ethagent 3.3.3 → 4.0.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/.claude-plugin/marketplace.json +11 -0
- package/.claude-plugin/plugin.json +35 -0
- package/LICENSE +1 -1
- package/README.md +64 -104
- package/commands/ethagent.md +40 -0
- package/package.json +16 -16
- package/src/app/keybindings/KeybindingProvider.tsx +1 -6
- package/src/app/keybindings/types.ts +1 -6
- package/src/cli/ResetConfirmView.tsx +54 -53
- package/src/cli/demo.ts +86 -0
- package/src/cli/hookIo.ts +45 -0
- package/src/cli/main.tsx +94 -123
- package/src/cli/memoryGuard.ts +49 -0
- package/src/cli/reset.ts +28 -70
- package/src/cli/sessionStart.ts +33 -0
- package/src/cli/status.ts +46 -0
- package/src/cli/sync.ts +167 -0
- package/src/cli/syncAdapters/claude-code.ts +86 -0
- package/src/cli/syncAdapters/codex.ts +66 -0
- package/src/cli/syncAdapters/index.ts +45 -0
- package/src/cli/syncAdapters/managedBlock.ts +175 -0
- package/src/cli/syncAdapters/shared.ts +63 -0
- package/src/identity/continuity/envelopeParse.ts +20 -1
- package/src/identity/continuity/publicSkills.ts +3 -1
- package/src/identity/continuity/skills/publicSkillsSync.ts +2 -1
- package/src/identity/continuity/skills/scaffold.ts +5 -2
- package/src/identity/continuity/snapshots.ts +12 -5
- package/src/identity/continuity/storage/defaults.ts +20 -19
- package/src/identity/continuity/storage/status.ts +1 -1
- package/src/identity/ens/ensLookup/constants.ts +1 -1
- package/src/identity/manager/IdentityManager.tsx +33 -0
- package/src/identity/{hub → manager}/OperationalRoutes.tsx +37 -18
- package/src/identity/{hub → manager}/Routes.tsx +48 -34
- package/src/identity/{hub → manager}/continuity/ContinuityDashboardScreen.tsx +9 -19
- package/src/identity/{hub → manager}/continuity/RebackupStorageScreen.tsx +3 -3
- package/src/identity/manager/continuity/RecoveryConfirmScreen.tsx +102 -0
- package/src/identity/{hub → manager}/continuity/SavePromptScreen.tsx +2 -3
- package/src/identity/{hub → manager}/continuity/completion.ts +1 -1
- package/src/identity/{hub → manager}/continuity/effects.ts +1 -1
- package/src/identity/{hub → manager}/continuity/skills/DeleteSkillConfirmScreen.tsx +2 -2
- package/src/identity/{hub → manager}/continuity/skills/NewSkillScreen.tsx +0 -5
- package/src/identity/{hub → manager}/continuity/skills/NewSkillVisibilityScreen.tsx +4 -4
- package/src/identity/{hub → manager}/continuity/skills/SkillActionsScreen.tsx +6 -22
- package/src/identity/{hub → manager}/continuity/skills/SkillsTreeScreen.tsx +5 -17
- package/src/identity/{hub → manager}/continuity/snapshot.ts +1 -1
- package/src/identity/{hub → manager}/continuity/vault.ts +1 -1
- package/src/identity/{hub → manager}/create/CreateFlow.tsx +59 -32
- package/src/identity/{hub → manager}/create/effects.ts +19 -10
- package/src/identity/manager/create/importScan.ts +122 -0
- package/src/identity/{hub → manager}/custody/CustodyEditFlow.tsx +17 -61
- package/src/identity/{hub → manager}/custody/actions.ts +1 -15
- package/src/identity/{hub → manager}/custody/routes.tsx +20 -40
- package/src/identity/{hub → manager}/custody/transactions.ts +1 -0
- package/src/identity/{hub → manager}/custody/types.ts +1 -2
- package/src/identity/{hub → manager}/custody/useCustodyEffects.ts +1 -1
- package/src/identity/{hub → manager}/ens/EnsEditAdvancedScreens.tsx +2 -2
- package/src/identity/{hub → manager}/ens/EnsEditMaintenanceScreens.tsx +12 -23
- package/src/identity/{hub → manager}/ens/EnsEditReviewScreens.tsx +18 -42
- package/src/identity/{hub → manager}/ens/EnsEditRunners.tsx +1 -1
- package/src/identity/{hub → manager}/ens/EnsEditShared.tsx +0 -2
- package/src/identity/{hub → manager}/ens/EnsEditSimpleScreens.tsx +10 -19
- package/src/identity/{hub → manager}/ens/EnsFlow.tsx +133 -41
- package/src/identity/{hub → manager}/ens/EnsOperatorWalletsScreen.tsx +14 -19
- package/src/identity/{hub → manager}/ens/editCopy.ts +1 -14
- package/src/identity/{hub → manager}/profile/EditProfileFlow.tsx +99 -66
- package/src/identity/{hub → manager}/profile/effects.ts +1 -3
- package/src/identity/{hub → manager}/profile/operatorSave.ts +1 -1
- package/src/identity/{hub → manager}/profile/state.ts +1 -1
- package/src/identity/{hub/identityHubReducer.ts → manager/reducer.ts} +25 -26
- package/src/identity/{hub → manager}/restore/RestoreFlow.tsx +16 -24
- package/src/identity/{hub → manager}/restore/apply.ts +1 -1
- package/src/identity/{hub → manager}/restore/auth.ts +1 -1
- package/src/identity/{hub → manager}/restore/discover.ts +1 -1
- package/src/identity/{hub → manager}/restore/fetch.ts +1 -1
- package/src/identity/{hub → manager}/restore/restoreAdmin.ts +1 -1
- package/src/identity/{hub → manager}/restore/useRestoreEffects.ts +2 -9
- package/src/identity/{hub → manager}/settings/StorageCredentialScreen.tsx +10 -25
- package/src/identity/{hub → manager}/shared/components/DetailsScreen.tsx +5 -7
- package/src/identity/{hub → manager}/shared/components/ErrorScreen.tsx +6 -10
- package/src/identity/{hub → manager}/shared/components/FlowTimeline.tsx +4 -3
- package/src/identity/{hub → manager}/shared/components/IdentitySummary.tsx +19 -59
- package/src/identity/manager/shared/components/LazyMenu.tsx +147 -0
- package/src/identity/manager/shared/components/MenuScreen.tsx +220 -0
- package/src/identity/manager/shared/components/OperationCompleteScreen.tsx +28 -0
- package/src/identity/{hub → manager}/shared/components/UnlinkedIdentityScreen.tsx +9 -10
- package/src/identity/{hub → manager}/shared/components/WalletApprovalScreen.tsx +1 -2
- package/src/identity/manager/shared/components/Wordmark.tsx +54 -0
- package/src/identity/{hub → manager}/shared/components/menuFlagsFromReconciliation.ts +39 -15
- package/src/identity/{hub → manager}/shared/effects/profilePrep.ts +1 -1
- package/src/identity/manager/shared/effects/types.ts +30 -0
- package/src/identity/{hub → manager}/shared/model/copy.ts +0 -4
- package/src/identity/{hub → manager}/shared/model/errors.ts +32 -3
- package/src/identity/{hub → manager}/shared/model/network.ts +2 -2
- package/src/identity/{hub → manager}/shared/reconciliation/agentReconciliation/hook.ts +5 -0
- package/src/identity/{hub → manager}/shared/reconciliation/agentReconciliation/run.ts +1 -1
- package/src/identity/{hub/shared/reconciliation/useAgentReconciliation.ts → manager/shared/reconciliation/index.ts} +6 -0
- package/src/identity/{hub → manager}/shared/utils.ts +6 -10
- package/src/identity/{hub → manager}/transfer/TokenTransferFlow.tsx +3 -3
- package/src/identity/{hub → manager}/transfer/TokenTransferScreens.tsx +4 -10
- package/src/identity/{hub → manager}/transfer/effects.ts +1 -1
- package/src/identity/{hub → manager}/types.ts +5 -6
- package/src/identity/{hub/useIdentityHubContinuity.ts → manager/useContinuity.ts} +59 -27
- package/src/identity/{hub/useIdentityHubController.ts → manager/useController.ts} +38 -35
- package/src/identity/{hub/useIdentityHubSideEffects.ts → manager/useSideEffects.ts} +40 -4
- package/src/identity/registry/erc8004/discovery.ts +3 -17
- package/src/identity/registry/erc8004/utils.ts +1 -1
- package/src/identity/storage/ipfs.ts +21 -1
- package/src/identity/wallet/browserWallet/html.ts +10 -2
- package/src/identity/wallet/browserWallet/http.ts +18 -0
- package/src/identity/wallet/browserWallet/requestServer.ts +5 -1
- package/src/identity/wallet/browserWallet/requests.ts +10 -28
- package/src/identity/wallet/browserWallet/session.ts +26 -33
- package/src/identity/wallet/browserWallet/validation.ts +14 -0
- package/src/identity/wallet/browserWallet/walletPageSource.ts +22 -40
- package/src/identity/wallet/page/boot.ts +43 -0
- package/src/identity/wallet/page/config.ts +59 -0
- package/src/identity/wallet/page/constants.ts +12 -0
- package/src/identity/wallet/page/copy.ts +47 -68
- package/src/identity/wallet/page/css.ts +638 -0
- package/src/identity/wallet/page/{errorView.ts → errors.ts} +5 -14
- package/src/identity/wallet/page/{controller.ts → flow.ts} +4 -71
- package/src/identity/wallet/page/markup.ts +44 -34
- package/src/identity/wallet/page/{walletProvider.ts → provider.ts} +0 -3
- package/src/identity/wallet/page/resize.ts +95 -0
- package/src/identity/wallet/page/state.ts +135 -8
- package/src/identity/wallet/page/timeline.ts +161 -0
- package/src/identity/wallet/page/view.ts +22 -302
- package/src/storage/config.ts +30 -80
- package/src/storage/reset.ts +31 -0
- package/src/storage/secrets.ts +1 -16
- package/src/ui/Select.tsx +27 -5
- package/src/ui/Spinner.tsx +16 -15
- package/src/ui/Surface.tsx +21 -17
- package/src/ui/TextArea.tsx +173 -0
- package/src/ui/TextInput.tsx +31 -133
- package/src/ui/theme.ts +22 -13
- package/src/utils/clipboard.ts +0 -140
- package/src/app/FirstRun.tsx +0 -577
- package/src/app/FirstRunTimeline.tsx +0 -51
- package/src/app/firstRunConfig.ts +0 -26
- package/src/app/hooks/useCancelRequest.ts +0 -22
- package/src/app/hooks/useDoublePress.ts +0 -46
- package/src/app/hooks/useExitOnCtrlC.ts +0 -36
- package/src/auth/openaiOAuth/credentials.ts +0 -47
- package/src/auth/openaiOAuth/crypto.ts +0 -23
- package/src/auth/openaiOAuth/index.ts +0 -238
- package/src/auth/openaiOAuth/landingPage.ts +0 -116
- package/src/auth/openaiOAuth/listener.ts +0 -151
- package/src/auth/openaiOAuth/refresh.ts +0 -70
- package/src/auth/openaiOAuth/shared.ts +0 -115
- package/src/chat/ChatBottomPane.tsx +0 -296
- package/src/chat/ChatScreen.tsx +0 -1685
- package/src/chat/ConversationStack.tsx +0 -56
- package/src/chat/MessageList.tsx +0 -638
- package/src/chat/SessionStatus.tsx +0 -53
- package/src/chat/chatEnvironment.ts +0 -16
- package/src/chat/chatScreenUtils.ts +0 -194
- package/src/chat/chatSessionState.ts +0 -146
- package/src/chat/chatTurnContext.ts +0 -50
- package/src/chat/chatTurnOrchestrator.ts +0 -603
- package/src/chat/chatTurnRows.ts +0 -64
- package/src/chat/commands.ts +0 -494
- package/src/chat/continuityEditReview.ts +0 -42
- package/src/chat/display/DiffView.tsx +0 -193
- package/src/chat/display/SyntaxText.tsx +0 -192
- package/src/chat/display/toolCallDisplay.ts +0 -103
- package/src/chat/display/toolResultDisplay.ts +0 -19
- package/src/chat/input/ChatInput.tsx +0 -625
- package/src/chat/input/chatInputHelpers.ts +0 -62
- package/src/chat/input/chatInputState.ts +0 -247
- package/src/chat/input/chatPaste.ts +0 -49
- package/src/chat/input/imageRefs.ts +0 -30
- package/src/chat/input/inputRendering.tsx +0 -93
- package/src/chat/input/textCursor.ts +0 -212
- package/src/chat/messageMarkdown.ts +0 -220
- package/src/chat/messageRows.ts +0 -43
- package/src/chat/planImplementation.ts +0 -62
- package/src/chat/slashCommandHandlers.ts +0 -122
- package/src/chat/slashCommandViews.ts +0 -120
- package/src/chat/transcript/TranscriptView.tsx +0 -184
- package/src/chat/transcript/transcriptViewport.ts +0 -295
- package/src/chat/views/ContextLimitView.tsx +0 -95
- package/src/chat/views/ContinuityEditReviewView.tsx +0 -50
- package/src/chat/views/CopyPicker.tsx +0 -50
- package/src/chat/views/PermissionPrompt.tsx +0 -156
- package/src/chat/views/PermissionsView.tsx +0 -165
- package/src/chat/views/PlanApprovalView.tsx +0 -91
- package/src/chat/views/ResumeView.tsx +0 -273
- package/src/chat/views/RewindView.tsx +0 -412
- package/src/cli/preview.tsx +0 -14
- package/src/cli/updateNotice.ts +0 -54
- package/src/identity/continuity/privateEdit/apply.ts +0 -170
- package/src/identity/continuity/privateEdit/diff.ts +0 -6
- package/src/identity/continuity/privateEdit/files.ts +0 -23
- package/src/identity/continuity/privateEdit/types.ts +0 -28
- package/src/identity/continuity/privateEdit.ts +0 -46
- package/src/identity/hub/IdentityHub.tsx +0 -14
- package/src/identity/hub/continuity/RecoveryConfirmScreen.tsx +0 -104
- package/src/identity/hub/ens/effects.ts +0 -218
- package/src/identity/hub/shared/components/MenuScreen.tsx +0 -241
- package/src/identity/hub/shared/effects/types.ts +0 -53
- package/src/identity/hub/shared/reconciliation/index.ts +0 -14
- package/src/identity/wallet/page/grainient.ts +0 -278
- package/src/identity/wallet/page/html.ts +0 -28
- package/src/identity/wallet/page/styles/base.ts +0 -259
- package/src/identity/wallet/page/styles/components.ts +0 -262
- package/src/identity/wallet/page/styles/index.ts +0 -5
- package/src/identity/wallet/page/styles/responsive.ts +0 -247
- package/src/identity/wallet/page.tsx +0 -38
- package/src/mcp/approvals.ts +0 -113
- package/src/mcp/config.ts +0 -235
- package/src/mcp/manager.ts +0 -482
- package/src/mcp/managerHelpers.ts +0 -70
- package/src/mcp/names.ts +0 -19
- package/src/mcp/output.ts +0 -96
- package/src/models/ModelPicker.tsx +0 -1009
- package/src/models/catalog.ts +0 -327
- package/src/models/huggingface.ts +0 -712
- package/src/models/huggingfaceStorage.ts +0 -136
- package/src/models/llamacpp.ts +0 -848
- package/src/models/llamacppCommands.ts +0 -44
- package/src/models/llamacppConfig.ts +0 -34
- package/src/models/llamacppDiscovery.ts +0 -176
- package/src/models/llamacppOutput.ts +0 -65
- package/src/models/llamacppPreflight.ts +0 -158
- package/src/models/modelDisplay.ts +0 -180
- package/src/models/modelPickerCatalogFlow.ts +0 -56
- package/src/models/modelPickerCredentials.ts +0 -166
- package/src/models/modelPickerData.ts +0 -41
- package/src/models/modelPickerDisplay.tsx +0 -132
- package/src/models/modelPickerHfFlow.ts +0 -192
- package/src/models/modelPickerLocalRunnerFlow.ts +0 -115
- package/src/models/modelPickerOptions.ts +0 -457
- package/src/models/modelPickerTypes.ts +0 -69
- package/src/models/modelPickerUninstallFlow.ts +0 -48
- package/src/models/modelPickerViewHelpers.ts +0 -174
- package/src/models/modelRecommendation.ts +0 -139
- package/src/models/providerDisplay.ts +0 -16
- package/src/models/runtimeDetection.ts +0 -81
- package/src/models/uncensoredCatalog.ts +0 -86
- package/src/providers/anthropic.ts +0 -290
- package/src/providers/contracts.ts +0 -71
- package/src/providers/errors.ts +0 -80
- package/src/providers/gemini.ts +0 -391
- package/src/providers/openai-chat.ts +0 -474
- package/src/providers/openai-responses-format.ts +0 -177
- package/src/providers/openai-responses.ts +0 -306
- package/src/providers/openaiChatWire.ts +0 -124
- package/src/providers/registry.ts +0 -120
- package/src/providers/retry.ts +0 -58
- package/src/providers/sse.ts +0 -93
- package/src/runtime/compaction.ts +0 -395
- package/src/runtime/cwd.ts +0 -43
- package/src/runtime/providerTurn.ts +0 -38
- package/src/runtime/sessionMode.ts +0 -55
- package/src/runtime/systemPrompt.ts +0 -213
- package/src/runtime/textToolParser.ts +0 -161
- package/src/runtime/toolClaimGuards.ts +0 -143
- package/src/runtime/toolExecution.ts +0 -304
- package/src/runtime/toolIntent.ts +0 -143
- package/src/runtime/turn.ts +0 -369
- package/src/runtime/turnNudges.ts +0 -223
- package/src/runtime/turnTypes.ts +0 -86
- package/src/storage/factoryReset.ts +0 -127
- package/src/storage/history.ts +0 -58
- package/src/storage/permissions.ts +0 -76
- package/src/storage/rewind.ts +0 -266
- package/src/storage/sessionExport.ts +0 -49
- package/src/storage/sessions.ts +0 -495
- package/src/tools/bashSafety.ts +0 -186
- package/src/tools/bashTool.ts +0 -140
- package/src/tools/changeDirectoryTool.ts +0 -213
- package/src/tools/contracts.ts +0 -192
- package/src/tools/deleteFileTool.ts +0 -116
- package/src/tools/editTool.ts +0 -165
- package/src/tools/editUtils.ts +0 -170
- package/src/tools/fileDiff.ts +0 -261
- package/src/tools/listDirectoryTool.ts +0 -55
- package/src/tools/listSkillFilesTool.ts +0 -77
- package/src/tools/listSkillsTool.ts +0 -68
- package/src/tools/mcpResourceTools.ts +0 -95
- package/src/tools/permissionRules.ts +0 -85
- package/src/tools/privateContinuityEditTool.ts +0 -187
- package/src/tools/privateContinuityReadTool.ts +0 -106
- package/src/tools/readSkillTool.ts +0 -107
- package/src/tools/readTool.ts +0 -85
- package/src/tools/registry.ts +0 -103
- package/src/tools/writeFileTool.ts +0 -167
- package/src/ui/BrandSplash.tsx +0 -133
- package/src/ui/terminalTitle.ts +0 -30
- package/src/utils/images.ts +0 -140
- package/src/utils/markdownSegments.ts +0 -51
- package/src/utils/messages.ts +0 -37
- package/src/utils/withRetry.ts +0 -324
- /package/src/identity/{hub → manager}/continuity/state.ts +0 -0
- /package/src/identity/{hub → manager}/custody/helpers.ts +0 -0
- /package/src/identity/{hub → manager}/custody/preflight.ts +0 -0
- /package/src/identity/{hub → manager}/custody/state.ts +0 -0
- /package/src/identity/{hub → manager}/custody/useCustodyFlow.tsx +0 -0
- /package/src/identity/{hub → manager}/ens/EnsEditFlow.tsx +0 -0
- /package/src/identity/{hub → manager}/ens/advancedEnsValidation.ts +0 -0
- /package/src/identity/{hub → manager}/ens/state.ts +0 -0
- /package/src/identity/{hub → manager}/ens/transactions.ts +0 -0
- /package/src/identity/{hub → manager}/ens/types.ts +0 -0
- /package/src/identity/{hub → manager}/profile/identity.ts +0 -0
- /package/src/identity/{hub → manager}/restore/envelopes.ts +0 -0
- /package/src/identity/{hub → manager}/restore/helpers.ts +0 -0
- /package/src/identity/{hub → manager}/restore/recovery.ts +0 -0
- /package/src/identity/{hub → manager}/restore/resolve.ts +0 -0
- /package/src/identity/{hub → manager}/shared/components/BusyScreen.tsx +0 -0
- /package/src/identity/{hub → manager}/shared/components/NetworkScreen.tsx +0 -0
- /package/src/identity/{hub → manager}/shared/components/PinataJwtInput.tsx +0 -0
- /package/src/identity/{hub → manager}/shared/effects/receipts.ts +0 -0
- /package/src/identity/{hub → manager}/shared/effects/sync.ts +0 -0
- /package/src/identity/{hub → manager}/shared/model/format.ts +0 -0
- /package/src/identity/{hub → manager}/shared/operatorWallets.ts +0 -0
- /package/src/identity/{hub → manager}/shared/reconciliation/agentReconciliation/ownership.ts +0 -0
- /package/src/identity/{hub → manager}/shared/reconciliation/agentReconciliation/types.ts +0 -0
- /package/src/identity/{hub → manager}/shared/reconciliation/walletSetup.ts +0 -0
- /package/src/identity/{hub → manager}/shared/txGuard.ts +0 -0
- /package/src/identity/{hub → manager}/transfer/progress.ts +0 -0
- /package/src/identity/{hub → manager}/transfer/state.ts +0 -0
package/src/mcp/config.ts
DELETED
|
@@ -1,235 +0,0 @@
|
|
|
1
|
-
import crypto from 'node:crypto'
|
|
2
|
-
import fs from 'node:fs/promises'
|
|
3
|
-
import path from 'node:path'
|
|
4
|
-
import { z } from 'zod'
|
|
5
|
-
import { atomicWriteText } from '../storage/atomicWrite.js'
|
|
6
|
-
import { ensureConfigDir, getConfigDir } from '../storage/config.js'
|
|
7
|
-
|
|
8
|
-
export type McpConfigScope = 'user' | 'project'
|
|
9
|
-
|
|
10
|
-
const McpStdioServerConfigSchema = z.object({
|
|
11
|
-
type: z.literal('stdio').optional(),
|
|
12
|
-
command: z.string().min(1),
|
|
13
|
-
args: z.array(z.string()).optional(),
|
|
14
|
-
env: z.record(z.string()).optional(),
|
|
15
|
-
cwd: z.string().min(1).optional(),
|
|
16
|
-
})
|
|
17
|
-
|
|
18
|
-
const McpHttpServerConfigSchema = z.object({
|
|
19
|
-
type: z.literal('http'),
|
|
20
|
-
url: z.string().url(),
|
|
21
|
-
headers: z.record(z.string()).optional(),
|
|
22
|
-
})
|
|
23
|
-
|
|
24
|
-
const McpSseServerConfigSchema = z.object({
|
|
25
|
-
type: z.literal('sse'),
|
|
26
|
-
url: z.string().url(),
|
|
27
|
-
headers: z.record(z.string()).optional(),
|
|
28
|
-
})
|
|
29
|
-
|
|
30
|
-
export const McpServerConfigSchema = z.union([
|
|
31
|
-
McpStdioServerConfigSchema,
|
|
32
|
-
McpHttpServerConfigSchema,
|
|
33
|
-
McpSseServerConfigSchema,
|
|
34
|
-
])
|
|
35
|
-
|
|
36
|
-
export const McpJsonConfigSchema = z.object({
|
|
37
|
-
mcpServers: z.record(McpServerConfigSchema),
|
|
38
|
-
})
|
|
39
|
-
|
|
40
|
-
export type McpServerConfig = z.infer<typeof McpServerConfigSchema>
|
|
41
|
-
export type McpJsonConfig = z.infer<typeof McpJsonConfigSchema>
|
|
42
|
-
|
|
43
|
-
export type ScopedMcpServerConfig = {
|
|
44
|
-
name: string
|
|
45
|
-
scope: McpConfigScope
|
|
46
|
-
config: McpServerConfig
|
|
47
|
-
configHash: string
|
|
48
|
-
}
|
|
49
|
-
|
|
50
|
-
export type McpConfigIssue = {
|
|
51
|
-
scope: McpConfigScope
|
|
52
|
-
filePath: string
|
|
53
|
-
serverName?: string
|
|
54
|
-
severity: 'error' | 'warning'
|
|
55
|
-
message: string
|
|
56
|
-
}
|
|
57
|
-
|
|
58
|
-
export type LoadedMcpConfigs = {
|
|
59
|
-
servers: ScopedMcpServerConfig[]
|
|
60
|
-
issues: McpConfigIssue[]
|
|
61
|
-
}
|
|
62
|
-
|
|
63
|
-
export function getUserMcpConfigPath(): string {
|
|
64
|
-
return path.join(getConfigDir(), 'mcp.json')
|
|
65
|
-
}
|
|
66
|
-
|
|
67
|
-
export function getProjectMcpConfigPath(cwd: string): string {
|
|
68
|
-
return path.join(path.resolve(cwd), '.mcp.json')
|
|
69
|
-
}
|
|
70
|
-
|
|
71
|
-
export async function loadMcpConfigs(cwd: string): Promise<LoadedMcpConfigs> {
|
|
72
|
-
const user = await readMcpConfigFile(getUserMcpConfigPath(), 'user', true)
|
|
73
|
-
const project = await readMcpConfigFile(getProjectMcpConfigPath(cwd), 'project', true)
|
|
74
|
-
const byName = new Map<string, ScopedMcpServerConfig>()
|
|
75
|
-
for (const server of user.servers) byName.set(server.name, server)
|
|
76
|
-
for (const server of project.servers) byName.set(server.name, server)
|
|
77
|
-
return {
|
|
78
|
-
servers: [...byName.values()],
|
|
79
|
-
issues: [...user.issues, ...project.issues],
|
|
80
|
-
}
|
|
81
|
-
}
|
|
82
|
-
|
|
83
|
-
export async function addMcpServerConfig(params: {
|
|
84
|
-
cwd: string
|
|
85
|
-
scope: McpConfigScope
|
|
86
|
-
name: string
|
|
87
|
-
config: McpServerConfig
|
|
88
|
-
}): Promise<string> {
|
|
89
|
-
const filePath = params.scope === 'user' ? getUserMcpConfigPath() : getProjectMcpConfigPath(params.cwd)
|
|
90
|
-
const current = await readRawMcpConfig(filePath)
|
|
91
|
-
current.mcpServers[params.name] = params.config
|
|
92
|
-
if (params.scope === 'user') await ensureConfigDir()
|
|
93
|
-
await atomicWriteText(filePath, JSON.stringify(current, null, 2) + '\n')
|
|
94
|
-
return filePath
|
|
95
|
-
}
|
|
96
|
-
|
|
97
|
-
export function parseMcpServerConfigJson(value: string): McpServerConfig {
|
|
98
|
-
return McpServerConfigSchema.parse(JSON.parse(value))
|
|
99
|
-
}
|
|
100
|
-
|
|
101
|
-
export function mcpServerTransport(config: McpServerConfig): 'stdio' | 'http' | 'sse' {
|
|
102
|
-
return config.type === 'http' || config.type === 'sse' ? config.type : 'stdio'
|
|
103
|
-
}
|
|
104
|
-
|
|
105
|
-
export function stableMcpConfigHash(config: McpServerConfig): string {
|
|
106
|
-
return crypto.createHash('sha256').update(stableJson(config)).digest('hex').slice(0, 16)
|
|
107
|
-
}
|
|
108
|
-
|
|
109
|
-
async function readMcpConfigFile(
|
|
110
|
-
filePath: string,
|
|
111
|
-
scope: McpConfigScope,
|
|
112
|
-
expandVars: boolean,
|
|
113
|
-
): Promise<LoadedMcpConfigs> {
|
|
114
|
-
let raw: string
|
|
115
|
-
try {
|
|
116
|
-
raw = await fs.readFile(filePath, 'utf8')
|
|
117
|
-
} catch (err: unknown) {
|
|
118
|
-
if ((err as NodeJS.ErrnoException).code === 'ENOENT') return { servers: [], issues: [] }
|
|
119
|
-
return {
|
|
120
|
-
servers: [],
|
|
121
|
-
issues: [{ scope, filePath, severity: 'error', message: `failed to read MCP config: ${(err as Error).message}` }],
|
|
122
|
-
}
|
|
123
|
-
}
|
|
124
|
-
|
|
125
|
-
let parsedJson: unknown
|
|
126
|
-
try {
|
|
127
|
-
parsedJson = JSON.parse(raw)
|
|
128
|
-
} catch (err: unknown) {
|
|
129
|
-
return {
|
|
130
|
-
servers: [],
|
|
131
|
-
issues: [{ scope, filePath, severity: 'error', message: `MCP config is not valid JSON: ${(err as Error).message}` }],
|
|
132
|
-
}
|
|
133
|
-
}
|
|
134
|
-
|
|
135
|
-
const parsed = McpJsonConfigSchema.safeParse(parsedJson)
|
|
136
|
-
if (!parsed.success) {
|
|
137
|
-
return {
|
|
138
|
-
servers: [],
|
|
139
|
-
issues: parsed.error.issues.map(issue => ({
|
|
140
|
-
scope,
|
|
141
|
-
filePath,
|
|
142
|
-
severity: 'error',
|
|
143
|
-
message: `MCP config schema error at ${issue.path.join('.') || 'root'}: ${issue.message}`,
|
|
144
|
-
})),
|
|
145
|
-
}
|
|
146
|
-
}
|
|
147
|
-
|
|
148
|
-
const servers: ScopedMcpServerConfig[] = []
|
|
149
|
-
const issues: McpConfigIssue[] = []
|
|
150
|
-
for (const [name, config] of Object.entries(parsed.data.mcpServers)) {
|
|
151
|
-
const expanded = expandVars ? expandEnvVars(config) : { config, missing: [] }
|
|
152
|
-
if (expanded.missing.length > 0) {
|
|
153
|
-
issues.push({
|
|
154
|
-
scope,
|
|
155
|
-
filePath,
|
|
156
|
-
serverName: name,
|
|
157
|
-
severity: 'warning',
|
|
158
|
-
message: `missing environment variables: ${expanded.missing.join(', ')}`,
|
|
159
|
-
})
|
|
160
|
-
}
|
|
161
|
-
if (process.platform === 'win32' && 'command' in expanded.config && isBareNpxCommand(expanded.config.command)) {
|
|
162
|
-
issues.push({
|
|
163
|
-
scope,
|
|
164
|
-
filePath,
|
|
165
|
-
serverName: name,
|
|
166
|
-
severity: 'warning',
|
|
167
|
-
message: 'Windows MCP stdio servers should use command "cmd" with args ["/c", "npx", ...]',
|
|
168
|
-
})
|
|
169
|
-
}
|
|
170
|
-
servers.push({
|
|
171
|
-
name,
|
|
172
|
-
scope,
|
|
173
|
-
config: expanded.config,
|
|
174
|
-
configHash: stableMcpConfigHash(expanded.config),
|
|
175
|
-
})
|
|
176
|
-
}
|
|
177
|
-
return { servers, issues }
|
|
178
|
-
}
|
|
179
|
-
|
|
180
|
-
async function readRawMcpConfig(filePath: string): Promise<McpJsonConfig> {
|
|
181
|
-
let raw: string
|
|
182
|
-
try {
|
|
183
|
-
raw = await fs.readFile(filePath, 'utf8')
|
|
184
|
-
} catch (err: unknown) {
|
|
185
|
-
if ((err as NodeJS.ErrnoException).code === 'ENOENT') return { mcpServers: {} }
|
|
186
|
-
throw err
|
|
187
|
-
}
|
|
188
|
-
return McpJsonConfigSchema.parse(JSON.parse(raw))
|
|
189
|
-
}
|
|
190
|
-
|
|
191
|
-
function expandEnvVars(config: McpServerConfig): { config: McpServerConfig; missing: string[] } {
|
|
192
|
-
const missing = new Set<string>()
|
|
193
|
-
const expanded = expandValue(config, missing)
|
|
194
|
-
return { config: McpServerConfigSchema.parse(expanded), missing: [...missing].sort() }
|
|
195
|
-
}
|
|
196
|
-
|
|
197
|
-
function expandValue(value: unknown, missing: Set<string>): unknown {
|
|
198
|
-
if (typeof value === 'string') return expandString(value, missing)
|
|
199
|
-
if (Array.isArray(value)) return value.map(item => expandValue(item, missing))
|
|
200
|
-
if (value && typeof value === 'object') {
|
|
201
|
-
const out: Record<string, unknown> = {}
|
|
202
|
-
for (const [key, child] of Object.entries(value)) out[key] = expandValue(child, missing)
|
|
203
|
-
return out
|
|
204
|
-
}
|
|
205
|
-
return value
|
|
206
|
-
}
|
|
207
|
-
|
|
208
|
-
function expandString(value: string, missing: Set<string>): string {
|
|
209
|
-
return value.replace(/\$\{([A-Za-z_][A-Za-z0-9_]*)(?::-(.*?))?\}/g, (_match, name: string, fallback: string | undefined) => {
|
|
210
|
-
const envValue = process.env[name]
|
|
211
|
-
if (envValue !== undefined) return envValue
|
|
212
|
-
if (fallback !== undefined) return fallback
|
|
213
|
-
missing.add(name)
|
|
214
|
-
return ''
|
|
215
|
-
})
|
|
216
|
-
}
|
|
217
|
-
|
|
218
|
-
function isBareNpxCommand(command: string): boolean {
|
|
219
|
-
const normalized = command.replace(/\\/g, '/').toLowerCase()
|
|
220
|
-
return normalized === 'npx' || normalized.endsWith('/npx')
|
|
221
|
-
}
|
|
222
|
-
|
|
223
|
-
function stableJson(value: unknown): string {
|
|
224
|
-
return JSON.stringify(sortForStableJson(value))
|
|
225
|
-
}
|
|
226
|
-
|
|
227
|
-
function sortForStableJson(value: unknown): unknown {
|
|
228
|
-
if (Array.isArray(value)) return value.map(sortForStableJson)
|
|
229
|
-
if (value && typeof value === 'object') {
|
|
230
|
-
const out: Record<string, unknown> = {}
|
|
231
|
-
for (const key of Object.keys(value).sort()) out[key] = sortForStableJson((value as Record<string, unknown>)[key])
|
|
232
|
-
return out
|
|
233
|
-
}
|
|
234
|
-
return value
|
|
235
|
-
}
|