feat: map add-mcp hosts added after 2.0

package.json

@@ -50,7 +50,7 @@
 		"@inquirer/checkbox": "^5.2.2",
 		"@modelcontextprotocol/client": "2.0.0",
 		"@napi-rs/keyring": "^1.3.0",
-		"add-mcp": "^2.0.0",
+		"add-mcp": "^2.4.0",
 		"ps-list": "^9.0.0"
 	},
 	"devDependencies": {

src/add-mcp-install.ts

@@ -18,12 +18,18 @@ export const addMcpAgentByHostId = {
 	'claude-code': 'claude-code',
 	codex: 'codex',
 	cursor: 'cursor',
+	fx: 'fx',
 	'gemini-cli': 'gemini-cli',
 	goose: 'goose',
 	'copilot-cli': 'github-copilot-cli',
 	'grok-build': 'grok-build',
+	'kilo-code': 'kilo-code',
+	'kimi-code': 'kimi-code',
+	'kiro-cli': 'kiro-cli',
+	mastracode: 'mastracode',
 	mcporter: 'mcporter',
 	opencode: 'opencode',
+	pi: 'pi',
 	vscode: 'vscode',
 	windsurf: 'windsurf',
 	zed: 'zed',
@@ -38,8 +44,13 @@ const addMcpProjectHosts = new Set<AddMcpHostId>([
 	'gemini-cli',
 	'copilot-cli',
 	'grok-build',
+	'kilo-code',
+	'kimi-code',
+	'kiro-cli',
+	'mastracode',
 	'mcporter',
 	'opencode',
+	'pi',
 	'vscode',
 	'zed',
 ])

src/host-catalog.ts

@@ -11,12 +11,18 @@ export const hostIds = [
 	'codex',
 	'copilot-cli',
 	'cursor',
+	'fx',
 	'gemini-cli',
 	'goose',
 	'grok-build',
 	'jetbrains',
+	'kilo-code',
+	'kimi-code',
+	'kiro-cli',
+	'mastracode',
 	'mcporter',
 	'opencode',
+	'pi',
 	'qwen-code',
 	'visual-studio',
 	'vscode',
@@ -42,6 +48,12 @@ const hostAliases: Record<string, HostId> = {
 	cascade: 'windsurf',
 	gemini: 'gemini-cli',
 	'github-copilot-cli': 'copilot-cli',
+	kilo: 'kilo-code',
+	kilocode: 'kilo-code',
+	kimi: 'kimi-code',
+	kiro: 'kiro-cli',
+	mastra: 'mastracode',
+	'pi-agent': 'pi',
 }
 
 function isClaudeDesktop(process: ProcessInfo): boolean {
@@ -230,6 +242,45 @@ export const hostCatalog: ReadonlyArray<HostDefinition> = [
 		kind: 'file',
 		matches: (process) => nameEquals(process, 'mcporter'),
 	},
+	{
+		id: 'kilo-code',
+		label: 'Kilo Code',
+		kind: 'file',
+		matches: (process) =>
+			nameEquals(process, 'kilo') ||
+			haystackMatches(process, /Kilo\.app|kilocode\.kilo-code|kilo-code/iu),
+	},
+	{
+		id: 'kimi-code',
+		label: 'Kimi Code',
+		kind: 'command',
+		matches: (process) => nameEquals(process, 'kimi'),
+	},
+	{
+		id: 'kiro-cli',
+		label: 'Kiro CLI',
+		kind: 'file',
+		matches: (process) =>
+			nameEquals(process, 'kiro') || haystackMatches(process, /Kiro\.app/iu),
+	},
+	{
+		id: 'mastracode',
+		label: 'Mastra Code',
+		kind: 'file',
+		matches: (process) => nameEquals(process, 'mastra', 'mastracode'),
+	},
+	{
+		id: 'fx',
+		label: 'fx',
+		kind: 'file',
+		matches: (process) => nameEquals(process, 'fx'),
+	},
+	{
+		id: 'pi',
+		label: 'Pi',
+		kind: 'file',
+		matches: (process) => nameEquals(process, 'pi'),
+	},
 	{
 		id: 'visual-studio',
 		label: 'Visual Studio',
@@ -303,10 +354,21 @@ export function hostConfigPath(input: {
 				return join(input.cwd, '.grok', 'config.toml')
 			case 'mcporter':
 				return join(input.cwd, 'config', 'mcporter.json')
+			case 'kilo-code':
+				return join(input.cwd, 'kilo.json')
+			case 'kimi-code':
+				return join(input.cwd, '.kimi-code', 'mcp.json')
+			case 'kiro-cli':
+				return join(input.cwd, '.kiro', 'settings', 'mcp.json')
+			case 'mastracode':
+				return join(input.cwd, '.mastracode', 'mcp.json')
+			case 'pi':
+				return join(input.cwd, '.pi', 'mcp.json')
 			case 'antigravity':
 			case 'claude-desktop':
 			case 'cline':
 			case 'cline-cli':
+			case 'fx':
 			case 'goose':
 			case 'windsurf':
 			case 'visual-studio':
@@ -362,6 +424,18 @@ export function hostConfigPath(input: {
 			return join(input.home, '.grok', 'config.toml')
 		case 'mcporter':
 			return join(input.home, '.mcporter', 'mcporter.json')
+		case 'kilo-code':
+			return join(configHome(input.home, platform), 'kilo', 'kilo.json')
+		case 'kimi-code':
+			return join(input.home, '.kimi-code', 'mcp.json')
+		case 'kiro-cli':
+			return join(input.home, '.kiro', 'settings', 'mcp.json')
+		case 'mastracode':
+			return join(input.home, '.mastracode', 'mcp.json')
+		case 'fx':
+			return join(input.home, '.fx', 'mcp.json')
+		case 'pi':
+			return join(input.home, '.pi', 'agent', 'mcp.json')
 		case 'visual-studio':
 			return join(input.home, '.mcp.json')
 		case 'claude-desktop':

src/install-hosts.ts

@@ -318,8 +318,14 @@ export async function applyHost(input: {
 		case 'antigravity':
 		case 'cline':
 		case 'cline-cli':
+		case 'fx':
 		case 'grok-build':
+		case 'kilo-code':
+		case 'kimi-code':
+		case 'kiro-cli':
+		case 'mastracode':
 		case 'mcporter':
+		case 'pi':
 			return addMcpResult(input, [
 				`Restart ${host.label} if the new server does not appear.`,
 				oauthNote,

test/host-catalog.test.ts

@@ -13,6 +13,13 @@ import {
 test('parseHostIds rejects web clients and accepts local aliases', () => {
 	assert.deepEqual(parseHostIds('cursor,vscode'), ['cursor', 'vscode'])
 	assert.deepEqual(parseHostIds('github-copilot-cli,gemini'), ['copilot-cli', 'gemini-cli'])
+	assert.deepEqual(parseHostIds('kilo,kimi,kiro,mastra,pi-agent'), [
+		'kilo-code',
+		'kimi-code',
+		'kiro-cli',
+		'mastracode',
+		'pi',
+	])
 	assert.throws(() => parseHostIds('chatgpt'), /web client/)
 	assert.throws(() => parseHostIds('grok'), /grok-build/)
 	assert.throws(() => parseHostIds('claude.ai'), /web client/)
@@ -35,6 +42,22 @@ test('detectRunningHosts only matches local process names', () => {
 	)
 })
 
+test('add-mcp hosts added after 2.0 match local process names', () => {
+	const detected = detectRunningHosts([
+		{ name: 'kilo', cmd: '/usr/local/bin/kilo' },
+		{ name: 'kimi', cmd: '/usr/local/bin/kimi' },
+		{ name: 'Kiro', cmd: '/Applications/Kiro.app/Contents/MacOS/Kiro' },
+		{ name: 'mastra', cmd: '/usr/local/bin/mastra' },
+		{ name: 'fx', cmd: '/usr/local/bin/fx' },
+		{ name: 'pi', cmd: '/usr/local/bin/pi' },
+		{ name: 'Safari', cmd: '/Applications/Safari.app/Contents/MacOS/Safari' },
+	])
+	assert.deepEqual(
+		detected.map((host) => host.id).sort(),
+		['fx', 'kilo-code', 'kimi-code', 'kiro-cli', 'mastracode', 'pi'],
+	)
+})
+
 test('Cursor is not classified as VS Code', () => {
 	const detected = detectRunningHosts([
 		{ name: 'Cursor Helper', cmd: '/Applications/Cursor.app/Contents/Frameworks/Cursor Helper.app' },
@@ -77,6 +100,32 @@ test('hostConfigPath uses user-level files by default', () => {
 		hostConfigPath({ id: 'cursor', home: '/home/me', cwd: '/proj', project: true }),
 		'/proj/.cursor/mcp.json',
 	)
+	assert.equal(
+		hostConfigPath({
+			id: 'kilo-code',
+			home: '/home/me',
+			cwd: '/proj',
+			project: false,
+			platform: 'linux',
+		}),
+		'/home/me/.config/kilo/kilo.json',
+	)
+	assert.equal(
+		hostConfigPath({ id: 'kilo-code', home: '/home/me', cwd: '/proj', project: true }),
+		'/proj/kilo.json',
+	)
+	assert.equal(
+		hostConfigPath({ id: 'fx', home: '/home/me', cwd: '/proj', project: true }),
+		null,
+	)
+	assert.equal(
+		hostConfigPath({ id: 'fx', home: '/home/me', cwd: '/proj', project: false }),
+		'/home/me/.fx/mcp.json',
+	)
+	assert.equal(
+		hostConfigPath({ id: 'pi', home: '/home/me', cwd: '/proj', project: false }),
+		'/home/me/.pi/agent/mcp.json',
+	)
 })
 
 test('install deeplinks encode the MCP URL', () => {

test/install.test.ts

@@ -77,6 +77,28 @@ test('runInstall does not list web clients when nothing local is running', async
 	assert.doesNotMatch(output, /chatgpt/)
 })
 
+test('runInstall writes Kilo Code config through add-mcp', async () => {
+	const upserts: Array<{ agent: string; local?: boolean }> = []
+	const result = await runInstall(
+		{ mcpUrl, clients: 'kilo-code' },
+		{
+			stdout: () => undefined,
+			home: '/home/me',
+			cwd: '/proj',
+			isTTY: false,
+			listProcesses: async () => [],
+			runtime: {
+				upsertServer: (agent, _name, _config, options) => {
+					upserts.push({ agent, local: options?.local })
+					return { success: true, path: '/home/me/.config/kilo/kilo.json' }
+				},
+			},
+		},
+	)
+	assert.equal(result.results[0]?.status, 'wrote')
+	assert.deepEqual(upserts, [{ agent: 'kilo-code', local: false }])
+})
+
 test('runInstall writes leftover VS Code Insiders config without add-mcp', async () => {
 	const files = new Map<string, string>()
 	const upserts: Array<string> = []