@1mcp/agent 0.35.0-beta.2 → 0.35.0-beta.3

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.
Files changed (242) hide show
  1. package/README.md +5 -2
  2. package/build/admin/assets/{admin-console-CbHHoqLr.js → admin-console-BOl7XR0p.js} +2 -2
  3. package/build/admin/assets/{admin-console-C5_zD_qW.css → admin-console-Bbil6BQU.css} +1 -1
  4. package/build/admin/index.html +2 -2
  5. package/build/auth/oauthAuthorizationFlow.d.ts +2 -2
  6. package/build/auth/oauthAuthorizationFlow.d.ts.map +1 -1
  7. package/build/auth/oauthAuthorizationFlow.js +1 -1
  8. package/build/auth/oauthAuthorizationFlow.js.map +1 -1
  9. package/build/auth/sdkOAuthServerProvider.d.ts +4 -3
  10. package/build/auth/sdkOAuthServerProvider.d.ts.map +1 -1
  11. package/build/auth/sdkOAuthServerProvider.js +132 -17
  12. package/build/auth/sdkOAuthServerProvider.js.map +1 -1
  13. package/build/auth/sessionTypes.d.ts +40 -5
  14. package/build/auth/sessionTypes.d.ts.map +1 -1
  15. package/build/auth/sessionTypes.js +33 -1
  16. package/build/auth/sessionTypes.js.map +1 -1
  17. package/build/auth/storage/fileStorageService.d.ts +18 -1
  18. package/build/auth/storage/fileStorageService.d.ts.map +1 -1
  19. package/build/auth/storage/fileStorageService.js +253 -3
  20. package/build/auth/storage/fileStorageService.js.map +1 -1
  21. package/build/auth/storage/oauthStorageService.d.ts +4 -1
  22. package/build/auth/storage/oauthStorageService.d.ts.map +1 -1
  23. package/build/auth/storage/oauthStorageService.js +8 -1
  24. package/build/auth/storage/oauthStorageService.js.map +1 -1
  25. package/build/auth/storage/refreshTokenFamilyRepository.d.ts +36 -0
  26. package/build/auth/storage/refreshTokenFamilyRepository.d.ts.map +1 -0
  27. package/build/auth/storage/refreshTokenFamilyRepository.js +167 -0
  28. package/build/auth/storage/refreshTokenFamilyRepository.js.map +1 -0
  29. package/build/auth/storage/sessionRepository.d.ts +14 -1
  30. package/build/auth/storage/sessionRepository.d.ts.map +1 -1
  31. package/build/auth/storage/sessionRepository.js +32 -9
  32. package/build/auth/storage/sessionRepository.js.map +1 -1
  33. package/build/commands/inspect/inspect.d.ts.map +1 -1
  34. package/build/commands/inspect/inspect.js +2 -9
  35. package/build/commands/inspect/inspect.js.map +1 -1
  36. package/build/commands/inspect/inspectUtils.d.ts +4 -0
  37. package/build/commands/inspect/inspectUtils.d.ts.map +1 -1
  38. package/build/commands/inspect/inspectUtils.js +12 -0
  39. package/build/commands/inspect/inspectUtils.js.map +1 -1
  40. package/build/commands/instructions/instructionsUtils.d.ts +2 -0
  41. package/build/commands/instructions/instructionsUtils.d.ts.map +1 -1
  42. package/build/commands/instructions/instructionsUtils.js +7 -3
  43. package/build/commands/instructions/instructionsUtils.js.map +1 -1
  44. package/build/commands/run/run.d.ts.map +1 -1
  45. package/build/commands/run/run.js +86 -7
  46. package/build/commands/run/run.js.map +1 -1
  47. package/build/commands/serve/asyncLoadingOptions.d.ts +30 -0
  48. package/build/commands/serve/asyncLoadingOptions.d.ts.map +1 -0
  49. package/build/commands/serve/asyncLoadingOptions.js +34 -0
  50. package/build/commands/serve/asyncLoadingOptions.js.map +1 -0
  51. package/build/commands/serve/index.d.ts +4 -1
  52. package/build/commands/serve/index.d.ts.map +1 -1
  53. package/build/commands/serve/index.js +14 -15
  54. package/build/commands/serve/index.js.map +1 -1
  55. package/build/commands/serve/serve.d.ts +2 -1
  56. package/build/commands/serve/serve.d.ts.map +1 -1
  57. package/build/commands/serve/serve.js +17 -8
  58. package/build/commands/serve/serve.js.map +1 -1
  59. package/build/commands/serve/serveBackground.d.ts.map +1 -1
  60. package/build/commands/serve/serveBackground.js +1 -0
  61. package/build/commands/serve/serveBackground.js.map +1 -1
  62. package/build/commands/shared/apiClient.d.ts +1 -1
  63. package/build/commands/shared/apiClient.d.ts.map +1 -1
  64. package/build/commands/shared/apiClient.js +2 -2
  65. package/build/commands/shared/apiClient.js.map +1 -1
  66. package/build/commands/shared/clientSurfaceAttachment.d.ts +3 -1
  67. package/build/commands/shared/clientSurfaceAttachment.d.ts.map +1 -1
  68. package/build/commands/shared/clientSurfaceAttachment.js +14 -4
  69. package/build/commands/shared/clientSurfaceAttachment.js.map +1 -1
  70. package/build/commands/shared/commandRunner.d.ts +1 -0
  71. package/build/commands/shared/commandRunner.d.ts.map +1 -1
  72. package/build/commands/shared/commandRunner.js +10 -2
  73. package/build/commands/shared/commandRunner.js.map +1 -1
  74. package/build/commands/shared/filterSelectionQuery.d.ts +8 -0
  75. package/build/commands/shared/filterSelectionQuery.d.ts.map +1 -0
  76. package/build/commands/shared/filterSelectionQuery.js +12 -0
  77. package/build/commands/shared/filterSelectionQuery.js.map +1 -0
  78. package/build/commands/shared/inspectApiSchemas.d.ts +83 -0
  79. package/build/commands/shared/inspectApiSchemas.d.ts.map +1 -0
  80. package/build/commands/shared/inspectApiSchemas.js +40 -0
  81. package/build/commands/shared/inspectApiSchemas.js.map +1 -0
  82. package/build/commands/shared/serveTargetResolver.d.ts.map +1 -1
  83. package/build/commands/shared/serveTargetResolver.js +19 -8
  84. package/build/commands/shared/serveTargetResolver.js.map +1 -1
  85. package/build/commands/wait/index.d.ts +3 -0
  86. package/build/commands/wait/index.d.ts.map +1 -0
  87. package/build/commands/wait/index.js +20 -0
  88. package/build/commands/wait/index.js.map +1 -0
  89. package/build/commands/wait/wait.d.ts +39 -0
  90. package/build/commands/wait/wait.d.ts.map +1 -0
  91. package/build/commands/wait/wait.js +161 -0
  92. package/build/commands/wait/wait.js.map +1 -0
  93. package/build/config/configLoader.d.ts.map +1 -1
  94. package/build/config/configLoader.js +12 -0
  95. package/build/config/configLoader.js.map +1 -1
  96. package/build/constants/auth.d.ts +10 -1
  97. package/build/constants/auth.d.ts.map +1 -1
  98. package/build/constants/auth.js +11 -1
  99. package/build/constants/auth.js.map +1 -1
  100. package/build/constants/mcp.d.ts +7 -1
  101. package/build/constants/mcp.d.ts.map +1 -1
  102. package/build/constants/mcp.js +9 -1
  103. package/build/constants/mcp.js.map +1 -1
  104. package/build/core/capabilities/capabilityAggregator.d.ts.map +1 -1
  105. package/build/core/capabilities/capabilityAggregator.js +10 -9
  106. package/build/core/capabilities/capabilityAggregator.js.map +1 -1
  107. package/build/core/capabilities/capabilityCatalog.d.ts +6 -5
  108. package/build/core/capabilities/capabilityCatalog.d.ts.map +1 -1
  109. package/build/core/capabilities/capabilityCatalog.js +36 -23
  110. package/build/core/capabilities/capabilityCatalog.js.map +1 -1
  111. package/build/core/capabilities/capabilityVisibility.d.ts +12 -0
  112. package/build/core/capabilities/capabilityVisibility.d.ts.map +1 -0
  113. package/build/core/capabilities/capabilityVisibility.js +13 -0
  114. package/build/core/capabilities/capabilityVisibility.js.map +1 -0
  115. package/build/core/capabilities/internalCapabilitiesProvider.d.ts +2 -1
  116. package/build/core/capabilities/internalCapabilitiesProvider.d.ts.map +1 -1
  117. package/build/core/capabilities/internalCapabilitiesProvider.js +2 -2
  118. package/build/core/capabilities/internalCapabilitiesProvider.js.map +1 -1
  119. package/build/core/capabilities/lazyLoadingOrchestrator.d.ts +5 -23
  120. package/build/core/capabilities/lazyLoadingOrchestrator.d.ts.map +1 -1
  121. package/build/core/capabilities/lazyLoadingOrchestrator.js +25 -44
  122. package/build/core/capabilities/lazyLoadingOrchestrator.js.map +1 -1
  123. package/build/core/capabilities/metaToolProvider.d.ts +6 -21
  124. package/build/core/capabilities/metaToolProvider.d.ts.map +1 -1
  125. package/build/core/capabilities/metaToolProvider.js +18 -70
  126. package/build/core/capabilities/metaToolProvider.js.map +1 -1
  127. package/build/core/capabilities/toolRegistry.d.ts +5 -1
  128. package/build/core/capabilities/toolRegistry.d.ts.map +1 -1
  129. package/build/core/capabilities/toolRegistry.js +11 -3
  130. package/build/core/capabilities/toolRegistry.js.map +1 -1
  131. package/build/core/client/clientManager.d.ts +9 -0
  132. package/build/core/client/clientManager.d.ts.map +1 -1
  133. package/build/core/client/clientManager.js +82 -0
  134. package/build/core/client/clientManager.js.map +1 -1
  135. package/build/core/client/recreateHttpTransportOptions.d.ts +14 -0
  136. package/build/core/client/recreateHttpTransportOptions.d.ts.map +1 -0
  137. package/build/core/client/recreateHttpTransportOptions.js +2 -0
  138. package/build/core/client/recreateHttpTransportOptions.js.map +1 -0
  139. package/build/core/client/transportRecreator.d.ts +8 -1
  140. package/build/core/client/transportRecreator.d.ts.map +1 -1
  141. package/build/core/client/transportRecreator.js +11 -2
  142. package/build/core/client/transportRecreator.js.map +1 -1
  143. package/build/core/instructions/templateTypes.d.ts +2 -2
  144. package/build/core/instructions/templateTypes.d.ts.map +1 -1
  145. package/build/core/protocol/requestHandlerUtils.d.ts +3 -0
  146. package/build/core/protocol/requestHandlerUtils.d.ts.map +1 -1
  147. package/build/core/protocol/requestHandlerUtils.js +23 -7
  148. package/build/core/protocol/requestHandlerUtils.js.map +1 -1
  149. package/build/core/protocol/toolRequestHandlers.d.ts.map +1 -1
  150. package/build/core/protocol/toolRequestHandlers.js +13 -13
  151. package/build/core/protocol/toolRequestHandlers.js.map +1 -1
  152. package/build/core/runtime/runtimeIdentityService.d.ts +1 -0
  153. package/build/core/runtime/runtimeIdentityService.d.ts.map +1 -1
  154. package/build/core/runtime/runtimeIdentityService.js +4 -1
  155. package/build/core/runtime/runtimeIdentityService.js.map +1 -1
  156. package/build/core/server/clientInstanceFactory.d.ts.map +1 -1
  157. package/build/core/server/clientInstanceFactory.js +12 -3
  158. package/build/core/server/clientInstanceFactory.js.map +1 -1
  159. package/build/core/server/connectionManager.d.ts +0 -6
  160. package/build/core/server/connectionManager.d.ts.map +1 -1
  161. package/build/core/server/connectionManager.js +0 -39
  162. package/build/core/server/connectionManager.js.map +1 -1
  163. package/build/core/server/connectionResolver.d.ts.map +1 -1
  164. package/build/core/server/connectionResolver.js +35 -1
  165. package/build/core/server/connectionResolver.js.map +1 -1
  166. package/build/core/types/transport.d.ts +2 -0
  167. package/build/core/types/transport.d.ts.map +1 -1
  168. package/build/core/types/transport.js +18 -5
  169. package/build/core/types/transport.js.map +1 -1
  170. package/build/domains/backend-logs/backendLogBroker.d.ts +47 -0
  171. package/build/domains/backend-logs/backendLogBroker.d.ts.map +1 -0
  172. package/build/domains/backend-logs/backendLogBroker.js +249 -0
  173. package/build/domains/backend-logs/backendLogBroker.js.map +1 -0
  174. package/build/domains/backend-logs/backendLogProjection.d.ts +9 -0
  175. package/build/domains/backend-logs/backendLogProjection.d.ts.map +1 -0
  176. package/build/domains/backend-logs/backendLogProjection.js +40 -0
  177. package/build/domains/backend-logs/backendLogProjection.js.map +1 -0
  178. package/build/domains/backend-logs/backendLogRuntime.d.ts +4 -0
  179. package/build/domains/backend-logs/backendLogRuntime.d.ts.map +1 -0
  180. package/build/domains/backend-logs/backendLogRuntime.js +11 -0
  181. package/build/domains/backend-logs/backendLogRuntime.js.map +1 -0
  182. package/build/domains/backend-logs/backendLogSanitizer.d.ts +2 -0
  183. package/build/domains/backend-logs/backendLogSanitizer.d.ts.map +1 -0
  184. package/build/domains/backend-logs/backendLogSanitizer.js +30 -0
  185. package/build/domains/backend-logs/backendLogSanitizer.js.map +1 -0
  186. package/build/domains/backend-logs/backendLogSource.d.ts +8 -0
  187. package/build/domains/backend-logs/backendLogSource.d.ts.map +1 -0
  188. package/build/domains/backend-logs/backendLogSource.js +22 -0
  189. package/build/domains/backend-logs/backendLogSource.js.map +1 -0
  190. package/build/domains/backend-logs/backendLogTypes.d.ts +49 -0
  191. package/build/domains/backend-logs/backendLogTypes.d.ts.map +1 -0
  192. package/build/domains/backend-logs/backendLogTypes.js +2 -0
  193. package/build/domains/backend-logs/backendLogTypes.js.map +1 -0
  194. package/build/domains/runtime-targets/runtimeIdentityVerification.d.ts +8 -1
  195. package/build/domains/runtime-targets/runtimeIdentityVerification.d.ts.map +1 -1
  196. package/build/domains/runtime-targets/runtimeIdentityVerification.js +62 -3
  197. package/build/domains/runtime-targets/runtimeIdentityVerification.js.map +1 -1
  198. package/build/domains/runtime-targets/runtimeProbe.d.ts +34 -0
  199. package/build/domains/runtime-targets/runtimeProbe.d.ts.map +1 -0
  200. package/build/domains/runtime-targets/runtimeProbe.js +71 -0
  201. package/build/domains/runtime-targets/runtimeProbe.js.map +1 -0
  202. package/build/index.d.ts.map +1 -1
  203. package/build/index.js +3 -0
  204. package/build/index.js.map +1 -1
  205. package/build/transport/http/routes/adminRoutes.d.ts +2 -0
  206. package/build/transport/http/routes/adminRoutes.d.ts.map +1 -1
  207. package/build/transport/http/routes/adminRoutes.js +159 -17
  208. package/build/transport/http/routes/adminRoutes.js.map +1 -1
  209. package/build/transport/http/routes/inspectHelpers.d.ts +11 -4
  210. package/build/transport/http/routes/inspectHelpers.d.ts.map +1 -1
  211. package/build/transport/http/routes/inspectHelpers.js +21 -2
  212. package/build/transport/http/routes/inspectHelpers.js.map +1 -1
  213. package/build/transport/http/routes/inspectRoutes.d.ts.map +1 -1
  214. package/build/transport/http/routes/inspectRoutes.js +55 -4
  215. package/build/transport/http/routes/inspectRoutes.js.map +1 -1
  216. package/build/transport/http/routes/toolRoutes.d.ts.map +1 -1
  217. package/build/transport/http/routes/toolRoutes.js +37 -29
  218. package/build/transport/http/routes/toolRoutes.js.map +1 -1
  219. package/build/transport/http/server.d.ts.map +1 -1
  220. package/build/transport/http/server.js +3 -1
  221. package/build/transport/http/server.js.map +1 -1
  222. package/build/transport/managedStdioStderr.d.ts +17 -1
  223. package/build/transport/managedStdioStderr.d.ts.map +1 -1
  224. package/build/transport/managedStdioStderr.js +129 -5
  225. package/build/transport/managedStdioStderr.js.map +1 -1
  226. package/build/transport/managedStdioStderrOptions.d.ts +2 -0
  227. package/build/transport/managedStdioStderrOptions.d.ts.map +1 -1
  228. package/build/transport/restartableStdioTransport.js +1 -1
  229. package/build/transport/restartableStdioTransport.js.map +1 -1
  230. package/build/transport/transportFactory.d.ts +6 -2
  231. package/build/transport/transportFactory.d.ts.map +1 -1
  232. package/build/transport/transportFactory.js +43 -15
  233. package/build/transport/transportFactory.js.map +1 -1
  234. package/build/types/serverStatus.d.ts +3 -0
  235. package/build/types/serverStatus.d.ts.map +1 -0
  236. package/build/types/serverStatus.js +13 -0
  237. package/build/types/serverStatus.js.map +1 -0
  238. package/build/utils/validation/urlDetection.d.ts +12 -9
  239. package/build/utils/validation/urlDetection.d.ts.map +1 -1
  240. package/build/utils/validation/urlDetection.js +233 -31
  241. package/build/utils/validation/urlDetection.js.map +1 -1
  242. package/package.json +4 -3
