@codemieai/code 0.0.55 → 0.0.57
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/README.md +28 -0
- package/dist/agents/core/AgentCLI.d.ts.map +1 -1
- package/dist/agents/core/AgentCLI.js +27 -2
- package/dist/agents/core/AgentCLI.js.map +1 -1
- package/dist/agents/core/BaseAgentAdapter.d.ts.map +1 -1
- package/dist/agents/core/BaseAgentAdapter.js +20 -6
- package/dist/agents/core/BaseAgentAdapter.js.map +1 -1
- package/dist/agents/core/session/ensure-session.d.ts.map +1 -1
- package/dist/agents/core/session/ensure-session.js +7 -2
- package/dist/agents/core/session/ensure-session.js.map +1 -1
- package/dist/agents/core/session/types.d.ts +1 -0
- package/dist/agents/core/session/types.d.ts.map +1 -1
- package/dist/agents/plugins/claude/claude.plugin.js +4 -4
- package/dist/agents/plugins/claude/claude.plugin.js.map +1 -1
- package/dist/agents/plugins/claude/plugin/.claude-plugin/plugin.json +1 -1
- package/dist/agents/plugins/claude/plugin/skills/codemie-html-report/SKILL.md +273 -0
- package/dist/agents/plugins/claude/plugin/skills/codemie-html-report/style-guide/css/base.css +166 -0
- package/dist/agents/plugins/claude/plugin/skills/codemie-html-report/style-guide/css/buttons.css +253 -0
- package/dist/agents/plugins/claude/plugin/skills/codemie-html-report/style-guide/css/components.css +605 -0
- package/dist/agents/plugins/claude/plugin/skills/codemie-html-report/style-guide/css/forms.css +550 -0
- package/dist/agents/plugins/claude/plugin/skills/codemie-html-report/style-guide/css/layout.css +410 -0
- package/dist/agents/plugins/claude/plugin/skills/codemie-html-report/style-guide/css/tokens.css +323 -0
- package/dist/agents/plugins/claude/plugin/skills/codemie-html-report/style-guide/css/typography.css +155 -0
- package/dist/agents/plugins/claude/plugin/skills/codemie-html-report/style-guide/css/utilities.css +238 -0
- package/dist/agents/plugins/claude/plugin/skills/msgraph/SKILL.md +10 -8
- package/dist/agents/plugins/claude/plugin/skills/msgraph/scripts/msgraph.js +298 -149
- package/dist/cli/commands/hook.d.ts +2 -0
- package/dist/cli/commands/hook.d.ts.map +1 -1
- package/dist/cli/commands/hook.js +36 -31
- package/dist/cli/commands/hook.js.map +1 -1
- package/dist/cli/commands/setup.js +11 -1
- package/dist/cli/commands/setup.js.map +1 -1
- package/dist/providers/core/codemie-auth-helpers.d.ts +22 -0
- package/dist/providers/core/codemie-auth-helpers.d.ts.map +1 -0
- package/dist/providers/core/codemie-auth-helpers.js +118 -0
- package/dist/providers/core/codemie-auth-helpers.js.map +1 -0
- package/dist/providers/core/index.d.ts +1 -0
- package/dist/providers/core/index.d.ts.map +1 -1
- package/dist/providers/core/index.js +1 -0
- package/dist/providers/core/index.js.map +1 -1
- package/dist/providers/core/types.d.ts +4 -0
- package/dist/providers/core/types.d.ts.map +1 -1
- package/dist/providers/core/types.js.map +1 -1
- package/dist/providers/index.d.ts +2 -0
- package/dist/providers/index.d.ts.map +1 -1
- package/dist/providers/index.js +2 -0
- package/dist/providers/index.js.map +1 -1
- package/dist/providers/plugins/anthropic-subscription/anthropic-subscription.auth.d.ts +11 -0
- package/dist/providers/plugins/anthropic-subscription/anthropic-subscription.auth.d.ts.map +1 -0
- package/dist/providers/plugins/anthropic-subscription/anthropic-subscription.auth.js +30 -0
- package/dist/providers/plugins/anthropic-subscription/anthropic-subscription.auth.js.map +1 -0
- package/dist/providers/plugins/anthropic-subscription/anthropic-subscription.setup-steps.d.ts +8 -0
- package/dist/providers/plugins/anthropic-subscription/anthropic-subscription.setup-steps.d.ts.map +1 -0
- package/dist/providers/plugins/anthropic-subscription/anthropic-subscription.setup-steps.js +88 -0
- package/dist/providers/plugins/anthropic-subscription/anthropic-subscription.setup-steps.js.map +1 -0
- package/dist/providers/plugins/anthropic-subscription/anthropic-subscription.template.d.ts +11 -0
- package/dist/providers/plugins/anthropic-subscription/anthropic-subscription.template.d.ts.map +1 -0
- package/dist/providers/plugins/anthropic-subscription/anthropic-subscription.template.js +119 -0
- package/dist/providers/plugins/anthropic-subscription/anthropic-subscription.template.js.map +1 -0
- package/dist/providers/plugins/anthropic-subscription/index.d.ts +9 -0
- package/dist/providers/plugins/anthropic-subscription/index.d.ts.map +1 -0
- package/dist/providers/plugins/anthropic-subscription/index.js +9 -0
- package/dist/providers/plugins/anthropic-subscription/index.js.map +1 -0
- package/dist/providers/plugins/jwt/jwt.setup-steps.js +1 -1
- package/dist/providers/plugins/jwt/jwt.setup-steps.js.map +1 -1
- package/dist/providers/plugins/sso/proxy/plugins/claude-thinking-transformer.plugin.d.ts +30 -0
- package/dist/providers/plugins/sso/proxy/plugins/claude-thinking-transformer.plugin.d.ts.map +1 -0
- package/dist/providers/plugins/sso/proxy/plugins/claude-thinking-transformer.plugin.js +111 -0
- package/dist/providers/plugins/sso/proxy/plugins/claude-thinking-transformer.plugin.js.map +1 -0
- package/dist/providers/plugins/sso/proxy/plugins/index.d.ts +2 -1
- package/dist/providers/plugins/sso/proxy/plugins/index.d.ts.map +1 -1
- package/dist/providers/plugins/sso/proxy/plugins/index.js +3 -1
- package/dist/providers/plugins/sso/proxy/plugins/index.js.map +1 -1
- package/dist/providers/plugins/sso/proxy/plugins/sso.session-sync.plugin.d.ts.map +1 -1
- package/dist/providers/plugins/sso/proxy/plugins/sso.session-sync.plugin.js +9 -7
- package/dist/providers/plugins/sso/proxy/plugins/sso.session-sync.plugin.js.map +1 -1
- package/dist/providers/plugins/sso/proxy/plugins/types.d.ts +1 -0
- package/dist/providers/plugins/sso/proxy/plugins/types.d.ts.map +1 -1
- package/dist/providers/plugins/sso/proxy/proxy-types.d.ts +2 -0
- package/dist/providers/plugins/sso/proxy/proxy-types.d.ts.map +1 -1
- package/dist/providers/plugins/sso/proxy/sso.proxy.d.ts.map +1 -1
- package/dist/providers/plugins/sso/proxy/sso.proxy.js +10 -0
- package/dist/providers/plugins/sso/proxy/sso.proxy.js.map +1 -1
- package/dist/providers/plugins/sso/session/processors/metrics/metrics-aggregator.js +1 -1
- package/dist/providers/plugins/sso/session/processors/metrics/metrics-aggregator.js.map +1 -1
- package/dist/providers/plugins/sso/session/processors/metrics/metrics-api-client.d.ts +2 -2
- package/dist/providers/plugins/sso/session/processors/metrics/metrics-api-client.d.ts.map +1 -1
- package/dist/providers/plugins/sso/session/processors/metrics/metrics-api-client.js +4 -4
- package/dist/providers/plugins/sso/session/processors/metrics/metrics-api-client.js.map +1 -1
- package/dist/providers/plugins/sso/sso.auth.d.ts +0 -4
- package/dist/providers/plugins/sso/sso.auth.d.ts.map +1 -1
- package/dist/providers/plugins/sso/sso.auth.js +3 -13
- package/dist/providers/plugins/sso/sso.auth.js.map +1 -1
- package/dist/providers/plugins/sso/sso.http-client.d.ts +3 -42
- package/dist/providers/plugins/sso/sso.http-client.d.ts.map +1 -1
- package/dist/providers/plugins/sso/sso.http-client.js +4 -75
- package/dist/providers/plugins/sso/sso.http-client.js.map +1 -1
- package/dist/providers/plugins/sso/sso.setup-steps.d.ts.map +1 -1
- package/dist/providers/plugins/sso/sso.setup-steps.js +15 -66
- package/dist/providers/plugins/sso/sso.setup-steps.js.map +1 -1
- package/dist/providers/plugins/sso/sso.template.d.ts.map +1 -1
- package/dist/providers/plugins/sso/sso.template.js +2 -1
- package/dist/providers/plugins/sso/sso.template.js.map +1 -1
- package/dist/utils/config.d.ts.map +1 -1
- package/dist/utils/config.js +17 -0
- package/dist/utils/config.js.map +1 -1
- package/dist/utils/processes.d.ts +9 -0
- package/dist/utils/processes.d.ts.map +1 -1
- package/dist/utils/processes.js +21 -0
- package/dist/utils/processes.js.map +1 -1
- package/package.json +3 -3
|
@@ -4,21 +4,9 @@
|
|
|
4
4
|
* CodeMie-specific HTTP client with SSO cookie handling
|
|
5
5
|
*/
|
|
6
6
|
import type { CodeMieIntegration } from '../../core/types.js';
|
|
7
|
-
|
|
8
|
-
|
|
9
|
-
|
|
10
|
-
export interface CodeMieUserInfo {
|
|
11
|
-
userId: string;
|
|
12
|
-
name: string;
|
|
13
|
-
username: string;
|
|
14
|
-
isAdmin: boolean;
|
|
15
|
-
applications: string[];
|
|
16
|
-
applications_admin: string[];
|
|
17
|
-
applicationsAdmin?: string[];
|
|
18
|
-
picture: string;
|
|
19
|
-
knowledgeBases: string[];
|
|
20
|
-
userType?: string;
|
|
21
|
-
}
|
|
7
|
+
import { fetchCodeMieUserInfo } from '../../core/codemie-auth-helpers.js';
|
|
8
|
+
export { fetchCodeMieUserInfo };
|
|
9
|
+
export type { CodeMieUserInfo } from '../../core/codemie-auth-helpers.js';
|
|
22
10
|
/**
|
|
23
11
|
* CodeMie API endpoints
|
|
24
12
|
*/
|
|
@@ -30,20 +18,6 @@ export declare const CODEMIE_ENDPOINTS: {
|
|
|
30
18
|
readonly METRICS: "/v1/metrics";
|
|
31
19
|
readonly AUTH_LOGIN: "/v1/auth/login";
|
|
32
20
|
};
|
|
33
|
-
/**
|
|
34
|
-
* Ensure API base URL has correct format with /code-assistant-api suffix
|
|
35
|
-
*
|
|
36
|
-
* @param rawUrl - Raw URL from user input (e.g., https://codemie.lab.epam.com)
|
|
37
|
-
* @returns Normalized URL with /code-assistant-api suffix
|
|
38
|
-
*
|
|
39
|
-
* @example
|
|
40
|
-
* ensureApiBase('https://codemie.lab.epam.com')
|
|
41
|
-
* // => 'https://codemie.lab.epam.com/code-assistant-api'
|
|
42
|
-
*
|
|
43
|
-
* ensureApiBase('https://codemie.lab.epam.com/code-assistant-api')
|
|
44
|
-
* // => 'https://codemie.lab.epam.com/code-assistant-api'
|
|
45
|
-
*/
|
|
46
|
-
export declare function ensureApiBase(rawUrl: string): string;
|
|
47
21
|
/**
|
|
48
22
|
* Full model descriptor returned by GET /v1/llm_models?include_all=true
|
|
49
23
|
*/
|
|
@@ -92,19 +66,6 @@ export declare function fetchCodeMieLlmModels(apiUrl: string, jwtToken: string):
|
|
|
92
66
|
*/
|
|
93
67
|
export declare function fetchCodeMieModels(apiUrl: string, cookies: Record<string, string>): Promise<string[]>;
|
|
94
68
|
export declare function fetchCodeMieModels(apiUrl: string, jwtToken: string): Promise<string[]>;
|
|
95
|
-
/**
|
|
96
|
-
* Fetch user information including accessible applications (supports both cookies and JWT)
|
|
97
|
-
*
|
|
98
|
-
* @param apiUrl - CodeMie API base URL
|
|
99
|
-
* @param auth - SSO session cookies or JWT token
|
|
100
|
-
* @returns User info with applications array
|
|
101
|
-
* @throws Error if request fails or response invalid
|
|
102
|
-
*
|
|
103
|
-
* Overload 1: SSO cookies (backward compatible - existing callers unchanged)
|
|
104
|
-
* Overload 2: JWT token string (new)
|
|
105
|
-
*/
|
|
106
|
-
export declare function fetchCodeMieUserInfo(apiUrl: string, cookies: Record<string, string>): Promise<CodeMieUserInfo>;
|
|
107
|
-
export declare function fetchCodeMieUserInfo(apiUrl: string, jwtToken: string): Promise<CodeMieUserInfo>;
|
|
108
69
|
/**
|
|
109
70
|
* Fetch application details (non-blocking, best-effort) - supports both cookies and JWT
|
|
110
71
|
*
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"sso.http-client.d.ts","sourceRoot":"","sources":["../../../../src/providers/plugins/sso/sso.http-client.ts"],"names":[],"mappings":"AAAA;;;;GAIG;
|
|
1
|
+
{"version":3,"file":"sso.http-client.d.ts","sourceRoot":"","sources":["../../../../src/providers/plugins/sso/sso.http-client.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH,OAAO,KAAK,EAAgB,kBAAkB,EAA+B,MAAM,qBAAqB,CAAC;AAEzG,OAAO,EACL,oBAAoB,EAErB,MAAM,oCAAoC,CAAC;AAC5C,OAAO,EAAE,oBAAoB,EAAE,CAAC;AAChC,YAAY,EAAE,eAAe,EAAE,MAAM,oCAAoC,CAAC;AAE1E;;GAEG;AACH,eAAO,MAAM,iBAAiB;;;;;;;CAOpB,CAAC;AAGX;;GAEG;AACH,MAAM,WAAW,QAAQ;IACvB,SAAS,EAAE,MAAM,CAAC;IAClB,eAAe,EAAE,MAAM,CAAC;IACxB,KAAK,EAAE,MAAM,CAAC;IACd,UAAU,CAAC,EAAE,OAAO,CAAC;IACrB,WAAW,CAAC,EAAE,OAAO,CAAC;IACtB,OAAO,EAAE,OAAO,CAAC;IACjB,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,OAAO,CAAC,EAAE,OAAO,CAAC;IAClB,IAAI,CAAC,EAAE;QACL,KAAK,CAAC,EAAE,MAAM,CAAC;QACf,MAAM,CAAC,EAAE,MAAM,CAAC;QAChB,2BAA2B,CAAC,EAAE,MAAM,CAAC;QACrC,+BAA+B,CAAC,EAAE,MAAM,CAAC;KAC1C,CAAC;IACF,QAAQ,CAAC,EAAE;QACT,SAAS,CAAC,EAAE,OAAO,CAAC;QACpB,KAAK,CAAC,EAAE,OAAO,CAAC;QAChB,WAAW,CAAC,EAAE,OAAO,CAAC;QACtB,mBAAmB,CAAC,EAAE,OAAO,CAAC;QAC9B,aAAa,CAAC,EAAE,OAAO,CAAC;QACxB,UAAU,CAAC,EAAE,OAAO,CAAC;QACrB,KAAK,CAAC,EAAE,OAAO,CAAC;KACjB,CAAC;IACF,iBAAiB,CAAC,EAAE,OAAO,CAAC;CAC7B;AAED;;;;;;;;GAQG;AAEH,wBAAgB,qBAAqB,CACnC,MAAM,EAAE,MAAM,EACd,OAAO,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,GAC9B,OAAO,CAAC,QAAQ,EAAE,CAAC,CAAC;AACvB,wBAAgB,qBAAqB,CACnC,MAAM,EAAE,MAAM,EACd,QAAQ,EAAE,MAAM,GACf,OAAO,CAAC,QAAQ,EAAE,CAAC,CAAC;AA6BvB;;;;;GAKG;AAEH,wBAAgB,kBAAkB,CAChC,MAAM,EAAE,MAAM,EACd,OAAO,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,GAC9B,OAAO,CAAC,MAAM,EAAE,CAAC,CAAC;AACrB,wBAAgB,kBAAkB,CAChC,MAAM,EAAE,MAAM,EACd,QAAQ,EAAE,MAAM,GACf,OAAO,CAAC,MAAM,EAAE,CAAC,CAAC;AAoDrB;;;;;;;;;GASG;AAEH,wBAAgB,uBAAuB,CACrC,MAAM,EAAE,MAAM,EACd,OAAO,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,GAC9B,OAAO,CAAC,MAAM,EAAE,CAAC,CAAC;AACrB,wBAAgB,uBAAuB,CACrC,MAAM,EAAE,MAAM,EACd,QAAQ,EAAE,MAAM,GACf,OAAO,CAAC,MAAM,EAAE,CAAC,CAAC;AA8BrB;;;;;GAKG;AAEH,wBAAgB,wBAAwB,CACtC,MAAM,EAAE,MAAM,EACd,OAAO,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,EAC/B,YAAY,CAAC,EAAE,MAAM,GACpB,OAAO,CAAC,kBAAkB,EAAE,CAAC,CAAC;AACjC,wBAAgB,wBAAwB,CACtC,MAAM,EAAE,MAAM,EACd,QAAQ,EAAE,MAAM,EAChB,YAAY,CAAC,EAAE,MAAM,GACpB,OAAO,CAAC,kBAAkB,EAAE,CAAC,CAAC"}
|
|
@@ -4,6 +4,8 @@
|
|
|
4
4
|
* CodeMie-specific HTTP client with SSO cookie handling
|
|
5
5
|
*/
|
|
6
6
|
import { HTTPClient } from '../../core/base/http-client.js';
|
|
7
|
+
import { fetchCodeMieUserInfo, buildAuthHeaders } from '../../core/codemie-auth-helpers.js';
|
|
8
|
+
export { fetchCodeMieUserInfo };
|
|
7
9
|
/**
|
|
8
10
|
* CodeMie API endpoints
|
|
9
11
|
*/
|
|
@@ -15,50 +17,6 @@ export const CODEMIE_ENDPOINTS = {
|
|
|
15
17
|
METRICS: '/v1/metrics',
|
|
16
18
|
AUTH_LOGIN: '/v1/auth/login'
|
|
17
19
|
};
|
|
18
|
-
/**
|
|
19
|
-
* Internal helper: build auth headers from cookies or JWT token
|
|
20
|
-
*/
|
|
21
|
-
function buildAuthHeaders(auth) {
|
|
22
|
-
const cliVersion = process.env.CODEMIE_CLI_VERSION || 'unknown';
|
|
23
|
-
const headers = {
|
|
24
|
-
'Content-Type': 'application/json',
|
|
25
|
-
'User-Agent': `codemie-cli/${cliVersion}`,
|
|
26
|
-
'X-CodeMie-CLI': `codemie-cli/${cliVersion}`,
|
|
27
|
-
'X-CodeMie-Client': 'codemie-cli'
|
|
28
|
-
};
|
|
29
|
-
if (typeof auth === 'string') {
|
|
30
|
-
// JWT token (string)
|
|
31
|
-
headers['authorization'] = `Bearer ${auth}`;
|
|
32
|
-
}
|
|
33
|
-
else {
|
|
34
|
-
// SSO cookies (object) - existing behavior
|
|
35
|
-
headers['cookie'] = Object.entries(auth)
|
|
36
|
-
.map(([key, value]) => `${key}=${value}`)
|
|
37
|
-
.join(';');
|
|
38
|
-
}
|
|
39
|
-
return headers;
|
|
40
|
-
}
|
|
41
|
-
/**
|
|
42
|
-
* Ensure API base URL has correct format with /code-assistant-api suffix
|
|
43
|
-
*
|
|
44
|
-
* @param rawUrl - Raw URL from user input (e.g., https://codemie.lab.epam.com)
|
|
45
|
-
* @returns Normalized URL with /code-assistant-api suffix
|
|
46
|
-
*
|
|
47
|
-
* @example
|
|
48
|
-
* ensureApiBase('https://codemie.lab.epam.com')
|
|
49
|
-
* // => 'https://codemie.lab.epam.com/code-assistant-api'
|
|
50
|
-
*
|
|
51
|
-
* ensureApiBase('https://codemie.lab.epam.com/code-assistant-api')
|
|
52
|
-
* // => 'https://codemie.lab.epam.com/code-assistant-api'
|
|
53
|
-
*/
|
|
54
|
-
export function ensureApiBase(rawUrl) {
|
|
55
|
-
let base = rawUrl.replace(/\/$/, ''); // Remove trailing slash
|
|
56
|
-
// If URL doesn't have /code-assistant-api suffix, append it
|
|
57
|
-
if (!/\/code-assistant-api(\/|$)/i.test(base)) {
|
|
58
|
-
base = `${base}/code-assistant-api`;
|
|
59
|
-
}
|
|
60
|
-
return base;
|
|
61
|
-
}
|
|
62
20
|
export async function fetchCodeMieLlmModels(apiUrl, auth) {
|
|
63
21
|
/* eslint-enable no-redeclare */
|
|
64
22
|
const headers = buildAuthHeaders(auth);
|
|
@@ -85,8 +43,8 @@ export async function fetchCodeMieModels(apiUrl, auth) {
|
|
|
85
43
|
const headers = buildAuthHeaders(auth);
|
|
86
44
|
const url = `${apiUrl}${CODEMIE_ENDPOINTS.MODELS}`;
|
|
87
45
|
const client = new HTTPClient({
|
|
88
|
-
timeout:
|
|
89
|
-
maxRetries:
|
|
46
|
+
timeout: 30000,
|
|
47
|
+
maxRetries: 5,
|
|
90
48
|
rejectUnauthorized: false
|
|
91
49
|
});
|
|
92
50
|
const response = await client.getRaw(url, headers);
|
|
@@ -120,35 +78,6 @@ export async function fetchCodeMieModels(apiUrl, auth) {
|
|
|
120
78
|
.sort();
|
|
121
79
|
return filteredModels;
|
|
122
80
|
}
|
|
123
|
-
export async function fetchCodeMieUserInfo(apiUrl, auth) {
|
|
124
|
-
const headers = buildAuthHeaders(auth);
|
|
125
|
-
const url = `${apiUrl}${CODEMIE_ENDPOINTS.USER}`;
|
|
126
|
-
const client = new HTTPClient({
|
|
127
|
-
timeout: 10000,
|
|
128
|
-
maxRetries: 3,
|
|
129
|
-
rejectUnauthorized: false
|
|
130
|
-
});
|
|
131
|
-
const response = await client.getRaw(url, headers);
|
|
132
|
-
// Handle HTTP errors
|
|
133
|
-
if (!response.statusCode || response.statusCode < 200 || response.statusCode >= 300) {
|
|
134
|
-
if (response.statusCode === 401 || response.statusCode === 403) {
|
|
135
|
-
throw new Error('Authentication failed - invalid or expired credentials');
|
|
136
|
-
}
|
|
137
|
-
throw new Error(`Failed to fetch user info: ${response.statusCode} ${response.statusMessage}`);
|
|
138
|
-
}
|
|
139
|
-
// Parse response
|
|
140
|
-
const userInfo = JSON.parse(response.data);
|
|
141
|
-
// Normalize applications_admin: support both snake_case and camelCase variants
|
|
142
|
-
// applications_admin has higher priority; fall back to applicationsAdmin if missing
|
|
143
|
-
if (!Array.isArray(userInfo.applications_admin) && Array.isArray(userInfo.applicationsAdmin)) {
|
|
144
|
-
userInfo.applications_admin = userInfo.applicationsAdmin;
|
|
145
|
-
}
|
|
146
|
-
// Validate response structure
|
|
147
|
-
if (!userInfo || !Array.isArray(userInfo.applications) || !Array.isArray(userInfo.applications_admin)) {
|
|
148
|
-
throw new Error('Invalid user info response: missing applications arrays');
|
|
149
|
-
}
|
|
150
|
-
return userInfo;
|
|
151
|
-
}
|
|
152
81
|
export async function fetchApplicationDetails(apiUrl, auth) {
|
|
153
82
|
try {
|
|
154
83
|
const headers = buildAuthHeaders(auth);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"sso.http-client.js","sourceRoot":"","sources":["../../../../src/providers/plugins/sso/sso.http-client.ts"],"names":[],"mappings":"AAAA;;;;GAIG;
|
|
1
|
+
{"version":3,"file":"sso.http-client.js","sourceRoot":"","sources":["../../../../src/providers/plugins/sso/sso.http-client.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"sso.setup-steps.d.ts","sourceRoot":"","sources":["../../../../src/providers/plugins/sso/sso.setup-steps.ts"],"names":[],"mappings":"AAAA;;;;;;;;;GASG;AAKH,OAAO,KAAK,EACV,kBAAkB,EAInB,MAAM,qBAAqB,CAAC;
|
|
1
|
+
{"version":3,"file":"sso.setup-steps.d.ts","sourceRoot":"","sources":["../../../../src/providers/plugins/sso/sso.setup-steps.ts"],"names":[],"mappings":"AAAA;;;;;;;;;GASG;AAKH,OAAO,KAAK,EACV,kBAAkB,EAInB,MAAM,qBAAqB,CAAC;AAc7B;;GAEG;AACH,eAAO,MAAM,aAAa,EAAE,kBA2R3B,CAAC"}
|
|
@@ -12,11 +12,11 @@ import inquirer from 'inquirer';
|
|
|
12
12
|
import chalk from 'chalk';
|
|
13
13
|
import ora from 'ora';
|
|
14
14
|
import { ProviderRegistry } from '../../core/registry.js';
|
|
15
|
-
import { SSOTemplate } from './sso.template.js';
|
|
16
15
|
import { CodeMieSSO } from './sso.auth.js';
|
|
17
16
|
import { SSOModelProxy } from './sso.models.js';
|
|
18
|
-
import {
|
|
17
|
+
import { fetchCodeMieModels, fetchCodeMieIntegrations } from './sso.http-client.js';
|
|
19
18
|
import { logger } from '../../../utils/logger.js';
|
|
19
|
+
import { DEFAULT_CODEMIE_BASE_URL, authenticateWithCodeMie, promptForCodeMieUrl, selectCodeMieProject } from '../../core/codemie-auth-helpers.js';
|
|
20
20
|
/**
|
|
21
21
|
* SSO setup steps implementation
|
|
22
22
|
*/
|
|
@@ -28,32 +28,10 @@ export const SSOSetupSteps = {
|
|
|
28
28
|
* Prompts for CodeMie URL and performs browser-based authentication
|
|
29
29
|
*/
|
|
30
30
|
async getCredentials() {
|
|
31
|
-
|
|
32
|
-
const answers = await inquirer.prompt([
|
|
33
|
-
{
|
|
34
|
-
type: 'input',
|
|
35
|
-
name: 'codeMieUrl',
|
|
36
|
-
message: 'CodeMie organization URL:',
|
|
37
|
-
default: SSOTemplate.defaultBaseUrl,
|
|
38
|
-
validate: (input) => {
|
|
39
|
-
if (!input.trim()) {
|
|
40
|
-
return 'CodeMie URL is required';
|
|
41
|
-
}
|
|
42
|
-
if (!input.startsWith('http://') && !input.startsWith('https://')) {
|
|
43
|
-
return 'Please enter a valid URL starting with http:// or https://';
|
|
44
|
-
}
|
|
45
|
-
return true;
|
|
46
|
-
}
|
|
47
|
-
}
|
|
48
|
-
]);
|
|
49
|
-
const codeMieUrl = answers.codeMieUrl.trim();
|
|
31
|
+
const codeMieUrl = await promptForCodeMieUrl(DEFAULT_CODEMIE_BASE_URL);
|
|
50
32
|
// Authenticate via browser
|
|
51
33
|
console.log(chalk.cyan('\n🔐 Authenticating via browser...\n'));
|
|
52
|
-
const
|
|
53
|
-
const authResult = await sso.authenticate({
|
|
54
|
-
codeMieUrl,
|
|
55
|
-
timeout: 120000 // 2 minutes
|
|
56
|
-
});
|
|
34
|
+
const authResult = await authenticateWithCodeMie(codeMieUrl, 120000);
|
|
57
35
|
if (!authResult.success) {
|
|
58
36
|
throw new Error(`SSO authentication failed: ${authResult.error || 'Unknown error'}`);
|
|
59
37
|
}
|
|
@@ -66,41 +44,7 @@ export const SSOSetupSteps = {
|
|
|
66
44
|
if (!authResult.apiUrl || !authResult.cookies) {
|
|
67
45
|
throw new Error('API URL or cookies not found in authentication result');
|
|
68
46
|
}
|
|
69
|
-
|
|
70
|
-
const userInfo = await fetchCodeMieUserInfo(authResult.apiUrl, authResult.cookies);
|
|
71
|
-
// Merge applications and applicationsAdmin arrays (deduplicated)
|
|
72
|
-
const applications = userInfo.applications || [];
|
|
73
|
-
const applicationsAdmin = userInfo.applications_admin || [];
|
|
74
|
-
const allProjects = [...new Set([...applications, ...applicationsAdmin])];
|
|
75
|
-
// Validate that user has at least one project
|
|
76
|
-
if (allProjects.length === 0) {
|
|
77
|
-
throw new Error('No projects found for your account. Please contact your administrator.');
|
|
78
|
-
}
|
|
79
|
-
// Sort projects alphabetically (case-insensitive)
|
|
80
|
-
const sortedProjects = allProjects.sort((a, b) => a.localeCompare(b, undefined, { sensitivity: 'base' }));
|
|
81
|
-
// Auto-select if only one project
|
|
82
|
-
if (sortedProjects.length === 1) {
|
|
83
|
-
selectedProject = sortedProjects[0];
|
|
84
|
-
console.log(chalk.green(`✓ Auto-selected project: ${chalk.bold(selectedProject)}\n`));
|
|
85
|
-
}
|
|
86
|
-
else {
|
|
87
|
-
// Multiple projects - prompt user to select
|
|
88
|
-
console.log(chalk.dim(`Found ${sortedProjects.length} accessible project(s)\n`));
|
|
89
|
-
const projectAnswers = await inquirer.prompt([
|
|
90
|
-
{
|
|
91
|
-
type: 'list',
|
|
92
|
-
name: 'project',
|
|
93
|
-
message: 'Select your project:',
|
|
94
|
-
choices: sortedProjects.map(proj => ({
|
|
95
|
-
name: proj,
|
|
96
|
-
value: proj
|
|
97
|
-
})),
|
|
98
|
-
pageSize: 15
|
|
99
|
-
}
|
|
100
|
-
]);
|
|
101
|
-
selectedProject = projectAnswers.project;
|
|
102
|
-
console.log(chalk.green(`✓ Selected project: ${chalk.bold(selectedProject)}\n`));
|
|
103
|
-
}
|
|
47
|
+
selectedProject = await selectCodeMieProject(authResult);
|
|
104
48
|
}
|
|
105
49
|
catch (error) {
|
|
106
50
|
const errorMsg = error instanceof Error ? error.message : String(error);
|
|
@@ -132,10 +76,16 @@ export const SSOSetupSteps = {
|
|
|
132
76
|
console.log(chalk.yellow(`⚠️ Could not fetch integrations: ${integrationsFetchError}\n`));
|
|
133
77
|
integrations = [];
|
|
134
78
|
}
|
|
135
|
-
//
|
|
79
|
+
// Resolve integration: auto-select if single, prompt if multiple, preserve existing on failure
|
|
136
80
|
let integrationInfo;
|
|
137
|
-
|
|
138
|
-
|
|
81
|
+
const projectLabel = selectedProject ? ` for project "${selectedProject}"` : '';
|
|
82
|
+
if (integrations.length === 1) {
|
|
83
|
+
// Auto-select the only available integration
|
|
84
|
+
const single = integrations[0];
|
|
85
|
+
integrationInfo = { id: single.id, alias: single.alias };
|
|
86
|
+
console.log(chalk.green(`✓ Auto-selected LiteLLM integration: ${chalk.bold(integrationInfo.alias)}\n`));
|
|
87
|
+
}
|
|
88
|
+
else if (integrations.length > 1) {
|
|
139
89
|
console.log(chalk.cyan(`📦 Found ${integrations.length} LiteLLM integration(s)${projectLabel}\n`));
|
|
140
90
|
const integrationAnswers = await inquirer.prompt([
|
|
141
91
|
{
|
|
@@ -154,8 +104,7 @@ export const SSOSetupSteps = {
|
|
|
154
104
|
integrationInfo = integrationAnswers.integration;
|
|
155
105
|
}
|
|
156
106
|
else {
|
|
157
|
-
//
|
|
158
|
-
const projectLabel = selectedProject ? ` for project "${selectedProject}"` : '';
|
|
107
|
+
// No integrations found
|
|
159
108
|
if (integrationsFetchError) {
|
|
160
109
|
console.log(chalk.dim(`ℹ️ Proceeding without LiteLLM integration (fetch failed)\n`));
|
|
161
110
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"sso.setup-steps.js","sourceRoot":"","sources":["../../../../src/providers/plugins/sso/sso.setup-steps.ts"],"names":[],"mappings":"AAAA;;;;;;;;;GASG;AAEH,OAAO,QAAQ,MAAM,UAAU,CAAC;AAChC,OAAO,KAAK,MAAM,OAAO,CAAC;AAC1B,OAAO,GAAG,MAAM,KAAK,CAAC;AAQtB,OAAO,EAAE,gBAAgB,EAAE,MAAM,wBAAwB,CAAC;AAC1D,OAAO,EAAE,
|
|
1
|
+
{"version":3,"file":"sso.setup-steps.js","sourceRoot":"","sources":["../../../../src/providers/plugins/sso/sso.setup-steps.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"sso.template.d.ts","sourceRoot":"","sources":["../../../../src/providers/plugins/sso/sso.template.ts"],"names":[],"mappings":"AAAA;;;;;;;GAOG;AAEH,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,qBAAqB,CAAC;
|
|
1
|
+
{"version":3,"file":"sso.template.d.ts","sourceRoot":"","sources":["../../../../src/providers/plugins/sso/sso.template.ts"],"names":[],"mappings":"AAAA;;;;;;;GAOG;AAEH,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,qBAAqB,CAAC;AAK5D,eAAO,MAAM,WAAW,kBAsItB,CAAC"}
|
|
@@ -7,11 +7,12 @@
|
|
|
7
7
|
* Auto-registers on import via registerProvider().
|
|
8
8
|
*/
|
|
9
9
|
import { registerProvider } from '../../core/index.js';
|
|
10
|
+
import { DEFAULT_CODEMIE_BASE_URL } from '../../core/codemie-auth-helpers.js';
|
|
10
11
|
export const SSOTemplate = registerProvider({
|
|
11
12
|
name: 'ai-run-sso',
|
|
12
13
|
displayName: 'CodeMie SSO',
|
|
13
14
|
description: 'Enterprise SSO Authentication with centralized model management',
|
|
14
|
-
defaultBaseUrl:
|
|
15
|
+
defaultBaseUrl: DEFAULT_CODEMIE_BASE_URL,
|
|
15
16
|
requiresAuth: true,
|
|
16
17
|
authType: 'sso',
|
|
17
18
|
priority: 0, // Highest priority (shown first)
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"sso.template.js","sourceRoot":"","sources":["../../../../src/providers/plugins/sso/sso.template.ts"],"names":[],"mappings":"AAAA;;;;;;;GAOG;AAIH,OAAO,EAAE,gBAAgB,EAAE,MAAM,qBAAqB,CAAC;
|
|
1
|
+
{"version":3,"file":"sso.template.js","sourceRoot":"","sources":["../../../../src/providers/plugins/sso/sso.template.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"config.d.ts","sourceRoot":"","sources":["../../src/utils/config.ts"],"names":[],"mappings":"AAIA,OAAO,EACL,oBAAoB,EACpB,eAAe,EACf,mBAAmB,EACnB,sBAAsB,EACtB,gBAAgB,EAChB,iBAAiB,EACjB,gBAAgB,EAGjB,MAAM,iBAAiB,CAAC;AAKzB,YAAY,EAAE,oBAAoB,EAAE,sBAAsB,EAAE,gBAAgB,EAAE,iBAAiB,EAAE,CAAC;AAElG;;;;;;;GAOG;AACH,qBAAa,YAAY;IACvB,OAAO,CAAC,MAAM,CAAC,iBAAiB,CAAoB;IACpD,OAAO,CAAC,MAAM,CAAC,aAAa,CAA6C;IACzE,OAAO,CAAC,MAAM,CAAC,YAAY,CAAsC;IAGjE,OAAO,CAAC,MAAM,CAAC,kBAAkB,CAAoC;IAErE;;;OAGG;WACU,IAAI,CACf,UAAU,GAAE,MAAsB,EAClC,YAAY,CAAC,EAAE,OAAO,CAAC,oBAAoB,CAAC,GAC3C,OAAO,CAAC,oBAAoB,CAAC;
|
|
1
|
+
{"version":3,"file":"config.d.ts","sourceRoot":"","sources":["../../src/utils/config.ts"],"names":[],"mappings":"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"}
|
package/dist/utils/config.js
CHANGED
|
@@ -73,6 +73,18 @@ export class ConfigLoader {
|
|
|
73
73
|
delete filteredEnvConfig.provider;
|
|
74
74
|
filtered.push('provider');
|
|
75
75
|
}
|
|
76
|
+
if (!cliOverrides.codeMieUrl && filteredEnvConfig.codeMieUrl) {
|
|
77
|
+
delete filteredEnvConfig.codeMieUrl;
|
|
78
|
+
filtered.push('codeMieUrl');
|
|
79
|
+
}
|
|
80
|
+
if (!cliOverrides.authMethod && filteredEnvConfig.authMethod) {
|
|
81
|
+
delete filteredEnvConfig.authMethod;
|
|
82
|
+
filtered.push('authMethod');
|
|
83
|
+
}
|
|
84
|
+
if (!cliOverrides.codeMieIntegration && filteredEnvConfig.codeMieIntegration) {
|
|
85
|
+
delete filteredEnvConfig.codeMieIntegration;
|
|
86
|
+
filtered.push('codeMieIntegration');
|
|
87
|
+
}
|
|
76
88
|
if (filtered.length > 0 && config.debug) {
|
|
77
89
|
console.log(`[ConfigLoader] Profile protection: filtered environment vars: ${filtered.join(', ')}`);
|
|
78
90
|
}
|
|
@@ -899,6 +911,11 @@ export class ConfigLoader {
|
|
|
899
911
|
env.CODEMIE_TIMEOUT = String(config.timeout);
|
|
900
912
|
if (config.debug)
|
|
901
913
|
env.CODEMIE_DEBUG = String(config.debug);
|
|
914
|
+
// Always export CODEMIE_AUTH_METHOD so that a stale 'jwt' value written to
|
|
915
|
+
// process.env by a previous JWT-authenticated session cannot bleed into the
|
|
916
|
+
// current session and trigger proxy usage for non-JWT providers.
|
|
917
|
+
// Falls back to '' (no auth method) when the provider doesn't set one.
|
|
918
|
+
env.CODEMIE_AUTH_METHOD = config.authMethod ?? '';
|
|
902
919
|
// Provider-specific environment variables (pluggable)
|
|
903
920
|
// Each provider defines its own exportEnvVars function
|
|
904
921
|
if (providerTemplate?.exportEnvVars) {
|