@1mcp/agent 0.30.3 → 0.31.0-beta1
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 +75 -2
- package/build/commands/auth/index.d.ts +3 -0
- package/build/commands/auth/index.d.ts.map +1 -0
- package/build/commands/auth/index.js +47 -0
- package/build/commands/auth/index.js.map +1 -0
- package/build/commands/auth/login.d.ts +7 -0
- package/build/commands/auth/login.d.ts.map +1 -0
- package/build/commands/auth/login.js +83 -0
- package/build/commands/auth/login.js.map +1 -0
- package/build/commands/auth/logout.d.ts +7 -0
- package/build/commands/auth/logout.d.ts.map +1 -0
- package/build/commands/auth/logout.js +46 -0
- package/build/commands/auth/logout.js.map +1 -0
- package/build/commands/auth/status.d.ts +6 -0
- package/build/commands/auth/status.d.ts.map +1 -0
- package/build/commands/auth/status.js +54 -0
- package/build/commands/auth/status.js.map +1 -0
- package/build/commands/cliSetup/cliSetup.d.ts +12 -0
- package/build/commands/cliSetup/cliSetup.d.ts.map +1 -0
- package/build/commands/cliSetup/cliSetup.js +49 -0
- package/build/commands/cliSetup/cliSetup.js.map +1 -0
- package/build/commands/cliSetup/index.d.ts +3 -0
- package/build/commands/cliSetup/index.d.ts.map +1 -0
- package/build/commands/cliSetup/index.js +52 -0
- package/build/commands/cliSetup/index.js.map +1 -0
- package/build/commands/cliSetup/setupFiles.d.ts +24 -0
- package/build/commands/cliSetup/setupFiles.d.ts.map +1 -0
- package/build/commands/cliSetup/setupFiles.js +233 -0
- package/build/commands/cliSetup/setupFiles.js.map +1 -0
- package/build/commands/inspect/index.d.ts +3 -0
- package/build/commands/inspect/index.d.ts.map +1 -0
- package/build/commands/inspect/index.js +60 -0
- package/build/commands/inspect/index.js.map +1 -0
- package/build/commands/inspect/inspect.d.ts +36 -0
- package/build/commands/inspect/inspect.d.ts.map +1 -0
- package/build/commands/inspect/inspect.js +274 -0
- package/build/commands/inspect/inspect.js.map +1 -0
- package/build/commands/inspect/inspectUtils.d.ts +76 -0
- package/build/commands/inspect/inspectUtils.d.ts.map +1 -0
- package/build/commands/inspect/inspectUtils.js +303 -0
- package/build/commands/inspect/inspectUtils.js.map +1 -0
- package/build/commands/instructions/index.d.ts +3 -0
- package/build/commands/instructions/index.d.ts.map +1 -0
- package/build/commands/instructions/index.js +34 -0
- package/build/commands/instructions/index.js.map +1 -0
- package/build/commands/instructions/instructions.d.ts +10 -0
- package/build/commands/instructions/instructions.d.ts.map +1 -0
- package/build/commands/instructions/instructions.js +86 -0
- package/build/commands/instructions/instructions.js.map +1 -0
- package/build/commands/instructions/instructionsUtils.d.ts +24 -0
- package/build/commands/instructions/instructionsUtils.d.ts.map +1 -0
- package/build/commands/instructions/instructionsUtils.js +74 -0
- package/build/commands/instructions/instructionsUtils.js.map +1 -0
- package/build/commands/proxy/proxy.d.ts.map +1 -1
- package/build/commands/proxy/proxy.js +26 -30
- package/build/commands/proxy/proxy.js.map +1 -1
- package/build/commands/run/index.d.ts +3 -0
- package/build/commands/run/index.d.ts.map +1 -0
- package/build/commands/run/index.js +62 -0
- package/build/commands/run/index.js.map +1 -0
- package/build/commands/run/run.d.ts +35 -0
- package/build/commands/run/run.d.ts.map +1 -0
- package/build/commands/run/run.js +340 -0
- package/build/commands/run/run.js.map +1 -0
- package/build/commands/run/runUtils.d.ts +49 -0
- package/build/commands/run/runUtils.d.ts.map +1 -0
- package/build/commands/run/runUtils.js +195 -0
- package/build/commands/run/runUtils.js.map +1 -0
- package/build/commands/shared/apiClient.d.ts +27 -0
- package/build/commands/shared/apiClient.d.ts.map +1 -0
- package/build/commands/shared/apiClient.js +96 -0
- package/build/commands/shared/apiClient.js.map +1 -0
- package/build/commands/shared/authProfileStore.d.ts +16 -0
- package/build/commands/shared/authProfileStore.d.ts.map +1 -0
- package/build/commands/shared/authProfileStore.js +109 -0
- package/build/commands/shared/authProfileStore.js.map +1 -0
- package/build/commands/shared/baseConfigUtils.d.ts.map +1 -1
- package/build/commands/shared/baseConfigUtils.js +28 -2
- package/build/commands/shared/baseConfigUtils.js.map +1 -1
- package/build/commands/shared/cliContext.d.ts +13 -0
- package/build/commands/shared/cliContext.d.ts.map +1 -0
- package/build/commands/shared/cliContext.js +71 -0
- package/build/commands/shared/cliContext.js.map +1 -0
- package/build/commands/shared/commandRunner.d.ts +3 -0
- package/build/commands/shared/commandRunner.d.ts.map +1 -0
- package/build/commands/shared/commandRunner.js +13 -0
- package/build/commands/shared/commandRunner.js.map +1 -0
- package/build/commands/shared/serveClient.d.ts +68 -0
- package/build/commands/shared/serveClient.d.ts.map +1 -0
- package/build/commands/shared/serveClient.js +204 -0
- package/build/commands/shared/serveClient.js.map +1 -0
- package/build/commands/shared/serveTargetResolver.d.ts +21 -0
- package/build/commands/shared/serveTargetResolver.d.ts.map +1 -0
- package/build/commands/shared/serveTargetResolver.js +33 -0
- package/build/commands/shared/serveTargetResolver.js.map +1 -0
- package/build/config/configManager.d.ts +10 -0
- package/build/config/configManager.d.ts.map +1 -1
- package/build/config/configManager.js +54 -2
- package/build/config/configManager.js.map +1 -1
- package/build/config/projectConfigLoader.d.ts +9 -0
- package/build/config/projectConfigLoader.d.ts.map +1 -1
- package/build/config/projectConfigLoader.js +72 -20
- package/build/config/projectConfigLoader.js.map +1 -1
- package/build/config/templateProcessor.d.ts.map +1 -1
- package/build/config/templateProcessor.js +2 -2
- package/build/config/templateProcessor.js.map +1 -1
- package/build/constants/api.d.ts +6 -0
- package/build/constants/api.d.ts.map +1 -1
- package/build/constants/api.js +7 -0
- package/build/constants/api.js.map +1 -1
- package/build/constants/mcp.d.ts +1 -1
- package/build/constants/mcp.d.ts.map +1 -1
- package/build/constants/mcp.js +1 -1
- package/build/constants/mcp.js.map +1 -1
- package/build/core/capabilities/lazyLoadingOrchestrator.d.ts +7 -2
- package/build/core/capabilities/lazyLoadingOrchestrator.d.ts.map +1 -1
- package/build/core/capabilities/lazyLoadingOrchestrator.js +12 -12
- package/build/core/capabilities/lazyLoadingOrchestrator.js.map +1 -1
- package/build/core/capabilities/metaToolProvider.d.ts +1 -1
- package/build/core/capabilities/metaToolProvider.d.ts.map +1 -1
- package/build/core/capabilities/metaToolProvider.js +22 -21
- package/build/core/capabilities/metaToolProvider.js.map +1 -1
- package/build/core/server/connectionResolver.d.ts +4 -0
- package/build/core/server/connectionResolver.d.ts.map +1 -1
- package/build/core/server/connectionResolver.js +18 -11
- package/build/core/server/connectionResolver.js.map +1 -1
- package/build/core/server/serverManager.d.ts +4 -0
- package/build/core/server/serverManager.d.ts.map +1 -1
- package/build/core/server/serverManager.js +6 -0
- package/build/core/server/serverManager.js.map +1 -1
- package/build/core/tools/handlers/serverManagementHandler.d.ts +2 -2
- package/build/core/tools/internal/schemas/discovery.d.ts +3 -3
- package/build/core/tools/internal/schemas/index.d.ts +4 -4
- package/build/core/tools/internal/schemas/management.d.ts +1 -1
- package/build/globalOptions.d.ts +6 -0
- package/build/globalOptions.d.ts.map +1 -1
- package/build/globalOptions.js +5 -0
- package/build/globalOptions.js.map +1 -1
- package/build/index.js +20 -1
- package/build/index.js.map +1 -1
- package/build/transport/http/routes/apiRoutes.d.ts +10 -0
- package/build/transport/http/routes/apiRoutes.d.ts.map +1 -0
- package/build/transport/http/routes/apiRoutes.js +18 -0
- package/build/transport/http/routes/apiRoutes.js.map +1 -0
- package/build/transport/http/routes/cliTokenRoute.d.ts +4 -0
- package/build/transport/http/routes/cliTokenRoute.d.ts.map +1 -0
- package/build/transport/http/routes/cliTokenRoute.js +35 -0
- package/build/transport/http/routes/cliTokenRoute.js.map +1 -0
- package/build/transport/http/routes/inspectHelpers.d.ts +68 -0
- package/build/transport/http/routes/inspectHelpers.d.ts.map +1 -0
- package/build/transport/http/routes/inspectHelpers.js +141 -0
- package/build/transport/http/routes/inspectHelpers.js.map +1 -0
- package/build/transport/http/routes/inspectRoutes.d.ts +8 -0
- package/build/transport/http/routes/inspectRoutes.d.ts.map +1 -0
- package/build/transport/http/routes/inspectRoutes.js +348 -0
- package/build/transport/http/routes/inspectRoutes.js.map +1 -0
- package/build/transport/http/routes/toolRoutes.d.ts +5 -0
- package/build/transport/http/routes/toolRoutes.d.ts.map +1 -0
- package/build/transport/http/routes/toolRoutes.js +204 -0
- package/build/transport/http/routes/toolRoutes.js.map +1 -0
- package/build/transport/http/server.d.ts.map +1 -1
- package/build/transport/http/server.js +16 -1
- package/build/transport/http/server.js.map +1 -1
- package/build/transport/http/utils/contextExtractor.d.ts +5 -1
- package/build/transport/http/utils/contextExtractor.d.ts.map +1 -1
- package/build/transport/http/utils/contextExtractor.js +75 -12
- package/build/transport/http/utils/contextExtractor.js.map +1 -1
- package/build/transport/stdioProxyTransport.d.ts +2 -2
- package/build/transport/stdioProxyTransport.d.ts.map +1 -1
- package/build/transport/stdioProxyTransport.js +11 -75
- package/build/transport/stdioProxyTransport.js.map +1 -1
- package/build/types/context.d.ts +1 -0
- package/build/types/context.d.ts.map +1 -1
- package/build/types/context.js.map +1 -1
- package/build/utils/context/contextHash.d.ts +11 -0
- package/build/utils/context/contextHash.d.ts.map +1 -0
- package/build/utils/context/contextHash.js +37 -0
- package/build/utils/context/contextHash.js.map +1 -0
- package/build/utils/typeGuards.d.ts +2 -0
- package/build/utils/typeGuards.d.ts.map +1 -0
- package/build/utils/typeGuards.js +4 -0
- package/build/utils/typeGuards.js.map +1 -0
- package/build/utils/urlUtils.d.ts +2 -0
- package/build/utils/urlUtils.d.ts.map +1 -0
- package/build/utils/urlUtils.js +4 -0
- package/build/utils/urlUtils.js.map +1 -0
- package/build/utils/validation/urlDetection.d.ts +1 -0
- package/build/utils/validation/urlDetection.d.ts.map +1 -1
- package/build/utils/validation/urlDetection.js +8 -3
- package/build/utils/validation/urlDetection.js.map +1 -1
- package/package.json +3 -2
|
@@ -13,6 +13,7 @@ import { httpRequestLogger } from './middlewares/httpRequestLogger.js';
|
|
|
13
13
|
import { createMcpAvailabilityMiddleware } from './middlewares/mcpAvailabilityMiddleware.js';
|
|
14
14
|
import { createScopeAuthMiddleware } from './middlewares/scopeAuthMiddleware.js';
|
|
15
15
|
import { setupSecurityMiddleware } from './middlewares/securityMiddleware.js';
|
|
16
|
+
import { createApiRoutes, createCliTokenRoute } from './routes/apiRoutes.js';
|
|
16
17
|
import createHealthRoutes from './routes/healthRoutes.js';
|
|
17
18
|
import createOAuthRoutes from './routes/oauthRoutes.js';
|
|
18
19
|
import { setupSseRoutes } from './routes/sseRoutes.js';
|
|
@@ -142,9 +143,23 @@ export class ExpressServer {
|
|
|
142
143
|
this.app.use('/oauth', createOAuthRoutes(this.oauthProvider, this.loadingManager));
|
|
143
144
|
// Setup health check routes (no auth required for monitoring)
|
|
144
145
|
this.app.use('/health', createHealthRoutes(this.loadingManager));
|
|
146
|
+
// CLI token endpoint (localhost-only, no auth middleware).
|
|
147
|
+
// Reject requests with an Origin header — browsers always send it for cross-origin
|
|
148
|
+
// requests, so this prevents any web page from silently obtaining a full-scope token
|
|
149
|
+
// even though the global cors() middleware is permissive.
|
|
150
|
+
this.app.post('/api/auth/cli-token', (req, res, next) => {
|
|
151
|
+
if (req.headers.origin) {
|
|
152
|
+
res.status(403).json({ error: 'Cross-origin requests are not allowed for this endpoint' });
|
|
153
|
+
return;
|
|
154
|
+
}
|
|
155
|
+
next();
|
|
156
|
+
}, createCliTokenRoute(this.oauthProvider));
|
|
157
|
+
// Setup API routes (CLI-oriented fast endpoints, auth via scopeAuthMiddleware)
|
|
158
|
+
const scopeAuthMiddleware = createScopeAuthMiddleware(this.oauthProvider);
|
|
159
|
+
const apiRouter = createApiRoutes(this.serverManager, scopeAuthMiddleware);
|
|
160
|
+
this.app.use('/api/v1', apiRouter);
|
|
145
161
|
// Setup MCP transport routes (auth is handled per-route via scopeAuthMiddleware)
|
|
146
162
|
const router = express.Router();
|
|
147
|
-
const scopeAuthMiddleware = createScopeAuthMiddleware(this.oauthProvider);
|
|
148
163
|
const availabilityMiddleware = createMcpAvailabilityMiddleware(this.loadingManager, {
|
|
149
164
|
allowPartialAvailability: true,
|
|
150
165
|
includeOAuthServers: false,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"server.js","sourceRoot":"","sources":["../../../src/transport/http/server.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"server.js","sourceRoot":"","sources":["../../../src/transport/http/server.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import type { ClientInfo, ContextNamespace, EnvironmentContext, UserContext } from '../../../types/context.js';
|
|
1
|
+
import type { ClientInfo, ContextData, ContextNamespace, EnvironmentContext, UserContext } from '../../../types/context.js';
|
|
2
2
|
import type { Request } from 'express';
|
|
3
3
|
export declare const CONTEXT_HEADERS: {
|
|
4
4
|
readonly SESSION_ID: "mcp-session-id";
|
|
@@ -20,4 +20,8 @@ export declare function extractContextFromMeta(req: Request): {
|
|
|
20
20
|
client?: ClientInfo;
|
|
21
21
|
};
|
|
22
22
|
} | null;
|
|
23
|
+
export declare function encodeContextValue(context: ContextData): string;
|
|
24
|
+
export declare function extractContextFromQuery(req: Request): ContextData | null;
|
|
25
|
+
export declare function extractRequestContext(req: Request): ContextData | null;
|
|
26
|
+
export declare function deriveContextSessionId(context: ContextData): string;
|
|
23
27
|
//# sourceMappingURL=contextExtractor.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"contextExtractor.d.ts","sourceRoot":"","sources":["../../../../src/transport/http/utils/contextExtractor.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"contextExtractor.d.ts","sourceRoot":"","sources":["../../../../src/transport/http/utils/contextExtractor.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,UAAU,EAAE,WAAW,EAAE,gBAAgB,EAAE,kBAAkB,EAAE,WAAW,EAAE,MAAM,uBAAuB,CAAC;AAExH,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,SAAS,CAAC;AAGvC,eAAO,MAAM,eAAe;;CAElB,CAAC;AAiCX;;GAEG;AACH,wBAAgB,sBAAsB,CAAC,GAAG,EAAE,OAAO,GAAG;IACpD,OAAO,CAAC,EAAE,gBAAgB,CAAC;IAC3B,IAAI,CAAC,EAAE,WAAW,CAAC;IACnB,WAAW,CAAC,EAAE,kBAAkB,CAAC;IACjC,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,SAAS,CAAC,EAAE;QACV,IAAI,EAAE,MAAM,CAAC;QACb,YAAY,CAAC,EAAE,MAAM,CAAC;QACtB,mBAAmB,CAAC,EAAE,MAAM,CAAC;QAC7B,MAAM,CAAC,EAAE,UAAU,CAAC;KACrB,CAAC;CACH,GAAG,IAAI,CA0EP;AAED,wBAAgB,kBAAkB,CAAC,OAAO,EAAE,WAAW,GAAG,MAAM,CAE/D;AAED,wBAAgB,uBAAuB,CAAC,GAAG,EAAE,OAAO,GAAG,WAAW,GAAG,IAAI,CAyBxE;AAED,wBAAgB,qBAAqB,CAAC,GAAG,EAAE,OAAO,GAAG,WAAW,GAAG,IAAI,CAEtE;AAED,wBAAgB,sBAAsB,CAAC,OAAO,EAAE,WAAW,GAAG,MAAM,CAmBnE"}
|
|
@@ -1,5 +1,6 @@
|
|
|
1
|
+
import { createHash } from 'node:crypto';
|
|
1
2
|
import logger from '../../../logger/logger.js';
|
|
2
|
-
// Header constants for context transmission
|
|
3
|
+
// Header constants for context transmission
|
|
3
4
|
export const CONTEXT_HEADERS = {
|
|
4
5
|
SESSION_ID: 'mcp-session-id', // Use standard streamable HTTP header
|
|
5
6
|
};
|
|
@@ -7,26 +8,30 @@ export const CONTEXT_HEADERS = {
|
|
|
7
8
|
* Type guard to check if a value is a valid ContextData
|
|
8
9
|
*/
|
|
9
10
|
function isContextData(value) {
|
|
10
|
-
|
|
11
|
-
|
|
12
|
-
|
|
13
|
-
|
|
14
|
-
|
|
15
|
-
|
|
16
|
-
typeof
|
|
17
|
-
|
|
11
|
+
if (typeof value !== 'object' || value === null) {
|
|
12
|
+
return false;
|
|
13
|
+
}
|
|
14
|
+
const candidate = value;
|
|
15
|
+
return (typeof candidate.project === 'object' &&
|
|
16
|
+
candidate.project !== null &&
|
|
17
|
+
typeof candidate.user === 'object' &&
|
|
18
|
+
candidate.user !== null &&
|
|
19
|
+
typeof candidate.environment === 'object' &&
|
|
20
|
+
candidate.environment !== null);
|
|
18
21
|
}
|
|
19
22
|
/**
|
|
20
23
|
* Extract context data from _meta field in request body (from STDIO proxy)
|
|
21
24
|
*/
|
|
22
25
|
export function extractContextFromMeta(req) {
|
|
23
26
|
try {
|
|
24
|
-
// Check if request body exists and has
|
|
27
|
+
// Check if request body exists and has _meta in either:
|
|
28
|
+
// - JSON-RPC shape: body.params._meta.context
|
|
29
|
+
// - REST shape: body._meta.context
|
|
25
30
|
const body = req.body;
|
|
26
|
-
|
|
31
|
+
const contextData = body?.params?._meta?.context ?? body?._meta?.context;
|
|
32
|
+
if (!contextData) {
|
|
27
33
|
return null;
|
|
28
34
|
}
|
|
29
|
-
const contextData = body.params._meta.context;
|
|
30
35
|
// Validate that the context has the correct structure
|
|
31
36
|
if (!isContextData(contextData)) {
|
|
32
37
|
logger.warn('Invalid context structure in _meta field, ignoring context');
|
|
@@ -55,4 +60,62 @@ export function extractContextFromMeta(req) {
|
|
|
55
60
|
return null;
|
|
56
61
|
}
|
|
57
62
|
}
|
|
63
|
+
export function encodeContextValue(context) {
|
|
64
|
+
return Buffer.from(JSON.stringify(context), 'utf8').toString('base64url');
|
|
65
|
+
}
|
|
66
|
+
export function extractContextFromQuery(req) {
|
|
67
|
+
try {
|
|
68
|
+
const queryValue = req.query?.context;
|
|
69
|
+
const encoded = Array.isArray(queryValue) ? queryValue[0] : queryValue;
|
|
70
|
+
if (!encoded || typeof encoded !== 'string') {
|
|
71
|
+
return null;
|
|
72
|
+
}
|
|
73
|
+
const decoded = Buffer.from(encoded, 'base64url').toString('utf8');
|
|
74
|
+
const parsed = JSON.parse(decoded);
|
|
75
|
+
if (!isContextData(parsed)) {
|
|
76
|
+
logger.warn('Invalid context structure in request query, ignoring context');
|
|
77
|
+
return null;
|
|
78
|
+
}
|
|
79
|
+
return parsed;
|
|
80
|
+
}
|
|
81
|
+
catch (error) {
|
|
82
|
+
logger.error('Failed to extract context from request query:', error instanceof Error ? error : new Error(String(error)));
|
|
83
|
+
return null;
|
|
84
|
+
}
|
|
85
|
+
}
|
|
86
|
+
export function extractRequestContext(req) {
|
|
87
|
+
return extractContextFromMeta(req) ?? extractContextFromQuery(req);
|
|
88
|
+
}
|
|
89
|
+
export function deriveContextSessionId(context) {
|
|
90
|
+
const stableContext = normalizeForSessionHash({
|
|
91
|
+
project: context.project,
|
|
92
|
+
user: context.user,
|
|
93
|
+
environment: context.environment,
|
|
94
|
+
...(context.version ? { version: context.version } : {}),
|
|
95
|
+
...(context.transport
|
|
96
|
+
? {
|
|
97
|
+
transport: {
|
|
98
|
+
type: context.transport.type,
|
|
99
|
+
...(context.transport.url ? { url: context.transport.url } : {}),
|
|
100
|
+
...(context.transport.client ? { client: context.transport.client } : {}),
|
|
101
|
+
},
|
|
102
|
+
}
|
|
103
|
+
: {}),
|
|
104
|
+
...(context.sessionId ? { sessionId: context.sessionId } : {}),
|
|
105
|
+
});
|
|
106
|
+
const hash = createHash('sha256').update(JSON.stringify(stableContext)).digest('hex').slice(0, 16);
|
|
107
|
+
return `rest-${hash}`;
|
|
108
|
+
}
|
|
109
|
+
function normalizeForSessionHash(value) {
|
|
110
|
+
if (Array.isArray(value)) {
|
|
111
|
+
return value.map((item) => normalizeForSessionHash(item));
|
|
112
|
+
}
|
|
113
|
+
if (value && typeof value === 'object') {
|
|
114
|
+
return Object.fromEntries(Object.entries(value)
|
|
115
|
+
.filter(([, entryValue]) => entryValue !== undefined)
|
|
116
|
+
.sort(([leftKey], [rightKey]) => leftKey.localeCompare(rightKey))
|
|
117
|
+
.map(([key, entryValue]) => [key, normalizeForSessionHash(entryValue)]));
|
|
118
|
+
}
|
|
119
|
+
return value;
|
|
120
|
+
}
|
|
58
121
|
//# sourceMappingURL=contextExtractor.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"contextExtractor.js","sourceRoot":"","sources":["../../../../src/transport/http/utils/contextExtractor.ts"],"names":[],"mappings":"AAAA,OAAO,MAAM,MAAM,uBAAuB,CAAC;AAK3C,
|
|
1
|
+
{"version":3,"file":"contextExtractor.js","sourceRoot":"","sources":["../../../../src/transport/http/utils/contextExtractor.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import type {
|
|
1
|
+
import type { ContextData } from '../types/context.js';
|
|
2
2
|
/**
|
|
3
3
|
* STDIO Proxy Transport Options
|
|
4
4
|
*/
|
|
@@ -8,7 +8,7 @@ export interface StdioProxyTransportOptions {
|
|
|
8
8
|
filter?: string;
|
|
9
9
|
tags?: string[];
|
|
10
10
|
timeout?: number;
|
|
11
|
-
|
|
11
|
+
context?: ContextData;
|
|
12
12
|
}
|
|
13
13
|
/**
|
|
14
14
|
* STDIO Proxy Transport
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"stdioProxyTransport.d.ts","sourceRoot":"","sources":["../../src/transport/stdioProxyTransport.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"stdioProxyTransport.d.ts","sourceRoot":"","sources":["../../src/transport/stdioProxyTransport.ts"],"names":[],"mappings":"AAOA,OAAO,KAAK,EAAc,WAAW,EAAE,MAAM,uBAAuB,CAAC;AAGrE;;GAEG;AACH,MAAM,WAAW,0BAA0B;IACzC,SAAS,EAAE,MAAM,CAAC;IAClB,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,IAAI,CAAC,EAAE,MAAM,EAAE,CAAC;IAChB,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,OAAO,CAAC,EAAE,WAAW,CAAC;CACvB;AASD;;;;;;;;GAQG;AACH,qBAAa,mBAAmB;IASlB,OAAO,CAAC,OAAO;IAR3B,OAAO,CAAC,cAAc,CAAuB;IAC7C,OAAO,CAAC,aAAa,CAAgC;IACrD,OAAO,CAAC,WAAW,CAAS;IAC5B,OAAO,CAAC,OAAO,CAAc;IAC7B,OAAO,CAAC,UAAU,CAA2B;IAC7C,OAAO,CAAC,qBAAqB,CAAS;IACtC,OAAO,CAAC,SAAS,CAAM;gBAEH,OAAO,EAAE,0BAA0B;IAgDvD;;OAEG;IACG,KAAK,IAAI,OAAO,CAAC,IAAI,CAAC;IAsB5B;;;OAGG;IACH,OAAO,CAAC,iCAAiC;IAuBzC;;OAEG;IACH,OAAO,CAAC,sBAAsB;IAkD9B;;OAEG;IACH,OAAO,CAAC,cAAc;IAUtB;;;;;;;;;;;;;;;OAeG;IACH,OAAO,CAAC,wBAAwB;IAoBhC;;OAEG;IACH,OAAO,CAAC,SAAS;IAOjB;;OAEG;IACH,OAAO,CAAC,cAAc;IAiCtB;;OAEG;IACG,KAAK,IAAI,OAAO,CAAC,IAAI,CAAC;CAqB7B"}
|
|
@@ -1,85 +1,14 @@
|
|
|
1
1
|
import { StreamableHTTPClientTransport } from '@modelcontextprotocol/sdk/client/streamableHttp.js';
|
|
2
2
|
import { StdioServerTransport } from '@modelcontextprotocol/sdk/server/stdio.js';
|
|
3
|
-
import {
|
|
3
|
+
import { buildCliContext, generateStreamableSessionId } from '../commands/shared/cliContext.js';
|
|
4
4
|
import { MCP_SERVER_VERSION } from '../constants/mcp.js';
|
|
5
5
|
import logger from '../logger/logger.js';
|
|
6
6
|
import { ClientInfoExtractor } from '../utils/client/clientInfoExtractor.js';
|
|
7
|
-
/**
|
|
8
|
-
* Enrich context with project configuration
|
|
9
|
-
*/
|
|
10
|
-
function enrichContextWithProjectConfig(context, projectConfig) {
|
|
11
|
-
if (!projectConfig?.context) {
|
|
12
|
-
return context;
|
|
13
|
-
}
|
|
14
|
-
const enrichedContext = { ...context };
|
|
15
|
-
// Enrich project context
|
|
16
|
-
if (projectConfig.context) {
|
|
17
|
-
enrichedContext.project = {
|
|
18
|
-
...context.project,
|
|
19
|
-
environment: projectConfig.context.environment || context.project.environment,
|
|
20
|
-
custom: {
|
|
21
|
-
...context.project.custom,
|
|
22
|
-
projectId: projectConfig.context.projectId,
|
|
23
|
-
team: projectConfig.context.team,
|
|
24
|
-
...projectConfig.context.custom,
|
|
25
|
-
},
|
|
26
|
-
};
|
|
27
|
-
// Handle environment variable prefixes
|
|
28
|
-
if (projectConfig.context.envPrefixes && projectConfig.context.envPrefixes.length > 0) {
|
|
29
|
-
const envVars = {};
|
|
30
|
-
for (const prefix of projectConfig.context.envPrefixes) {
|
|
31
|
-
for (const [key, value] of Object.entries(process.env)) {
|
|
32
|
-
if (key.startsWith(prefix) && value) {
|
|
33
|
-
envVars[key] = value;
|
|
34
|
-
}
|
|
35
|
-
}
|
|
36
|
-
}
|
|
37
|
-
enrichedContext.environment = {
|
|
38
|
-
...context.environment,
|
|
39
|
-
variables: {
|
|
40
|
-
...context.environment.variables,
|
|
41
|
-
...envVars,
|
|
42
|
-
},
|
|
43
|
-
};
|
|
44
|
-
}
|
|
45
|
-
}
|
|
46
|
-
return enrichedContext;
|
|
47
|
-
}
|
|
48
7
|
/**
|
|
49
8
|
* Generate a secure mcp-session-id for the proxy with the correct prefix
|
|
50
9
|
*/
|
|
51
10
|
function generateMcpSessionId() {
|
|
52
|
-
return
|
|
53
|
-
}
|
|
54
|
-
/**
|
|
55
|
-
* Auto-detects context from the proxy's environment
|
|
56
|
-
*/
|
|
57
|
-
function detectProxyContext(projectConfig) {
|
|
58
|
-
const cwd = process.cwd();
|
|
59
|
-
const projectName = cwd.split('/').pop() || 'unknown';
|
|
60
|
-
const baseContext = {
|
|
61
|
-
project: {
|
|
62
|
-
path: cwd,
|
|
63
|
-
name: projectName,
|
|
64
|
-
environment: process.env.NODE_ENV || 'development',
|
|
65
|
-
},
|
|
66
|
-
user: {
|
|
67
|
-
username: process.env.USER || process.env.USERNAME || 'unknown',
|
|
68
|
-
home: process.env.HOME || process.env.USERPROFILE || '',
|
|
69
|
-
},
|
|
70
|
-
environment: {
|
|
71
|
-
variables: {
|
|
72
|
-
NODE_VERSION: process.version,
|
|
73
|
-
PLATFORM: process.platform,
|
|
74
|
-
ARCH: process.arch,
|
|
75
|
-
PWD: cwd,
|
|
76
|
-
},
|
|
77
|
-
},
|
|
78
|
-
timestamp: new Date().toISOString(),
|
|
79
|
-
version: MCP_SERVER_VERSION,
|
|
80
|
-
sessionId: generateMcpSessionId(),
|
|
81
|
-
};
|
|
82
|
-
return enrichContextWithProjectConfig(baseContext, projectConfig);
|
|
11
|
+
return generateStreamableSessionId();
|
|
83
12
|
}
|
|
84
13
|
/**
|
|
85
14
|
* STDIO Proxy Transport
|
|
@@ -103,8 +32,15 @@ export class StdioProxyTransport {
|
|
|
103
32
|
this.options = options;
|
|
104
33
|
// Reset any previous state
|
|
105
34
|
ClientInfoExtractor.reset();
|
|
106
|
-
|
|
107
|
-
|
|
35
|
+
this.context =
|
|
36
|
+
this.options.context ||
|
|
37
|
+
buildCliContext({
|
|
38
|
+
cwd: process.cwd(),
|
|
39
|
+
projectRoot: process.cwd(),
|
|
40
|
+
transportType: 'stdio-proxy',
|
|
41
|
+
version: MCP_SERVER_VERSION,
|
|
42
|
+
sessionId: generateMcpSessionId(),
|
|
43
|
+
});
|
|
108
44
|
logger.info('🔍 Detected proxy context', {
|
|
109
45
|
projectPath: this.context.project.path,
|
|
110
46
|
projectName: this.context.project.name,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"stdioProxyTransport.js","sourceRoot":"","sources":["../../src/transport/stdioProxyTransport.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,6BAA6B,EAAE,MAAM,oDAAoD,CAAC;AACnG,OAAO,EAAE,oBAAoB,EAAE,MAAM,2CAA2C,CAAC;
|
|
1
|
+
{"version":3,"file":"stdioProxyTransport.js","sourceRoot":"","sources":["../../src/transport/stdioProxyTransport.ts"],"names":[],"mappings":"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"}
|
package/build/types/context.d.ts
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"context.d.ts","sourceRoot":"","sources":["../../src/types/context.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"context.d.ts","sourceRoot":"","sources":["../../src/types/context.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"context.js","sourceRoot":"","sources":["../../src/types/context.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"context.js","sourceRoot":"","sources":["../../src/types/context.ts"],"names":[],"mappings":"AA+HA,MAAM,UAAU,eAAe;IAC7B,OAAO,IAAI,IAAI,EAAE,CAAC,WAAW,EAAE,CAAC;AAClC,CAAC"}
|
|
@@ -0,0 +1,11 @@
|
|
|
1
|
+
import type { ContextData } from '../../types/context.js';
|
|
2
|
+
type JsonValue = null | boolean | number | string | JsonValue[] | {
|
|
3
|
+
[key: string]: JsonValue;
|
|
4
|
+
};
|
|
5
|
+
export interface ContextHashOptions {
|
|
6
|
+
omitWorkingDirectory?: boolean;
|
|
7
|
+
}
|
|
8
|
+
export declare function toCacheableContext(context: ContextData, options?: ContextHashOptions): JsonValue;
|
|
9
|
+
export declare function createContextHash(context: ContextData, options?: ContextHashOptions): string;
|
|
10
|
+
export {};
|
|
11
|
+
//# sourceMappingURL=contextHash.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"contextHash.d.ts","sourceRoot":"","sources":["../../../src/utils/context/contextHash.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,uBAAuB,CAAC;AAEzD,KAAK,SAAS,GAAG,IAAI,GAAG,OAAO,GAAG,MAAM,GAAG,MAAM,GAAG,SAAS,EAAE,GAAG;IAAE,CAAC,GAAG,EAAE,MAAM,GAAG,SAAS,CAAA;CAAE,CAAC;AAE/F,MAAM,WAAW,kBAAkB;IACjC,oBAAoB,CAAC,EAAE,OAAO,CAAC;CAChC;AAED,wBAAgB,kBAAkB,CAAC,OAAO,EAAE,WAAW,EAAE,OAAO,GAAE,kBAAuB,GAAG,SAAS,CAiBpG;AAED,wBAAgB,iBAAiB,CAAC,OAAO,EAAE,WAAW,EAAE,OAAO,CAAC,EAAE,kBAAkB,GAAG,MAAM,CAI5F"}
|
|
@@ -0,0 +1,37 @@
|
|
|
1
|
+
import { createHash } from 'crypto';
|
|
2
|
+
export function toCacheableContext(context, options = {}) {
|
|
3
|
+
const { timestamp: _timestamp, ...rest } = context;
|
|
4
|
+
return sortJsonValue({
|
|
5
|
+
...rest,
|
|
6
|
+
project: {
|
|
7
|
+
...rest.project,
|
|
8
|
+
cwd: options.omitWorkingDirectory ? undefined : rest.project.cwd,
|
|
9
|
+
},
|
|
10
|
+
environment: {
|
|
11
|
+
...rest.environment,
|
|
12
|
+
variables: {
|
|
13
|
+
...rest.environment?.variables,
|
|
14
|
+
PWD: options.omitWorkingDirectory ? undefined : rest.environment?.variables?.PWD,
|
|
15
|
+
},
|
|
16
|
+
},
|
|
17
|
+
});
|
|
18
|
+
}
|
|
19
|
+
export function createContextHash(context, options) {
|
|
20
|
+
return createHash('sha256')
|
|
21
|
+
.update(JSON.stringify(toCacheableContext(context, options)))
|
|
22
|
+
.digest('hex');
|
|
23
|
+
}
|
|
24
|
+
function sortJsonValue(value) {
|
|
25
|
+
if (Array.isArray(value)) {
|
|
26
|
+
return value.map((item) => sortJsonValue(item));
|
|
27
|
+
}
|
|
28
|
+
if (value && typeof value === 'object') {
|
|
29
|
+
const sortedEntries = Object.entries(value)
|
|
30
|
+
.filter(([, entryValue]) => entryValue !== undefined)
|
|
31
|
+
.sort(([leftKey], [rightKey]) => leftKey.localeCompare(rightKey))
|
|
32
|
+
.map(([key, entryValue]) => [key, sortJsonValue(entryValue)]);
|
|
33
|
+
return Object.fromEntries(sortedEntries);
|
|
34
|
+
}
|
|
35
|
+
return value;
|
|
36
|
+
}
|
|
37
|
+
//# sourceMappingURL=contextHash.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"contextHash.js","sourceRoot":"","sources":["../../../src/utils/context/contextHash.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,QAAQ,CAAC;AAUpC,MAAM,UAAU,kBAAkB,CAAC,OAAoB,EAAE,UAA8B,EAAE;IACvF,MAAM,EAAE,SAAS,EAAE,UAAU,EAAE,GAAG,IAAI,EAAE,GAAG,OAAO,CAAC;IAEnD,OAAO,aAAa,CAAC;QACnB,GAAG,IAAI;QACP,OAAO,EAAE;YACP,GAAG,IAAI,CAAC,OAAO;YACf,GAAG,EAAE,OAAO,CAAC,oBAAoB,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,IAAI,CAAC,OAAO,CAAC,GAAG;SACjE;QACD,WAAW,EAAE;YACX,GAAG,IAAI,CAAC,WAAW;YACnB,SAAS,EAAE;gBACT,GAAG,IAAI,CAAC,WAAW,EAAE,SAAS;gBAC9B,GAAG,EAAE,OAAO,CAAC,oBAAoB,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,IAAI,CAAC,WAAW,EAAE,SAAS,EAAE,GAAG;aACjF;SACF;KACF,CAAc,CAAC;AAClB,CAAC;AAED,MAAM,UAAU,iBAAiB,CAAC,OAAoB,EAAE,OAA4B;IAClF,OAAO,UAAU,CAAC,QAAQ,CAAC;SACxB,MAAM,CAAC,IAAI,CAAC,SAAS,CAAC,kBAAkB,CAAC,OAAO,EAAE,OAAO,CAAC,CAAC,CAAC;SAC5D,MAAM,CAAC,KAAK,CAAC,CAAC;AACnB,CAAC;AAED,SAAS,aAAa,CAAC,KAAc;IACnC,IAAI,KAAK,CAAC,OAAO,CAAC,KAAK,CAAC,EAAE,CAAC;QACzB,OAAO,KAAK,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,aAAa,CAAC,IAAI,CAAC,CAAC,CAAC;IAClD,CAAC;IAED,IAAI,KAAK,IAAI,OAAO,KAAK,KAAK,QAAQ,EAAE,CAAC;QACvC,MAAM,aAAa,GAAG,MAAM,CAAC,OAAO,CAAC,KAAgC,CAAC;aACnE,MAAM,CAAC,CAAC,CAAC,EAAE,UAAU,CAAC,EAAE,EAAE,CAAC,UAAU,KAAK,SAAS,CAAC;aACpD,IAAI,CAAC,CAAC,CAAC,OAAO,CAAC,EAAE,CAAC,QAAQ,CAAC,EAAE,EAAE,CAAC,OAAO,CAAC,aAAa,CAAC,QAAQ,CAAC,CAAC;aAChE,GAAG,CAAC,CAAC,CAAC,GAAG,EAAE,UAAU,CAAC,EAAE,EAAE,CAAC,CAAC,GAAG,EAAE,aAAa,CAAC,UAAU,CAAC,CAAU,CAAC,CAAC;QAEzE,OAAO,MAAM,CAAC,WAAW,CAAC,aAAa,CAAC,CAAC;IAC3C,CAAC;IAED,OAAO,KAAK,CAAC;AACf,CAAC"}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"typeGuards.d.ts","sourceRoot":"","sources":["../../src/utils/typeGuards.ts"],"names":[],"mappings":"AAAA,wBAAgB,aAAa,CAAC,KAAK,EAAE,OAAO,GAAG,KAAK,IAAI,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAE9E"}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"typeGuards.js","sourceRoot":"","sources":["../../src/utils/typeGuards.ts"],"names":[],"mappings":"AAAA,MAAM,UAAU,aAAa,CAAC,KAAc;IAC1C,OAAO,OAAO,KAAK,KAAK,QAAQ,IAAI,KAAK,KAAK,IAAI,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC;AAC9E,CAAC"}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"urlUtils.d.ts","sourceRoot":"","sources":["../../src/utils/urlUtils.ts"],"names":[],"mappings":"AAAA,wBAAgB,cAAc,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,CAElD"}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"urlUtils.js","sourceRoot":"","sources":["../../src/utils/urlUtils.ts"],"names":[],"mappings":"AAAA,MAAM,UAAU,cAAc,CAAC,GAAW;IACxC,OAAO,GAAG,CAAC,OAAO,CAAC,oBAAoB,EAAE,EAAE,CAAC,CAAC;AAC/C,CAAC"}
|
|
@@ -32,6 +32,7 @@ export declare function detectServer1mcpUrl(): Promise<string>;
|
|
|
32
32
|
export declare function discoverServerWithPidFile(configDir?: string, userUrl?: string): Promise<{
|
|
33
33
|
url: string;
|
|
34
34
|
source: 'user' | 'pidfile' | 'portscan';
|
|
35
|
+
pid?: number;
|
|
35
36
|
}>;
|
|
36
37
|
/**
|
|
37
38
|
* Method 7: Get URL with user override (for command-specific URLs)
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"urlDetection.d.ts","sourceRoot":"","sources":["../../../src/utils/validation/urlDetection.ts"],"names":[],"mappings":"AAIA;;;;;;GAMG;AAEH;;GAEG;AACH,wBAAgB,oBAAoB,IAAI,MAAM,CAiB7C;AAED;;GAEG;AACH,wBAAsB,sBAAsB,IAAI,OAAO,CAAC,MAAM,GAAG,IAAI,CAAC,CAiBrE;AAED;;GAEG;AACH,wBAAgB,gBAAgB,IAAI,MAAM,GAAG,IAAI,CAShD;AAED;;GAEG;AACH,wBAAsB,oBAAoB,CAAC,SAAS,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,GAAG,IAAI,CAAC,CAerF;AAED;;GAEG;AACH,wBAAsB,mBAAmB,IAAI,OAAO,CAAC,MAAM,CAAC,CAe3D;AAED;;;GAGG;AACH,wBAAsB,yBAAyB,CAC7C,SAAS,CAAC,EAAE,MAAM,EAClB,OAAO,CAAC,EAAE,MAAM,GACf,OAAO,CAAC;IAAE,GAAG,EAAE,MAAM,CAAC;IAAC,MAAM,EAAE,MAAM,GAAG,SAAS,GAAG,UAAU,CAAA;CAAE,CAAC,
|
|
1
|
+
{"version":3,"file":"urlDetection.d.ts","sourceRoot":"","sources":["../../../src/utils/validation/urlDetection.ts"],"names":[],"mappings":"AAIA;;;;;;GAMG;AAEH;;GAEG;AACH,wBAAgB,oBAAoB,IAAI,MAAM,CAiB7C;AAED;;GAEG;AACH,wBAAsB,sBAAsB,IAAI,OAAO,CAAC,MAAM,GAAG,IAAI,CAAC,CAiBrE;AAED;;GAEG;AACH,wBAAgB,gBAAgB,IAAI,MAAM,GAAG,IAAI,CAShD;AAED;;GAEG;AACH,wBAAsB,oBAAoB,CAAC,SAAS,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,GAAG,IAAI,CAAC,CAerF;AAED;;GAEG;AACH,wBAAsB,mBAAmB,IAAI,OAAO,CAAC,MAAM,CAAC,CAe3D;AAED;;;GAGG;AACH,wBAAsB,yBAAyB,CAC7C,SAAS,CAAC,EAAE,MAAM,EAClB,OAAO,CAAC,EAAE,MAAM,GACf,OAAO,CAAC;IAAE,GAAG,EAAE,MAAM,CAAC;IAAC,MAAM,EAAE,MAAM,GAAG,SAAS,GAAG,UAAU,CAAC;IAAC,GAAG,CAAC,EAAE,MAAM,CAAA;CAAE,CAAC,CAiCjF;AAED;;GAEG;AACH,wBAAsB,gBAAgB,CAAC,eAAe,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC,CAOhF;AAED;;GAEG;AACH,wBAAsB,qBAAqB,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAAC;IAChE,KAAK,EAAE,OAAO,CAAC;IACf,KAAK,CAAC,EAAE,MAAM,CAAC;CAChB,CAAC,CA6BD"}
|
|
@@ -105,9 +105,14 @@ export async function discoverServerWithPidFile(configDir, userUrl) {
|
|
|
105
105
|
return { url: normalizedUrl, source: 'user' };
|
|
106
106
|
}
|
|
107
107
|
// 2. Try PID file
|
|
108
|
-
const
|
|
109
|
-
|
|
110
|
-
|
|
108
|
+
const dir = getConfigDir(configDir);
|
|
109
|
+
const serverInfo = readPidFile(dir);
|
|
110
|
+
if (serverInfo) {
|
|
111
|
+
const validation = await validateServer1mcpUrl(serverInfo.url);
|
|
112
|
+
if (validation.valid) {
|
|
113
|
+
return { url: serverInfo.url, source: 'pidfile', pid: serverInfo.pid };
|
|
114
|
+
}
|
|
115
|
+
cleanupPidFile(dir);
|
|
111
116
|
}
|
|
112
117
|
// 3. Fallback to port scanning
|
|
113
118
|
const portScanUrl = await detectRunningServerUrl();
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"urlDetection.js","sourceRoot":"","sources":["../../../src/utils/validation/urlDetection.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"urlDetection.js","sourceRoot":"","sources":["../../../src/utils/validation/urlDetection.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@1mcp/agent",
|
|
3
|
-
"version": "0.
|
|
3
|
+
"version": "0.31.0-beta1",
|
|
4
4
|
"description": "One MCP server to aggregate them all - A unified Model Context Protocol server implementation",
|
|
5
5
|
"keywords": [
|
|
6
6
|
"mcp",
|
|
@@ -55,6 +55,7 @@
|
|
|
55
55
|
},
|
|
56
56
|
"dependencies": {
|
|
57
57
|
"@modelcontextprotocol/sdk": "^1.25.1",
|
|
58
|
+
"@toon-format/toon": "^2.1.0",
|
|
58
59
|
"ajv": "^8.17.1",
|
|
59
60
|
"ajv-formats": "^3.0.1",
|
|
60
61
|
"axios": "^1.12.2",
|
|
@@ -65,7 +66,7 @@
|
|
|
65
66
|
"express": "^5.1.0",
|
|
66
67
|
"express-rate-limit": "^8.2.1",
|
|
67
68
|
"handlebars": "^4.7.8",
|
|
68
|
-
"https-proxy-agent": "^
|
|
69
|
+
"https-proxy-agent": "^9.0.0",
|
|
69
70
|
"json5": "^2.2.3",
|
|
70
71
|
"ora": "^9.0.0",
|
|
71
72
|
"prompts": "^2.4.2",
|