@structured-world/gitlab-mcp 6.45.0 → 6.46.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/README.md +1 -1
- package/dist/src/entities/context/handlers.d.ts +4 -3
- package/dist/src/entities/context/handlers.js +7 -0
- package/dist/src/entities/context/handlers.js.map +1 -1
- package/dist/src/entities/context/registry.js +1 -1
- package/dist/src/entities/context/registry.js.map +1 -1
- package/dist/src/entities/context/schema.d.ts +6 -0
- package/dist/src/entities/context/schema.js +9 -0
- package/dist/src/entities/context/schema.js.map +1 -1
- package/dist/src/entities/context/types.d.ts +63 -0
- package/dist/src/entities/context/whoami.d.ts +2 -0
- package/dist/src/entities/context/whoami.js +263 -0
- package/dist/src/entities/context/whoami.js.map +1 -0
- package/dist/src/logger.d.ts +1 -0
- package/dist/src/logger.js +3 -2
- package/dist/src/logger.js.map +1 -1
- package/dist/src/logging/access-log.js +0 -1
- package/dist/src/logging/access-log.js.map +1 -1
- package/dist/src/logging/connection-tracker.js +6 -1
- package/dist/src/logging/connection-tracker.js.map +1 -1
- package/dist/src/logging/request-tracker.js +6 -1
- package/dist/src/logging/request-tracker.js.map +1 -1
- package/dist/src/registry-manager.d.ts +10 -0
- package/dist/src/registry-manager.js +59 -0
- package/dist/src/registry-manager.js.map +1 -1
- package/dist/src/services/ConnectionManager.d.ts +1 -0
- package/dist/src/services/ConnectionManager.js +27 -0
- package/dist/src/services/ConnectionManager.js.map +1 -1
- package/dist/structured-world-gitlab-mcp-6.46.0.tgz +0 -0
- package/dist/tsconfig.build.tsbuildinfo +1 -1
- package/package.json +1 -1
- package/dist/structured-world-gitlab-mcp-6.45.0.tgz +0 -0
package/README.md
CHANGED
|
@@ -4,7 +4,7 @@
|
|
|
4
4
|
|
|
5
5
|
A [Model Context Protocol](https://modelcontextprotocol.io) server that connects AI agents to the GitLab API — 44 tools across 18 entity types with CQRS architecture, OAuth 2.1, and multiple transport modes.
|
|
6
6
|
|
|
7
|
-
[](https://gitlab-mcp.sw.foundation/downloads/gitlab-mcp-6.
|
|
7
|
+
[](https://gitlab-mcp.sw.foundation/downloads/gitlab-mcp-6.46.0.mcpb)
|
|
8
8
|
[](vscode:mcp/install?%7B%22name%22%3A%22gitlab-mcp%22%2C%22command%22%3A%22npx%22%2C%22args%22%3A%5B%22-y%22%2C%22%40structured-world%2Fgitlab-mcp%22%5D%7D)
|
|
9
9
|
[](vscode-insiders:mcp/install?%7B%22name%22%3A%22gitlab-mcp%22%2C%22command%22%3A%22npx%22%2C%22args%22%3A%5B%22-y%22%2C%22%40structured-world%2Fgitlab-mcp%22%5D%7D)
|
|
10
10
|
|
|
@@ -1,5 +1,5 @@
|
|
|
1
|
-
import { ListPresetsInput, ListProfilesInput, ManageContextInput, ResetContextInput, SetScopeInput, ShowContextInput, SwitchPresetInput, SwitchProfileInput } from "./schema";
|
|
2
|
-
import { PresetInfo, ProfileInfo, ResetResult, SessionContext, SetScopeResult, SwitchResult } from "./types";
|
|
1
|
+
import { ListPresetsInput, ListProfilesInput, ManageContextInput, ResetContextInput, SetScopeInput, ShowContextInput, SwitchPresetInput, SwitchProfileInput, WhoamiInput } from "./schema";
|
|
2
|
+
import { PresetInfo, ProfileInfo, ResetResult, SessionContext, SetScopeResult, SwitchResult, WhoamiResult } from "./types";
|
|
3
3
|
export declare function handleShowContext(_input: ShowContextInput): Promise<SessionContext>;
|
|
4
4
|
export declare function handleListPresets(_input: ListPresetsInput): Promise<PresetInfo[]>;
|
|
5
5
|
export declare function handleListProfiles(_input: ListProfilesInput): Promise<ProfileInfo[]>;
|
|
@@ -7,4 +7,5 @@ export declare function handleSwitchPreset(input: SwitchPresetInput): Promise<Sw
|
|
|
7
7
|
export declare function handleSwitchProfile(input: SwitchProfileInput): Promise<SwitchResult>;
|
|
8
8
|
export declare function handleSetScope(input: SetScopeInput): Promise<SetScopeResult>;
|
|
9
9
|
export declare function handleResetContext(_input: ResetContextInput): Promise<ResetResult>;
|
|
10
|
-
export declare function
|
|
10
|
+
export declare function handleWhoami(_input: WhoamiInput): Promise<WhoamiResult>;
|
|
11
|
+
export declare function handleManageContext(input: ManageContextInput): Promise<SessionContext | PresetInfo[] | ProfileInfo[] | SwitchResult | SetScopeResult | ResetResult | WhoamiResult>;
|
|
@@ -7,8 +7,10 @@ exports.handleSwitchPreset = handleSwitchPreset;
|
|
|
7
7
|
exports.handleSwitchProfile = handleSwitchProfile;
|
|
8
8
|
exports.handleSetScope = handleSetScope;
|
|
9
9
|
exports.handleResetContext = handleResetContext;
|
|
10
|
+
exports.handleWhoami = handleWhoami;
|
|
10
11
|
exports.handleManageContext = handleManageContext;
|
|
11
12
|
const context_manager_1 = require("./context-manager");
|
|
13
|
+
const whoami_1 = require("./whoami");
|
|
12
14
|
async function handleShowContext(_input) {
|
|
13
15
|
const manager = (0, context_manager_1.getContextManager)();
|
|
14
16
|
return manager.getContext();
|
|
@@ -37,6 +39,9 @@ async function handleResetContext(_input) {
|
|
|
37
39
|
const manager = (0, context_manager_1.getContextManager)();
|
|
38
40
|
return manager.reset();
|
|
39
41
|
}
|
|
42
|
+
async function handleWhoami(_input) {
|
|
43
|
+
return (0, whoami_1.executeWhoami)();
|
|
44
|
+
}
|
|
40
45
|
async function handleManageContext(input) {
|
|
41
46
|
switch (input.action) {
|
|
42
47
|
case "show":
|
|
@@ -53,6 +58,8 @@ async function handleManageContext(input) {
|
|
|
53
58
|
return handleSetScope(input);
|
|
54
59
|
case "reset":
|
|
55
60
|
return handleResetContext(input);
|
|
61
|
+
case "whoami":
|
|
62
|
+
return handleWhoami(input);
|
|
56
63
|
default:
|
|
57
64
|
throw new Error(`Unknown action: ${input.action}`);
|
|
58
65
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"handlers.js","sourceRoot":"","sources":["../../../../src/entities/context/handlers.ts"],"names":[],"mappings":";;
|
|
1
|
+
{"version":3,"file":"handlers.js","sourceRoot":"","sources":["../../../../src/entities/context/handlers.ts"],"names":[],"mappings":";;AAgCA,8CAGC;AAKD,8CAGC;AAKD,gDAGC;AAKD,gDAGC;AAKD,kDAGC;AAKD,wCAGC;AAKD,gDAGC;AAKD,oCAEC;AAKD,kDAgCC;AAzHD,uDAAsD;AAqBtD,qCAAyC;AAKlC,KAAK,UAAU,iBAAiB,CAAC,MAAwB;IAC9D,MAAM,OAAO,GAAG,IAAA,mCAAiB,GAAE,CAAC;IACpC,OAAO,OAAO,CAAC,UAAU,EAAE,CAAC;AAC9B,CAAC;AAKM,KAAK,UAAU,iBAAiB,CAAC,MAAwB;IAC9D,MAAM,OAAO,GAAG,IAAA,mCAAiB,GAAE,CAAC;IACpC,OAAO,OAAO,CAAC,WAAW,EAAE,CAAC;AAC/B,CAAC;AAKM,KAAK,UAAU,kBAAkB,CAAC,MAAyB;IAChE,MAAM,OAAO,GAAG,IAAA,mCAAiB,GAAE,CAAC;IACpC,OAAO,OAAO,CAAC,YAAY,EAAE,CAAC;AAChC,CAAC;AAKM,KAAK,UAAU,kBAAkB,CAAC,KAAwB;IAC/D,MAAM,OAAO,GAAG,IAAA,mCAAiB,GAAE,CAAC;IACpC,OAAO,OAAO,CAAC,YAAY,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC;AAC5C,CAAC;AAKM,KAAK,UAAU,mBAAmB,CAAC,KAAyB;IACjE,MAAM,OAAO,GAAG,IAAA,mCAAiB,GAAE,CAAC;IACpC,OAAO,OAAO,CAAC,aAAa,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC;AAC9C,CAAC;AAKM,KAAK,UAAU,cAAc,CAAC,KAAoB;IACvD,MAAM,OAAO,GAAG,IAAA,mCAAiB,GAAE,CAAC;IACpC,OAAO,OAAO,CAAC,QAAQ,CAAC,KAAK,CAAC,SAAS,EAAE,KAAK,CAAC,gBAAgB,CAAC,CAAC;AACnE,CAAC;AAKM,KAAK,UAAU,kBAAkB,CAAC,MAAyB;IAChE,MAAM,OAAO,GAAG,IAAA,mCAAiB,GAAE,CAAC;IACpC,OAAO,OAAO,CAAC,KAAK,EAAE,CAAC;AACzB,CAAC;AAKM,KAAK,UAAU,YAAY,CAAC,MAAmB;IACpD,OAAO,IAAA,sBAAa,GAAE,CAAC;AACzB,CAAC;AAKM,KAAK,UAAU,mBAAmB,CACvC,KAAyB;IAUzB,QAAQ,KAAK,CAAC,MAAM,EAAE,CAAC;QACrB,KAAK,MAAM;YACT,OAAO,iBAAiB,CAAC,KAAK,CAAC,CAAC;QAClC,KAAK,cAAc;YACjB,OAAO,iBAAiB,CAAC,KAAK,CAAC,CAAC;QAClC,KAAK,eAAe;YAClB,OAAO,kBAAkB,CAAC,KAAK,CAAC,CAAC;QACnC,KAAK,eAAe;YAClB,OAAO,kBAAkB,CAAC,KAAK,CAAC,CAAC;QACnC,KAAK,gBAAgB;YACnB,OAAO,mBAAmB,CAAC,KAAK,CAAC,CAAC;QACpC,KAAK,WAAW;YACd,OAAO,cAAc,CAAC,KAAK,CAAC,CAAC;QAC/B,KAAK,OAAO;YACV,OAAO,kBAAkB,CAAC,KAAK,CAAC,CAAC;QACnC,KAAK,QAAQ;YACX,OAAO,YAAY,CAAC,KAAK,CAAC,CAAC;QAE7B;YACE,MAAM,IAAI,KAAK,CAAC,mBAAoB,KAA4B,CAAC,MAAM,EAAE,CAAC,CAAC;IAC/E,CAAC;AACH,CAAC"}
|
|
@@ -45,7 +45,7 @@ exports.contextToolRegistry = new Map([
|
|
|
45
45
|
"manage_context",
|
|
46
46
|
{
|
|
47
47
|
name: "manage_context",
|
|
48
|
-
description: "View and manage runtime session configuration. Actions: show (current host/preset/scope/mode), list_presets (available tool configurations), list_profiles (OAuth users), switch_preset (change active preset), switch_profile (change OAuth user), set_scope (restrict to namespace), reset (restore initial state).",
|
|
48
|
+
description: "View and manage runtime session configuration. Actions: show (current host/preset/scope/mode), list_presets (available tool configurations), list_profiles (OAuth users), whoami (token introspection with live refresh - detects permission changes and updates available tools), switch_preset (change active preset), switch_profile (change OAuth user), set_scope (restrict to namespace), reset (restore initial state). Use whoami to diagnose access issues and verify token permissions.",
|
|
49
49
|
inputSchema: z.toJSONSchema(schema_1.ManageContextSchema),
|
|
50
50
|
handler: async (args) => {
|
|
51
51
|
const input = schema_1.ManageContextSchema.parse(args);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"registry.js","sourceRoot":"","sources":["../../../../src/entities/context/registry.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
|
|
1
|
+
{"version":3,"file":"registry.js","sourceRoot":"","sources":["../../../../src/entities/context/registry.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AA+CA,kEAEC;AAKD,8DAEC;AAMD,0DAEC;AA1DD,uCAAyB;AAEzB,qCAA+C;AAC/C,yCAAiD;AAepC,QAAA,mBAAmB,GAAiB,IAAI,GAAG,CAAiC;IACvF;QACE,gBAAgB;QAChB;YACE,IAAI,EAAE,gBAAgB;YACtB,WAAW,EACT,meAAme;YACre,WAAW,EAAE,CAAC,CAAC,YAAY,CAAC,4BAAmB,CAAC;YAEhD,OAAO,EAAE,KAAK,EAAE,IAAa,EAAE,EAAE;gBAC/B,MAAM,KAAK,GAAG,4BAAmB,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;gBAC9C,OAAO,IAAA,8BAAmB,EAAC,KAAK,CAAC,CAAC;YACpC,CAAC;SACF;KACF;CACF,CAAC,CAAC;AAQH,SAAgB,2BAA2B;IACzC,OAAO,CAAC,gBAAgB,CAAC,CAAC;AAC5B,CAAC;AAKD,SAAgB,yBAAyB;IACvC,OAAO,KAAK,CAAC,IAAI,CAAC,2BAAmB,CAAC,MAAM,EAAE,CAAC,CAAC;AAClD,CAAC;AAMD,SAAgB,uBAAuB,CAAC,gBAAyB,KAAK;IACpE,OAAO,yBAAyB,EAAE,CAAC;AACrC,CAAC"}
|
|
@@ -24,6 +24,9 @@ declare const SetScopeSchema: z.ZodObject<{
|
|
|
24
24
|
declare const ResetContextSchema: z.ZodObject<{
|
|
25
25
|
action: z.ZodLiteral<"reset">;
|
|
26
26
|
}, z.core.$strip>;
|
|
27
|
+
declare const WhoamiSchema: z.ZodObject<{
|
|
28
|
+
action: z.ZodLiteral<"whoami">;
|
|
29
|
+
}, z.core.$strip>;
|
|
27
30
|
export declare const ManageContextSchema: z.ZodDiscriminatedUnion<[z.ZodObject<{
|
|
28
31
|
action: z.ZodLiteral<"show">;
|
|
29
32
|
}, z.core.$strip>, z.ZodObject<{
|
|
@@ -42,6 +45,8 @@ export declare const ManageContextSchema: z.ZodDiscriminatedUnion<[z.ZodObject<{
|
|
|
42
45
|
includeSubgroups: z.ZodDefault<z.ZodOptional<z.ZodBoolean>>;
|
|
43
46
|
}, z.core.$strip>, z.ZodObject<{
|
|
44
47
|
action: z.ZodLiteral<"reset">;
|
|
48
|
+
}, z.core.$strip>, z.ZodObject<{
|
|
49
|
+
action: z.ZodLiteral<"whoami">;
|
|
45
50
|
}, z.core.$strip>], "action">;
|
|
46
51
|
export type ManageContextInput = z.infer<typeof ManageContextSchema>;
|
|
47
52
|
export type ShowContextInput = z.infer<typeof ShowContextSchema>;
|
|
@@ -51,4 +56,5 @@ export type SwitchPresetInput = z.infer<typeof SwitchPresetSchema>;
|
|
|
51
56
|
export type SwitchProfileInput = z.infer<typeof SwitchProfileSchema>;
|
|
52
57
|
export type SetScopeInput = z.infer<typeof SetScopeSchema>;
|
|
53
58
|
export type ResetContextInput = z.infer<typeof ResetContextSchema>;
|
|
59
|
+
export type WhoamiInput = z.infer<typeof WhoamiSchema>;
|
|
54
60
|
export {};
|
|
@@ -40,6 +40,14 @@ const SetScopeSchema = zod_1.z.object({
|
|
|
40
40
|
const ResetContextSchema = zod_1.z.object({
|
|
41
41
|
action: zod_1.z.literal("reset").describe("Reset context to initial state from session start"),
|
|
42
42
|
});
|
|
43
|
+
const WhoamiSchema = zod_1.z.object({
|
|
44
|
+
action: zod_1.z
|
|
45
|
+
.literal("whoami")
|
|
46
|
+
.describe("Get authentication status, token capabilities, and server configuration. " +
|
|
47
|
+
"Re-introspects token to detect permission changes - if scopes changed, " +
|
|
48
|
+
"automatically refreshes available tools (scopesRefreshed=true in response). " +
|
|
49
|
+
"Use to diagnose access issues or verify new token permissions are active."),
|
|
50
|
+
});
|
|
43
51
|
exports.ManageContextSchema = zod_1.z.discriminatedUnion("action", [
|
|
44
52
|
ShowContextSchema,
|
|
45
53
|
ListPresetsSchema,
|
|
@@ -48,5 +56,6 @@ exports.ManageContextSchema = zod_1.z.discriminatedUnion("action", [
|
|
|
48
56
|
SwitchProfileSchema,
|
|
49
57
|
SetScopeSchema,
|
|
50
58
|
ResetContextSchema,
|
|
59
|
+
WhoamiSchema,
|
|
51
60
|
]);
|
|
52
61
|
//# sourceMappingURL=schema.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"schema.js","sourceRoot":"","sources":["../../../../src/entities/context/schema.ts"],"names":[],"mappings":";;;
|
|
1
|
+
{"version":3,"file":"schema.js","sourceRoot":"","sources":["../../../../src/entities/context/schema.ts"],"names":[],"mappings":";;;AAcA,6BAAwB;AASxB,MAAM,iBAAiB,GAAG,OAAC,CAAC,MAAM,CAAC;IACjC,MAAM,EAAE,OAAC;SACN,OAAO,CAAC,MAAM,CAAC;SACf,QAAQ,CAAC,iEAAiE,CAAC;CAC/E,CAAC,CAAC;AAKH,MAAM,iBAAiB,GAAG,OAAC,CAAC,MAAM,CAAC;IACjC,MAAM,EAAE,OAAC,CAAC,OAAO,CAAC,cAAc,CAAC,CAAC,QAAQ,CAAC,8CAA8C,CAAC;CAC3F,CAAC,CAAC;AAKH,MAAM,kBAAkB,GAAG,OAAC,CAAC,MAAM,CAAC;IAClC,MAAM,EAAE,OAAC;SACN,OAAO,CAAC,eAAe,CAAC;SACxB,QAAQ,CAAC,0DAA0D,CAAC;CACxE,CAAC,CAAC;AAKH,MAAM,kBAAkB,GAAG,OAAC,CAAC,MAAM,CAAC;IAClC,MAAM,EAAE,OAAC,CAAC,OAAO,CAAC,eAAe,CAAC,CAAC,QAAQ,CAAC,4CAA4C,CAAC;IACzF,MAAM,EAAE,OAAC,CAAC,MAAM,EAAE,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,QAAQ,CAAC,gCAAgC,CAAC;CACrE,CAAC,CAAC;AAKH,MAAM,mBAAmB,GAAG,OAAC,CAAC,MAAM,CAAC;IACnC,MAAM,EAAE,OAAC;SACN,OAAO,CAAC,gBAAgB,CAAC;SACzB,QAAQ,CAAC,uDAAuD,CAAC;IACpE,OAAO,EAAE,OAAC,CAAC,MAAM,EAAE,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,QAAQ,CAAC,iCAAiC,CAAC;CACvE,CAAC,CAAC;AAKH,MAAM,cAAc,GAAG,OAAC,CAAC,MAAM,CAAC;IAC9B,MAAM,EAAE,OAAC,CAAC,OAAO,CAAC,WAAW,CAAC,CAAC,QAAQ,CAAC,iDAAiD,CAAC;IAC1F,SAAS,EAAE,OAAC;SACT,MAAM,EAAE;SACR,GAAG,CAAC,CAAC,CAAC;SACN,QAAQ,CAAC,8EAA8E,CAAC;IAC3F,gBAAgB,EAAE,OAAC;SAChB,OAAO,EAAE;SACT,QAAQ,EAAE;SACV,OAAO,CAAC,IAAI,CAAC;SACb,QAAQ,CAAC,yDAAyD,CAAC;CACvE,CAAC,CAAC;AAKH,MAAM,kBAAkB,GAAG,OAAC,CAAC,MAAM,CAAC;IAClC,MAAM,EAAE,OAAC,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC,QAAQ,CAAC,mDAAmD,CAAC;CACzF,CAAC,CAAC;AAQH,MAAM,YAAY,GAAG,OAAC,CAAC,MAAM,CAAC;IAC5B,MAAM,EAAE,OAAC;SACN,OAAO,CAAC,QAAQ,CAAC;SACjB,QAAQ,CACP,2EAA2E;QACzE,yEAAyE;QACzE,8EAA8E;QAC9E,2EAA2E,CAC9E;CACJ,CAAC,CAAC;AASU,QAAA,mBAAmB,GAAG,OAAC,CAAC,kBAAkB,CAAC,QAAQ,EAAE;IAChE,iBAAiB;IACjB,iBAAiB;IACjB,kBAAkB;IAClB,kBAAkB;IAClB,mBAAmB;IACnB,cAAc;IACd,kBAAkB;IAClB,YAAY;CACb,CAAC,CAAC"}
|
|
@@ -47,3 +47,66 @@ export interface ContextState {
|
|
|
47
47
|
initialState?: ContextState;
|
|
48
48
|
}
|
|
49
49
|
export type { ProfileInfo };
|
|
50
|
+
export type WhoamiTokenType = "personal_access_token" | "project_access_token" | "group_access_token" | "oauth" | "unknown";
|
|
51
|
+
export interface WhoamiUserInfo {
|
|
52
|
+
id: number;
|
|
53
|
+
username: string;
|
|
54
|
+
name: string;
|
|
55
|
+
email?: string;
|
|
56
|
+
avatarUrl?: string;
|
|
57
|
+
isAdmin?: boolean;
|
|
58
|
+
state: "active" | "blocked" | "deactivated";
|
|
59
|
+
}
|
|
60
|
+
export interface WhoamiTokenInfo {
|
|
61
|
+
type: WhoamiTokenType;
|
|
62
|
+
name: string | null;
|
|
63
|
+
scopes: string[];
|
|
64
|
+
expiresAt: string | null;
|
|
65
|
+
daysUntilExpiry: number | null;
|
|
66
|
+
isValid: boolean;
|
|
67
|
+
hasGraphQLAccess: boolean;
|
|
68
|
+
hasWriteAccess: boolean;
|
|
69
|
+
}
|
|
70
|
+
export interface WhoamiServerInfo {
|
|
71
|
+
host: string;
|
|
72
|
+
apiUrl: string;
|
|
73
|
+
version: string;
|
|
74
|
+
tier: "free" | "premium" | "ultimate" | "unknown";
|
|
75
|
+
edition: "EE" | "CE" | "unknown";
|
|
76
|
+
readOnlyMode: boolean;
|
|
77
|
+
oauthEnabled: boolean;
|
|
78
|
+
}
|
|
79
|
+
export interface WhoamiCapabilities {
|
|
80
|
+
canBrowse: boolean;
|
|
81
|
+
canManage: boolean;
|
|
82
|
+
canAccessGraphQL: boolean;
|
|
83
|
+
availableToolCount: number;
|
|
84
|
+
totalToolCount: number;
|
|
85
|
+
filteredByScopes: number;
|
|
86
|
+
filteredByReadOnly: number;
|
|
87
|
+
filteredByTier: number;
|
|
88
|
+
filteredByDeniedRegex: number;
|
|
89
|
+
filteredByActionDenial: number;
|
|
90
|
+
}
|
|
91
|
+
export type WhoamiRecommendationAction = "create_new_token" | "add_scope" | "enable_oauth" | "contact_admin" | "renew_token";
|
|
92
|
+
export interface WhoamiRecommendation {
|
|
93
|
+
action: WhoamiRecommendationAction;
|
|
94
|
+
message: string;
|
|
95
|
+
url?: string;
|
|
96
|
+
priority: "high" | "medium" | "low";
|
|
97
|
+
}
|
|
98
|
+
export interface WhoamiContextInfo {
|
|
99
|
+
activePreset: string | null;
|
|
100
|
+
activeProfile: string | null;
|
|
101
|
+
scope: RuntimeScope | null;
|
|
102
|
+
}
|
|
103
|
+
export interface WhoamiResult {
|
|
104
|
+
user: WhoamiUserInfo | null;
|
|
105
|
+
token: WhoamiTokenInfo | null;
|
|
106
|
+
server: WhoamiServerInfo;
|
|
107
|
+
capabilities: WhoamiCapabilities;
|
|
108
|
+
context: WhoamiContextInfo;
|
|
109
|
+
warnings: string[];
|
|
110
|
+
recommendations: WhoamiRecommendation[];
|
|
111
|
+
scopesRefreshed: boolean;
|
|
112
|
+
}
|
|
@@ -0,0 +1,263 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.executeWhoami = executeWhoami;
|
|
4
|
+
const config_1 = require("../../config");
|
|
5
|
+
const logger_1 = require("../../logger");
|
|
6
|
+
const index_js_1 = require("../../oauth/index.js");
|
|
7
|
+
const ConnectionManager_1 = require("../../services/ConnectionManager");
|
|
8
|
+
const TokenScopeDetector_1 = require("../../services/TokenScopeDetector");
|
|
9
|
+
const registry_manager_1 = require("../../registry-manager");
|
|
10
|
+
const server_1 = require("../../server");
|
|
11
|
+
const fetch_1 = require("../../utils/fetch");
|
|
12
|
+
const context_manager_1 = require("./context-manager");
|
|
13
|
+
function getHost() {
|
|
14
|
+
try {
|
|
15
|
+
const url = new URL(config_1.GITLAB_BASE_URL);
|
|
16
|
+
return url.hostname;
|
|
17
|
+
}
|
|
18
|
+
catch {
|
|
19
|
+
return config_1.GITLAB_BASE_URL;
|
|
20
|
+
}
|
|
21
|
+
}
|
|
22
|
+
async function fetchCurrentUser() {
|
|
23
|
+
try {
|
|
24
|
+
const response = await (0, fetch_1.enhancedFetch)(`${config_1.GITLAB_BASE_URL}/api/v4/user`, {
|
|
25
|
+
retry: false,
|
|
26
|
+
});
|
|
27
|
+
if (!response.ok) {
|
|
28
|
+
logger_1.logger.debug({ status: response.status }, "Failed to fetch current user");
|
|
29
|
+
return null;
|
|
30
|
+
}
|
|
31
|
+
const data = (await response.json());
|
|
32
|
+
return {
|
|
33
|
+
id: data.id,
|
|
34
|
+
username: data.username,
|
|
35
|
+
name: data.name,
|
|
36
|
+
email: data.email,
|
|
37
|
+
avatarUrl: data.avatar_url,
|
|
38
|
+
isAdmin: data.is_admin,
|
|
39
|
+
state: data.state,
|
|
40
|
+
};
|
|
41
|
+
}
|
|
42
|
+
catch (error) {
|
|
43
|
+
logger_1.logger.debug({ error: error instanceof Error ? error.message : String(error) }, "Error fetching current user");
|
|
44
|
+
return null;
|
|
45
|
+
}
|
|
46
|
+
}
|
|
47
|
+
function buildTokenInfo() {
|
|
48
|
+
try {
|
|
49
|
+
const connectionManager = ConnectionManager_1.ConnectionManager.getInstance();
|
|
50
|
+
const tokenScopeInfo = connectionManager.getTokenScopeInfo();
|
|
51
|
+
if (!tokenScopeInfo) {
|
|
52
|
+
if ((0, index_js_1.isOAuthEnabled)()) {
|
|
53
|
+
return {
|
|
54
|
+
type: "oauth",
|
|
55
|
+
name: null,
|
|
56
|
+
scopes: [],
|
|
57
|
+
expiresAt: null,
|
|
58
|
+
daysUntilExpiry: null,
|
|
59
|
+
isValid: true,
|
|
60
|
+
hasGraphQLAccess: true,
|
|
61
|
+
hasWriteAccess: true,
|
|
62
|
+
};
|
|
63
|
+
}
|
|
64
|
+
return null;
|
|
65
|
+
}
|
|
66
|
+
return {
|
|
67
|
+
type: tokenScopeInfo.tokenType,
|
|
68
|
+
name: tokenScopeInfo.name,
|
|
69
|
+
scopes: tokenScopeInfo.scopes,
|
|
70
|
+
expiresAt: tokenScopeInfo.expiresAt,
|
|
71
|
+
daysUntilExpiry: tokenScopeInfo.daysUntilExpiry,
|
|
72
|
+
isValid: tokenScopeInfo.active,
|
|
73
|
+
hasGraphQLAccess: tokenScopeInfo.hasGraphQLAccess,
|
|
74
|
+
hasWriteAccess: tokenScopeInfo.hasWriteAccess,
|
|
75
|
+
};
|
|
76
|
+
}
|
|
77
|
+
catch {
|
|
78
|
+
return null;
|
|
79
|
+
}
|
|
80
|
+
}
|
|
81
|
+
function buildServerInfo() {
|
|
82
|
+
let version = "unknown";
|
|
83
|
+
let tier = "unknown";
|
|
84
|
+
const edition = "unknown";
|
|
85
|
+
try {
|
|
86
|
+
const connectionManager = ConnectionManager_1.ConnectionManager.getInstance();
|
|
87
|
+
const instanceInfo = connectionManager.getInstanceInfo();
|
|
88
|
+
version = instanceInfo.version;
|
|
89
|
+
tier = instanceInfo.tier;
|
|
90
|
+
}
|
|
91
|
+
catch {
|
|
92
|
+
}
|
|
93
|
+
return {
|
|
94
|
+
host: getHost(),
|
|
95
|
+
apiUrl: config_1.GITLAB_BASE_URL,
|
|
96
|
+
version,
|
|
97
|
+
tier,
|
|
98
|
+
edition,
|
|
99
|
+
readOnlyMode: config_1.GITLAB_READ_ONLY_MODE,
|
|
100
|
+
oauthEnabled: (0, index_js_1.isOAuthEnabled)(),
|
|
101
|
+
};
|
|
102
|
+
}
|
|
103
|
+
function buildCapabilities(tokenInfo) {
|
|
104
|
+
const registryManager = registry_manager_1.RegistryManager.getInstance();
|
|
105
|
+
const filterStats = registryManager.getFilterStats();
|
|
106
|
+
const canBrowse = tokenInfo === null ||
|
|
107
|
+
tokenInfo.scopes.length === 0 ||
|
|
108
|
+
tokenInfo.scopes.some(s => ["api", "read_api", "read_user"].includes(s));
|
|
109
|
+
const canManage = tokenInfo?.hasWriteAccess ?? false;
|
|
110
|
+
const canAccessGraphQL = tokenInfo?.hasGraphQLAccess ?? false;
|
|
111
|
+
return {
|
|
112
|
+
canBrowse,
|
|
113
|
+
canManage,
|
|
114
|
+
canAccessGraphQL,
|
|
115
|
+
availableToolCount: filterStats.available,
|
|
116
|
+
totalToolCount: filterStats.total,
|
|
117
|
+
filteredByScopes: filterStats.filteredByScopes,
|
|
118
|
+
filteredByReadOnly: filterStats.filteredByReadOnly,
|
|
119
|
+
filteredByTier: filterStats.filteredByTier,
|
|
120
|
+
filteredByDeniedRegex: filterStats.filteredByDeniedRegex,
|
|
121
|
+
filteredByActionDenial: filterStats.filteredByActionDenial,
|
|
122
|
+
};
|
|
123
|
+
}
|
|
124
|
+
function buildContextInfo() {
|
|
125
|
+
const contextManager = (0, context_manager_1.getContextManager)();
|
|
126
|
+
const context = contextManager.getContext();
|
|
127
|
+
return {
|
|
128
|
+
activePreset: context.presetName ?? null,
|
|
129
|
+
activeProfile: context.profileName ?? null,
|
|
130
|
+
scope: context.scope ?? null,
|
|
131
|
+
};
|
|
132
|
+
}
|
|
133
|
+
function generateWarnings(tokenInfo, capabilities) {
|
|
134
|
+
const warnings = [];
|
|
135
|
+
if (tokenInfo && tokenInfo.daysUntilExpiry !== null) {
|
|
136
|
+
const days = tokenInfo.daysUntilExpiry;
|
|
137
|
+
if (days < 0) {
|
|
138
|
+
warnings.push(`Token has expired (${Math.abs(days)} days ago)`);
|
|
139
|
+
}
|
|
140
|
+
else if (days === 0) {
|
|
141
|
+
warnings.push("Token expires today!");
|
|
142
|
+
}
|
|
143
|
+
else if (days <= 7) {
|
|
144
|
+
warnings.push(`Token expires in ${days} day(s)`);
|
|
145
|
+
}
|
|
146
|
+
}
|
|
147
|
+
if (tokenInfo && !tokenInfo.isValid) {
|
|
148
|
+
warnings.push("Token is invalid or revoked - authentication may fail");
|
|
149
|
+
}
|
|
150
|
+
if (capabilities.filteredByScopes > 0) {
|
|
151
|
+
const pct = Math.round((capabilities.filteredByScopes / capabilities.totalToolCount) * 100);
|
|
152
|
+
warnings.push(`Limited token scopes: ${capabilities.availableToolCount} of ${capabilities.totalToolCount} tools available (${pct}% filtered)`);
|
|
153
|
+
if (!capabilities.canAccessGraphQL) {
|
|
154
|
+
warnings.push("No GraphQL access - project/MR/issue operations unavailable");
|
|
155
|
+
}
|
|
156
|
+
if (!capabilities.canManage) {
|
|
157
|
+
warnings.push("No write access - all manage_* operations blocked");
|
|
158
|
+
}
|
|
159
|
+
}
|
|
160
|
+
if (capabilities.filteredByReadOnly > 0) {
|
|
161
|
+
warnings.push(`Read-only mode enabled: ${capabilities.filteredByReadOnly} write tools disabled`);
|
|
162
|
+
}
|
|
163
|
+
if (capabilities.filteredByTier > 0) {
|
|
164
|
+
warnings.push(`GitLab tier restrictions: ${capabilities.filteredByTier} tools unavailable for current tier`);
|
|
165
|
+
}
|
|
166
|
+
if (capabilities.filteredByDeniedRegex > 0) {
|
|
167
|
+
warnings.push(`Tool access restrictions: ${capabilities.filteredByDeniedRegex} tools blocked by configuration`);
|
|
168
|
+
}
|
|
169
|
+
return warnings;
|
|
170
|
+
}
|
|
171
|
+
function generateRecommendations(tokenInfo, capabilities, serverInfo) {
|
|
172
|
+
const recommendations = [];
|
|
173
|
+
if (tokenInfo && tokenInfo.daysUntilExpiry !== null && tokenInfo.daysUntilExpiry < 0) {
|
|
174
|
+
recommendations.push({
|
|
175
|
+
action: "renew_token",
|
|
176
|
+
message: "Your token has expired. Create a new token to restore access.",
|
|
177
|
+
url: (0, TokenScopeDetector_1.getTokenCreationUrl)(config_1.GITLAB_BASE_URL, ["api", "read_user"]),
|
|
178
|
+
priority: "high",
|
|
179
|
+
});
|
|
180
|
+
}
|
|
181
|
+
if (tokenInfo &&
|
|
182
|
+
tokenInfo.daysUntilExpiry !== null &&
|
|
183
|
+
tokenInfo.daysUntilExpiry >= 0 &&
|
|
184
|
+
tokenInfo.daysUntilExpiry <= 7) {
|
|
185
|
+
recommendations.push({
|
|
186
|
+
action: "renew_token",
|
|
187
|
+
message: `Your token expires in ${tokenInfo.daysUntilExpiry} day(s). Renew soon to avoid service interruption.`,
|
|
188
|
+
url: (0, TokenScopeDetector_1.getTokenCreationUrl)(config_1.GITLAB_BASE_URL, ["api", "read_user"]),
|
|
189
|
+
priority: "medium",
|
|
190
|
+
});
|
|
191
|
+
}
|
|
192
|
+
const needsNewToken = capabilities.filteredByScopes > 0 && !capabilities.canManage;
|
|
193
|
+
if (needsNewToken) {
|
|
194
|
+
recommendations.push({
|
|
195
|
+
action: "create_new_token",
|
|
196
|
+
message: "Create a token with 'api' scope for full GitLab functionality",
|
|
197
|
+
url: (0, TokenScopeDetector_1.getTokenCreationUrl)(config_1.GITLAB_BASE_URL, ["api", "read_user"]),
|
|
198
|
+
priority: "high",
|
|
199
|
+
});
|
|
200
|
+
}
|
|
201
|
+
if (!needsNewToken &&
|
|
202
|
+
!capabilities.canAccessGraphQL &&
|
|
203
|
+
tokenInfo &&
|
|
204
|
+
tokenInfo.scopes.length > 0) {
|
|
205
|
+
recommendations.push({
|
|
206
|
+
action: "add_scope",
|
|
207
|
+
message: "Add 'api' or 'read_api' scope to enable project, issue, and MR operations",
|
|
208
|
+
url: (0, TokenScopeDetector_1.getTokenCreationUrl)(config_1.GITLAB_BASE_URL, ["api", "read_user"]),
|
|
209
|
+
priority: "high",
|
|
210
|
+
});
|
|
211
|
+
}
|
|
212
|
+
if (capabilities.filteredByTier > 0 && serverInfo.tier === "free") {
|
|
213
|
+
recommendations.push({
|
|
214
|
+
action: "contact_admin",
|
|
215
|
+
message: "Some features require GitLab Premium or Ultimate. Contact your administrator for tier upgrade.",
|
|
216
|
+
priority: "low",
|
|
217
|
+
});
|
|
218
|
+
}
|
|
219
|
+
return recommendations;
|
|
220
|
+
}
|
|
221
|
+
async function executeWhoami() {
|
|
222
|
+
let scopesRefreshed = false;
|
|
223
|
+
try {
|
|
224
|
+
const connectionManager = ConnectionManager_1.ConnectionManager.getInstance();
|
|
225
|
+
scopesRefreshed = await connectionManager.refreshTokenScopes();
|
|
226
|
+
if (scopesRefreshed) {
|
|
227
|
+
logger_1.logger.info("Token scopes changed - refreshing tool registry");
|
|
228
|
+
registry_manager_1.RegistryManager.getInstance().refreshCache();
|
|
229
|
+
await (0, server_1.sendToolsListChangedNotification)();
|
|
230
|
+
}
|
|
231
|
+
}
|
|
232
|
+
catch (error) {
|
|
233
|
+
logger_1.logger.debug({ error: error instanceof Error ? error.message : String(error) }, "Failed to refresh token scopes");
|
|
234
|
+
}
|
|
235
|
+
const [userInfo, tokenInfo] = await Promise.all([
|
|
236
|
+
fetchCurrentUser(),
|
|
237
|
+
Promise.resolve(buildTokenInfo()),
|
|
238
|
+
]);
|
|
239
|
+
const serverInfo = buildServerInfo();
|
|
240
|
+
const capabilities = buildCapabilities(tokenInfo);
|
|
241
|
+
const contextInfo = buildContextInfo();
|
|
242
|
+
const warnings = generateWarnings(tokenInfo, capabilities);
|
|
243
|
+
const recommendations = generateRecommendations(tokenInfo, capabilities, serverInfo);
|
|
244
|
+
logger_1.logger.debug({
|
|
245
|
+
hasUser: userInfo !== null,
|
|
246
|
+
hasToken: tokenInfo !== null,
|
|
247
|
+
availableTools: capabilities.availableToolCount,
|
|
248
|
+
warnings: warnings.length,
|
|
249
|
+
recommendations: recommendations.length,
|
|
250
|
+
scopesRefreshed,
|
|
251
|
+
}, "Whoami executed");
|
|
252
|
+
return {
|
|
253
|
+
user: userInfo,
|
|
254
|
+
token: tokenInfo,
|
|
255
|
+
server: serverInfo,
|
|
256
|
+
capabilities,
|
|
257
|
+
context: contextInfo,
|
|
258
|
+
warnings,
|
|
259
|
+
recommendations,
|
|
260
|
+
scopesRefreshed,
|
|
261
|
+
};
|
|
262
|
+
}
|
|
263
|
+
//# sourceMappingURL=whoami.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"whoami.js","sourceRoot":"","sources":["../../../../src/entities/context/whoami.ts"],"names":[],"mappings":"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"}
|
package/dist/src/logger.d.ts
CHANGED
package/dist/src/logger.js
CHANGED
|
@@ -1,14 +1,15 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.logger = exports.createLogger = void 0;
|
|
3
|
+
exports.logger = exports.createLogger = exports.LOG_JSON = void 0;
|
|
4
4
|
const pino_1 = require("pino");
|
|
5
5
|
const isTestEnv = process.env.NODE_ENV === "test" || process.env.JEST_WORKER_ID !== undefined;
|
|
6
|
+
exports.LOG_JSON = process.env.LOG_JSON === "true";
|
|
6
7
|
const createLogger = (name) => {
|
|
7
8
|
const options = {
|
|
8
9
|
name,
|
|
9
10
|
level: process.env.LOG_LEVEL ?? "info",
|
|
10
11
|
};
|
|
11
|
-
if (!isTestEnv) {
|
|
12
|
+
if (!isTestEnv && !exports.LOG_JSON) {
|
|
12
13
|
options.transport = {
|
|
13
14
|
target: "pino-pretty",
|
|
14
15
|
options: {
|
package/dist/src/logger.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"logger.js","sourceRoot":"","sources":["../../src/logger.ts"],"names":[],"mappings":";;;AAAA,+BAAgD;AAEhD,MAAM,SAAS,GAAG,OAAO,CAAC,GAAG,CAAC,QAAQ,KAAK,MAAM,IAAI,OAAO,CAAC,GAAG,CAAC,cAAc,KAAK,SAAS,CAAC;
|
|
1
|
+
{"version":3,"file":"logger.js","sourceRoot":"","sources":["../../src/logger.ts"],"names":[],"mappings":";;;AAAA,+BAAgD;AAEhD,MAAM,SAAS,GAAG,OAAO,CAAC,GAAG,CAAC,QAAQ,KAAK,MAAM,IAAI,OAAO,CAAC,GAAG,CAAC,cAAc,KAAK,SAAS,CAAC;AAQjF,QAAA,QAAQ,GAAG,OAAO,CAAC,GAAG,CAAC,QAAQ,KAAK,MAAM,CAAC;AAEjD,MAAM,YAAY,GAAG,CAAC,IAAa,EAAE,EAAE;IAC5C,MAAM,OAAO,GAAkB;QAC7B,IAAI;QACJ,KAAK,EAAE,OAAO,CAAC,GAAG,CAAC,SAAS,IAAI,MAAM;KACvC,CAAC;IAKF,IAAI,CAAC,SAAS,IAAI,CAAC,gBAAQ,EAAE,CAAC;QAC5B,OAAO,CAAC,SAAS,GAAG;YAClB,MAAM,EAAE,aAAa;YACrB,OAAO,EAAE;gBACP,QAAQ,EAAE,IAAI;gBACd,aAAa,EAAE,IAAI;gBACnB,MAAM,EAAE,cAAc;gBACtB,WAAW,EAAE,CAAC;aACf;SACF,CAAC;IACJ,CAAC;IAED,OAAO,IAAA,WAAI,EAAC,OAAO,CAAC,CAAC;AACvB,CAAC,CAAC;AAtBW,QAAA,YAAY,gBAsBvB;AAEW,QAAA,MAAM,GAAG,IAAA,oBAAY,EAAC,YAAY,CAAC,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"access-log.js","sourceRoot":"","sources":["../../../src/logging/access-log.ts"],"names":[],"mappings":";;;AAsBA,8CAIC;AAKD,wCAcC;AAMD,gDAKC;AA4BD,sCAaC;AAKD,oDAoBC;
|
|
1
|
+
{"version":3,"file":"access-log.js","sourceRoot":"","sources":["../../../src/logging/access-log.ts"],"names":[],"mappings":"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"}
|
|
@@ -67,7 +67,12 @@ class ConnectionTracker {
|
|
|
67
67
|
}
|
|
68
68
|
const entry = (0, access_log_js_1.createConnectionCloseEntry)(stats, reason);
|
|
69
69
|
const logLine = (0, access_log_js_1.formatConnectionClose)(entry);
|
|
70
|
-
logger_js_1.
|
|
70
|
+
if (logger_js_1.LOG_JSON) {
|
|
71
|
+
logger_js_1.logger.info({ connectionClose: entry }, logLine);
|
|
72
|
+
}
|
|
73
|
+
else {
|
|
74
|
+
logger_js_1.logger.info(logLine);
|
|
75
|
+
}
|
|
71
76
|
return logLine;
|
|
72
77
|
}
|
|
73
78
|
hasConnection(sessionId) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"connection-tracker.js","sourceRoot":"","sources":["../../../src/logging/connection-tracker.ts"],"names":[],"mappings":";;;
|
|
1
|
+
{"version":3,"file":"connection-tracker.js","sourceRoot":"","sources":["../../../src/logging/connection-tracker.ts"],"names":[],"mappings":"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"}
|
|
@@ -118,7 +118,12 @@ class RequestTracker {
|
|
|
118
118
|
}
|
|
119
119
|
const entry = (0, access_log_js_1.createAccessLogEntry)(stack);
|
|
120
120
|
const logLine = (0, access_log_js_1.formatAccessLog)(entry);
|
|
121
|
-
logger_js_1.
|
|
121
|
+
if (logger_js_1.LOG_JSON) {
|
|
122
|
+
logger_js_1.logger.info({ accessLog: entry }, logLine);
|
|
123
|
+
}
|
|
124
|
+
else {
|
|
125
|
+
logger_js_1.logger.info(logLine);
|
|
126
|
+
}
|
|
122
127
|
return logLine;
|
|
123
128
|
}
|
|
124
129
|
closeStackWithError(requestId, error) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"request-tracker.js","sourceRoot":"","sources":["../../../src/logging/request-tracker.ts"],"names":[],"mappings":";;;AAuCA,kDAEC;AAKD,sDAEC;AAKD,gEAKC;
|
|
1
|
+
{"version":3,"file":"request-tracker.js","sourceRoot":"","sources":["../../../src/logging/request-tracker.ts"],"names":[],"mappings":"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"}
|