Skip to content

Commit 1d1e684

Browse files
committed
Handle error when dxt user config is missing
1 parent 64b824f commit 1d1e684

File tree

2 files changed

+5
-10
lines changed

2 files changed

+5
-10
lines changed

src/renderer/screens/mcp/McpSideDock.vue

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -29,13 +29,9 @@ async function activeAllMcpServers() {
2929
snackbarStore.showSuccessMessage('mcp.updated')
3030
}
3131
} catch (error) {
32-
if (error instanceof Error) {
33-
console.log(error.message)
34-
snackbarStore.showErrorMessage(error.message)
35-
} else {
36-
console.log('Unknown Error', error)
37-
snackbarStore.showErrorMessage('Unknown error, use devtool to check detailed console log')
38-
}
32+
const errorMsg = error instanceof Error ? error.message : String(error)
33+
console.log(errorMsg)
34+
snackbarStore.showErrorMessage(errorMsg)
3935
} finally {
4036
layoutStore.mcpLoading = false
4137
mcpStore.version++

src/renderer/utils/index.ts

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -152,12 +152,11 @@ class Mcp {
152152
}
153153

154154
const userConfigObj = mcpMetadata.config.user_config
155-
if (!userConfigObj) {
155+
const userConfig = dxtStore.getConfig(key)
156+
if (!userConfigObj || !userConfig) {
156157
return [key, mcpMetadata]
157158
}
158159

159-
const userConfig = dxtStore.getConfig(key)
160-
161160
const mergedConfig = Object.fromEntries(
162161
Object.entries(userConfigObj).map(([configKey, configVal]) => {
163162
const userValue = userConfig[configKey]

0 commit comments

Comments
 (0)