@kabmo-labs/kabmo 0.30.0 → 0.31.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/README.md +79 -21
- package/dist/client/index.html +1 -1
- package/dist/client/index.js +481 -462
- package/dist/client/static/js/{index-5vjbp04s.js → index-r3bhgvkt.js} +882 -883
- package/marketplace/plugins/stats/package.json +2 -2
- package/marketplace/plugins/stats/src/format.test.ts +7 -1
- package/package.json +2 -2
- package/src/client/components/common/context-usage-button/McpSection.tsx +133 -0
- package/src/client/components/common/context-usage-button/Ring.tsx +12 -6
- package/src/client/components/common/context-usage-button/index.test.tsx +24 -13
- package/src/client/components/common/context-usage-button/index.tsx +32 -34
- package/src/client/components/common/session-row/TrailingSlot.tsx +6 -2
- package/src/client/components/common/session-row/session-row.test.tsx +13 -0
- package/src/client/components/layout/desktop-layout/index.tsx +5 -1
- package/src/client/components/mobile/RightSidebar.tsx +2 -1
- package/src/client/components/settings/categories/McpSettings.tsx +10 -3
- package/src/client/components/settings/categories/mcp-settings/AdvancedSection.tsx +244 -0
- package/src/client/components/settings/categories/mcp-settings/ConnectionTest.tsx +3 -3
- package/src/client/components/settings/categories/mcp-settings/DetailPane.tsx +55 -97
- package/src/client/components/settings/categories/mcp-settings/ImportModal.tsx +12 -64
- package/src/client/components/settings/categories/mcp-settings/{EnvVarsSection.tsx → KeyValueSection.tsx} +42 -24
- package/src/client/components/settings/categories/mcp-settings/SidebarList.tsx +1 -1
- package/src/client/components/settings/categories/mcp-settings/TransportSection.tsx +101 -0
- package/src/client/components/workspace/browser-panel/EngineNotice.test.tsx +109 -0
- package/src/client/components/workspace/browser-panel/EngineNotice.tsx +112 -0
- package/src/client/components/workspace/browser-panel/index.tsx +45 -12
- package/src/client/components/workspace/chat-timeline/chat-input/AccessDropdown.test.ts +63 -0
- package/src/client/components/workspace/chat-timeline/chat-input/AccessDropdown.tsx +18 -6
- package/src/client/components/workspace/chat-timeline/chat-input/Toolbar.tsx +3 -1
- package/src/client/components/workspace/chat-timeline/chat-input/access-levels.ts +39 -1
- package/src/client/components/workspace/chat-timeline/tool-renderers/panels/Eval.test.tsx +13 -7
- package/src/client/components/workspace/editor/plugin-rail.test.tsx +6 -1
- package/src/client/components/workspace/terminal-panel/scroll-hold.test.ts +20 -5
- package/src/client/data/settings/mcp.ts +4 -2
- package/src/client/data/settings/omp-schema.json +22 -2
- package/src/client/hooks/browser/use-browser-engine.ts +99 -0
- package/src/client/hooks/chat/context/mcp.ts +159 -0
- package/src/client/hooks/chat/timeline/access-mode.ts +45 -15
- package/src/client/hooks/chat/timeline/index.ts +7 -3
- package/src/client/hooks/chat/timeline/timeline-mode-state.test.ts +33 -4
- package/src/client/hooks/ui/ui-listeners.test.ts +13 -18
- package/src/server/lib/browser/engine.test.ts +118 -0
- package/src/server/lib/browser/engine.ts +102 -0
- package/src/server/lib/db/schema.ts +4 -0
- package/src/server/lib/fs/toolchain-path.test.ts +87 -0
- package/src/server/lib/fs/toolchain-path.ts +49 -0
- package/src/server/lib/harness/acp/protocol.ts +9 -1
- package/src/server/lib/harness/auto-probe.server.ts +3 -2
- package/src/server/lib/harness/launch-table.ts +3 -2
- package/src/server/lib/harness/spawn.server.ts +5 -1
- package/src/server/lib/harness/update-queue.server.ts +2 -1
- package/src/server/lib/harness/update-state.server.ts +6 -2
- package/src/server/lib/mcp/probe.server.ts +71 -0
- package/src/server/lib/mcp/registry.server.ts +195 -46
- package/src/server/lib/mcp/registry.test.ts +76 -4
- package/src/server/lib/mcp/schema.server.ts +35 -0
- package/src/server/lib/mcp/session-mcp.test.ts +164 -0
- package/src/server/lib/mcp/session-overlay.server.ts +152 -0
- package/src/server/lib/mcp/session-state.server.ts +75 -0
- package/src/server/lib/mcp/store.server.ts +6 -1
- package/src/server/lib/omp/config/config-cli.ts +4 -0
- package/src/server/lib/omp/config/mcp-and-cli.test.ts +12 -183
- package/src/server/lib/omp/config/mcp-config.test.ts +277 -0
- package/src/server/lib/omp/config/mcp-shared.ts +36 -0
- package/src/server/lib/omp/config/mcp-test-protocol.ts +89 -0
- package/src/server/lib/omp/config/mcp-test-remote.ts +167 -0
- package/src/server/lib/omp/config/mcp-test.ts +21 -123
- package/src/server/lib/omp/config/mcp-write.ts +179 -0
- package/src/server/lib/omp/config/mcp.ts +138 -118
- package/src/server/lib/omp/core/cli.ts +4 -14
- package/src/server/lib/omp/rpc/manager.ts +12 -17
- package/src/server/lib/omp/rpc/reload-mcp.ts +39 -0
- package/src/server/lib/omp/rpc/session-registry.ts +6 -2
- package/src/server/lib/omp/rpc/spawn-mcp.ts +43 -0
- package/src/server/lib/omp/session/delete.server.ts +7 -0
- package/src/server/lib/plugins/mcp.server.ts +2 -2
- package/src/server/lib/realtime/topics/workspace.server.test.ts +44 -0
- package/src/server/lib/realtime/topics/workspace.server.ts +3 -2
- package/src/server/routes/browser/engine.test.ts +70 -0
- package/src/server/routes/browser/engine.ts +51 -0
- package/src/server/routes/browser/index.ts +5 -0
- package/src/server/routes/fs/git.ts +4 -3
- package/src/server/routes/harness/versions.test.ts +5 -0
- package/src/server/routes/sessions/index.ts +7 -0
- package/src/server/routes/sessions/mcp.test.ts +154 -0
- package/src/server/routes/sessions/mcp.ts +202 -0
- package/src/server/routes/settings/mcp-test.ts +5 -4
- package/src/server/routes/settings/mcp.test.ts +42 -1
- package/src/server/routes/settings/mcp.ts +80 -24
- package/src/shared/lib/code/highlight-memo.test.ts +18 -0
- package/src/shared/lib/code/highlight-memo.ts +46 -17
- package/src/shared/lib/fonts/nerd-symbols.css +14 -0
- package/src/shared/lib/fonts/nerd-symbols.test.ts +86 -0
- package/src/shared/lib/fonts/symbols-nerd-font-mono.woff2 +0 -0
- package/src/shared/lib/mcp/import.ts +112 -0
- package/src/shared/lib/mcp/item.ts +61 -0
- package/src/shared/lib/mcp/key-value.ts +37 -0
- package/src/shared/lib/mcp/mcp-lib.test.ts +119 -0
- package/src/shared/lib/mcp/status.test.ts +36 -0
- package/src/shared/lib/mcp/status.ts +38 -0
- package/src/shared/lib/models/client.ts +27 -6
- package/src/shared/lib/models/provider/models.test.ts +31 -0
- package/src/shared/lib/omp/config/access-mode.test.ts +73 -0
- package/src/shared/lib/omp/config/access-mode.ts +49 -0
- package/src/shared/lib/workspace/right-panels.ts +13 -0
- package/src/shared/lib/workspace/workspace-modules.test.ts +3 -1
- package/src/shared/types/browser.ts +21 -0
- package/src/shared/types/settings/mcp.ts +73 -4
- package/src/test-support/pristine-globals.test.ts +53 -0
- package/src/test-support/pristine-globals.ts +6 -1
|
@@ -19,61 +19,21 @@ import { readLines } from '@/server/lib/omp/rpc/lines';
|
|
|
19
19
|
import { isMockMode } from '@/server/mock.server';
|
|
20
20
|
import type { McpServerItem } from '@/shared/types';
|
|
21
21
|
import { isRecord } from '@/shared/lib/util/guards';
|
|
22
|
-
|
|
23
|
-
|
|
24
|
-
|
|
25
|
-
|
|
26
|
-
|
|
27
|
-
|
|
28
|
-
|
|
29
|
-
|
|
30
|
-
|
|
31
|
-
|
|
32
|
-
error?: string;
|
|
33
|
-
}
|
|
22
|
+
import { REDACTED_SENTINEL, rowsToRecord } from '@/shared/lib/mcp/key-value';
|
|
23
|
+
import { runLinkTest, runSseTest } from '@/server/lib/omp/config/mcp-test-remote';
|
|
24
|
+
import {
|
|
25
|
+
describeError,
|
|
26
|
+
initializeRequest,
|
|
27
|
+
parseServerInfo,
|
|
28
|
+
PROTOCOL_VERSION,
|
|
29
|
+
type HandshakeOutcome,
|
|
30
|
+
type McpTestResult,
|
|
31
|
+
} from '@/server/lib/omp/config/mcp-test-protocol';
|
|
34
32
|
|
|
35
33
|
const HANDSHAKE_TIMEOUT_MS = 15_000;
|
|
36
|
-
const LINK_TIMEOUT_MS = 10_000;
|
|
37
|
-
const PROTOCOL_VERSION = '2025-06-18';
|
|
38
|
-
const REDACTED_SENTINEL = '••••••••';
|
|
39
34
|
const STDERR_TAIL_LIMIT = 8 * 1024;
|
|
40
35
|
const GRACE_PERIOD_MS = 2_000;
|
|
41
36
|
|
|
42
|
-
const CLIENT_INFO = { name: 'kabmo', version: '0.0.1' };
|
|
43
|
-
|
|
44
|
-
interface HandshakeOutcome {
|
|
45
|
-
protocolVersion?: string;
|
|
46
|
-
serverInfo?: { name?: string; version?: string };
|
|
47
|
-
toolCount?: number;
|
|
48
|
-
}
|
|
49
|
-
|
|
50
|
-
function parseServerInfo(value: unknown): { name?: string; version?: string } | undefined {
|
|
51
|
-
if (!isRecord(value)) return undefined;
|
|
52
|
-
const info: { name?: string; version?: string } = {};
|
|
53
|
-
if (typeof value.name === 'string') info.name = value.name;
|
|
54
|
-
if (typeof value.version === 'string') info.version = value.version;
|
|
55
|
-
return info.name !== undefined || info.version !== undefined ? info : undefined;
|
|
56
|
-
}
|
|
57
|
-
|
|
58
|
-
function describeError(value: unknown): string {
|
|
59
|
-
if (typeof value === 'string' && value.length > 0) return value;
|
|
60
|
-
if (isRecord(value) && typeof value.message === 'string') return value.message;
|
|
61
|
-
try {
|
|
62
|
-
return JSON.stringify(value);
|
|
63
|
-
} catch {
|
|
64
|
-
return 'Unknown error';
|
|
65
|
-
}
|
|
66
|
-
}
|
|
67
|
-
|
|
68
|
-
function initializeRequest(): Record<string, unknown> {
|
|
69
|
-
return {
|
|
70
|
-
jsonrpc: '2.0',
|
|
71
|
-
id: 1,
|
|
72
|
-
method: 'initialize',
|
|
73
|
-
params: { protocolVersion: PROTOCOL_VERSION, capabilities: {}, clientInfo: CLIENT_INFO },
|
|
74
|
-
};
|
|
75
|
-
}
|
|
76
|
-
|
|
77
37
|
/** Merge configured env vars over the sanitized env, skipping empty values and
|
|
78
38
|
* the redaction sentinel so masked credentials are never replayed. */
|
|
79
39
|
function mergeEnvVars(server: McpServerItem): NodeJS.ProcessEnv {
|
|
@@ -209,12 +169,12 @@ async function runCommandTest(server: McpServerItem, cwd: string | undefined): P
|
|
|
209
169
|
const commandArgs = (server.commandArgs ?? []).map((arg) => arg.trim()).filter((arg) => arg.length > 0);
|
|
210
170
|
const startedAt = Date.now();
|
|
211
171
|
if (commandArgs.length === 0) {
|
|
212
|
-
return { ok: false, transport: '
|
|
172
|
+
return { ok: false, transport: 'stdio', durationMs: 0, error: 'No command configured' };
|
|
213
173
|
}
|
|
214
174
|
|
|
215
175
|
const child: Subprocess<"pipe", "pipe", "pipe"> = Bun.spawn({
|
|
216
176
|
cmd: commandArgs,
|
|
217
|
-
cwd: cwd || process.cwd(),
|
|
177
|
+
cwd: server.cwd?.trim() || cwd || process.cwd(),
|
|
218
178
|
env: mergeEnvVars(server),
|
|
219
179
|
stdin: 'pipe',
|
|
220
180
|
stdout: 'pipe',
|
|
@@ -231,12 +191,12 @@ async function runCommandTest(server: McpServerItem, cwd: string | undefined): P
|
|
|
231
191
|
try {
|
|
232
192
|
const outcome = await runHandshake(child, () => stderrTail);
|
|
233
193
|
return {
|
|
234
|
-
ok: true, transport: '
|
|
194
|
+
ok: true, transport: 'stdio', protocolVersion: outcome.protocolVersion,
|
|
235
195
|
serverInfo: outcome.serverInfo, toolCount: outcome.toolCount, durationMs: Date.now() - startedAt,
|
|
236
196
|
};
|
|
237
197
|
} catch (error) {
|
|
238
198
|
return {
|
|
239
|
-
ok: false, transport: '
|
|
199
|
+
ok: false, transport: 'stdio', durationMs: Date.now() - startedAt,
|
|
240
200
|
error: error instanceof Error ? error.message : 'MCP handshake failed',
|
|
241
201
|
};
|
|
242
202
|
} finally {
|
|
@@ -244,79 +204,16 @@ async function runCommandTest(server: McpServerItem, cwd: string | undefined): P
|
|
|
244
204
|
}
|
|
245
205
|
}
|
|
246
206
|
|
|
247
|
-
function extractSseData(text: string): unknown {
|
|
248
|
-
for (const rawLine of text.split(/\r?\n/)) {
|
|
249
|
-
const line = rawLine.trim();
|
|
250
|
-
if (!line.startsWith('data:')) continue;
|
|
251
|
-
const data = line.slice(5).trim();
|
|
252
|
-
if (!data || data === '[DONE]') continue;
|
|
253
|
-
try {
|
|
254
|
-
return JSON.parse(data);
|
|
255
|
-
} catch {
|
|
256
|
-
// skip malformed frames; keep scanning for the first parseable data line
|
|
257
|
-
}
|
|
258
|
-
}
|
|
259
|
-
return undefined;
|
|
260
|
-
}
|
|
261
|
-
|
|
262
|
-
function extractInitializeOutcome(payload: unknown): HandshakeOutcome {
|
|
263
|
-
const result = isRecord(payload) && isRecord(payload.result) ? payload.result : payload;
|
|
264
|
-
if (!isRecord(result)) return {};
|
|
265
|
-
return {
|
|
266
|
-
protocolVersion: typeof result.protocolVersion === 'string' ? result.protocolVersion : undefined,
|
|
267
|
-
serverInfo: parseServerInfo(result.serverInfo),
|
|
268
|
-
};
|
|
269
|
-
}
|
|
270
|
-
|
|
271
|
-
async function runLinkTest(url: string): Promise<McpTestResult> {
|
|
272
|
-
const startedAt = Date.now();
|
|
273
|
-
try {
|
|
274
|
-
const response = await fetch(url, {
|
|
275
|
-
method: 'POST',
|
|
276
|
-
headers: { 'Content-Type': 'application/json', Accept: 'application/json, text/event-stream' },
|
|
277
|
-
body: JSON.stringify(initializeRequest()),
|
|
278
|
-
signal: AbortSignal.timeout(LINK_TIMEOUT_MS),
|
|
279
|
-
});
|
|
280
|
-
if (!response.ok) {
|
|
281
|
-
return {
|
|
282
|
-
ok: false,
|
|
283
|
-
transport: 'link',
|
|
284
|
-
durationMs: Date.now() - startedAt,
|
|
285
|
-
error: `HTTP ${response.status}${response.statusText ? ` ${response.statusText}` : ''}`,
|
|
286
|
-
};
|
|
287
|
-
}
|
|
288
|
-
const contentType = (response.headers.get('content-type') ?? '').toLowerCase();
|
|
289
|
-
const payload = contentType.includes('text/event-stream')
|
|
290
|
-
? extractSseData(await response.text())
|
|
291
|
-
: await response.json();
|
|
292
|
-
const outcome = extractInitializeOutcome(payload);
|
|
293
|
-
return {
|
|
294
|
-
ok: true,
|
|
295
|
-
transport: 'link',
|
|
296
|
-
protocolVersion: outcome.protocolVersion,
|
|
297
|
-
serverInfo: outcome.serverInfo,
|
|
298
|
-
durationMs: Date.now() - startedAt,
|
|
299
|
-
};
|
|
300
|
-
} catch (error) {
|
|
301
|
-
return {
|
|
302
|
-
ok: false,
|
|
303
|
-
transport: 'link',
|
|
304
|
-
durationMs: Date.now() - startedAt,
|
|
305
|
-
error: error instanceof Error ? error.message : 'Connection failed',
|
|
306
|
-
};
|
|
307
|
-
}
|
|
308
|
-
}
|
|
309
|
-
|
|
310
207
|
function mockTestResult(server: McpServerItem): McpTestResult {
|
|
311
|
-
const valid = server.
|
|
208
|
+
const valid = server.transport === 'stdio'
|
|
312
209
|
? (server.commandArgs ?? []).some((arg) => arg.trim().length > 0)
|
|
313
210
|
: typeof server.linkUrl === 'string' && /^https?:\/\//i.test(server.linkUrl);
|
|
314
211
|
if (!valid) {
|
|
315
|
-
return { ok: false, transport: server.
|
|
212
|
+
return { ok: false, transport: server.transport, durationMs: 12, error: 'Invalid server configuration' };
|
|
316
213
|
}
|
|
317
214
|
return {
|
|
318
215
|
ok: true,
|
|
319
|
-
transport: server.
|
|
216
|
+
transport: server.transport,
|
|
320
217
|
protocolVersion: PROTOCOL_VERSION,
|
|
321
218
|
serverInfo: { name: server.name || undefined, version: '1.0.0' },
|
|
322
219
|
toolCount: 3,
|
|
@@ -334,12 +231,13 @@ export async function testMcpServer(input: { server: McpServerItem; cwd?: string
|
|
|
334
231
|
return mockTestResult(server);
|
|
335
232
|
}
|
|
336
233
|
|
|
337
|
-
if (server.
|
|
234
|
+
if (server.transport !== 'stdio') {
|
|
338
235
|
const url = (server.linkUrl ?? '').trim();
|
|
339
236
|
if (!/^https?:\/\//i.test(url)) {
|
|
340
|
-
return { ok: false, transport:
|
|
237
|
+
return { ok: false, transport: server.transport, durationMs: 0, error: 'Link URL must be a valid http(s) endpoint' };
|
|
341
238
|
}
|
|
342
|
-
|
|
239
|
+
const headers = rowsToRecord(server.headers) ?? {};
|
|
240
|
+
return server.transport === 'sse' ? runSseTest(url, headers) : runLinkTest(url, headers);
|
|
343
241
|
}
|
|
344
242
|
|
|
345
243
|
return runCommandTest(server, cwd);
|
|
@@ -0,0 +1,179 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* @license
|
|
3
|
+
* SPDX-License-Identifier: MIT
|
|
4
|
+
*/
|
|
5
|
+
|
|
6
|
+
/**
|
|
7
|
+
* Writing a native `mcp.json` entry — user scope or project scope.
|
|
8
|
+
*
|
|
9
|
+
* Two facts make this more than a JSON edit:
|
|
10
|
+
* - the enablement lists (`disabledServers` / `enabledServers`) live in the
|
|
11
|
+
* USER file even when the entry is project-scoped, so a project save updates
|
|
12
|
+
* both files;
|
|
13
|
+
* - credential-bearing blocks the browser only ever sees redacted must be
|
|
14
|
+
* carried over from the previous entry instead of being erased.
|
|
15
|
+
*/
|
|
16
|
+
|
|
17
|
+
import { isRecord } from '@/shared/lib/util/guards';
|
|
18
|
+
import { writeFileAtomic } from '@/server/lib/fs/atomic-write';
|
|
19
|
+
import { withConfigLock } from '@/server/lib/fs/config-lock';
|
|
20
|
+
import { resolveProjectMcpConfig } from '@/server/lib/omp/config/mcp';
|
|
21
|
+
import {
|
|
22
|
+
SERVER_NAME,
|
|
23
|
+
stringsIn,
|
|
24
|
+
userMcpConfigPath,
|
|
25
|
+
type McpFile,
|
|
26
|
+
type McpServer,
|
|
27
|
+
} from '@/server/lib/omp/config/mcp-shared';
|
|
28
|
+
|
|
29
|
+
async function readConfigFile(path: string): Promise<McpFile> {
|
|
30
|
+
if (!(await Bun.file(path).exists())) return { mcpServers: {} };
|
|
31
|
+
const parsed: unknown = JSON.parse(await Bun.file(path).text());
|
|
32
|
+
if (!isRecord(parsed)) throw new Error(`${path} must contain a JSON object`);
|
|
33
|
+
if (parsed.mcpServers !== undefined && !isRecord(parsed.mcpServers)) throw new Error('mcpServers must be an object');
|
|
34
|
+
return parsed as McpFile;
|
|
35
|
+
}
|
|
36
|
+
|
|
37
|
+
async function writeConfigFile(path: string, config: McpFile): Promise<void> {
|
|
38
|
+
await writeFileAtomic(path, `${JSON.stringify(config, null, 2)}\n`);
|
|
39
|
+
}
|
|
40
|
+
|
|
41
|
+
/** Apply one server's enablement to the user-level denylist/allowlist pair. */
|
|
42
|
+
function withEnabledLists(
|
|
43
|
+
config: McpFile,
|
|
44
|
+
name: string,
|
|
45
|
+
previousName: string | undefined,
|
|
46
|
+
enabled: boolean | undefined,
|
|
47
|
+
): McpFile {
|
|
48
|
+
const disabled = new Set(stringsIn(config.disabledServers));
|
|
49
|
+
const enabledList = new Set(stringsIn(config.enabledServers));
|
|
50
|
+
for (const candidate of [name, previousName]) {
|
|
51
|
+
if (!candidate) continue;
|
|
52
|
+
disabled.delete(candidate);
|
|
53
|
+
enabledList.delete(candidate);
|
|
54
|
+
}
|
|
55
|
+
if (enabled === false) disabled.add(name);
|
|
56
|
+
const next: McpFile = { ...config };
|
|
57
|
+
if (disabled.size > 0) next.disabledServers = [...disabled].sort();
|
|
58
|
+
else delete next.disabledServers;
|
|
59
|
+
if (enabledList.size > 0) next.enabledServers = [...enabledList].sort();
|
|
60
|
+
else delete next.enabledServers;
|
|
61
|
+
return next;
|
|
62
|
+
}
|
|
63
|
+
|
|
64
|
+
async function applyEnabledLists(
|
|
65
|
+
path: string,
|
|
66
|
+
name: string,
|
|
67
|
+
previousName: string | undefined,
|
|
68
|
+
enabled: boolean | undefined,
|
|
69
|
+
): Promise<void> {
|
|
70
|
+
await withConfigLock(path, async () => {
|
|
71
|
+
const config = await readConfigFile(path);
|
|
72
|
+
const disabled = stringsIn(config.disabledServers);
|
|
73
|
+
const allowed = stringsIn(config.enabledServers);
|
|
74
|
+
const touches = [name, previousName].filter((entry): entry is string => Boolean(entry));
|
|
75
|
+
const changes =
|
|
76
|
+
enabled === false ||
|
|
77
|
+
touches.some((entry) => disabled.includes(entry) || allowed.includes(entry));
|
|
78
|
+
// A project-scope write must not create a user `mcp.json` that omp did not
|
|
79
|
+
// have: when neither list mentions the server, there is nothing to record.
|
|
80
|
+
if (!changes) return;
|
|
81
|
+
await writeConfigFile(path, withEnabledLists(config, name, previousName, enabled));
|
|
82
|
+
});
|
|
83
|
+
}
|
|
84
|
+
|
|
85
|
+
async function writeServerAt(
|
|
86
|
+
path: string,
|
|
87
|
+
name: string,
|
|
88
|
+
server: McpServer,
|
|
89
|
+
previousName?: string,
|
|
90
|
+
listsPath = path,
|
|
91
|
+
): Promise<{ path: string }> {
|
|
92
|
+
return withConfigLock(path, async () => {
|
|
93
|
+
const config = await readConfigFile(path);
|
|
94
|
+
const servers = { ...(config.mcpServers ?? {}) };
|
|
95
|
+
// Capture the old entry before any rename: a rename must retain
|
|
96
|
+
// credentials the browser intentionally redacts from its payload.
|
|
97
|
+
const previous = servers[previousName ?? name];
|
|
98
|
+
if (previousName && previousName !== name) delete servers[previousName];
|
|
99
|
+
const merged: Record<string, unknown> = { ...server };
|
|
100
|
+
for (const key of ['env', 'headers'] as const) {
|
|
101
|
+
if (previous?.[key] !== undefined && merged[key] === undefined) merged[key] = previous[key];
|
|
102
|
+
}
|
|
103
|
+
// `auth`/`oauth` carry credentials the browser only ever sees redacted, so
|
|
104
|
+
// they merge per FIELD: a form that edits `scope` and leaves `clientSecret`
|
|
105
|
+
// blank must not erase the stored secret.
|
|
106
|
+
for (const key of ['auth', 'oauth'] as const) {
|
|
107
|
+
const incoming = merged[key];
|
|
108
|
+
if (isRecord(incoming)) {
|
|
109
|
+
const prior = isRecord(previous?.[key]) ? previous[key] : undefined;
|
|
110
|
+
merged[key] = { ...(prior ?? {}), ...incoming };
|
|
111
|
+
} else if (previous?.[key] !== undefined) {
|
|
112
|
+
merged[key] = previous[key];
|
|
113
|
+
}
|
|
114
|
+
}
|
|
115
|
+
const enabled = merged.enabled === false ? false : merged.enabled === true ? true : undefined;
|
|
116
|
+
if (enabled === false) merged.enabled = false;
|
|
117
|
+
else delete merged.enabled;
|
|
118
|
+
servers[name] = merged;
|
|
119
|
+
const next = listsPath === path
|
|
120
|
+
? withEnabledLists({ ...config, mcpServers: servers }, name, previousName, enabled)
|
|
121
|
+
: { ...config, mcpServers: servers };
|
|
122
|
+
await writeConfigFile(path, next);
|
|
123
|
+
if (listsPath !== path) await applyEnabledLists(listsPath, name, previousName, enabled);
|
|
124
|
+
return { path };
|
|
125
|
+
});
|
|
126
|
+
}
|
|
127
|
+
|
|
128
|
+
async function deleteServerAt(path: string, name: string, listsPath = path): Promise<{ path: string }> {
|
|
129
|
+
if (!(await Bun.file(path).exists())) throw new Error('MCP server was not found');
|
|
130
|
+
return withConfigLock(path, async () => {
|
|
131
|
+
const config = await readConfigFile(path);
|
|
132
|
+
const servers = { ...(config.mcpServers ?? {}) };
|
|
133
|
+
if (!(name in servers)) throw new Error('MCP server was not found');
|
|
134
|
+
delete servers[name];
|
|
135
|
+
const next = listsPath === path
|
|
136
|
+
? withEnabledLists({ ...config, mcpServers: servers }, name, undefined, undefined)
|
|
137
|
+
: { ...config, mcpServers: servers };
|
|
138
|
+
await writeConfigFile(path, next);
|
|
139
|
+
if (listsPath !== path) await applyEnabledLists(listsPath, name, undefined, undefined);
|
|
140
|
+
return { path };
|
|
141
|
+
});
|
|
142
|
+
}
|
|
143
|
+
|
|
144
|
+
/** Atomic read-modify-write of one server entry in the user mcp.json. */
|
|
145
|
+
export async function writeUserMcpServer(
|
|
146
|
+
name: string,
|
|
147
|
+
server: McpServer,
|
|
148
|
+
path = userMcpConfigPath(),
|
|
149
|
+
previousName?: string,
|
|
150
|
+
): Promise<{ path: string }> {
|
|
151
|
+
if (!SERVER_NAME.test(name)) throw new Error('Invalid server name');
|
|
152
|
+
if (!isRecord(server)) throw new Error('Server configuration must be an object');
|
|
153
|
+
return writeServerAt(path, name, server, previousName);
|
|
154
|
+
}
|
|
155
|
+
|
|
156
|
+
/** Atomic removal of one server entry from the user mcp.json. */
|
|
157
|
+
export async function deleteUserMcpServer(name: string, path = userMcpConfigPath()): Promise<{ path: string }> {
|
|
158
|
+
if (!SERVER_NAME.test(name)) throw new Error('Invalid server name');
|
|
159
|
+
return deleteServerAt(path, name);
|
|
160
|
+
}
|
|
161
|
+
|
|
162
|
+
/** Atomic read-modify-write of one server entry in a project's mcp.json.
|
|
163
|
+
* Enablement lists live in the USER file, so a project write updates both. */
|
|
164
|
+
export async function writeProjectMcpServer(
|
|
165
|
+
projectRoot: string,
|
|
166
|
+
name: string,
|
|
167
|
+
server: McpServer,
|
|
168
|
+
previousName?: string,
|
|
169
|
+
): Promise<{ path: string }> {
|
|
170
|
+
if (!SERVER_NAME.test(name)) throw new Error('Invalid server name');
|
|
171
|
+
if (!isRecord(server)) throw new Error('Server configuration must be an object');
|
|
172
|
+
return writeServerAt((await resolveProjectMcpConfig(projectRoot)).path, name, server, previousName, userMcpConfigPath());
|
|
173
|
+
}
|
|
174
|
+
|
|
175
|
+
/** Atomic removal of one server entry from a project's mcp.json. */
|
|
176
|
+
export async function deleteProjectMcpServer(projectRoot: string, name: string): Promise<{ path: string }> {
|
|
177
|
+
if (!SERVER_NAME.test(name)) throw new Error('Invalid server name');
|
|
178
|
+
return deleteServerAt((await resolveProjectMcpConfig(projectRoot)).path, name, userMcpConfigPath());
|
|
179
|
+
}
|