@within-7/minto 0.3.9 → 0.4.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/dist/Tool.js.map +2 -2
- package/dist/commands/agents/AgentsCommand.js +461 -657
- package/dist/commands/agents/AgentsCommand.js.map +2 -2
- package/dist/commands/agents/types.js +1 -0
- package/dist/commands/agents/types.js.map +2 -2
- package/dist/commands/agents/utils/fileOperations.js +96 -36
- package/dist/commands/agents/utils/fileOperations.js.map +3 -3
- package/dist/commands/agents/utils/index.js +3 -1
- package/dist/commands/agents/utils/index.js.map +2 -2
- package/dist/commands/context.js +54 -23
- package/dist/commands/context.js.map +2 -2
- package/dist/commands/ctx_viz.js +1 -1
- package/dist/commands/effort.js +87 -0
- package/dist/commands/effort.js.map +7 -0
- package/dist/commands/export.js +684 -94
- package/dist/commands/export.js.map +2 -2
- package/dist/commands/ide.js +18 -0
- package/dist/commands/ide.js.map +7 -0
- package/dist/commands/language.js +19 -46
- package/dist/commands/language.js.map +2 -2
- package/dist/commands/mcp-interactive.js +425 -217
- package/dist/commands/mcp-interactive.js.map +2 -2
- package/dist/commands/memory.js +168 -0
- package/dist/commands/memory.js.map +7 -0
- package/dist/commands/model.js +457 -65
- package/dist/commands/model.js.map +2 -2
- package/dist/commands/outputStyle.js +64 -0
- package/dist/commands/outputStyle.js.map +7 -0
- package/dist/commands/permissions.js +75 -49
- package/dist/commands/permissions.js.map +2 -2
- package/dist/commands/plugin/utils.js +33 -1
- package/dist/commands/plugin/utils.js.map +2 -2
- package/dist/commands/plugin.js +891 -185
- package/dist/commands/plugin.js.map +3 -3
- package/dist/commands/refreshCommands.js +2 -0
- package/dist/commands/refreshCommands.js.map +2 -2
- package/dist/commands/resume.js +1 -1
- package/dist/commands/resume.js.map +1 -1
- package/dist/commands/review.js +51 -0
- package/dist/commands/review.js.map +7 -0
- package/dist/commands/sandbox.js +168 -70
- package/dist/commands/sandbox.js.map +2 -2
- package/dist/commands/setup.js +593 -107
- package/dist/commands/setup.js.map +2 -2
- package/dist/commands/stats.js +188 -131
- package/dist/commands/stats.js.map +2 -2
- package/dist/commands/status.js +75 -13
- package/dist/commands/status.js.map +2 -2
- package/dist/commands/terminalSetup.js +6 -0
- package/dist/commands/terminalSetup.js.map +2 -2
- package/dist/commands/undo.js +146 -174
- package/dist/commands/undo.js.map +2 -2
- package/dist/commands/vim.js +22 -0
- package/dist/commands/vim.js.map +7 -0
- package/dist/commands.js +12 -0
- package/dist/commands.js.map +2 -2
- package/dist/components/Help.js +165 -32
- package/dist/components/Help.js.map +2 -2
- package/dist/components/HighlightedCode.js +1 -0
- package/dist/components/HighlightedCode.js.map +2 -2
- package/dist/components/InfoPanel/InfoPanel.js +123 -0
- package/dist/components/InfoPanel/InfoPanel.js.map +7 -0
- package/dist/components/InfoPanel/index.js +5 -0
- package/dist/components/InfoPanel/index.js.map +7 -0
- package/dist/components/InfoPanel/types.js +1 -0
- package/dist/components/InfoPanel/types.js.map +7 -0
- package/dist/components/ModelSelector/BrandTextInput.js +43 -0
- package/dist/components/ModelSelector/BrandTextInput.js.map +7 -0
- package/dist/components/ModelSelector/ModelSelector.js +590 -565
- package/dist/components/ModelSelector/ModelSelector.js.map +2 -2
- package/dist/components/ModelSelector/WizardContainer.js +45 -0
- package/dist/components/ModelSelector/WizardContainer.js.map +7 -0
- package/dist/components/ModelSelector/index.js +1 -3
- package/dist/components/ModelSelector/index.js.map +2 -2
- package/dist/components/PromptInput.js +26 -11
- package/dist/components/PromptInput.js.map +2 -2
- package/dist/components/PulseLabel.js +44 -0
- package/dist/components/PulseLabel.js.map +7 -0
- package/dist/components/RequestStatusIndicator.js +1 -1
- package/dist/components/RequestStatusIndicator.js.map +1 -1
- package/dist/components/SimpleSelector/SimpleSelector.js +154 -0
- package/dist/components/SimpleSelector/SimpleSelector.js.map +7 -0
- package/dist/components/SimpleSelector/index.js +5 -0
- package/dist/components/SimpleSelector/index.js.map +7 -0
- package/dist/components/SimpleSelector/types.js +1 -0
- package/dist/components/SimpleSelector/types.js.map +7 -0
- package/dist/components/Spinner.js +12 -42
- package/dist/components/Spinner.js.map +3 -3
- package/dist/components/StartupStatus.js +57 -0
- package/dist/components/StartupStatus.js.map +7 -0
- package/dist/components/StatusOverlayContent.js +21 -0
- package/dist/components/StatusOverlayContent.js.map +7 -0
- package/dist/components/SubagentBlock.js +43 -6
- package/dist/components/SubagentBlock.js.map +2 -2
- package/dist/components/TabbedListView/ScrollableList.js +31 -5
- package/dist/components/TabbedListView/ScrollableList.js.map +2 -2
- package/dist/components/TabbedListView/TabBar.js +13 -8
- package/dist/components/TabbedListView/TabBar.js.map +2 -2
- package/dist/components/TabbedListView/TabbedListView.js +123 -48
- package/dist/components/TabbedListView/TabbedListView.js.map +2 -2
- package/dist/components/TodoPanel.js +1 -1
- package/dist/components/TodoPanel.js.map +1 -1
- package/dist/components/ToolUseLoader.js +5 -0
- package/dist/components/ToolUseLoader.js.map +2 -2
- package/dist/components/TrustDialog.js +0 -2
- package/dist/components/TrustDialog.js.map +2 -2
- package/dist/components/messages/TaskInModuleView.js +1 -1
- package/dist/components/messages/TaskInModuleView.js.map +2 -2
- package/dist/components/messages/TaskToolMessage.js +1 -1
- package/dist/components/messages/TaskToolMessage.js.map +2 -2
- package/dist/components/messages/UserPromptMessage.js +6 -1
- package/dist/components/messages/UserPromptMessage.js.map +2 -2
- package/dist/constants/modelCapabilities.js +103 -18
- package/dist/constants/modelCapabilities.js.map +2 -2
- package/dist/constants/product.js +2 -0
- package/dist/constants/product.js.map +2 -2
- package/dist/constants/prompts/agentPrompt.js +30 -0
- package/dist/constants/prompts/agentPrompt.js.map +7 -0
- package/dist/constants/prompts/codeConventions.js +27 -0
- package/dist/constants/prompts/codeConventions.js.map +7 -0
- package/dist/constants/prompts/doingTasks.js +15 -0
- package/dist/constants/prompts/doingTasks.js.map +7 -0
- package/dist/constants/prompts/envInfo.js +17 -0
- package/dist/constants/prompts/envInfo.js.map +7 -0
- package/dist/constants/prompts/executingWithCare.js +17 -0
- package/dist/constants/prompts/executingWithCare.js.map +7 -0
- package/dist/constants/prompts/identity.js +10 -0
- package/dist/constants/prompts/identity.js.map +7 -0
- package/dist/constants/prompts/index.js +78 -0
- package/dist/constants/prompts/index.js.map +7 -0
- package/dist/constants/prompts/taskManagement.js +60 -0
- package/dist/constants/prompts/taskManagement.js.map +7 -0
- package/dist/constants/prompts/toneAndStyle.js +62 -0
- package/dist/constants/prompts/toneAndStyle.js.map +7 -0
- package/dist/constants/prompts/toolUsagePolicy.js +38 -0
- package/dist/constants/prompts/toolUsagePolicy.js.map +7 -0
- package/dist/constants/prompts.js +5 -176
- package/dist/constants/prompts.js.map +2 -2
- package/dist/constants/providerRegistry.js +235 -0
- package/dist/constants/providerRegistry.js.map +7 -0
- package/dist/constants/providers.js +35 -0
- package/dist/constants/providers.js.map +7 -0
- package/dist/context/PermissionContext.js +0 -1
- package/dist/context/PermissionContext.js.map +2 -2
- package/dist/context.js +87 -31
- package/dist/context.js.map +2 -2
- package/dist/core/backupHook.js +29 -0
- package/dist/core/backupHook.js.map +7 -0
- package/dist/core/config/defaults.js +11 -2
- package/dist/core/config/defaults.js.map +2 -2
- package/dist/core/config/schema.js +21 -3
- package/dist/core/config/schema.js.map +2 -2
- package/dist/core/costTracker.js +18 -16
- package/dist/core/costTracker.js.map +2 -2
- package/dist/core/index.js +0 -1
- package/dist/core/index.js.map +2 -2
- package/dist/core/tokenStatsManager.js +22 -4
- package/dist/core/tokenStatsManager.js.map +2 -2
- package/dist/cost-tracker.js +0 -16
- package/dist/cost-tracker.js.map +2 -2
- package/dist/entrypoints/bootstrap.js +3 -1
- package/dist/entrypoints/bootstrap.js.map +2 -2
- package/dist/entrypoints/cli.js +81 -68
- package/dist/entrypoints/cli.js.map +2 -2
- package/dist/hooks/useAgentTokenStats.js +1 -1
- package/dist/hooks/useAgentTokenStats.js.map +2 -2
- package/dist/hooks/useAgentTranscripts.js +2 -1
- package/dist/hooks/useAgentTranscripts.js.map +2 -2
- package/dist/hooks/useBackgroundShells.js +29 -0
- package/dist/hooks/useBackgroundShells.js.map +7 -0
- package/dist/hooks/useCanUseTool.js +1 -1
- package/dist/hooks/useCanUseTool.js.map +2 -2
- package/dist/hooks/useDeferredLoading.js +64 -0
- package/dist/hooks/useDeferredLoading.js.map +7 -0
- package/dist/hooks/useHookStatus.js +1 -1
- package/dist/hooks/useHookStatus.js.map +2 -2
- package/dist/hooks/useSessionTracking.js +55 -0
- package/dist/hooks/useSessionTracking.js.map +7 -0
- package/dist/hooks/useTerminalSize.js +21 -0
- package/dist/hooks/useTerminalSize.js.map +2 -2
- package/dist/hooks/useTextInput.js +1 -0
- package/dist/hooks/useTextInput.js.map +2 -2
- package/dist/hooks/useUnifiedCompletion.js +3 -2
- package/dist/hooks/useUnifiedCompletion.js.map +2 -2
- package/dist/i18n/locales/en.js +299 -1
- package/dist/i18n/locales/en.js.map +2 -2
- package/dist/i18n/locales/zh-CN.js +300 -2
- package/dist/i18n/locales/zh-CN.js.map +2 -2
- package/dist/i18n/types.js.map +1 -1
- package/dist/messages.js +41 -17
- package/dist/messages.js.map +2 -2
- package/dist/permissions.js +94 -1
- package/dist/permissions.js.map +2 -2
- package/dist/query.js +27 -19
- package/dist/query.js.map +2 -2
- package/dist/screens/REPL.js +83 -74
- package/dist/screens/REPL.js.map +2 -2
- package/dist/services/adapters/responsesAPI.js +6 -0
- package/dist/services/adapters/responsesAPI.js.map +2 -2
- package/dist/services/agentTeams/index.js +35 -0
- package/dist/services/agentTeams/index.js.map +7 -0
- package/dist/services/agentTeams/mailbox.js +114 -0
- package/dist/services/agentTeams/mailbox.js.map +7 -0
- package/dist/services/agentTeams/teamManager.js +149 -0
- package/dist/services/agentTeams/teamManager.js.map +7 -0
- package/dist/services/agentTeams/teamTaskStore.js +114 -0
- package/dist/services/agentTeams/teamTaskStore.js.map +7 -0
- package/dist/services/agentTeams/teammateSpawner.js +80 -0
- package/dist/services/agentTeams/teammateSpawner.js.map +7 -0
- package/dist/services/checkpointManager.js +16 -3
- package/dist/services/checkpointManager.js.map +2 -2
- package/dist/services/claude.js +19 -1728
- package/dist/services/claude.js.map +3 -3
- package/dist/services/customCommands.js +30 -8
- package/dist/services/customCommands.js.map +2 -2
- package/dist/services/gpt5ConnectionTest.js +4 -2
- package/dist/services/gpt5ConnectionTest.js.map +2 -2
- package/dist/services/hookExecutor.js +411 -127
- package/dist/services/hookExecutor.js.map +2 -2
- package/dist/services/llm/anthropicProvider.js +807 -0
- package/dist/services/llm/anthropicProvider.js.map +7 -0
- package/dist/services/llm/dispatch.js +218 -0
- package/dist/services/llm/dispatch.js.map +7 -0
- package/dist/services/llm/index.js +44 -0
- package/dist/services/llm/index.js.map +7 -0
- package/dist/services/llm/mintoContext.js +69 -0
- package/dist/services/llm/mintoContext.js.map +7 -0
- package/dist/services/llm/openaiProvider.js +622 -0
- package/dist/services/llm/openaiProvider.js.map +7 -0
- package/dist/services/llm/types.js +157 -0
- package/dist/services/llm/types.js.map +7 -0
- package/dist/services/mcpClient.js +183 -33
- package/dist/services/mcpClient.js.map +2 -2
- package/dist/services/notifier.js +14 -0
- package/dist/services/notifier.js.map +2 -2
- package/dist/services/oauth.js +4 -2
- package/dist/services/oauth.js.map +2 -2
- package/dist/services/openai.js +66 -56
- package/dist/services/openai.js.map +3 -3
- package/dist/services/outputStyles.js +102 -21
- package/dist/services/outputStyles.js.map +2 -2
- package/dist/services/plugins/lspServers.js +1 -1
- package/dist/services/plugins/lspServers.js.map +2 -2
- package/dist/services/plugins/pluginRuntime.js +2 -1
- package/dist/services/plugins/pluginRuntime.js.map +2 -2
- package/dist/services/plugins/pluginValidation.js +10 -3
- package/dist/services/plugins/pluginValidation.js.map +2 -2
- package/dist/services/plugins/skillMarketplace.js +20 -9
- package/dist/services/plugins/skillMarketplace.js.map +2 -2
- package/dist/services/sentry.js +1 -1
- package/dist/services/sentry.js.map +2 -2
- package/dist/services/sessionMemory.js +16 -3
- package/dist/services/sessionMemory.js.map +2 -2
- package/dist/services/systemReminder.js +367 -9
- package/dist/services/systemReminder.js.map +2 -2
- package/dist/services/taskStore.js +19 -0
- package/dist/services/taskStore.js.map +2 -2
- package/dist/tools/ArchitectTool/ArchitectTool.js.map +1 -1
- package/dist/tools/AskUserQuestionTool/AskUserQuestionTool.js.map +1 -1
- package/dist/tools/BashOutputTool/BashOutputTool.js.map +1 -1
- package/dist/tools/BashTool/BashTool.js +28 -0
- package/dist/tools/BashTool/BashTool.js.map +2 -2
- package/dist/tools/FileEditTool/FileEditTool.js +8 -1
- package/dist/tools/FileEditTool/FileEditTool.js.map +2 -2
- package/dist/tools/FileReadTool/FileReadTool.js +14 -0
- package/dist/tools/FileReadTool/FileReadTool.js.map +2 -2
- package/dist/tools/FileWriteTool/FileWriteTool.js +10 -1
- package/dist/tools/FileWriteTool/FileWriteTool.js.map +2 -2
- package/dist/tools/GlobTool/GlobTool.js.map +1 -1
- package/dist/tools/GrepTool/GrepTool.js.map +1 -1
- package/dist/tools/KillShellTool/KillShellTool.js.map +1 -1
- package/dist/tools/ListMcpResourcesTool/ListMcpResourcesTool.js.map +2 -2
- package/dist/tools/LspTool/LspTool.js +11 -2
- package/dist/tools/LspTool/LspTool.js.map +2 -2
- package/dist/tools/MCPTool/MCPTool.js.map +1 -1
- package/dist/tools/MemoryReadTool/MemoryReadTool.js +2 -1
- package/dist/tools/MemoryReadTool/MemoryReadTool.js.map +2 -2
- package/dist/tools/MemoryWriteTool/MemoryWriteTool.js +2 -1
- package/dist/tools/MemoryWriteTool/MemoryWriteTool.js.map +2 -2
- package/dist/tools/MultiEditTool/MultiEditTool.js +7 -0
- package/dist/tools/MultiEditTool/MultiEditTool.js.map +2 -2
- package/dist/tools/NotebookEditTool/NotebookEditTool.js +2 -0
- package/dist/tools/NotebookEditTool/NotebookEditTool.js.map +2 -2
- package/dist/tools/NotebookReadTool/NotebookReadTool.js.map +1 -1
- package/dist/tools/PlanModeTool/EnterPlanModeTool.js +8 -2
- package/dist/tools/PlanModeTool/EnterPlanModeTool.js.map +2 -2
- package/dist/tools/PlanModeTool/ExitPlanModeTool.js +2 -0
- package/dist/tools/PlanModeTool/ExitPlanModeTool.js.map +2 -2
- package/dist/tools/ReadMcpResourceTool/ReadMcpResourceTool.js.map +1 -1
- package/dist/tools/SlashCommandTool/SlashCommandTool.js +174 -18
- package/dist/tools/SlashCommandTool/SlashCommandTool.js.map +3 -3
- package/dist/tools/TaskCreateTool/TaskCreateTool.js.map +1 -1
- package/dist/tools/TaskGetTool/TaskGetTool.js.map +1 -1
- package/dist/tools/TaskListTool/TaskListTool.js.map +1 -1
- package/dist/tools/TaskOutputTool/TaskOutputTool.js.map +1 -1
- package/dist/tools/TaskStopTool/TaskStopTool.js.map +1 -1
- package/dist/tools/TaskTool/TaskTool.js +84 -11
- package/dist/tools/TaskTool/TaskTool.js.map +2 -2
- package/dist/tools/TaskTool/prompt.js +12 -6
- package/dist/tools/TaskTool/prompt.js.map +2 -2
- package/dist/tools/TaskUpdateTool/TaskUpdateTool.js.map +1 -1
- package/dist/tools/ThinkTool/ThinkTool.js.map +1 -1
- package/dist/tools/TodoWriteTool/TodoWriteTool.js.map +1 -1
- package/dist/tools/URLFetcherTool/URLFetcherTool.js.map +1 -1
- package/dist/tools/WebSearchTool/WebSearchTool.js.map +1 -1
- package/dist/tools/WebSearchTool/searchProviders.js +2 -1
- package/dist/tools/WebSearchTool/searchProviders.js.map +2 -2
- package/dist/tools/lsTool/lsTool.js.map +2 -2
- package/dist/tools/lsTool/prompt.js.map +1 -1
- package/dist/tools.js +14 -3
- package/dist/tools.js.map +2 -2
- package/dist/types/PermissionMode.js +21 -1
- package/dist/types/PermissionMode.js.map +2 -2
- package/dist/types/agentTeams.js +1 -0
- package/dist/types/agentTeams.js.map +7 -0
- package/dist/types/hooks.js +8 -2
- package/dist/types/hooks.js.map +2 -2
- package/dist/types/plugin.js +3 -5
- package/dist/types/plugin.js.map +2 -2
- package/dist/utils/agentHookExecutor.js +1 -4
- package/dist/utils/agentHookExecutor.js.map +2 -2
- package/dist/utils/agentLoader.js +91 -15
- package/dist/utils/agentLoader.js.map +2 -2
- package/dist/utils/agentMemory.js.map +2 -2
- package/dist/utils/animationManager.js +1 -1
- package/dist/utils/animationManager.js.map +2 -2
- package/dist/utils/ask.js +1 -1
- package/dist/utils/async.js +5 -1
- package/dist/utils/async.js.map +2 -2
- package/dist/utils/autoCompactCore.js +60 -0
- package/dist/utils/autoCompactCore.js.map +2 -2
- package/dist/utils/claudeCodeSync.js +439 -0
- package/dist/utils/claudeCodeSync.js.map +7 -0
- package/dist/utils/config.js +27 -151
- package/dist/utils/config.js.map +2 -2
- package/dist/utils/configSchema.js +227 -0
- package/dist/utils/configSchema.js.map +7 -0
- package/dist/utils/debugLogger.js.map +2 -2
- package/dist/utils/env.js +4 -3
- package/dist/utils/env.js.map +2 -2
- package/dist/utils/envConfig.js +34 -0
- package/dist/utils/envConfig.js.map +3 -3
- package/dist/utils/execFileNoThrow.js +2 -1
- package/dist/utils/execFileNoThrow.js.map +2 -2
- package/dist/utils/gpt5.js +146 -0
- package/dist/utils/gpt5.js.map +7 -0
- package/dist/utils/hookManager.js +374 -140
- package/dist/utils/hookManager.js.map +2 -2
- package/dist/utils/markdown.js +47 -0
- package/dist/utils/markdown.js.map +2 -2
- package/dist/utils/marketplaceManager.js +80 -43
- package/dist/utils/marketplaceManager.js.map +2 -2
- package/dist/utils/memoizeWithTTL.js +25 -0
- package/dist/utils/memoizeWithTTL.js.map +7 -0
- package/dist/utils/messages.js +2 -2
- package/dist/utils/messages.js.map +2 -2
- package/dist/utils/model.js +34 -9
- package/dist/utils/model.js.map +2 -2
- package/dist/utils/pluginInstaller.js +68 -29
- package/dist/utils/pluginInstaller.js.map +2 -2
- package/dist/utils/pluginLoader.js +249 -57
- package/dist/utils/pluginLoader.js.map +2 -2
- package/dist/utils/repoFetcher.js +110 -0
- package/dist/utils/repoFetcher.js.map +7 -0
- package/dist/utils/safeFetch.js +45 -0
- package/dist/utils/safeFetch.js.map +7 -0
- package/dist/utils/skillLoader.js +77 -12
- package/dist/utils/skillLoader.js.map +2 -2
- package/dist/utils/streamingState.js +52 -0
- package/dist/utils/streamingState.js.map +7 -0
- package/dist/utils/stringSubstitution.js +4 -5
- package/dist/utils/stringSubstitution.js.map +2 -2
- package/dist/utils/style.js +6 -3
- package/dist/utils/style.js.map +2 -2
- package/dist/utils/teamConfig.js +162 -16
- package/dist/utils/teamConfig.js.map +2 -2
- package/dist/utils/terminal.js +1 -1
- package/dist/utils/terminal.js.map +2 -2
- package/dist/utils/toolRiskClassification.js +0 -6
- package/dist/utils/toolRiskClassification.js.map +2 -2
- package/dist/version.js +2 -2
- package/dist/version.js.map +1 -1
- package/package.json +7 -6
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
{
|
|
2
2
|
"version": 3,
|
|
3
3
|
"sources": ["../../src/services/mcpClient.ts"],
|
|
4
|
-
"sourcesContent": ["import { zipObject } from 'lodash-es'\nimport {\n getCurrentProjectConfig,\n McpServerConfig,\n saveCurrentProjectConfig,\n getGlobalConfig,\n saveGlobalConfig,\n getMcprcConfig,\n addMcprcServerForTesting,\n removeMcprcServerForTesting,\n} from '@utils/config'\nimport { existsSync, readFileSync, writeFileSync } from 'fs'\nimport { join } from 'path'\nimport { getCwd } from '@utils/state'\nimport { safeParseJSON } from '@utils/json'\nimport {\n ImageBlockParam,\n MessageParam,\n ToolResultBlockParam,\n} from '@anthropic-ai/sdk/resources/index.mjs'\nimport { Client } from '@modelcontextprotocol/sdk/client/index.js'\nimport { StdioClientTransport } from '@modelcontextprotocol/sdk/client/stdio.js'\nimport { SSEClientTransport } from '@modelcontextprotocol/sdk/client/sse.js'\nimport {\n CallToolResultSchema,\n ClientRequest,\n ListPromptsResult,\n ListPromptsResultSchema,\n ListToolsResult,\n ListToolsResultSchema,\n ListResourcesResult,\n ListResourcesResultSchema,\n ReadResourceResult,\n ReadResourceResultSchema,\n Result,\n ResultSchema,\n} from '@modelcontextprotocol/sdk/types.js'\nimport { memoize, pickBy } from 'lodash-es'\nimport type { Tool } from '@tool'\nimport { MCPTool } from '@tools/MCPTool/MCPTool'\nimport { logMCPError } from '@utils/log'\nimport { Command } from '@commands'\nimport { PRODUCT_COMMAND } from '@constants/product'\nimport { CircuitBreakerRegistry, CircuitOpenError } from '@utils/CircuitBreaker'\n\ntype McpName = string\n\n/**\n * Circuit breaker registry for MCP server connections\n * Each server gets its own circuit breaker to prevent cascading failures\n */\nconst mcpCircuitBreakers = new CircuitBreakerRegistry({\n failureThreshold: 5,\n successThreshold: 2,\n openTimeout: 30000, // 30 seconds before trying again\n})\n\nexport function parseEnvVars(\n rawEnvArgs: string[] | undefined,\n): Record<string, string> {\n const parsedEnv: Record<string, string> = {}\n\n // Parse individual env vars\n if (rawEnvArgs) {\n for (const envStr of rawEnvArgs) {\n const [key, ...valueParts] = envStr.split('=')\n if (!key || valueParts.length === 0) {\n throw new Error(\n `Invalid environment variable format: ${envStr}, environment variables should be added as: -e KEY1=value1 -e KEY2=value2`,\n )\n }\n parsedEnv[key] = valueParts.join('=')\n }\n }\n return parsedEnv\n}\n\nconst VALID_SCOPES = ['project', 'global', 'mcprc'] as const\ntype ConfigScope = (typeof VALID_SCOPES)[number]\nconst EXTERNAL_SCOPES = ['project', 'global'] as ConfigScope[]\n\nexport function ensureConfigScope(scope?: string): ConfigScope {\n if (!scope) return 'project'\n\n const scopesToCheck =\n process.env.USER_TYPE === 'external' ? EXTERNAL_SCOPES : VALID_SCOPES\n\n if (!scopesToCheck.includes(scope as ConfigScope)) {\n throw new Error(\n `Invalid scope: ${scope}. Must be one of: ${scopesToCheck.join(', ')}`,\n )\n }\n\n return scope as ConfigScope\n}\n\nexport function addMcpServer(\n name: McpName,\n server: McpServerConfig,\n scope: ConfigScope = 'project',\n): void {\n if (scope === 'mcprc') {\n if (process.env.NODE_ENV === 'test') {\n addMcprcServerForTesting(name, server)\n } else {\n const mcprcPath = join(getCwd(), '.mcprc')\n let mcprcConfig: Record<string, McpServerConfig> = {}\n\n // Read existing config if present\n if (existsSync(mcprcPath)) {\n try {\n const mcprcContent = readFileSync(mcprcPath, 'utf-8')\n const existingConfig = safeParseJSON(mcprcContent)\n if (existingConfig && typeof existingConfig === 'object') {\n mcprcConfig = existingConfig as Record<string, McpServerConfig>\n }\n } catch {\n // If we can't read/parse, start with empty config\n }\n }\n\n // Add the server\n mcprcConfig[name] = server\n\n // Write back to .mcprc\n try {\n writeFileSync(mcprcPath, JSON.stringify(mcprcConfig, null, 2), 'utf-8')\n } catch (error) {\n throw new Error(`Failed to write to .mcprc: ${error}`)\n }\n }\n } else if (scope === 'global') {\n const config = getGlobalConfig()\n if (!config.mcpServers) {\n config.mcpServers = {}\n }\n config.mcpServers[name] = server\n saveGlobalConfig(config)\n } else {\n const config = getCurrentProjectConfig()\n if (!config.mcpServers) {\n config.mcpServers = {}\n }\n config.mcpServers[name] = server\n saveCurrentProjectConfig(config)\n }\n}\n\nexport function removeMcpServer(\n name: McpName,\n scope: ConfigScope = 'project',\n): void {\n if (scope === 'mcprc') {\n if (process.env.NODE_ENV === 'test') {\n removeMcprcServerForTesting(name)\n } else {\n const mcprcPath = join(getCwd(), '.mcprc')\n if (!existsSync(mcprcPath)) {\n throw new Error('No .mcprc file found in this directory')\n }\n\n try {\n const mcprcContent = readFileSync(mcprcPath, 'utf-8')\n const mcprcConfig = safeParseJSON(mcprcContent) as Record<\n string,\n McpServerConfig\n > | null\n\n if (\n !mcprcConfig ||\n typeof mcprcConfig !== 'object' ||\n !mcprcConfig[name]\n ) {\n throw new Error(`No MCP server found with name: ${name} in .mcprc`)\n }\n\n delete mcprcConfig[name]\n writeFileSync(mcprcPath, JSON.stringify(mcprcConfig, null, 2), 'utf-8')\n } catch (error) {\n if (error instanceof Error) {\n throw error\n }\n throw new Error(`Failed to remove from .mcprc: ${error}`)\n }\n }\n } else if (scope === 'global') {\n const config = getGlobalConfig()\n if (!config.mcpServers?.[name]) {\n throw new Error(`No global MCP server found with name: ${name}`)\n }\n delete config.mcpServers[name]\n saveGlobalConfig(config)\n } else {\n const config = getCurrentProjectConfig()\n if (!config.mcpServers?.[name]) {\n throw new Error(`No local MCP server found with name: ${name}`)\n }\n delete config.mcpServers[name]\n saveCurrentProjectConfig(config)\n }\n}\n\nexport function listMCPServers(): Record<string, McpServerConfig> {\n const globalConfig = getGlobalConfig()\n const mcprcConfig = getMcprcConfig()\n const projectConfig = getCurrentProjectConfig()\n return {\n ...(globalConfig.mcpServers ?? {}),\n ...(mcprcConfig ?? {}), // mcprc configs override global ones\n ...(projectConfig.mcpServers ?? {}), // Project configs override mcprc ones\n }\n}\n\nexport type ScopedMcpServerConfig = McpServerConfig & {\n scope: ConfigScope\n}\n\nexport function getMcpServer(name: McpName): ScopedMcpServerConfig | undefined {\n const projectConfig = getCurrentProjectConfig()\n const mcprcConfig = getMcprcConfig()\n const globalConfig = getGlobalConfig()\n\n // Check each scope in order of precedence\n if (projectConfig.mcpServers?.[name]) {\n return { ...projectConfig.mcpServers[name], scope: 'project' }\n }\n\n if (mcprcConfig?.[name]) {\n return { ...mcprcConfig[name], scope: 'mcprc' }\n }\n\n if (globalConfig.mcpServers?.[name]) {\n return { ...globalConfig.mcpServers[name], scope: 'global' }\n }\n\n return undefined\n}\n\nasync function connectToServer(\n name: string,\n serverRef: McpServerConfig,\n): Promise<Client> {\n const transport =\n serverRef.type === 'sse'\n ? new SSEClientTransport(new URL(serverRef.url))\n : new StdioClientTransport({\n command: serverRef.command,\n args: serverRef.args,\n env: {\n ...process.env,\n ...serverRef.env,\n } as Record<string, string>,\n stderr: 'pipe', // prevents error output from the MCP server from printing to the UI\n })\n\n const client = new Client(\n {\n name: PRODUCT_COMMAND,\n version: '0.1.0',\n },\n {\n capabilities: {},\n },\n )\n\n // Add a timeout to connection attempts to prevent tests from hanging indefinitely\n const CONNECTION_TIMEOUT_MS = 5000\n const connectPromise = client.connect(transport)\n const timeoutPromise = new Promise<never>((_, reject) => {\n const timeoutId = setTimeout(() => {\n reject(\n new Error(\n `Connection to MCP server \"${name}\" timed out after ${CONNECTION_TIMEOUT_MS}ms`,\n ),\n )\n }, CONNECTION_TIMEOUT_MS)\n\n // Clean up timeout if connect resolves or rejects\n connectPromise.then(\n () => clearTimeout(timeoutId),\n () => clearTimeout(timeoutId),\n )\n })\n\n await Promise.race([connectPromise, timeoutPromise])\n\n if (serverRef.type === 'stdio') {\n ;(transport as StdioClientTransport).stderr?.on('data', (data: Buffer) => {\n const errorText = data.toString().trim()\n if (errorText) {\n logMCPError(name, `Server stderr: ${errorText}`)\n }\n })\n }\n return client\n}\n\ntype ConnectedClient = {\n client: Client\n name: string\n type: 'connected'\n}\ntype FailedClient = {\n name: string\n type: 'failed'\n}\nexport type WrappedClient = ConnectedClient | FailedClient\n\nexport function getMcprcServerStatus(\n serverName: string,\n): 'approved' | 'rejected' | 'pending' {\n const config = getCurrentProjectConfig()\n if (config.approvedMcprcServers?.includes(serverName)) {\n return 'approved'\n }\n if (config.rejectedMcprcServers?.includes(serverName)) {\n return 'rejected'\n }\n return 'pending'\n}\n\n// Store connected clients for cleanup on shutdown\nlet connectedClients: WrappedClient[] = []\n\n// Connection pool configuration\nexport interface McpConnectionPoolConfig {\n /** Maximum concurrent connections (default: 10) */\n maxConnections: number\n /** Connection timeout in ms (default: 5000) */\n connectionTimeout: number\n /** Health check interval in ms (default: 30000, 0 to disable) */\n healthCheckInterval: number\n /** Retry failed connections (default: true) */\n retryFailed: boolean\n /** Max retry attempts (default: 3) */\n maxRetries: number\n}\n\nconst DEFAULT_POOL_CONFIG: McpConnectionPoolConfig = {\n maxConnections: 10,\n connectionTimeout: 5000,\n healthCheckInterval: 30000,\n retryFailed: true,\n maxRetries: 3,\n}\n\nlet poolConfig: McpConnectionPoolConfig = { ...DEFAULT_POOL_CONFIG }\nlet healthCheckTimer: ReturnType<typeof setInterval> | null = null\n\n// Connection lock mechanism to prevent concurrent refreshMCPConnections calls\nlet connectionLock: Promise<void> | null = null\nlet pendingRefresh = false\n\n/**\n * Acquires the connection lock for exclusive access to MCP connection refresh\n * Waits until any existing lock is released before creating a new one\n */\nasync function acquireConnectionLock(): Promise<() => void> {\n while (connectionLock) {\n await connectionLock\n }\n\n let release: () => void\n connectionLock = new Promise(resolve => {\n release = () => {\n connectionLock = null\n resolve()\n }\n })\n\n return release!\n}\n\n/**\n * Configure MCP connection pool settings\n */\nexport function configureMcpPool(\n config: Partial<McpConnectionPoolConfig>,\n): void {\n poolConfig = { ...poolConfig, ...config }\n\n // Restart health check with new interval if changed\n if (config.healthCheckInterval !== undefined) {\n stopHealthCheck()\n if (poolConfig.healthCheckInterval > 0) {\n startHealthCheck()\n }\n }\n}\n\n/**\n * Get current pool configuration\n */\nexport function getMcpPoolConfig(): McpConnectionPoolConfig {\n return { ...poolConfig }\n}\n\n/**\n * Connection health status\n */\nexport interface McpConnectionHealth {\n name: string\n status: 'healthy' | 'unhealthy' | 'unknown'\n lastCheck: number\n latencyMs?: number\n error?: string\n}\n\n// Track connection health\nconst connectionHealth: Map<string, McpConnectionHealth> = new Map()\n\n/**\n * Check health of a single MCP connection\n */\nasync function checkConnectionHealth(\n client: ConnectedClient,\n): Promise<McpConnectionHealth> {\n const startTime = Date.now()\n try {\n // Try to get server capabilities as a health check\n await client.client.getServerCapabilities()\n const latencyMs = Date.now() - startTime\n\n return {\n name: client.name,\n status: 'healthy',\n lastCheck: Date.now(),\n latencyMs,\n }\n } catch (error) {\n return {\n name: client.name,\n status: 'unhealthy',\n lastCheck: Date.now(),\n error: error instanceof Error ? error.message : String(error),\n }\n }\n}\n\n/**\n * Run health check on all connections\n */\nexport async function runHealthCheck(): Promise<McpConnectionHealth[]> {\n const clients = await getClients()\n const healthResults: McpConnectionHealth[] = []\n\n for (const client of clients) {\n if (client.type === 'connected') {\n const health = await checkConnectionHealth(client)\n connectionHealth.set(client.name, health)\n healthResults.push(health)\n } else {\n const health: McpConnectionHealth = {\n name: client.name,\n status: 'unhealthy',\n lastCheck: Date.now(),\n error: 'Connection failed',\n }\n connectionHealth.set(client.name, health)\n healthResults.push(health)\n }\n }\n\n return healthResults\n}\n\n/**\n * Get cached health status for all connections\n */\nexport function getConnectionHealth(): McpConnectionHealth[] {\n return Array.from(connectionHealth.values())\n}\n\n/**\n * Get health status for a specific server\n */\nexport function getServerHealth(\n serverName: string,\n): McpConnectionHealth | null {\n return connectionHealth.get(serverName) || null\n}\n\n/**\n * Get circuit breaker for an MCP server\n * Used to check breaker status and manually control it\n */\nexport function getServerCircuitBreaker(serverName: string) {\n return mcpCircuitBreakers.getOrCreate(serverName)\n}\n\n/**\n * Get circuit breaker stats for all servers\n */\nexport function getAllCircuitBreakerStats() {\n const stats: Record<string, any> = {}\n for (const [name, breaker] of mcpCircuitBreakers.getAll().entries()) {\n stats[name] = breaker.getStats()\n }\n return stats\n}\n\n/**\n * Start periodic health checks\n */\nexport function startHealthCheck(): void {\n if (healthCheckTimer) return\n if (poolConfig.healthCheckInterval <= 0) return\n\n healthCheckTimer = setInterval(async () => {\n try {\n await runHealthCheck()\n } catch {\n // Silently ignore health check errors\n }\n }, poolConfig.healthCheckInterval)\n}\n\n/**\n * Stop periodic health checks\n */\nexport function stopHealthCheck(): void {\n if (healthCheckTimer) {\n clearInterval(healthCheckTimer)\n healthCheckTimer = null\n }\n}\n\n/**\n * Get connection pool statistics\n */\nexport function getPoolStats(): {\n totalConnections: number\n connectedCount: number\n failedCount: number\n healthyCount: number\n unhealthyCount: number\n} {\n const health = getConnectionHealth()\n return {\n totalConnections: connectedClients.length,\n connectedCount: connectedClients.filter(c => c.type === 'connected').length,\n failedCount: connectedClients.filter(c => c.type === 'failed').length,\n healthyCount: health.filter(h => h.status === 'healthy').length,\n unhealthyCount: health.filter(h => h.status === 'unhealthy').length,\n }\n}\n\nexport const getClients = memoize(async (): Promise<WrappedClient[]> => {\n // TODO: This is a temporary fix for a hang during npm run verify in CI.\n // We need to investigate why MCP client connections hang in CI verify but not in CI tests.\n if (process.env.CI && process.env.NODE_ENV !== 'test') {\n return []\n }\n\n const globalServers = getGlobalConfig().mcpServers ?? {}\n const mcprcServers = getMcprcConfig()\n const projectServers = getCurrentProjectConfig().mcpServers ?? {}\n\n // Filter mcprc servers to only include approved ones\n const approvedMcprcServers = pickBy(\n mcprcServers,\n (_, name) => getMcprcServerStatus(name) === 'approved',\n )\n\n const allServers = {\n ...globalServers,\n ...approvedMcprcServers, // Approved .mcprc servers override global ones\n ...projectServers, // Project servers take highest precedence\n }\n\n // Filter out disabled servers\n const enabledServers = pickBy(\n allServers,\n server => server.enabled !== false, // Default to enabled if not specified\n )\n\n const clients = await Promise.all(\n Object.entries(enabledServers).map(async ([name, serverRef]) => {\n try {\n const client = await connectToServer(name, serverRef as McpServerConfig)\n return { name, client, type: 'connected' as const }\n } catch (error) {\n logMCPError(\n name,\n `Connection failed: ${error instanceof Error ? error.message : String(error)}`,\n )\n return { name, type: 'failed' as const }\n }\n }),\n )\n\n // Store reference for shutdown cleanup\n connectedClients = clients\n return clients\n})\n\nasync function requestAll<\n ResultT extends Result,\n ResultSchemaT extends typeof ResultSchema,\n>(\n req: ClientRequest,\n resultSchema: ResultSchemaT,\n requiredCapability: string,\n): Promise<{ client: ConnectedClient; result: ResultT }[]> {\n const clients = await getClients()\n const results = await Promise.allSettled(\n clients.map(async client => {\n if (client.type === 'failed') return null\n\n try {\n const capabilities = await client.client.getServerCapabilities()\n if (!capabilities?.[requiredCapability]) {\n return null\n }\n return {\n client,\n result: (await client.client.request(req, resultSchema)) as ResultT,\n }\n } catch (error) {\n if (client.type === 'connected') {\n logMCPError(\n client.name,\n `Failed to request '${req.method}': ${error instanceof Error ? error.message : String(error)}`,\n )\n }\n return null\n }\n }),\n )\n return results\n .filter(\n (\n result,\n ): result is PromiseFulfilledResult<{\n client: ConnectedClient\n result: ResultT\n } | null> => result.status === 'fulfilled',\n )\n .map(result => result.value)\n .filter(\n (result): result is { client: ConnectedClient; result: ResultT } =>\n result !== null,\n )\n}\n\nexport const getMCPTools = memoize(async (): Promise<Tool[]> => {\n const toolsList = await requestAll<\n ListToolsResult,\n typeof ListToolsResultSchema\n >(\n {\n method: 'tools/list',\n },\n ListToolsResultSchema,\n 'tools',\n )\n\n return toolsList.flatMap(({ client, result: { tools } }) => {\n // Validate tool structure before processing\n const validTools = tools.filter(\n (tool): tool is typeof tool & { name: string } => {\n if (!tool || typeof tool.name !== 'string' || tool.name.length === 0) {\n logMCPError(\n `Invalid MCP tool from ${client.name}: missing or invalid name`,\n new Error('Tool validation failed'),\n )\n return false\n }\n return true\n },\n )\n\n return validTools.map(\n (tool): Tool => ({\n ...MCPTool,\n name: 'mcp__' + client.name + '__' + tool.name,\n async description() {\n return tool.description ?? ''\n },\n async prompt() {\n return tool.description ?? ''\n },\n inputJSONSchema: tool.inputSchema as Tool['inputJSONSchema'],\n async validateInput(input, context) {\n // MCP tools handle their own validation through their schemas\n return { result: true }\n },\n async *call(args: Record<string, unknown>, context) {\n const data = await callMCPTool({ client, tool: tool.name, args })\n yield {\n type: 'result' as const,\n data,\n resultForAssistant: data,\n }\n },\n userFacingName() {\n return `${client.name}:${tool.name} (MCP)`\n },\n }),\n )\n })\n})\n\n/**\n * Wraps a promise with a timeout.\n * If the promise doesn't resolve/reject within the timeout, rejects with a TimeoutError.\n */\nasync function withTimeout<T>(\n promise: Promise<T>,\n timeoutMs: number,\n operationName: string,\n): Promise<T> {\n let timeoutId: ReturnType<typeof setTimeout> | undefined\n\n const timeoutPromise = new Promise<never>((_, reject) => {\n timeoutId = setTimeout(() => {\n reject(\n new Error(\n `MCP operation \"${operationName}\" timed out after ${timeoutMs}ms`,\n ),\n )\n }, timeoutMs)\n })\n\n try {\n const result = await Promise.race([promise, timeoutPromise])\n if (timeoutId) clearTimeout(timeoutId)\n return result\n } catch (error) {\n if (timeoutId) clearTimeout(timeoutId)\n throw error\n }\n}\n\n/**\n * Checks if an error is a timeout-related error.\n */\nfunction isTimeoutError(error: unknown): boolean {\n if (error instanceof Error) {\n return (\n error.name === 'TimeoutError' ||\n error.message.includes('timed out') ||\n error.message.includes('timeout')\n )\n }\n if (error instanceof DOMException) {\n return error.name === 'TimeoutError'\n }\n return false\n}\n\n// Import timing constants - use dynamic value or fallback\nconst MCP_TOOL_TIMEOUT_MS = 120000 // 2 minutes\nconst MCP_TOOL_MAX_RETRIES = 2\n\nasync function callMCPTool({\n client: { client, name },\n tool,\n args,\n}: {\n client: ConnectedClient\n tool: string\n args: Record<string, unknown>\n}): Promise<ToolResultBlockParam['content']> {\n const breaker = mcpCircuitBreakers.getOrCreate(name)\n let lastError: Error | undefined\n const maxRetries = MCP_TOOL_MAX_RETRIES\n\n for (let attempt = 0; attempt <= maxRetries; attempt++) {\n try {\n // Check circuit breaker before attempting the call\n const result = await breaker.executeWithTimeout(async () => {\n const callPromise = client.callTool(\n {\n name: tool,\n arguments: args,\n },\n CallToolResultSchema,\n )\n\n // Wrap with timeout protection\n return await withTimeout(\n callPromise,\n MCP_TOOL_TIMEOUT_MS,\n `${name}:${tool}`,\n )\n }, MCP_TOOL_TIMEOUT_MS)\n\n if ('isError' in result && result.isError) {\n const errorMessage = `Error calling tool ${tool}: ${result.error}`\n logMCPError(name, errorMessage)\n throw Error(errorMessage)\n }\n\n // Handle toolResult-type response\n if ('toolResult' in result) {\n return String(result.toolResult)\n }\n\n // Handle content array response\n if ('content' in result && Array.isArray(result.content)) {\n return result.content.map(item => {\n if (item.type === 'image') {\n return {\n type: 'image',\n source: {\n type: 'base64',\n data: String(item.data),\n media_type:\n item.mimeType as ImageBlockParam.Source['media_type'],\n },\n }\n }\n return item\n })\n }\n\n throw Error(`Unexpected response format from tool ${tool}`)\n } catch (error) {\n lastError = error instanceof Error ? error : new Error(String(error))\n\n // Circuit breaker is open - fail fast without retries\n if (lastError instanceof CircuitOpenError) {\n logMCPError(\n name,\n `Circuit breaker is open for server \"${name}\". ${lastError.message}`,\n )\n throw lastError\n }\n\n // Only retry on timeout errors, not on other errors\n if (isTimeoutError(error) && attempt < maxRetries) {\n logMCPError(\n name,\n `Tool \"${tool}\" timed out (attempt ${attempt + 1}/${maxRetries + 1}), retrying...`,\n )\n // Exponential backoff: 1s, 2s, 4s...\n await new Promise(resolve =>\n setTimeout(resolve, 1000 * Math.pow(2, attempt)),\n )\n continue\n }\n\n // Log and throw for non-retryable errors or after all retries exhausted\n if (isTimeoutError(error)) {\n logMCPError(\n name,\n `Tool \"${tool}\" failed after ${maxRetries + 1} attempts due to timeout`,\n )\n }\n throw lastError\n }\n }\n\n // This should never be reached, but TypeScript needs it\n throw lastError || new Error(`MCP tool ${tool} failed with unknown error`)\n}\n\nexport const getMCPCommands = memoize(async (): Promise<Command[]> => {\n const results = await requestAll<\n ListPromptsResult,\n typeof ListPromptsResultSchema\n >(\n {\n method: 'prompts/list',\n },\n ListPromptsResultSchema,\n 'prompts',\n )\n\n return results.flatMap(({ client, result }) =>\n result.prompts?.map(_ => {\n const argNames = Object.values(_.arguments ?? {}).map(k => k.name)\n return {\n type: 'prompt',\n name: 'mcp__' + client.name + '__' + _.name,\n description: _.description ?? '',\n isEnabled: true,\n isHidden: false,\n progressMessage: 'running',\n userFacingName() {\n return `${client.name}:${_.name} (MCP)`\n },\n argNames,\n async getPromptForCommand(args: string) {\n const argsArray = args.split(' ')\n return await runCommand(\n { name: _.name, client },\n zipObject(argNames, argsArray),\n )\n },\n }\n }),\n )\n})\n\nexport async function runCommand(\n { name, client }: { name: string; client: ConnectedClient },\n args: Record<string, string>,\n): Promise<MessageParam[]> {\n try {\n const result = await client.client.getPrompt({ name, arguments: args })\n // TODO: Support type == resource\n return result.messages.map(\n (message): MessageParam => ({\n role: message.role,\n content: [\n message.content.type === 'text'\n ? {\n type: 'text',\n text: message.content.text,\n }\n : {\n type: 'image',\n source: {\n data: String(message.content.data),\n media_type: message.content\n .mimeType as ImageBlockParam.Source['media_type'],\n type: 'base64',\n },\n },\n ],\n }),\n )\n } catch (error) {\n logMCPError(\n client.name,\n `Error running command '${name}': ${error instanceof Error ? error.message : String(error)}`,\n )\n throw error\n }\n}\n\n/**\n * Refreshes MCP connections by clearing memoization cache and reconnecting\n * Useful when MCP configuration changes or servers become available after app startup\n * Uses an async lock to prevent concurrent execution and race conditions\n * Also resets circuit breakers to allow reconnection attempts\n */\nexport async function refreshMCPConnections(): Promise<void> {\n // Early return if refresh is already pending to avoid request accumulation\n if (pendingRefresh) {\n return\n }\n\n pendingRefresh = true\n\n const release = await acquireConnectionLock()\n\n try {\n // Clear memoization caches\n if (typeof getClients.cache?.clear === 'function') {\n getClients.cache.clear()\n }\n if (typeof getMCPTools.cache?.clear === 'function') {\n getMCPTools.cache.clear()\n }\n if (typeof getMCPCommands.cache?.clear === 'function') {\n getMCPCommands.cache.clear()\n }\n\n // Reset circuit breakers to allow reconnection attempts\n mcpCircuitBreakers.resetAll()\n\n // Also invalidate the main tools cache since MCP tools are part of it\n // This is imported lazily to avoid circular dependencies\n try {\n const { invalidateToolsCache } = await import('../tools')\n invalidateToolsCache()\n } catch {\n // Ignore errors - tools.ts may not be loaded yet\n }\n } finally {\n pendingRefresh = false\n release()\n }\n}\n\n/**\n * Shuts down all MCP client connections gracefully\n * Should be called when the application is exiting\n */\nexport async function shutdownMCPClients(): Promise<void> {\n if (connectedClients.length === 0) {\n return\n }\n\n // Close all connected clients\n const closePromises = connectedClients.map(async wrappedClient => {\n if (wrappedClient.type === 'connected') {\n try {\n await wrappedClient.client.close()\n } catch {\n // Ignore errors during shutdown - the process is exiting anyway\n }\n }\n })\n\n // Wait for all clients to close with a timeout\n const SHUTDOWN_TIMEOUT_MS = 3000\n try {\n await Promise.race([\n Promise.allSettled(closePromises),\n new Promise(resolve => setTimeout(resolve, SHUTDOWN_TIMEOUT_MS)),\n ])\n } catch {\n // Ignore timeout errors during shutdown\n }\n\n // Clear references\n connectedClients = []\n await refreshMCPConnections()\n}\n\n/**\n * MCP Resource type for listing\n */\nexport type McpResource = {\n uri: string\n name: string\n description?: string\n mimeType?: string\n serverName: string\n}\n\n/**\n * List all resources from MCP servers\n * @param serverFilter Optional server name to filter resources from a specific server\n */\nexport async function listMCPResources(\n serverFilter?: string,\n): Promise<McpResource[]> {\n const results = await requestAll<\n ListResourcesResult,\n typeof ListResourcesResultSchema\n >(\n {\n method: 'resources/list',\n },\n ListResourcesResultSchema,\n 'resources',\n )\n\n return results\n .filter(({ client }) => !serverFilter || client.name === serverFilter)\n .flatMap(({ client, result }) =>\n (result.resources || []).map(resource => ({\n uri: resource.uri,\n name: resource.name,\n description: resource.description,\n mimeType: resource.mimeType,\n serverName: client.name,\n })),\n )\n}\n\n/**\n * MCP Resource content type\n */\nexport type McpResourceContent = {\n uri: string\n mimeType?: string\n text?: string\n blob?: string // Base64 encoded binary data\n}\n\n/**\n * Read a specific resource from an MCP server\n * @param uri The resource URI to read\n * @param serverName Optional server name to target a specific server\n */\nexport async function readMCPResource(\n uri: string,\n serverName?: string,\n): Promise<McpResourceContent | null> {\n const clients = await getClients()\n\n // Find the appropriate client\n const targetClients = serverName\n ? (clients.filter(\n c => c.type === 'connected' && c.name === serverName,\n ) as ConnectedClient[])\n : (clients.filter(c => c.type === 'connected') as ConnectedClient[])\n\n for (const client of targetClients) {\n try {\n // Check if this server has resources capability\n const capabilities = await client.client.getServerCapabilities()\n if (!capabilities?.resources) {\n continue\n }\n\n // Try to read the resource\n const result = (await client.client.request(\n {\n method: 'resources/read',\n params: { uri },\n },\n ReadResourceResultSchema,\n )) as ReadResourceResult\n\n if (result.contents && result.contents.length > 0) {\n const content = result.contents[0]\n return {\n uri: content.uri,\n mimeType: content.mimeType,\n text: 'text' in content ? String(content.text) : undefined,\n blob: 'blob' in content ? String(content.blob) : undefined,\n }\n }\n } catch (error) {\n // Log but continue trying other servers\n logMCPError(\n client.name,\n `Failed to read resource '${uri}': ${error instanceof Error ? error.message : String(error)}`,\n )\n }\n }\n\n return null\n}\n"],
|
|
5
|
-
"mappings": "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",
|
|
4
|
+
"sourcesContent": ["import { zipObject } from 'lodash-es'\nimport { debug as debugLogger } from '@utils/debugLogger'\nimport {\n getCurrentProjectConfig,\n McpServerConfig,\n saveCurrentProjectConfig,\n getGlobalConfig,\n saveGlobalConfig,\n getMcprcConfig,\n addMcprcServerForTesting,\n removeMcprcServerForTesting,\n} from '@utils/config'\nimport { existsSync, readFileSync, writeFileSync } from 'fs'\nimport { join } from 'path'\nimport { getCwd } from '@utils/state'\nimport { safeParseJSON } from '@utils/json'\nimport {\n ImageBlockParam,\n MessageParam,\n ToolResultBlockParam,\n} from '@anthropic-ai/sdk/resources/index.mjs'\nimport { Client } from '@modelcontextprotocol/sdk/client/index.js'\nimport { StdioClientTransport } from '@modelcontextprotocol/sdk/client/stdio.js'\nimport { SSEClientTransport } from '@modelcontextprotocol/sdk/client/sse.js'\nimport {\n CallToolResultSchema,\n ClientRequest,\n ListPromptsResult,\n ListPromptsResultSchema,\n ListToolsResult,\n ListToolsResultSchema,\n ListResourcesResult,\n ListResourcesResultSchema,\n ReadResourceResult,\n ReadResourceResultSchema,\n Result,\n ResultSchema,\n ToolListChangedNotificationSchema,\n} from '@modelcontextprotocol/sdk/types.js'\nimport { memoize, pickBy } from 'lodash-es'\nimport type { Tool } from '@tool'\nimport { MCPTool } from '@tools/MCPTool/MCPTool'\nimport { logMCPError } from '@utils/log'\nimport { ensureProxyBypass } from '@utils/envConfig'\nimport { Command } from '@commands'\nimport { PRODUCT_COMMAND } from '@constants/product'\nimport { CircuitBreakerRegistry, CircuitOpenError } from '@utils/CircuitBreaker'\nimport { emitReminderEvent } from '@services/systemReminder'\n\ntype McpName = string\n\n/**\n * Circuit breaker registry for MCP server connections\n * Each server gets its own circuit breaker to prevent cascading failures\n */\n/**\n * Env var prefixes/names to strip when spawning MCP server processes.\n * Prevents leaking API keys and secrets to third-party servers.\n * Explicit per-server `env` values in config still override (intentional).\n */\nconst SENSITIVE_ENV_PREFIXES = [\n 'ANTHROPIC_',\n 'OPENAI_',\n 'AWS_SECRET',\n 'GITHUB_TOKEN',\n 'GH_TOKEN',\n 'MINTO_API',\n]\n\nfunction filterSensitiveEnv(env: NodeJS.ProcessEnv): Record<string, string> {\n return Object.fromEntries(\n Object.entries(env)\n .filter(\n ([k]) => !SENSITIVE_ENV_PREFIXES.some(p => k.startsWith(p) || k === p),\n )\n .filter((e): e is [string, string] => e[1] !== undefined),\n )\n}\n\nconst mcpCircuitBreakers = new CircuitBreakerRegistry({\n failureThreshold: 5,\n successThreshold: 2,\n openTimeout: 30000, // 30 seconds before trying again\n})\n\nexport function parseEnvVars(\n rawEnvArgs: string[] | undefined,\n): Record<string, string> {\n const parsedEnv: Record<string, string> = {}\n\n // Parse individual env vars\n if (rawEnvArgs) {\n for (const envStr of rawEnvArgs) {\n const [key, ...valueParts] = envStr.split('=')\n if (!key || valueParts.length === 0) {\n throw new Error(\n `Invalid environment variable format: ${envStr}, environment variables should be added as: -e KEY1=value1 -e KEY2=value2`,\n )\n }\n parsedEnv[key] = valueParts.join('=')\n }\n }\n return parsedEnv\n}\n\nconst VALID_SCOPES = ['project', 'global', 'mcprc'] as const\ntype ConfigScope = (typeof VALID_SCOPES)[number]\nconst EXTERNAL_SCOPES = ['project', 'global'] as ConfigScope[]\n\nexport function ensureConfigScope(scope?: string): ConfigScope {\n if (!scope) return 'project'\n\n const scopesToCheck =\n process.env.USER_TYPE === 'external' ? EXTERNAL_SCOPES : VALID_SCOPES\n\n if (!scopesToCheck.includes(scope as ConfigScope)) {\n throw new Error(\n `Invalid scope: ${scope}. Must be one of: ${scopesToCheck.join(', ')}`,\n )\n }\n\n return scope as ConfigScope\n}\n\nexport function addMcpServer(\n name: McpName,\n server: McpServerConfig,\n scope: ConfigScope = 'project',\n): void {\n if (scope === 'mcprc') {\n if (process.env.NODE_ENV === 'test') {\n addMcprcServerForTesting(name, server)\n } else {\n const mcprcPath = join(getCwd(), '.mcprc')\n let mcprcConfig: Record<string, McpServerConfig> = {}\n\n // Read existing config if present\n if (existsSync(mcprcPath)) {\n try {\n const mcprcContent = readFileSync(mcprcPath, 'utf-8')\n const existingConfig = safeParseJSON(mcprcContent)\n if (existingConfig && typeof existingConfig === 'object') {\n mcprcConfig = existingConfig as Record<string, McpServerConfig>\n }\n } catch (e) {\n debugLogger.warn(\n 'MCP_CONFIG',\n `Failed to read/parse .mcprc: ${e instanceof Error ? e.message : String(e)}`,\n )\n }\n }\n\n // Add the server\n mcprcConfig[name] = server\n\n // Write back to .mcprc\n try {\n writeFileSync(mcprcPath, JSON.stringify(mcprcConfig, null, 2), 'utf-8')\n } catch (error) {\n throw new Error(`Failed to write to .mcprc: ${error}`)\n }\n }\n } else if (scope === 'global') {\n const config = getGlobalConfig()\n if (!config.mcpServers) {\n config.mcpServers = {}\n }\n config.mcpServers[name] = server\n saveGlobalConfig(config)\n } else {\n const config = getCurrentProjectConfig()\n if (!config.mcpServers) {\n config.mcpServers = {}\n }\n config.mcpServers[name] = server\n saveCurrentProjectConfig(config)\n }\n}\n\nexport function removeMcpServer(\n name: McpName,\n scope: ConfigScope = 'project',\n): void {\n if (scope === 'mcprc') {\n if (process.env.NODE_ENV === 'test') {\n removeMcprcServerForTesting(name)\n } else {\n const mcprcPath = join(getCwd(), '.mcprc')\n if (!existsSync(mcprcPath)) {\n throw new Error('No .mcprc file found in this directory')\n }\n\n try {\n const mcprcContent = readFileSync(mcprcPath, 'utf-8')\n const mcprcConfig = safeParseJSON(mcprcContent) as Record<\n string,\n McpServerConfig\n > | null\n\n if (\n !mcprcConfig ||\n typeof mcprcConfig !== 'object' ||\n !mcprcConfig[name]\n ) {\n throw new Error(`No MCP server found with name: ${name} in .mcprc`)\n }\n\n delete mcprcConfig[name]\n writeFileSync(mcprcPath, JSON.stringify(mcprcConfig, null, 2), 'utf-8')\n } catch (error) {\n if (error instanceof Error) {\n throw error\n }\n throw new Error(`Failed to remove from .mcprc: ${error}`)\n }\n }\n } else if (scope === 'global') {\n const config = getGlobalConfig()\n if (!config.mcpServers?.[name]) {\n throw new Error(`No global MCP server found with name: ${name}`)\n }\n delete config.mcpServers[name]\n saveGlobalConfig(config)\n } else {\n const config = getCurrentProjectConfig()\n if (!config.mcpServers?.[name]) {\n throw new Error(`No local MCP server found with name: ${name}`)\n }\n delete config.mcpServers[name]\n saveCurrentProjectConfig(config)\n }\n}\n\nexport function listMCPServers(): Record<string, McpServerConfig> {\n const globalConfig = getGlobalConfig()\n const mcprcConfig = getMcprcConfig()\n const projectConfig = getCurrentProjectConfig()\n return {\n ...(globalConfig.mcpServers ?? {}),\n ...(mcprcConfig ?? {}), // mcprc configs override global ones\n ...(projectConfig.mcpServers ?? {}), // Project configs override mcprc ones\n }\n}\n\nexport type ScopedMcpServerConfig = McpServerConfig & {\n scope: ConfigScope\n}\n\nexport function getMcpServer(name: McpName): ScopedMcpServerConfig | undefined {\n const projectConfig = getCurrentProjectConfig()\n const mcprcConfig = getMcprcConfig()\n const globalConfig = getGlobalConfig()\n\n // Check each scope in order of precedence\n if (projectConfig.mcpServers?.[name]) {\n return { ...projectConfig.mcpServers[name], scope: 'project' }\n }\n\n if (mcprcConfig?.[name]) {\n return { ...mcprcConfig[name], scope: 'mcprc' }\n }\n\n if (globalConfig.mcpServers?.[name]) {\n return { ...globalConfig.mcpServers[name], scope: 'global' }\n }\n\n return undefined\n}\n\nasync function connectToServer(\n name: string,\n serverRef: McpServerConfig,\n): Promise<Client> {\n let transport\n\n if (serverRef.type === 'http') {\n // Streamable HTTP transport (CC spec)\n const { StreamableHTTPClientTransport } = await import(\n '@modelcontextprotocol/sdk/client/streamableHttp.js'\n )\n transport = new StreamableHTTPClientTransport(\n new URL((serverRef as any).url),\n {\n // Pass headers but never log sensitive values\n requestInit: (serverRef as any).headers\n ? { headers: (serverRef as any).headers }\n : undefined,\n },\n )\n } else if (serverRef.type === 'sse') {\n transport = new SSEClientTransport(new URL(serverRef.url))\n } else {\n transport = new StdioClientTransport({\n command: serverRef.command,\n args: serverRef.args,\n env: ensureProxyBypass({\n ...filterSensitiveEnv(process.env),\n ...serverRef.env,\n } as Record<string, string>),\n stderr: 'pipe', // prevents error output from the MCP server from printing to the UI\n })\n }\n\n const client = new Client(\n {\n name: PRODUCT_COMMAND,\n version: '0.1.0',\n },\n {\n capabilities: {},\n },\n )\n\n // Add a timeout to connection attempts to prevent tests from hanging indefinitely\n const connectionTimeout = poolConfig.connectionTimeout\n const connectPromise = client.connect(transport)\n const timeoutPromise = new Promise<never>((_, reject) => {\n const timeoutId = setTimeout(() => {\n reject(\n new Error(\n `Connection to MCP server \"${name}\" timed out after ${connectionTimeout}ms`,\n ),\n )\n }, connectionTimeout)\n\n // Clean up timeout if connect resolves or rejects\n connectPromise.then(\n () => clearTimeout(timeoutId),\n () => clearTimeout(timeoutId),\n )\n })\n\n await Promise.race([connectPromise, timeoutPromise])\n\n if (serverRef.type === 'stdio') {\n ;(transport as StdioClientTransport).stderr?.on('data', (data: Buffer) => {\n const errorText = data.toString().trim()\n if (errorText) {\n logMCPError(name, `Server stderr: ${errorText}`)\n }\n })\n }\n\n // Listen for tools/list_changed notification to dynamically update tool lists\n client.setNotificationHandler(ToolListChangedNotificationSchema, async () => {\n // Clear cached tools so next getMCPTools() fetches fresh list\n if (typeof getMCPTools.cache?.clear === 'function') {\n getMCPTools.cache.clear()\n }\n })\n\n return client\n}\n\ntype ConnectedClient = {\n client: Client\n name: string\n type: 'connected'\n}\ntype FailedClient = {\n name: string\n type: 'failed'\n}\nexport type WrappedClient = ConnectedClient | FailedClient\n\nexport function getMcprcServerStatus(\n serverName: string,\n): 'approved' | 'rejected' | 'pending' {\n const config = getCurrentProjectConfig()\n if (config.approvedMcprcServers?.includes(serverName)) {\n return 'approved'\n }\n if (config.rejectedMcprcServers?.includes(serverName)) {\n return 'rejected'\n }\n return 'pending'\n}\n\n// Store connected clients for cleanup on shutdown\nlet connectedClients: WrappedClient[] = []\n\n// Connection pool configuration\nexport interface McpConnectionPoolConfig {\n /** Maximum concurrent connections (default: 10) */\n maxConnections: number\n /** Connection timeout in ms (default: 10000) */\n connectionTimeout: number\n /** Health check interval in ms (default: 30000, 0 to disable) */\n healthCheckInterval: number\n /** Retry failed connections (default: true) */\n retryFailed: boolean\n /** Max retry attempts (default: 3) */\n maxRetries: number\n /** Maximum output size from MCP tool calls in characters (default: 25000) */\n maxOutputChars: number\n}\n\nconst DEFAULT_POOL_CONFIG: McpConnectionPoolConfig = {\n maxConnections: 10,\n connectionTimeout: Number(process.env.MCP_TIMEOUT) || 10000,\n healthCheckInterval: 30000,\n retryFailed: true,\n maxRetries: 2,\n maxOutputChars: Number(process.env.MAX_MCP_OUTPUT_CHARS) || 25000,\n}\n\nlet poolConfig: McpConnectionPoolConfig = { ...DEFAULT_POOL_CONFIG }\nlet healthCheckTimer: ReturnType<typeof setInterval> | null = null\n\n// Connection lock mechanism to prevent concurrent refreshMCPConnections calls\nlet connectionLock: Promise<void> | null = null\nlet pendingRefresh = false\n\n/**\n * Acquires the connection lock for exclusive access to MCP connection refresh\n * Waits until any existing lock is released before creating a new one\n */\nasync function acquireConnectionLock(): Promise<() => void> {\n while (connectionLock) {\n await connectionLock\n }\n\n let release: () => void\n connectionLock = new Promise(resolve => {\n release = () => {\n connectionLock = null\n resolve()\n }\n })\n\n return release!\n}\n\n/**\n * Configure MCP connection pool settings\n */\nexport function configureMcpPool(\n config: Partial<McpConnectionPoolConfig>,\n): void {\n poolConfig = { ...poolConfig, ...config }\n\n // Restart health check with new interval if changed\n if (config.healthCheckInterval !== undefined) {\n stopHealthCheck()\n if (poolConfig.healthCheckInterval > 0) {\n startHealthCheck()\n }\n }\n}\n\n/**\n * Get current pool configuration\n */\nexport function getMcpPoolConfig(): McpConnectionPoolConfig {\n return { ...poolConfig }\n}\n\n/**\n * Connection health status\n */\nexport interface McpConnectionHealth {\n name: string\n status: 'healthy' | 'unhealthy' | 'unknown'\n lastCheck: number\n latencyMs?: number\n error?: string\n}\n\n// Track connection health\nconst connectionHealth: Map<string, McpConnectionHealth> = new Map()\n\n/**\n * Check health of a single MCP connection\n */\nasync function checkConnectionHealth(\n client: ConnectedClient,\n): Promise<McpConnectionHealth> {\n const startTime = Date.now()\n try {\n // Try to get server capabilities as a health check\n await client.client.getServerCapabilities()\n const latencyMs = Date.now() - startTime\n\n return {\n name: client.name,\n status: 'healthy',\n lastCheck: Date.now(),\n latencyMs,\n }\n } catch (error) {\n return {\n name: client.name,\n status: 'unhealthy',\n lastCheck: Date.now(),\n error: error instanceof Error ? error.message : String(error),\n }\n }\n}\n\n/**\n * Run health check on all connections\n */\nexport async function runHealthCheck(): Promise<McpConnectionHealth[]> {\n const clients = await getClients()\n const healthResults: McpConnectionHealth[] = []\n\n for (const client of clients) {\n if (client.type === 'connected') {\n const health = await checkConnectionHealth(client)\n connectionHealth.set(client.name, health)\n healthResults.push(health)\n } else {\n const health: McpConnectionHealth = {\n name: client.name,\n status: 'unhealthy',\n lastCheck: Date.now(),\n error: 'Connection failed',\n }\n connectionHealth.set(client.name, health)\n healthResults.push(health)\n }\n }\n\n return healthResults\n}\n\n/**\n * Get cached health status for all connections\n */\nexport function getConnectionHealth(): McpConnectionHealth[] {\n return Array.from(connectionHealth.values())\n}\n\n/**\n * Get health status for a specific server\n */\nexport function getServerHealth(\n serverName: string,\n): McpConnectionHealth | null {\n return connectionHealth.get(serverName) || null\n}\n\n/**\n * Get circuit breaker for an MCP server\n * Used to check breaker status and manually control it\n */\nexport function getServerCircuitBreaker(serverName: string) {\n return mcpCircuitBreakers.getOrCreate(serverName)\n}\n\n/**\n * Get circuit breaker stats for all servers\n */\nexport function getAllCircuitBreakerStats() {\n const stats: Record<string, any> = {}\n for (const [name, breaker] of mcpCircuitBreakers.getAll().entries()) {\n stats[name] = breaker.getStats()\n }\n return stats\n}\n\n/**\n * Start periodic health checks\n */\nexport function startHealthCheck(): void {\n if (healthCheckTimer) return\n if (poolConfig.healthCheckInterval <= 0) return\n\n healthCheckTimer = setInterval(async () => {\n try {\n await runHealthCheck()\n } catch (e) {\n debugLogger.warn(\n 'MCP_HEALTH',\n `Health check failed: ${e instanceof Error ? e.message : String(e)}`,\n )\n }\n }, poolConfig.healthCheckInterval)\n}\n\n/**\n * Stop periodic health checks\n */\nexport function stopHealthCheck(): void {\n if (healthCheckTimer) {\n clearInterval(healthCheckTimer)\n healthCheckTimer = null\n }\n}\n\n/**\n * Get connection pool statistics\n */\nexport function getPoolStats(): {\n totalConnections: number\n connectedCount: number\n failedCount: number\n healthyCount: number\n unhealthyCount: number\n} {\n const health = getConnectionHealth()\n return {\n totalConnections: connectedClients.length,\n connectedCount: connectedClients.filter(c => c.type === 'connected').length,\n failedCount: connectedClients.filter(c => c.type === 'failed').length,\n healthyCount: health.filter(h => h.status === 'healthy').length,\n unhealthyCount: health.filter(h => h.status === 'unhealthy').length,\n }\n}\n\n/**\n * Connect to an MCP server with retry and exponential backoff.\n * Uses poolConfig.retryFailed and poolConfig.maxRetries settings.\n */\nasync function connectWithRetry(\n name: string,\n serverRef: McpServerConfig,\n): Promise<Client> {\n const { retryFailed, maxRetries } = poolConfig\n let lastError: Error | undefined\n\n const attempts = retryFailed ? maxRetries : 0\n for (let attempt = 0; attempt <= attempts; attempt++) {\n try {\n return await connectToServer(name, serverRef)\n } catch (error) {\n lastError = error instanceof Error ? error : new Error(String(error))\n if (attempt < attempts && retryFailed) {\n const delay = 1000 * Math.pow(2, attempt) // 1s, 2s\n logMCPError(\n name,\n `Connection attempt ${attempt + 1} failed, retrying in ${delay}ms...`,\n )\n await new Promise(r => setTimeout(r, delay))\n }\n }\n }\n throw lastError!\n}\n\nexport const getClients = memoize(async (): Promise<WrappedClient[]> => {\n // TODO: This is a temporary fix for a hang during npm run verify in CI.\n // We need to investigate why MCP client connections hang in CI verify but not in CI tests.\n if (process.env.CI && process.env.NODE_ENV !== 'test') {\n return []\n }\n\n const globalServers = getGlobalConfig().mcpServers ?? {}\n const mcprcServers = getMcprcConfig()\n const projectServers = getCurrentProjectConfig().mcpServers ?? {}\n\n // Filter mcprc servers to only include approved ones\n const approvedMcprcServers = pickBy(\n mcprcServers,\n (_, name) => getMcprcServerStatus(name) === 'approved',\n )\n\n const allServers = {\n ...globalServers,\n ...approvedMcprcServers, // Approved .mcprc servers override global ones\n ...projectServers, // Project servers take highest precedence\n }\n\n // Filter out disabled servers\n const enabledServers = pickBy(\n allServers,\n server => server.enabled !== false, // Default to enabled if not specified\n )\n\n const clients = await Promise.all(\n Object.entries(enabledServers).map(async ([name, serverRef]) => {\n try {\n const client = await connectWithRetry(\n name,\n serverRef as McpServerConfig,\n )\n return { name, client, type: 'connected' as const }\n } catch (error) {\n logMCPError(\n name,\n `Connection failed: ${error instanceof Error ? error.message : String(error)}`,\n )\n return { name, type: 'failed' as const }\n }\n }),\n )\n\n // Store reference for shutdown cleanup\n connectedClients = clients\n return clients\n})\n\nasync function requestAll<\n ResultT extends Result,\n ResultSchemaT extends typeof ResultSchema,\n>(\n req: ClientRequest,\n resultSchema: ResultSchemaT,\n requiredCapability: string,\n): Promise<{ client: ConnectedClient; result: ResultT }[]> {\n const clients = await getClients()\n const results = await Promise.allSettled(\n clients.map(async client => {\n if (client.type === 'failed') return null\n\n try {\n const capabilities = await client.client.getServerCapabilities()\n if (!capabilities?.[requiredCapability]) {\n return null\n }\n return {\n client,\n result: (await client.client.request(req, resultSchema)) as ResultT,\n }\n } catch (error) {\n if (client.type === 'connected') {\n logMCPError(\n client.name,\n `Failed to request '${req.method}': ${error instanceof Error ? error.message : String(error)}`,\n )\n }\n return null\n }\n }),\n )\n return results\n .filter(\n (\n result,\n ): result is PromiseFulfilledResult<{\n client: ConnectedClient\n result: ResultT\n } | null> => result.status === 'fulfilled',\n )\n .map(result => result.value)\n .filter(\n (result): result is { client: ConnectedClient; result: ResultT } =>\n result !== null,\n )\n}\n\n/**\n * Check if lazy/deferred MCP tool loading is enabled.\n * When enabled, inputSchema is loaded on-demand instead of upfront.\n */\nfunction isLazyMCPEnabled(): boolean {\n return !!(\n process.env.MINTO_ENABLE_TOOL_SEARCH || process.env.ENABLE_TOOL_SEARCH\n )\n}\n\n/**\n * Cache for lazily-loaded MCP tool schemas\n */\nconst lazySchemaCache = new Map<string, Tool['inputJSONSchema']>()\n\n/**\n * Lazily fetch the full input schema for an MCP tool\n */\nasync function getLazyInputSchema(\n client: ConnectedClient,\n toolName: string,\n fullName: string,\n): Promise<Tool['inputJSONSchema']> {\n if (lazySchemaCache.has(fullName)) {\n return lazySchemaCache.get(fullName)\n }\n\n try {\n const result = await client.client.request(\n { method: 'tools/list' },\n ListToolsResultSchema,\n )\n for (const tool of result.tools) {\n const key = 'mcp__' + client.name + '__' + tool.name\n lazySchemaCache.set(key, tool.inputSchema as Tool['inputJSONSchema'])\n }\n return lazySchemaCache.get(fullName)\n } catch {\n return undefined\n }\n}\n\nexport const getMCPTools = memoize(async (): Promise<Tool[]> => {\n const toolsList = await requestAll<\n ListToolsResult,\n typeof ListToolsResultSchema\n >(\n {\n method: 'tools/list',\n },\n ListToolsResultSchema,\n 'tools',\n )\n\n const lazyMode = isLazyMCPEnabled()\n\n return toolsList.flatMap(({ client, result: { tools } }) => {\n // Validate tool structure before processing\n const validTools = tools.filter(\n (tool): tool is typeof tool & { name: string } => {\n if (!tool || typeof tool.name !== 'string' || tool.name.length === 0) {\n logMCPError(\n `Invalid MCP tool from ${client.name}: missing or invalid name`,\n new Error('Tool validation failed'),\n )\n return false\n }\n return true\n },\n )\n\n return validTools.map((tool): Tool => {\n const fullName = 'mcp__' + client.name + '__' + tool.name\n\n // In lazy mode, defer schema loading until actually called\n if (lazyMode) {\n lazySchemaCache.set(\n fullName,\n tool.inputSchema as Tool['inputJSONSchema'],\n )\n }\n\n return {\n ...MCPTool,\n name: fullName,\n async description() {\n return tool.description ?? ''\n },\n async prompt() {\n return tool.description ?? ''\n },\n // In lazy mode, schema starts as undefined and is loaded on-demand\n inputJSONSchema: lazyMode\n ? undefined\n : (tool.inputSchema as Tool['inputJSONSchema']),\n async validateInput(input, context) {\n // MCP tools handle their own validation through their schemas\n return { result: true }\n },\n async *call(args: Record<string, unknown>, context) {\n // If in lazy mode and schema wasn't loaded yet, load it now\n if (lazyMode && !lazySchemaCache.has(fullName)) {\n await getLazyInputSchema(client, tool.name, fullName)\n }\n const data = await callMCPTool({ client, tool: tool.name, args })\n yield {\n type: 'result' as const,\n data,\n resultForAssistant: data,\n }\n },\n userFacingName() {\n return `${client.name}:${tool.name} (MCP)`\n },\n }\n })\n })\n})\n\n/**\n * Wraps a promise with a timeout.\n * If the promise doesn't resolve/reject within the timeout, rejects with a TimeoutError.\n */\nasync function withTimeout<T>(\n promise: Promise<T>,\n timeoutMs: number,\n operationName: string,\n): Promise<T> {\n let timeoutId: ReturnType<typeof setTimeout> | undefined\n\n const timeoutPromise = new Promise<never>((_, reject) => {\n timeoutId = setTimeout(() => {\n reject(\n new Error(\n `MCP operation \"${operationName}\" timed out after ${timeoutMs}ms`,\n ),\n )\n }, timeoutMs)\n })\n\n try {\n const result = await Promise.race([promise, timeoutPromise])\n if (timeoutId) clearTimeout(timeoutId)\n return result\n } catch (error) {\n if (timeoutId) clearTimeout(timeoutId)\n throw error\n }\n}\n\n/**\n * Checks if an error is a timeout-related error.\n */\nfunction isTimeoutError(error: unknown): boolean {\n if (error instanceof Error) {\n return (\n error.name === 'TimeoutError' ||\n error.message.includes('timed out') ||\n error.message.includes('timeout')\n )\n }\n if (error instanceof DOMException) {\n return error.name === 'TimeoutError'\n }\n return false\n}\n\n// Import timing constants - use dynamic value or fallback\nconst MCP_TOOL_TIMEOUT_MS = 120000 // 2 minutes\nconst MCP_TOOL_MAX_RETRIES = 2\n\n/**\n * Truncate MCP tool output to prevent token overflow\n * Uses configurable maxOutputChars from pool config\n */\nfunction truncateMcpOutput(text: string): string {\n const limit = poolConfig.maxOutputChars\n if (text.length <= limit) return text\n return (\n text.slice(0, limit) +\n `\\n\\n[Output truncated: ${text.length} chars exceeded limit of ${limit}]`\n )\n}\n\nasync function callMCPTool({\n client: { client, name },\n tool,\n args,\n}: {\n client: ConnectedClient\n tool: string\n args: Record<string, unknown>\n}): Promise<ToolResultBlockParam['content']> {\n const breaker = mcpCircuitBreakers.getOrCreate(name)\n let lastError: Error | undefined\n const maxRetries = MCP_TOOL_MAX_RETRIES\n\n for (let attempt = 0; attempt <= maxRetries; attempt++) {\n try {\n // Check circuit breaker before attempting the call\n const result = await breaker.executeWithTimeout(async () => {\n const callPromise = client.callTool(\n {\n name: tool,\n arguments: args,\n },\n CallToolResultSchema,\n )\n\n // Wrap with timeout protection\n return await withTimeout(\n callPromise,\n MCP_TOOL_TIMEOUT_MS,\n `${name}:${tool}`,\n )\n }, MCP_TOOL_TIMEOUT_MS)\n\n if ('isError' in result && result.isError) {\n const errorMessage = `Error calling tool ${tool}: ${result.error}`\n logMCPError(name, errorMessage)\n throw Error(errorMessage)\n }\n\n // Handle toolResult-type response\n if ('toolResult' in result) {\n const text = String(result.toolResult)\n return truncateMcpOutput(text)\n }\n\n // Handle content array response\n if ('content' in result && Array.isArray(result.content)) {\n return result.content.map(item => {\n if (item.type === 'image') {\n return {\n type: 'image',\n source: {\n type: 'base64',\n data: String(item.data),\n media_type:\n item.mimeType as ImageBlockParam.Source['media_type'],\n },\n }\n }\n return item\n })\n }\n\n throw Error(`Unexpected response format from tool ${tool}`)\n } catch (error) {\n lastError = error instanceof Error ? error : new Error(String(error))\n\n // Circuit breaker is open - fail fast without retries\n if (lastError instanceof CircuitOpenError) {\n logMCPError(\n name,\n `Circuit breaker is open for server \"${name}\". ${lastError.message}`,\n )\n throw lastError\n }\n\n // Only retry on timeout errors, not on other errors\n if (isTimeoutError(error) && attempt < maxRetries) {\n logMCPError(\n name,\n `Tool \"${tool}\" timed out (attempt ${attempt + 1}/${maxRetries + 1}), retrying...`,\n )\n // Exponential backoff: 1s, 2s, 4s...\n await new Promise(resolve =>\n setTimeout(resolve, 1000 * Math.pow(2, attempt)),\n )\n continue\n }\n\n // Log and throw for non-retryable errors or after all retries exhausted\n if (isTimeoutError(error)) {\n logMCPError(\n name,\n `Tool \"${tool}\" failed after ${maxRetries + 1} attempts due to timeout`,\n )\n }\n throw lastError\n }\n }\n\n // This should never be reached, but TypeScript needs it\n throw lastError || new Error(`MCP tool ${tool} failed with unknown error`)\n}\n\nexport const getMCPCommands = memoize(async (): Promise<Command[]> => {\n const results = await requestAll<\n ListPromptsResult,\n typeof ListPromptsResultSchema\n >(\n {\n method: 'prompts/list',\n },\n ListPromptsResultSchema,\n 'prompts',\n )\n\n return results.flatMap(({ client, result }) =>\n result.prompts?.map(_ => {\n const argNames = Object.values(_.arguments ?? {}).map(k => k.name)\n return {\n type: 'prompt',\n name: 'mcp__' + client.name + '__' + _.name,\n description: _.description ?? '',\n isEnabled: true,\n isHidden: false,\n progressMessage: 'running',\n userFacingName() {\n return `${client.name}:${_.name} (MCP)`\n },\n argNames,\n async getPromptForCommand(args: string) {\n const argsArray = args.split(' ')\n return await runCommand(\n { name: _.name, client },\n zipObject(argNames, argsArray),\n )\n },\n }\n }),\n )\n})\n\nexport async function runCommand(\n { name, client }: { name: string; client: ConnectedClient },\n args: Record<string, string>,\n): Promise<MessageParam[]> {\n try {\n const result = await client.client.getPrompt({ name, arguments: args })\n return result.messages.map(\n (message): MessageParam => ({\n role: message.role,\n content: [\n message.content.type === 'text'\n ? {\n type: 'text',\n text: message.content.text,\n }\n : message.content.type === 'resource'\n ? {\n type: 'text',\n text:\n typeof (message.content as any).resource?.text === 'string'\n ? (message.content as any).resource.text\n : `[MCP Resource: ${(message.content as any).resource?.uri ?? 'unknown'}]`,\n }\n : {\n type: 'image',\n source: {\n data: String(message.content.data),\n media_type: message.content\n .mimeType as ImageBlockParam.Source['media_type'],\n type: 'base64',\n },\n },\n ],\n }),\n )\n } catch (error) {\n logMCPError(\n client.name,\n `Error running command '${name}': ${error instanceof Error ? error.message : String(error)}`,\n )\n throw error\n }\n}\n\n/**\n * Close a list of MCP clients in the background (fire-and-forget).\n * Does not block the caller \u2014 errors are silently ignored.\n */\nfunction closeClientsInBackground(clients: WrappedClient[]): void {\n const CLOSE_TIMEOUT_MS = 5000\n const closePromises = clients.map(async wrappedClient => {\n if (wrappedClient.type === 'connected') {\n try {\n await wrappedClient.client.close()\n } catch (e) {\n debugLogger.warn(\n 'MCP_CLOSE',\n `Failed to close MCP client: ${e instanceof Error ? e.message : String(e)}`,\n )\n }\n }\n })\n\n // Race against timeout so orphaned closes don't linger forever\n Promise.race([\n Promise.allSettled(closePromises),\n new Promise(resolve => setTimeout(resolve, CLOSE_TIMEOUT_MS)),\n ]).catch(() => {})\n}\n\n/**\n * Refreshes MCP connections by clearing caches and allowing fresh\n * reconnections on next getClients() call.\n *\n * Old connections are closed in the background AFTER cache clear,\n * so new connections can be established independently without waiting\n * for old ones to shut down (which could fail or be slow).\n *\n * Uses an async lock to prevent concurrent execution and race conditions.\n * Also resets circuit breakers to allow reconnection attempts.\n */\nexport async function refreshMCPConnections(): Promise<void> {\n // Early return if refresh is already pending to avoid request accumulation\n if (pendingRefresh) {\n return\n }\n\n pendingRefresh = true\n\n const release = await acquireConnectionLock()\n\n try {\n // Snapshot old connections for background cleanup\n const oldClients = connectedClients\n connectedClients = []\n\n // Clear memoization caches so next getClients() reconnects fresh\n if (typeof getClients.cache?.clear === 'function') {\n getClients.cache.clear()\n }\n if (typeof getMCPTools.cache?.clear === 'function') {\n getMCPTools.cache.clear()\n }\n if (typeof getMCPCommands.cache?.clear === 'function') {\n getMCPCommands.cache.clear()\n }\n\n // Reset circuit breakers to allow reconnection attempts\n mcpCircuitBreakers.resetAll()\n\n // Also invalidate the main tools cache since MCP tools are part of it\n // This is imported lazily to avoid circular dependencies\n try {\n const { invalidateToolsCache } = await import('../tools')\n invalidateToolsCache()\n } catch {\n // Ignore errors - tools.ts may not be loaded yet\n }\n\n // Close old connections in background \u2014 don't block the refresh.\n // New connections (via getClients()) will be created independently.\n if (oldClients.length > 0) {\n closeClientsInBackground(oldClients)\n }\n } finally {\n pendingRefresh = false\n release()\n }\n}\n\n/**\n * Shuts down all MCP client connections gracefully.\n * Should be called when the application is exiting.\n * Unlike refresh, shutdown WAITS for connections to close.\n */\nexport async function shutdownMCPClients(): Promise<void> {\n if (connectedClients.length === 0) return\n\n const oldClients = connectedClients\n connectedClients = []\n\n const SHUTDOWN_TIMEOUT_MS = 3000\n const closePromises = oldClients.map(async wrappedClient => {\n if (wrappedClient.type === 'connected') {\n try {\n await wrappedClient.client.close()\n } catch {\n // Ignore errors during shutdown\n }\n }\n })\n\n try {\n await Promise.race([\n Promise.allSettled(closePromises),\n new Promise(resolve => setTimeout(resolve, SHUTDOWN_TIMEOUT_MS)),\n ])\n } catch {\n // Ignore timeout errors\n }\n\n // Clear caches so no stale state remains\n if (typeof getClients.cache?.clear === 'function') {\n getClients.cache.clear()\n }\n if (typeof getMCPTools.cache?.clear === 'function') {\n getMCPTools.cache.clear()\n }\n if (typeof getMCPCommands.cache?.clear === 'function') {\n getMCPCommands.cache.clear()\n }\n}\n\n/**\n * MCP Resource type for listing\n */\nexport type McpResource = {\n uri: string\n name: string\n description?: string\n mimeType?: string\n serverName: string\n}\n\n/**\n * List all resources from MCP servers\n * @param serverFilter Optional server name to filter resources from a specific server\n */\nexport async function listMCPResources(\n serverFilter?: string,\n): Promise<McpResource[]> {\n const results = await requestAll<\n ListResourcesResult,\n typeof ListResourcesResultSchema\n >(\n {\n method: 'resources/list',\n },\n ListResourcesResultSchema,\n 'resources',\n )\n\n return results\n .filter(({ client }) => !serverFilter || client.name === serverFilter)\n .flatMap(({ client, result }) =>\n (result.resources || []).map(resource => ({\n uri: resource.uri,\n name: resource.name,\n description: resource.description,\n mimeType: resource.mimeType,\n serverName: client.name,\n })),\n )\n}\n\n/**\n * MCP Resource content type\n */\nexport type McpResourceContent = {\n uri: string\n mimeType?: string\n text?: string\n blob?: string // Base64 encoded binary data\n}\n\n/**\n * Read a specific resource from an MCP server\n * @param uri The resource URI to read\n * @param serverName Optional server name to target a specific server\n */\nexport async function readMCPResource(\n uri: string,\n serverName?: string,\n): Promise<McpResourceContent | null> {\n const clients = await getClients()\n\n // Find the appropriate client\n const targetClients = serverName\n ? (clients.filter(\n c => c.type === 'connected' && c.name === serverName,\n ) as ConnectedClient[])\n : (clients.filter(c => c.type === 'connected') as ConnectedClient[])\n\n for (const client of targetClients) {\n try {\n // Check if this server has resources capability\n const capabilities = await client.client.getServerCapabilities()\n if (!capabilities?.resources) {\n continue\n }\n\n // Try to read the resource\n const result = (await client.client.request(\n {\n method: 'resources/read',\n params: { uri },\n },\n ReadResourceResultSchema,\n )) as ReadResourceResult\n\n if (result.contents && result.contents.length > 0) {\n const content = result.contents[0]\n return {\n uri: content.uri,\n mimeType: content.mimeType,\n text: 'text' in content ? String(content.text) : undefined,\n blob: 'blob' in content ? String(content.blob) : undefined,\n }\n } else {\n emitReminderEvent('mcp:resource_no_content', { resourceUri: uri })\n }\n } catch (error) {\n // Log but continue trying other servers\n logMCPError(\n client.name,\n `Failed to read resource '${uri}': ${error instanceof Error ? error.message : String(error)}`,\n )\n }\n }\n\n return null\n}\n"],
|
|
5
|
+
"mappings": "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",
|
|
6
6
|
"names": []
|
|
7
7
|
}
|
|
@@ -1,4 +1,5 @@
|
|
|
1
1
|
import { getGlobalConfig } from "../utils/config.js";
|
|
2
|
+
import { getHookManager } from "../utils/hookManager.js";
|
|
2
3
|
function sendITerm2Notification({ message, title }) {
|
|
3
4
|
const displayString = title ? `${title}:
|
|
4
5
|
${message}` : message;
|
|
@@ -13,6 +14,19 @@ function sendTerminalBell() {
|
|
|
13
14
|
process.stdout.write("\x07");
|
|
14
15
|
}
|
|
15
16
|
async function sendNotification(notif) {
|
|
17
|
+
const hookManager = getHookManager();
|
|
18
|
+
if (hookManager) {
|
|
19
|
+
try {
|
|
20
|
+
const result = await hookManager.executeNotification(
|
|
21
|
+
notif.message,
|
|
22
|
+
notif.title
|
|
23
|
+
);
|
|
24
|
+
if (result.suppressNotification) {
|
|
25
|
+
return;
|
|
26
|
+
}
|
|
27
|
+
} catch {
|
|
28
|
+
}
|
|
29
|
+
}
|
|
16
30
|
const channel = getGlobalConfig().preferredNotifChannel;
|
|
17
31
|
switch (channel) {
|
|
18
32
|
case "iterm2":
|
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
{
|
|
2
2
|
"version": 3,
|
|
3
3
|
"sources": ["../../src/services/notifier.ts"],
|
|
4
|
-
"sourcesContent": ["import { getGlobalConfig } from '@utils/config'\n\nexport type NotificationOptions = {\n message: string\n title?: string\n}\n\nfunction sendITerm2Notification({ message, title }: NotificationOptions): void {\n const displayString = title ? `${title}:\\n${message}` : message\n try {\n process.stdout.write(`\\x1b]9;\\n\\n${displayString}\\x07`)\n } catch {\n // Ignore errors\n }\n}\n\nfunction sendTerminalBell(): void {\n process.stdout.write('\\x07')\n}\n\nexport async function sendNotification(\n notif: NotificationOptions,\n): Promise<void> {\n const channel = getGlobalConfig().preferredNotifChannel\n switch (channel) {\n case 'iterm2':\n sendITerm2Notification(notif)\n break\n case 'terminal_bell':\n sendTerminalBell()\n break\n case 'iterm2_with_bell':\n sendITerm2Notification(notif)\n sendTerminalBell()\n break\n case 'notifications_disabled':\n // Do nothing\n break\n }\n}\n"],
|
|
5
|
-
"mappings": "AAAA,SAAS,uBAAuB;
|
|
4
|
+
"sourcesContent": ["import { getGlobalConfig } from '@utils/config'\nimport { getHookManager } from '@utils/hookManager'\n\nexport type NotificationOptions = {\n message: string\n title?: string\n}\n\nfunction sendITerm2Notification({ message, title }: NotificationOptions): void {\n const displayString = title ? `${title}:\\n${message}` : message\n try {\n process.stdout.write(`\\x1b]9;\\n\\n${displayString}\\x07`)\n } catch {\n // Ignore errors\n }\n}\n\nfunction sendTerminalBell(): void {\n process.stdout.write('\\x07')\n}\n\nexport async function sendNotification(\n notif: NotificationOptions,\n): Promise<void> {\n // Fire Notification hook \u2014 may suppress the notification\n const hookManager = getHookManager()\n if (hookManager) {\n try {\n const result = await hookManager.executeNotification(\n notif.message,\n notif.title,\n )\n if (result.suppressNotification) {\n return // Hook suppressed this notification\n }\n } catch {\n // Continue with notification on hook failure\n }\n }\n\n const channel = getGlobalConfig().preferredNotifChannel\n switch (channel) {\n case 'iterm2':\n sendITerm2Notification(notif)\n break\n case 'terminal_bell':\n sendTerminalBell()\n break\n case 'iterm2_with_bell':\n sendITerm2Notification(notif)\n sendTerminalBell()\n break\n case 'notifications_disabled':\n // Do nothing\n break\n }\n}\n"],
|
|
5
|
+
"mappings": "AAAA,SAAS,uBAAuB;AAChC,SAAS,sBAAsB;AAO/B,SAAS,uBAAuB,EAAE,SAAS,MAAM,GAA8B;AAC7E,QAAM,gBAAgB,QAAQ,GAAG,KAAK;AAAA,EAAM,OAAO,KAAK;AACxD,MAAI;AACF,YAAQ,OAAO,MAAM;AAAA;AAAA,EAAc,aAAa,MAAM;AAAA,EACxD,QAAQ;AAAA,EAER;AACF;AAEA,SAAS,mBAAyB;AAChC,UAAQ,OAAO,MAAM,MAAM;AAC7B;AAEA,eAAsB,iBACpB,OACe;AAEf,QAAM,cAAc,eAAe;AACnC,MAAI,aAAa;AACf,QAAI;AACF,YAAM,SAAS,MAAM,YAAY;AAAA,QAC/B,MAAM;AAAA,QACN,MAAM;AAAA,MACR;AACA,UAAI,OAAO,sBAAsB;AAC/B;AAAA,MACF;AAAA,IACF,QAAQ;AAAA,IAER;AAAA,EACF;AAEA,QAAM,UAAU,gBAAgB,EAAE;AAClC,UAAQ,SAAS;AAAA,IACf,KAAK;AACH,6BAAuB,KAAK;AAC5B;AAAA,IACF,KAAK;AACH,uBAAiB;AACjB;AAAA,IACF,KAAK;AACH,6BAAuB,KAAK;AAC5B,uBAAiB;AACjB;AAAA,IACF,KAAK;AAEH;AAAA,EACJ;AACF;",
|
|
6
6
|
"names": []
|
|
7
7
|
}
|
package/dist/services/oauth.js
CHANGED
|
@@ -169,7 +169,8 @@ class OAuthService {
|
|
|
169
169
|
headers: {
|
|
170
170
|
"Content-Type": "application/json"
|
|
171
171
|
},
|
|
172
|
-
body: JSON.stringify(requestBody)
|
|
172
|
+
body: JSON.stringify(requestBody),
|
|
173
|
+
signal: AbortSignal.timeout(3e4)
|
|
173
174
|
});
|
|
174
175
|
if (!response.ok) {
|
|
175
176
|
throw new Error(`Token exchange failed: ${response.statusText}`);
|
|
@@ -209,7 +210,8 @@ async function createAndStoreApiKey(accessToken) {
|
|
|
209
210
|
try {
|
|
210
211
|
const createApiKeyResp = await fetch(OAUTH_CONFIG.API_KEY_URL, {
|
|
211
212
|
method: "POST",
|
|
212
|
-
headers: { Authorization: `Bearer ${accessToken}` }
|
|
213
|
+
headers: { Authorization: `Bearer ${accessToken}` },
|
|
214
|
+
signal: AbortSignal.timeout(3e4)
|
|
213
215
|
});
|
|
214
216
|
let apiKeyData;
|
|
215
217
|
let errorText = "";
|
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
{
|
|
2
2
|
"version": 3,
|
|
3
3
|
"sources": ["../../src/services/oauth.ts"],
|
|
4
|
-
"sourcesContent": ["import * as crypto from 'crypto'\nimport * as http from 'http'\nimport { IncomingMessage, ServerResponse } from 'http'\nimport * as url from 'url'\n\nimport { OAUTH_CONFIG } from '@constants/oauth'\nimport { openBrowser } from '@utils/browser'\nimport { logError } from '@utils/log'\nimport { resetAnthropicClient } from './claude'\nimport {\n AccountInfo,\n getGlobalConfig,\n saveGlobalConfig,\n normalizeApiKeyForConfig,\n} from '@utils/config'\n\n// Base64URL encoding function (RFC 4648)\nfunction base64URLEncode(buffer: Buffer): string {\n return buffer\n .toString('base64')\n .replace(/\\+/g, '-')\n .replace(/\\//g, '_')\n .replace(/=/g, '')\n}\n\nfunction generateCodeVerifier(): string {\n return base64URLEncode(crypto.randomBytes(32))\n}\n\nasync function generateCodeChallenge(verifier: string): Promise<string> {\n const encoder = new TextEncoder()\n const data = encoder.encode(verifier)\n const digest = await crypto.subtle.digest('SHA-256', data)\n return base64URLEncode(Buffer.from(digest))\n}\n\ntype OAuthTokenExchangeResponse = {\n access_token: string\n account?: {\n uuid: string\n email_address: string\n }\n organization?: {\n uuid: string\n name: string\n }\n}\n\nexport type OAuthResult = {\n accessToken: string\n}\n\nexport class OAuthService {\n private server: http.Server | null = null\n private codeVerifier: string\n private expectedState: string | null = null\n private pendingCodePromise: {\n resolve: (result: {\n authorizationCode: string\n useManualRedirect: boolean\n }) => void\n reject: (err: Error) => void\n } | null = null\n\n constructor() {\n this.codeVerifier = generateCodeVerifier()\n }\n\n private generateAuthUrls(\n codeChallenge: string,\n state: string,\n ): { autoUrl: string; manualUrl: string } {\n function makeUrl(isManual: boolean): string {\n const authUrl = new URL(OAUTH_CONFIG.AUTHORIZE_URL)\n authUrl.searchParams.append('client_id', OAUTH_CONFIG.CLIENT_ID)\n authUrl.searchParams.append('response_type', 'code')\n authUrl.searchParams.append(\n 'redirect_uri',\n isManual\n ? OAUTH_CONFIG.MANUAL_REDIRECT_URL\n : `http://localhost:${OAUTH_CONFIG.REDIRECT_PORT}/callback`,\n )\n authUrl.searchParams.append('scope', OAUTH_CONFIG.SCOPES.join(' '))\n authUrl.searchParams.append('code_challenge', codeChallenge)\n authUrl.searchParams.append('code_challenge_method', 'S256')\n authUrl.searchParams.append('state', state)\n return authUrl.toString()\n }\n\n return {\n autoUrl: makeUrl(false),\n manualUrl: makeUrl(true),\n }\n }\n\n async startOAuthFlow(\n authURLHandler: (url: string) => Promise<void>,\n ): Promise<OAuthResult> {\n const codeChallenge = await generateCodeChallenge(this.codeVerifier)\n const state = base64URLEncode(crypto.randomBytes(32))\n this.expectedState = state\n const { autoUrl, manualUrl } = this.generateAuthUrls(codeChallenge, state)\n\n const onReady = async () => {\n await authURLHandler(manualUrl)\n await openBrowser(autoUrl)\n }\n\n const { authorizationCode, useManualRedirect } = await new Promise<{\n authorizationCode: string\n useManualRedirect: boolean\n }>((resolve, reject) => {\n this.pendingCodePromise = { resolve, reject }\n this.startLocalServer(state, onReady)\n })\n\n // Exchange code for tokens\n const {\n access_token: accessToken,\n account,\n organization,\n } = await this.exchangeCodeForTokens(\n authorizationCode,\n state,\n useManualRedirect,\n )\n\n // Store account info\n if (account) {\n const accountInfo: AccountInfo = {\n accountUuid: account.uuid,\n emailAddress: account.email_address,\n organizationUuid: organization?.uuid,\n }\n const config = getGlobalConfig()\n config.oauthAccount = accountInfo\n saveGlobalConfig(config)\n }\n\n return { accessToken }\n }\n\n private startLocalServer(state: string, onReady?: () => void): void {\n if (this.server) {\n this.closeServer()\n }\n this.server = http.createServer(\n (req: IncomingMessage, res: ServerResponse) => {\n const parsedUrl = url.parse(req.url || '', true)\n\n if (parsedUrl.pathname === '/callback') {\n const authorizationCode = parsedUrl.query.code as string\n const returnedState = parsedUrl.query.state as string\n\n if (!authorizationCode) {\n res.writeHead(400)\n res.end('Authorization code not found')\n if (this.pendingCodePromise) {\n this.pendingCodePromise.reject(\n new Error('No authorization code received'),\n )\n }\n return\n }\n\n if (returnedState !== state) {\n res.writeHead(400)\n res.end('Invalid state parameter')\n if (this.pendingCodePromise) {\n this.pendingCodePromise.reject(\n new Error('Invalid state parameter'), // Possible CSRF attack\n )\n }\n return\n }\n\n res.writeHead(302, {\n Location: OAUTH_CONFIG.SUCCESS_URL,\n })\n res.end()\n\n this.processCallback({\n authorizationCode,\n state,\n useManualRedirect: false,\n })\n } else {\n res.writeHead(404)\n res.end()\n }\n },\n )\n\n this.server.listen(OAUTH_CONFIG.REDIRECT_PORT, async () => {\n onReady?.()\n })\n\n this.server.on('error', (err: Error) => {\n const portError = err as NodeJS.ErrnoException\n if (portError.code === 'EADDRINUSE') {\n const error = new Error(\n `Port ${OAUTH_CONFIG.REDIRECT_PORT} is already in use. Please ensure no other applications are using this port.`,\n )\n logError(error)\n this.closeServer()\n if (this.pendingCodePromise) {\n this.pendingCodePromise.reject(error)\n }\n return\n } else {\n logError(err)\n this.closeServer()\n if (this.pendingCodePromise) {\n this.pendingCodePromise.reject(err)\n }\n return\n }\n })\n }\n\n private async exchangeCodeForTokens(\n authorizationCode: string,\n state: string,\n useManualRedirect: boolean = false,\n ): Promise<OAuthTokenExchangeResponse> {\n const requestBody = {\n grant_type: 'authorization_code',\n code: authorizationCode,\n redirect_uri: useManualRedirect\n ? OAUTH_CONFIG.MANUAL_REDIRECT_URL\n : `http://localhost:${OAUTH_CONFIG.REDIRECT_PORT}/callback`,\n client_id: OAUTH_CONFIG.CLIENT_ID,\n code_verifier: this.codeVerifier,\n state,\n }\n\n const response = await fetch(OAUTH_CONFIG.TOKEN_URL, {\n method: 'POST',\n headers: {\n 'Content-Type': 'application/json',\n },\n body: JSON.stringify(requestBody),\n })\n\n if (!response.ok) {\n throw new Error(`Token exchange failed: ${response.statusText}`)\n }\n\n const data = await response.json()\n return data\n }\n\n processCallback({\n authorizationCode,\n state,\n useManualRedirect,\n }: {\n authorizationCode: string\n state: string\n useManualRedirect: boolean\n }): void {\n this.closeServer()\n\n if (state !== this.expectedState) {\n if (this.pendingCodePromise) {\n this.pendingCodePromise.reject(\n new Error('Invalid state parameter'), // Possible CSRF attack\n )\n this.pendingCodePromise = null\n }\n return\n }\n\n if (this.pendingCodePromise) {\n this.pendingCodePromise.resolve({ authorizationCode, useManualRedirect })\n this.pendingCodePromise = null\n }\n }\n\n private closeServer(): void {\n if (this.server) {\n this.server.close()\n this.server = null\n }\n }\n}\n\nexport async function createAndStoreApiKey(\n accessToken: string,\n): Promise<string | null> {\n try {\n // Call create_api_key endpoint\n const createApiKeyResp = await fetch(OAUTH_CONFIG.API_KEY_URL, {\n method: 'POST',\n headers: { Authorization: `Bearer ${accessToken}` },\n })\n\n let apiKeyData\n let errorText = ''\n\n try {\n apiKeyData = await createApiKeyResp.json()\n } catch (_e) {\n // If response is not valid JSON, get as text for error logging\n errorText = await createApiKeyResp.text()\n }\n\n if (createApiKeyResp.ok && apiKeyData && apiKeyData.raw_key) {\n const apiKey = apiKeyData.raw_key\n\n // Store in global config\n const config = getGlobalConfig()\n\n // Note: API key is now managed per model profile\n\n // Add to approved list\n if (!config.customApiKeyResponses) {\n config.customApiKeyResponses = { approved: [], rejected: [] }\n }\n if (!config.customApiKeyResponses.approved) {\n config.customApiKeyResponses.approved = []\n }\n\n const normalizedKey = normalizeApiKeyForConfig(apiKey)\n if (!config.customApiKeyResponses.approved.includes(normalizedKey)) {\n config.customApiKeyResponses.approved.push(normalizedKey)\n }\n\n // Save config\n saveGlobalConfig(config)\n\n // Reset the Anthropic client to force creation with new API key\n resetAnthropicClient()\n\n return apiKey\n }\n\n return null\n } catch (error) {\n throw error\n }\n}\n"],
|
|
5
|
-
"mappings": "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
|
|
4
|
+
"sourcesContent": ["import * as crypto from 'crypto'\nimport * as http from 'http'\nimport { IncomingMessage, ServerResponse } from 'http'\nimport * as url from 'url'\n\nimport { OAUTH_CONFIG } from '@constants/oauth'\nimport { openBrowser } from '@utils/browser'\nimport { logError } from '@utils/log'\nimport { resetAnthropicClient } from './claude'\nimport {\n AccountInfo,\n getGlobalConfig,\n saveGlobalConfig,\n normalizeApiKeyForConfig,\n} from '@utils/config'\n\n// Base64URL encoding function (RFC 4648)\nfunction base64URLEncode(buffer: Buffer): string {\n return buffer\n .toString('base64')\n .replace(/\\+/g, '-')\n .replace(/\\//g, '_')\n .replace(/=/g, '')\n}\n\nfunction generateCodeVerifier(): string {\n return base64URLEncode(crypto.randomBytes(32))\n}\n\nasync function generateCodeChallenge(verifier: string): Promise<string> {\n const encoder = new TextEncoder()\n const data = encoder.encode(verifier)\n const digest = await crypto.subtle.digest('SHA-256', data)\n return base64URLEncode(Buffer.from(digest))\n}\n\ntype OAuthTokenExchangeResponse = {\n access_token: string\n account?: {\n uuid: string\n email_address: string\n }\n organization?: {\n uuid: string\n name: string\n }\n}\n\nexport type OAuthResult = {\n accessToken: string\n}\n\nexport class OAuthService {\n private server: http.Server | null = null\n private codeVerifier: string\n private expectedState: string | null = null\n private pendingCodePromise: {\n resolve: (result: {\n authorizationCode: string\n useManualRedirect: boolean\n }) => void\n reject: (err: Error) => void\n } | null = null\n\n constructor() {\n this.codeVerifier = generateCodeVerifier()\n }\n\n private generateAuthUrls(\n codeChallenge: string,\n state: string,\n ): { autoUrl: string; manualUrl: string } {\n function makeUrl(isManual: boolean): string {\n const authUrl = new URL(OAUTH_CONFIG.AUTHORIZE_URL)\n authUrl.searchParams.append('client_id', OAUTH_CONFIG.CLIENT_ID)\n authUrl.searchParams.append('response_type', 'code')\n authUrl.searchParams.append(\n 'redirect_uri',\n isManual\n ? OAUTH_CONFIG.MANUAL_REDIRECT_URL\n : `http://localhost:${OAUTH_CONFIG.REDIRECT_PORT}/callback`,\n )\n authUrl.searchParams.append('scope', OAUTH_CONFIG.SCOPES.join(' '))\n authUrl.searchParams.append('code_challenge', codeChallenge)\n authUrl.searchParams.append('code_challenge_method', 'S256')\n authUrl.searchParams.append('state', state)\n return authUrl.toString()\n }\n\n return {\n autoUrl: makeUrl(false),\n manualUrl: makeUrl(true),\n }\n }\n\n async startOAuthFlow(\n authURLHandler: (url: string) => Promise<void>,\n ): Promise<OAuthResult> {\n const codeChallenge = await generateCodeChallenge(this.codeVerifier)\n const state = base64URLEncode(crypto.randomBytes(32))\n this.expectedState = state\n const { autoUrl, manualUrl } = this.generateAuthUrls(codeChallenge, state)\n\n const onReady = async () => {\n await authURLHandler(manualUrl)\n await openBrowser(autoUrl)\n }\n\n const { authorizationCode, useManualRedirect } = await new Promise<{\n authorizationCode: string\n useManualRedirect: boolean\n }>((resolve, reject) => {\n this.pendingCodePromise = { resolve, reject }\n this.startLocalServer(state, onReady)\n })\n\n // Exchange code for tokens\n const {\n access_token: accessToken,\n account,\n organization,\n } = await this.exchangeCodeForTokens(\n authorizationCode,\n state,\n useManualRedirect,\n )\n\n // Store account info\n if (account) {\n const accountInfo: AccountInfo = {\n accountUuid: account.uuid,\n emailAddress: account.email_address,\n organizationUuid: organization?.uuid,\n }\n const config = getGlobalConfig()\n config.oauthAccount = accountInfo\n saveGlobalConfig(config)\n }\n\n return { accessToken }\n }\n\n private startLocalServer(state: string, onReady?: () => void): void {\n if (this.server) {\n this.closeServer()\n }\n this.server = http.createServer(\n (req: IncomingMessage, res: ServerResponse) => {\n const parsedUrl = url.parse(req.url || '', true)\n\n if (parsedUrl.pathname === '/callback') {\n const authorizationCode = parsedUrl.query.code as string\n const returnedState = parsedUrl.query.state as string\n\n if (!authorizationCode) {\n res.writeHead(400)\n res.end('Authorization code not found')\n if (this.pendingCodePromise) {\n this.pendingCodePromise.reject(\n new Error('No authorization code received'),\n )\n }\n return\n }\n\n if (returnedState !== state) {\n res.writeHead(400)\n res.end('Invalid state parameter')\n if (this.pendingCodePromise) {\n this.pendingCodePromise.reject(\n new Error('Invalid state parameter'), // Possible CSRF attack\n )\n }\n return\n }\n\n res.writeHead(302, {\n Location: OAUTH_CONFIG.SUCCESS_URL,\n })\n res.end()\n\n this.processCallback({\n authorizationCode,\n state,\n useManualRedirect: false,\n })\n } else {\n res.writeHead(404)\n res.end()\n }\n },\n )\n\n this.server.listen(OAUTH_CONFIG.REDIRECT_PORT, async () => {\n onReady?.()\n })\n\n this.server.on('error', (err: Error) => {\n const portError = err as NodeJS.ErrnoException\n if (portError.code === 'EADDRINUSE') {\n const error = new Error(\n `Port ${OAUTH_CONFIG.REDIRECT_PORT} is already in use. Please ensure no other applications are using this port.`,\n )\n logError(error)\n this.closeServer()\n if (this.pendingCodePromise) {\n this.pendingCodePromise.reject(error)\n }\n return\n } else {\n logError(err)\n this.closeServer()\n if (this.pendingCodePromise) {\n this.pendingCodePromise.reject(err)\n }\n return\n }\n })\n }\n\n private async exchangeCodeForTokens(\n authorizationCode: string,\n state: string,\n useManualRedirect: boolean = false,\n ): Promise<OAuthTokenExchangeResponse> {\n const requestBody = {\n grant_type: 'authorization_code',\n code: authorizationCode,\n redirect_uri: useManualRedirect\n ? OAUTH_CONFIG.MANUAL_REDIRECT_URL\n : `http://localhost:${OAUTH_CONFIG.REDIRECT_PORT}/callback`,\n client_id: OAUTH_CONFIG.CLIENT_ID,\n code_verifier: this.codeVerifier,\n state,\n }\n\n const response = await fetch(OAUTH_CONFIG.TOKEN_URL, {\n method: 'POST',\n headers: {\n 'Content-Type': 'application/json',\n },\n body: JSON.stringify(requestBody),\n signal: AbortSignal.timeout(30_000),\n })\n\n if (!response.ok) {\n throw new Error(`Token exchange failed: ${response.statusText}`)\n }\n\n const data = await response.json()\n return data\n }\n\n processCallback({\n authorizationCode,\n state,\n useManualRedirect,\n }: {\n authorizationCode: string\n state: string\n useManualRedirect: boolean\n }): void {\n this.closeServer()\n\n if (state !== this.expectedState) {\n if (this.pendingCodePromise) {\n this.pendingCodePromise.reject(\n new Error('Invalid state parameter'), // Possible CSRF attack\n )\n this.pendingCodePromise = null\n }\n return\n }\n\n if (this.pendingCodePromise) {\n this.pendingCodePromise.resolve({ authorizationCode, useManualRedirect })\n this.pendingCodePromise = null\n }\n }\n\n private closeServer(): void {\n if (this.server) {\n this.server.close()\n this.server = null\n }\n }\n}\n\nexport async function createAndStoreApiKey(\n accessToken: string,\n): Promise<string | null> {\n try {\n // Call create_api_key endpoint\n const createApiKeyResp = await fetch(OAUTH_CONFIG.API_KEY_URL, {\n method: 'POST',\n headers: { Authorization: `Bearer ${accessToken}` },\n signal: AbortSignal.timeout(30_000),\n })\n\n let apiKeyData\n let errorText = ''\n\n try {\n apiKeyData = await createApiKeyResp.json()\n } catch (_e) {\n // If response is not valid JSON, get as text for error logging\n errorText = await createApiKeyResp.text()\n }\n\n if (createApiKeyResp.ok && apiKeyData && apiKeyData.raw_key) {\n const apiKey = apiKeyData.raw_key\n\n // Store in global config\n const config = getGlobalConfig()\n\n // Note: API key is now managed per model profile\n\n // Add to approved list\n if (!config.customApiKeyResponses) {\n config.customApiKeyResponses = { approved: [], rejected: [] }\n }\n if (!config.customApiKeyResponses.approved) {\n config.customApiKeyResponses.approved = []\n }\n\n const normalizedKey = normalizeApiKeyForConfig(apiKey)\n if (!config.customApiKeyResponses.approved.includes(normalizedKey)) {\n config.customApiKeyResponses.approved.push(normalizedKey)\n }\n\n // Save config\n saveGlobalConfig(config)\n\n // Reset the Anthropic client to force creation with new API key\n resetAnthropicClient()\n\n return apiKey\n }\n\n return null\n } catch (error) {\n throw error\n }\n}\n"],
|
|
5
|
+
"mappings": "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",
|
|
6
6
|
"names": []
|
|
7
7
|
}
|
package/dist/services/openai.js
CHANGED
|
@@ -7,23 +7,17 @@ import {
|
|
|
7
7
|
logAPIError
|
|
8
8
|
} from "../utils/debugLogger.js";
|
|
9
9
|
import { logError } from "../utils/log.js";
|
|
10
|
-
import {
|
|
10
|
+
import {
|
|
11
|
+
abortableDelay,
|
|
12
|
+
getRetryDelay as sharedGetRetryDelay
|
|
13
|
+
} from "../utils/async.js";
|
|
11
14
|
import {
|
|
12
15
|
UserFriendlyError
|
|
13
16
|
} from "../utils/userFriendlyError.js";
|
|
14
|
-
|
|
15
|
-
|
|
16
|
-
|
|
17
|
-
|
|
18
|
-
if (retryAfter) {
|
|
19
|
-
const retryAfterMs = parseInt(retryAfter) * 1e3;
|
|
20
|
-
if (!isNaN(retryAfterMs) && retryAfterMs > 0) {
|
|
21
|
-
return Math.min(retryAfterMs, RETRY_CONFIG.maxServerDelayMs);
|
|
22
|
-
}
|
|
23
|
-
}
|
|
24
|
-
const delay = RETRY_CONFIG.baseDelayMs * Math.pow(2, attempt - 1);
|
|
25
|
-
const jitter = Math.random() * RETRY_CONFIG.jitterFactor * delay;
|
|
26
|
-
return Math.min(delay + jitter, RETRY_CONFIG.maxDelayMs);
|
|
17
|
+
import { isOpenAICompatibleProvider } from "../constants/providers.js";
|
|
18
|
+
import { getEffectiveCapabilities } from "../constants/providerRegistry.js";
|
|
19
|
+
function getRetryDelay(attempt) {
|
|
20
|
+
return sharedGetRetryDelay(attempt);
|
|
27
21
|
}
|
|
28
22
|
var ModelErrorType = /* @__PURE__ */ ((ModelErrorType2) => {
|
|
29
23
|
ModelErrorType2["MaxLength"] = "1024";
|
|
@@ -275,6 +269,38 @@ function applyModelSpecificTransformations(opts) {
|
|
|
275
269
|
}
|
|
276
270
|
}
|
|
277
271
|
}
|
|
272
|
+
function normalizeRequestParams(opts, provider) {
|
|
273
|
+
if (!opts.model || typeof opts.model !== "string") {
|
|
274
|
+
return;
|
|
275
|
+
}
|
|
276
|
+
const caps = getEffectiveCapabilities(provider, opts.model);
|
|
277
|
+
const correctField = caps.maxTokensField;
|
|
278
|
+
if (correctField === "max_completion_tokens") {
|
|
279
|
+
if ("max_tokens" in opts && !("max_completion_tokens" in opts)) {
|
|
280
|
+
opts.max_completion_tokens = opts.max_tokens;
|
|
281
|
+
delete opts.max_tokens;
|
|
282
|
+
}
|
|
283
|
+
} else if (correctField === "max_tokens") {
|
|
284
|
+
if ("max_completion_tokens" in opts && !("max_tokens" in opts)) {
|
|
285
|
+
opts.max_tokens = opts.max_completion_tokens;
|
|
286
|
+
delete opts.max_completion_tokens;
|
|
287
|
+
}
|
|
288
|
+
}
|
|
289
|
+
if (caps.temperatureRange === "omit") {
|
|
290
|
+
delete opts.temperature;
|
|
291
|
+
} else if ("temperature" in opts && opts.temperature !== void 0) {
|
|
292
|
+
const { min, max } = caps.temperatureRange;
|
|
293
|
+
opts.temperature = Math.max(min, Math.min(max, opts.temperature));
|
|
294
|
+
}
|
|
295
|
+
if (caps.supportsToolChoice === "auto-only" && opts.tool_choice && typeof opts.tool_choice === "object") {
|
|
296
|
+
opts.tool_choice = "auto";
|
|
297
|
+
} else if (caps.supportsToolChoice === false) {
|
|
298
|
+
delete opts.tool_choice;
|
|
299
|
+
}
|
|
300
|
+
if (caps.maxStopSequences !== null && opts.stop && Array.isArray(opts.stop) && opts.stop.length > caps.maxStopSequences) {
|
|
301
|
+
opts.stop = opts.stop.slice(0, caps.maxStopSequences);
|
|
302
|
+
}
|
|
303
|
+
}
|
|
278
304
|
async function applyModelErrorFixes(opts, baseURL) {
|
|
279
305
|
const isGPT5 = opts.model.startsWith("gpt-5");
|
|
280
306
|
const handlers = isGPT5 ? [...GPT5_ERROR_HANDLERS, ...ERROR_HANDLERS] : ERROR_HANDLERS;
|
|
@@ -348,6 +374,7 @@ async function getCompletionWithProfile(modelProfile, opts, attempt = 0, maxAtte
|
|
|
348
374
|
}
|
|
349
375
|
}
|
|
350
376
|
applyModelSpecificTransformations(opts);
|
|
377
|
+
normalizeRequestParams(opts, provider);
|
|
351
378
|
await applyModelErrorFixes(opts, baseURL || "");
|
|
352
379
|
debugLogger.api("OPENAI_API_CALL_START", {
|
|
353
380
|
endpoint: baseURL || "DEFAULT_OPENAI",
|
|
@@ -388,22 +415,8 @@ async function getCompletionWithProfile(modelProfile, opts, attempt = 0, maxAtte
|
|
|
388
415
|
}
|
|
389
416
|
try {
|
|
390
417
|
if (opts.stream) {
|
|
391
|
-
const isOpenAICompatible2 = [
|
|
392
|
-
"minimax",
|
|
393
|
-
"kimi",
|
|
394
|
-
"deepseek",
|
|
395
|
-
"siliconflow",
|
|
396
|
-
"qwen",
|
|
397
|
-
"glm",
|
|
398
|
-
"baidu-qianfan",
|
|
399
|
-
"openai",
|
|
400
|
-
"mistral",
|
|
401
|
-
"xai",
|
|
402
|
-
"groq",
|
|
403
|
-
"custom-openai"
|
|
404
|
-
].includes(provider);
|
|
405
418
|
let response2;
|
|
406
|
-
if (
|
|
419
|
+
if (isOpenAICompatibleProvider(provider) && provider !== "azure") {
|
|
407
420
|
const result = await tryWithEndpointFallback(
|
|
408
421
|
baseURL,
|
|
409
422
|
opts,
|
|
@@ -489,9 +502,12 @@ async function getCompletionWithProfile(modelProfile, opts, attempt = 0, maxAtte
|
|
|
489
502
|
});
|
|
490
503
|
}
|
|
491
504
|
const delayMs = getRetryDelay(attempt);
|
|
492
|
-
|
|
493
|
-
|
|
494
|
-
|
|
505
|
+
debugLogger.warn("API_RETRY", {
|
|
506
|
+
status: response2.status,
|
|
507
|
+
delayMs,
|
|
508
|
+
attempt: attempt + 1,
|
|
509
|
+
maxAttempts
|
|
510
|
+
});
|
|
495
511
|
try {
|
|
496
512
|
await abortableDelay(delayMs, signal);
|
|
497
513
|
} catch (error) {
|
|
@@ -512,22 +528,8 @@ async function getCompletionWithProfile(modelProfile, opts, attempt = 0, maxAtte
|
|
|
512
528
|
const stream = createStreamProcessor(response2.body, signal);
|
|
513
529
|
return stream;
|
|
514
530
|
}
|
|
515
|
-
const isOpenAICompatible = [
|
|
516
|
-
"minimax",
|
|
517
|
-
"kimi",
|
|
518
|
-
"deepseek",
|
|
519
|
-
"siliconflow",
|
|
520
|
-
"qwen",
|
|
521
|
-
"glm",
|
|
522
|
-
"baidu-qianfan",
|
|
523
|
-
"openai",
|
|
524
|
-
"mistral",
|
|
525
|
-
"xai",
|
|
526
|
-
"groq",
|
|
527
|
-
"custom-openai"
|
|
528
|
-
].includes(provider);
|
|
529
531
|
let response;
|
|
530
|
-
if (
|
|
532
|
+
if (isOpenAICompatibleProvider(provider) && provider !== "azure") {
|
|
531
533
|
const result = await tryWithEndpointFallback(
|
|
532
534
|
baseURL,
|
|
533
535
|
opts,
|
|
@@ -590,9 +592,12 @@ async function getCompletionWithProfile(modelProfile, opts, attempt = 0, maxAtte
|
|
|
590
592
|
debugLogger.warn("OPENAI_PARSE_ERROR", { status: response.status });
|
|
591
593
|
}
|
|
592
594
|
const delayMs = getRetryDelay(attempt);
|
|
593
|
-
|
|
594
|
-
|
|
595
|
-
|
|
595
|
+
debugLogger.warn("API_RETRY", {
|
|
596
|
+
status: response.status,
|
|
597
|
+
delayMs,
|
|
598
|
+
attempt: attempt + 1,
|
|
599
|
+
maxAttempts
|
|
600
|
+
});
|
|
596
601
|
try {
|
|
597
602
|
await abortableDelay(delayMs, signal);
|
|
598
603
|
} catch (error) {
|
|
@@ -621,9 +626,12 @@ async function getCompletionWithProfile(modelProfile, opts, attempt = 0, maxAtte
|
|
|
621
626
|
throw new Error("Request cancelled by user");
|
|
622
627
|
}
|
|
623
628
|
const delayMs = getRetryDelay(attempt);
|
|
624
|
-
|
|
625
|
-
|
|
626
|
-
|
|
629
|
+
debugLogger.warn("API_RETRY", {
|
|
630
|
+
error: "network_error",
|
|
631
|
+
delayMs,
|
|
632
|
+
attempt: attempt + 1,
|
|
633
|
+
maxAttempts
|
|
634
|
+
});
|
|
627
635
|
try {
|
|
628
636
|
await abortableDelay(delayMs, signal);
|
|
629
637
|
} catch (error2) {
|
|
@@ -746,9 +754,9 @@ async function callGPT5ResponsesAPI(modelProfile, opts, signal) {
|
|
|
746
754
|
// Responses API uses 'input' instead of 'messages'
|
|
747
755
|
};
|
|
748
756
|
if (opts.max_completion_tokens) {
|
|
749
|
-
responsesParams.
|
|
757
|
+
responsesParams.max_output_tokens = opts.max_completion_tokens;
|
|
750
758
|
} else if (opts.max_tokens) {
|
|
751
|
-
responsesParams.
|
|
759
|
+
responsesParams.max_output_tokens = opts.max_tokens;
|
|
752
760
|
}
|
|
753
761
|
if (opts.temperature === 1) {
|
|
754
762
|
responsesParams.temperature = 1;
|
|
@@ -959,7 +967,8 @@ async function fetchCustomModels(baseURL, apiKey) {
|
|
|
959
967
|
headers: {
|
|
960
968
|
Authorization: `Bearer ${apiKey}`,
|
|
961
969
|
"Content-Type": "application/json"
|
|
962
|
-
}
|
|
970
|
+
},
|
|
971
|
+
signal: AbortSignal.timeout(3e4)
|
|
963
972
|
});
|
|
964
973
|
if (!response.ok) {
|
|
965
974
|
if (response.status === 401) {
|
|
@@ -1034,6 +1043,7 @@ export {
|
|
|
1034
1043
|
getCompletionWithProfile,
|
|
1035
1044
|
getGPT5CompletionWithProfile,
|
|
1036
1045
|
getModelFeatures,
|
|
1046
|
+
normalizeRequestParams,
|
|
1037
1047
|
streamCompletion
|
|
1038
1048
|
};
|
|
1039
1049
|
//# sourceMappingURL=openai.js.map
|