@@ -1,8 +1,9 @@
1
1
  import { getConfigDir } from '../../constants.js';
2
2
  import { discoverScopedRuntime } from '../../core/server/runtimeLifecycle.js';
3
- import { fetchRuntimeTargetUrl, } from '../../domains/runtime-targets/runtimeIdentityVerification.js';
3
+ import { fetchRuntimeIdentity, fetchRuntimeTargetUrl, RuntimeTargetIdentityError, } from '../../domains/runtime-targets/runtimeIdentityVerification.js';
4
+ import { localRuntimeStatusCommand, RuntimeProbeError, } from '../../domains/runtime-targets/runtimeProbe.js';
4
5
  import { debugIf } from '../../logger/logger.js';
5
- import { createSafeErrorMessage } from '../../logger/secureLogger.js';
6
+ import { sanitizeForLogging } from '../../logger/secureLogger.js';
6
7
  import { normalizedArgv } from '../../utils/cli/normalizedArgv.js';
7
8
  /**
8
9
  * Multi-method URL detection system for app commands.
@@ -32,17 +33,28 @@ export function detectUrlFromCliArgs() {
32
33
  * Method 2: Detect running server on common ports
33
34
  */
34
35
  export async function detectRunningServerUrl() {
35
- // Try common ports and check /oauth endpoint (which always exists)
36
+ // Try common ports against the unthrottled runtime identity endpoint.
36
37
  const commonPorts = [3050, 3051, 3052];
37
38
  for (const port of commonPorts) {
38
39
  try {
39
- const response = await fetch(`http://localhost:${port}/oauth/`, {
40
+ const baseUrl = `http://localhost:${port}`;
41
+ const identityResponse = await fetch(`${baseUrl}/.well-known/1mcp/runtime-identity`, {
40
42
  redirect: 'manual',
41
43
  signal: AbortSignal.timeout(2000),
42
44
  });
43
- if (isReachableOAuthProbeResponse(response)) {
45
+ if (identityResponse.ok) {
44
46
  return `http://localhost:${port}/mcp`;
45
47
  }
48
+ // Compatibility fallback for runtimes that predate runtime identity.
49
+ if (identityResponse.status === 404) {
50
+ const oauthResponse = await fetch(`${baseUrl}/oauth/`, {
51
+ redirect: 'manual',
52
+ signal: AbortSignal.timeout(2000),
53
+ });
54
+ if (isReachableOAuthProbeResponse(oauthResponse)) {
55
+ return `http://localhost:${port}/mcp`;
56
+ }
57
+ }
46
58
  }
47
59
  catch (error) {
48
60
  // Connection refused is the expected case while scanning unused ports, but
@@ -69,9 +81,9 @@ export function detectUrlFromEnv() {
69
81
  return `http://${host}:${port}/mcp`;
70
82
  }
71
83
  /**
72
- * Reachability probe for client surfaces. Reuses the existing 1mcp-aware
73
- * validation (OAuth endpoint check) rather than the readiness gate, preserving
74
- * the attach semantics these commands already had.
84
+ * Reachability probe for client surfaces. Runtime identity is intentionally
85
+ * outside OAuth rate limiting, so repeated CLI attachments cannot exhaust the
86
+ * OAuth discovery budget and make a healthy runtime appear unavailable.
75
87
  */
76
88
  const clientSurfaceProbe = async (info) => (await validateServer1mcpUrl(info.url)).valid;
77
89
  /**
@@ -112,24 +124,36 @@ export async function detectServer1mcpUrl() {
112
124
  * Method 6: Combined detection with PID file support (for proxy command)
113
125
  * Priority: user URL → PID file → port scanning → error
114
126
  */
115
- export async function discoverServerWithPidFile(configDir, userUrl, options = {}) {
127
+ export async function discoverServerWithPidFile(configDir, userUrl) {
116
128
  // 1. User override (highest priority)
117
129
  if (userUrl) {
118
130
  const normalizedUrl = userUrl.endsWith('/mcp') ? userUrl : `${userUrl}/mcp`;
119
131
  return { url: normalizedUrl, source: 'user' };
120
132
  }
121
- // 2. Try PID file (lifecycle module owns the two-tier staleness rule:
122
- // dead → delete; alive-but-unreachable → retain and fall through).
133
+ // 2. Try PID file. A live PID is authoritative for its Runtime Scope, even
134
+ // when the endpoint rejects or cannot satisfy the probe.
123
135
  const dir = getConfigDir(configDir);
124
- const runtime = await discoverScopedRuntime(dir, clientSurfaceProbe);
136
+ let ownedProbeFailure;
137
+ const runtime = await discoverScopedRuntime(dir, async (info) => {
138
+ const validation = await validateServer1mcpUrl(info.url);
139
+ if (!validation.valid) {
140
+ ownedProbeFailure = toRuntimeProbeFailure(validation, info.url);
141
+ }
142
+ return validation.valid;
143
+ });
125
144
  if (runtime.status === 'running' && runtime.info) {
126
145
  return { url: runtime.info.url, source: 'pidfile', pid: runtime.info.pid };
127
146
  }
128
- if (options.failOnOwnedRuntimeUnavailable && runtime.status === 'unreachable' && runtime.info) {
129
- throw new LocalRuntimeAttachmentError('local_runtime_unreachable', `Runtime Scope process ${runtime.info.pid} is alive but its 1MCP endpoint is unreachable`);
147
+ if (runtime.status === 'unreachable' && runtime.info) {
148
+ throw new RuntimeProbeError(ownedProbeFailure ?? fallbackProbeFailure(runtime.info.url, 'Runtime endpoint did not respond'), {
149
+ targetKind: 'local',
150
+ configDir: dir,
151
+ pid: runtime.info.pid,
152
+ recoveryCommand: localRuntimeStatusCommand(dir),
153
+ });
130
154
  }
131
- if (options.failOnOwnedRuntimeUnavailable && runtime.status === 'error') {
132
- throw new LocalRuntimeAttachmentError('local_runtime_discovery_failed', runtime.error ?? 'Runtime Scope ownership could not be inspected safely');
155
+ if (runtime.status === 'error') {
156
+ throw new LocalRuntimeAttachmentError(runtime.error ?? 'Runtime Scope ownership could not be inspected safely', localRuntimeStatusCommand(dir));
133
157
  }
134
158
  // 3. Fallback to port scanning
135
159
  const portScanUrl = await detectRunningServerUrl();
@@ -151,10 +175,11 @@ export class LocalRuntimeUnavailableError extends Error {
151
175
  }
152
176
  }
153
177
  export class LocalRuntimeAttachmentError extends Error {
154
- code;
155
- constructor(code, message) {
178
+ recoveryCommand;
179
+ code = 'local_runtime_discovery_failed';
180
+ constructor(message, recoveryCommand) {
156
181
  super(message);
157
- this.code = code;
182
+ this.recoveryCommand = recoveryCommand;
158
183
  this.name = 'LocalRuntimeAttachmentError';
159
184
  }
160
185
  }
@@ -172,32 +197,209 @@ export async function getServer1mcpUrl(userOverrideUrl) {
172
197
  * Validate that a URL is accessible and appears to be a 1mcp server
173
198
  */
174
199
  export async function validateServer1mcpUrl(url, tls) {
200
+ // Remove a trailing /mcp suffix to test base URL. Anchor to the end so a URL
201
+ // like http://host/mcp-internal/mcp is not mangled by stripping the first match.
202
+ const baseUrl = url.replace(/\/mcp\/?$/, '');
203
+ try {
204
+ await fetchRuntimeIdentity(baseUrl, {
205
+ fetch: fetchRuntimeTargetUrl,
206
+ ...tls,
207
+ });
208
+ return { valid: true };
209
+ }
210
+ catch (error) {
211
+ if (!isMissingRuntimeIdentityEndpoint(error)) {
212
+ return invalidProbeResult(probeFailureFromError(error, '/.well-known/1mcp/runtime-identity'));
213
+ }
214
+ debugIf(() => ({
215
+ message: 'Runtime identity endpoint is unavailable; trying legacy OAuth discovery',
216
+ meta: { error: error instanceof Error ? error.message : String(error) },
217
+ }));
218
+ }
175
219
  try {
176
- // Remove a trailing /mcp suffix to test base URL. Anchor to the end so a URL
177
- // like http://host/mcp-internal/mcp is not mangled by stripping the first match.
178
- const baseUrl = url.replace(/\/mcp\/?$/, '');
179
- // Test basic connectivity to OAuth endpoint (which always exists)
220
+ // Compatibility fallback for runtimes that predate runtime identity.
180
221
  const oauthResponse = await fetchRuntimeTargetUrl(`${baseUrl}/oauth/`, {
181
222
  redirect: 'manual',
182
223
  signal: AbortSignal.timeout(5000),
183
224
  tls,
184
225
  });
185
226
  if (!isReachableOAuthProbeResponse(oauthResponse)) {
186
- return {
187
- valid: false,
188
- error: createSafeErrorMessage(`1mcp server not responding (HTTP ${oauthResponse.status})`),
189
- };
227
+ return invalidProbeResult(await probeFailureFromResponse(oauthResponse, '/oauth/'));
190
228
  }
191
- // For MCP endpoint, we just verify OAuth is working since MCP requires POST with specific payload
192
- // The OAuth endpoint responding successfully indicates the server is properly running
193
229
  return { valid: true };
194
230
  }
195
231
  catch (error) {
232
+ return invalidProbeResult(probeFailureFromError(error, '/oauth/'));
233
+ }
234
+ }
235
+ export function toRuntimeProbeFailure(validation, url) {
236
+ return validation.failure ?? fallbackProbeFailure(url, validation.error ?? 'Runtime probe failed');
237
+ }
238
+ function isMissingRuntimeIdentityEndpoint(error) {
239
+ return error instanceof RuntimeTargetIdentityError && error.details?.httpStatus === 404;
240
+ }
241
+ function invalidProbeResult(failure) {
242
+ const statusPrefix = failure.httpStatus !== undefined ? `HTTP ${failure.httpStatus}: ` : '';
243
+ return {
244
+ valid: false,
245
+ error: `${statusPrefix}${failure.reason}`,
246
+ failure,
247
+ };
248
+ }
249
+ function probeFailureFromError(error, endpoint) {
250
+ if (error instanceof RuntimeTargetIdentityError) {
251
+ const status = error.details?.httpStatus;
252
+ if (status !== undefined) {
253
+ return {
254
+ failureKind: 'http_rejection',
255
+ endpoint: error.details?.endpoint ?? endpoint,
256
+ reason: error.details?.reason ?? error.message,
257
+ retryable: isRetryableHttpStatus(status),
258
+ httpStatus: status,
259
+ ...(status === 429 && error.details?.retryAfterSeconds !== undefined
260
+ ? { retryAfterSeconds: error.details.retryAfterSeconds }
261
+ : {}),
262
+ };
263
+ }
264
+ if (error.code === 'identity_invalid' || error.code === 'identity_response_too_large') {
265
+ return {
266
+ failureKind: 'invalid_response',
267
+ endpoint,
268
+ reason: safeReason(error.message),
269
+ retryable: false,
270
+ };
271
+ }
272
+ if (error.code === 'target_ca_file_unreadable' || error.code === 'identity_url_invalid') {
273
+ return {
274
+ failureKind: 'tls_failure',
275
+ endpoint,
276
+ reason: safeReason(error.message),
277
+ retryable: false,
278
+ };
279
+ }
280
+ }
281
+ const cause = error instanceof Error && isErrorLike(error.cause) ? error.cause : error;
282
+ const code = isErrorLike(cause) && typeof cause.code === 'string' ? cause.code : undefined;
283
+ const message = cause instanceof Error ? cause.message : error instanceof Error ? error.message : String(error);
284
+ if (code === 'ECONNREFUSED') {
285
+ return {
286
+ failureKind: 'connection_refused',
287
+ endpoint,
288
+ reason: 'Connection refused (ECONNREFUSED)',
289
+ retryable: true,
290
+ };
291
+ }
292
+ if ((error instanceof Error && (error.name === 'AbortError' || error.name === 'TimeoutError')) ||
293
+ /timed?\s*out/i.test(message)) {
294
+ return {
295
+ failureKind: 'timeout',
296
+ endpoint,
297
+ reason: 'Request timed out',
298
+ retryable: true,
299
+ };
300
+ }
301
+ if (isTlsErrorCode(code)) {
196
302
  return {
197
- valid: false,
198
- error: createSafeErrorMessage(`Cannot connect to 1mcp server: ${error instanceof Error ? error.message : String(error)}`),
303
+ failureKind: 'tls_failure',
304
+ endpoint,
305
+ reason: code ? `TLS validation failed (${code})` : 'TLS validation failed',
306
+ retryable: false,
199
307
  };
200
308
  }
309
+ return {
310
+ failureKind: 'network_failure',
311
+ endpoint,
312
+ reason: safeReason(message || 'Network request failed'),
313
+ retryable: true,
314
+ };
315
+ }
316
+ async function probeFailureFromResponse(response, endpoint) {
317
+ const reason = (await readSafeResponseReason(response)) ?? `Server returned HTTP ${response.status}`;
318
+ const retryAfterSeconds = response.status === 429 ? parseRetryAfterSeconds(response.headers?.get('retry-after')) : undefined;
319
+ return {
320
+ failureKind: 'http_rejection',
321
+ endpoint,
322
+ reason,
323
+ retryable: isRetryableHttpStatus(response.status),
324
+ httpStatus: response.status,
325
+ ...(retryAfterSeconds !== undefined ? { retryAfterSeconds } : {}),
326
+ };
327
+ }
328
+ async function readSafeResponseReason(response) {
329
+ try {
330
+ const body = await response.json();
331
+ if (!isRecord(body)) {
332
+ return undefined;
333
+ }
334
+ const nestedError = isRecord(body.error) ? body.error.message : undefined;
335
+ const candidate = typeof body.error === 'string'
336
+ ? body.error
337
+ : typeof nestedError === 'string'
338
+ ? nestedError
339
+ : typeof body.message === 'string'
340
+ ? body.message
341
+ : typeof body.error_description === 'string'
342
+ ? body.error_description
343
+ : undefined;
344
+ return candidate ? safeReason(candidate) : undefined;
345
+ }
346
+ catch {
347
+ return undefined;
348
+ }
349
+ }
350
+ function fallbackProbeFailure(url, reason) {
351
+ let endpoint = '/';
352
+ try {
353
+ endpoint = new URL(url).pathname;
354
+ }
355
+ catch {
356
+ // Keep the bounded default path for malformed URLs.
357
+ }
358
+ return {
359
+ failureKind: 'network_failure',
360
+ endpoint,
361
+ reason: safeReason(reason),
362
+ retryable: true,
363
+ };
364
+ }
365
+ function isRetryableHttpStatus(status) {
366
+ return status === 408 || status === 425 || status === 429 || status >= 500;
367
+ }
368
+ function parseRetryAfterSeconds(value) {
369
+ if (!value) {
370
+ return undefined;
371
+ }
372
+ const deltaSeconds = Number(value);
373
+ if (Number.isFinite(deltaSeconds) && deltaSeconds >= 0) {
374
+ return Math.ceil(deltaSeconds);
375
+ }
376
+ const retryAt = Date.parse(value);
377
+ return Number.isFinite(retryAt) ? Math.max(0, Math.ceil((retryAt - Date.now()) / 1000)) : undefined;
378
+ }
379
+ function safeReason(value) {
380
+ const sanitized = sanitizeForLogging(value);
381
+ const reason = typeof sanitized === 'string' ? sanitized : String(sanitized);
382
+ return stripControlCharacters(reason).trim().slice(0, 300) || 'Runtime probe failed';
383
+ }
384
+ function stripControlCharacters(value) {
385
+ return Array.from(value, (character) => {
386
+ const code = character.charCodeAt(0);
387
+ return code <= 31 || (code >= 127 && code <= 159) ? ' ' : character;
388
+ }).join('');
389
+ }
390
+ function isTlsErrorCode(code) {
391
+ return Boolean(code &&
392
+ (code.startsWith('ERR_TLS') ||
393
+ code.startsWith('CERT_') ||
394
+ code === 'DEPTH_ZERO_SELF_SIGNED_CERT' ||
395
+ code === 'SELF_SIGNED_CERT_IN_CHAIN' ||
396
+ code === 'UNABLE_TO_VERIFY_LEAF_SIGNATURE'));
397
+ }
398
+ function isErrorLike(value) {
399
+ return typeof value === 'object' && value !== null;
400
+ }
401
+ function isRecord(value) {
402
+ return typeof value === 'object' && value !== null && !Array.isArray(value);
201
403
  }
202
404
  function isReachableOAuthProbeResponse(response) {
203
405
  if (response.ok) {
@@ -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.35.0-beta.2",
3
+ "version": "0.35.0-beta.3",
4
4
  "description": "One MCP server to aggregate them all - A unified Model Context Protocol server implementation",
5
5
  "keywords": [
6
6
  "mcp",
@@ -56,7 +56,7 @@
56
56
  },
57
57
  "dependencies": {
58
58
  "@modelcontextprotocol/sdk": "^1.25.1",
59
- "@toon-format/toon": "^2.1.0",
59
+ "@toon-format/toon": "^4.1.0",
60
60
  "ajv": "^8.17.1",
61
61
  "ajv-formats": "^3.0.1",
62
62
  "axios": "^1.12.2",
@@ -87,7 +87,7 @@
87
87
  "@eslint/js": "^9.22.0",
88
88
  "@mantine/core": "8.3.14",
89
89
  "@mantine/hooks": "8.3.14",
90
- "@testing-library/jest-dom": "^6.6.3",
90
+ "@testing-library/jest-dom": "^7.0.0",
91
91
  "@testing-library/react": "16.3.2",
92
92
  "@testing-library/user-event": "14.6.1",
93
93
  "@trivago/prettier-plugin-sort-imports": "^6.0.0",
@@ -129,6 +129,7 @@
129
129
  "react": "18.3.1",
130
130
  "react-dom": "18.3.1",
131
131
  "supertest": "^7.1.4",
132
+ "tar": "^7.5.22",
132
133
  "ts-node": "^10.9.2",
133
134
  "tsc-alias": "^1.8.16",
134
135
  "tsc-watch": "^7.1.1",