refactor: centralize cli command schema catalog

Author: thymikee

src/command-catalog.ts

@@ -54,18 +54,32 @@ export const INTERNAL_COMMANDS = {
   sessionList: 'session_list',
 } as const;
 
+export const LOCAL_CLI_COMMANDS = {
+  auth: 'auth',
+  connect: 'connect',
+  connection: 'connection',
+  disconnect: 'disconnect',
+  mcp: 'mcp',
+  metro: 'metro',
+  reactDevtools: 'react-devtools',
+  session: 'session',
+} as const;
+
 const GESTURE_SUBCOMMANDS = ['pan', 'fling', 'pinch', 'rotate', 'transform'] as const;
 export const GESTURE_SUBCOMMAND_ERROR = `gesture requires one of: ${GESTURE_SUBCOMMANDS.join(', ')}`;
 
 export type PublicCommandName = (typeof PUBLIC_COMMANDS)[keyof typeof PUBLIC_COMMANDS];
-export type CliCommandName =
-  | PublicCommandName
-  | 'auth'
-  | 'connect'
-  | 'connection'
-  | 'disconnect'
-  | 'metro'
-  | 'session';
+export type LocalCliCommandName = (typeof LOCAL_CLI_COMMANDS)[keyof typeof LOCAL_CLI_COMMANDS];
+export type CliCommandName = PublicCommandName | LocalCliCommandName;
+
+export const MCP_EXCLUDED_CLI_COMMANDS = commandSet(
+  LOCAL_CLI_COMMANDS.auth,
+  LOCAL_CLI_COMMANDS.connect,
+  LOCAL_CLI_COMMANDS.connection,
+  LOCAL_CLI_COMMANDS.disconnect,
+  LOCAL_CLI_COMMANDS.mcp,
+  LOCAL_CLI_COMMANDS.reactDevtools,
+);
 
 export const DAEMON_COMMAND_GROUPS = {
   inventory: commandSet(

src/mcp/__tests__/router.test.ts

@@ -1,16 +1,9 @@
 import assert from 'node:assert/strict';
 import { test } from 'vitest';
+import { MCP_EXCLUDED_CLI_COMMANDS } from '../../command-catalog.ts';
 import { getCliCommandNames } from '../../utils/command-schema.ts';
 import { handleMcpMessage } from '../router.ts';
 
-const LOCAL_ONLY_CLI_COMMANDS = new Set([
-  'auth',
-  'connect',
-  'connection',
-  'disconnect',
-  'react-devtools',
-]);
-
 test('MCP exposes every automatable CLI command as a semantic direct tool', async () => {
   const response = await handleMcpMessage({
     jsonrpc: '2.0',
@@ -23,7 +16,7 @@ test('MCP exposes every automatable CLI command as a semantic direct tool', asyn
     (tool) => tool.name,
   );
   const expectedToolNames = getCliCommandNames()
-    .filter((command) => command !== 'mcp' && !LOCAL_ONLY_CLI_COMMANDS.has(command))
+    .filter((command) => !MCP_EXCLUDED_CLI_COMMANDS.has(command))
     .sort();
 
   assert.deepEqual(tools.filter((name) => name !== 'status').sort(), expectedToolNames);

src/utils/__tests__/args.test.ts

@@ -4,6 +4,7 @@ import { parseArgs, usage, usageForCommand } from '../args.ts';
 import { AppError } from '../errors.ts';
 import { getCliCommandNames, getSchemaCapabilityKeys } from '../command-schema.ts';
 import { listCapabilityCommands } from '../../core/capabilities.ts';
+import { LOCAL_CLI_COMMANDS, PUBLIC_COMMANDS } from '../../command-catalog.ts';
 
 test('parseArgs recognizes command-specific flag combinations', async () => {
   const scenarios: Array<{
@@ -136,6 +137,13 @@ test('parseArgs recognizes command-specific flag combinations', async () => {
   }
 });
 
+test('command parser schemas cover the centralized CLI command catalog', () => {
+  assert.deepEqual(
+    new Set(getCliCommandNames()),
+    new Set([...Object.values(PUBLIC_COMMANDS), ...Object.values(LOCAL_CLI_COMMANDS)]),
+  );
+});
+
 test('parseArgs recognizes device isolation flags', () => {
   const parsed = parseArgs(
     [

src/utils/command-schema.ts

@@ -8,6 +8,7 @@ import {
   SCREENSHOT_SPECIFIC_FLAG_DEFINITIONS,
   type ScreenshotRequestFlags,
 } from '../commands/capture-screenshot-options.ts';
+import type { CliCommandName } from '../command-catalog.ts';
 
 export type CliFlags = RemoteConfigMetroOptions &
   ScreenshotRequestFlags & {
@@ -1481,7 +1482,7 @@ export const GLOBAL_FLAG_KEYS = new Set<FlagKey>([
   'noRecord',
 ]);
 
-const COMMAND_SCHEMAS: Record<string, CommandSchema> = {
+const COMMAND_SCHEMAS: Record<CliCommandName, CommandSchema> = {
   boot: {
     helpDescription: 'Ensure target device/simulator is booted and ready',
     summary: 'Boot target device/simulator',
@@ -1944,6 +1945,8 @@ const COMMAND_SCHEMAS: Record<string, CommandSchema> = {
   },
 };
 
+const COMMAND_SCHEMA_MAP: Readonly<Record<string, CommandSchema>> = COMMAND_SCHEMAS;
+
 const flagDefinitionByName = new Map<string, FlagDefinition>();
 const flagDefinitionsByKey = new Map<FlagKey, FlagDefinition[]>();
 for (const definition of FLAG_DEFINITIONS) {
@@ -1965,7 +1968,7 @@ export function getFlagDefinitions(): readonly FlagDefinition[] {
 
 export function getCommandSchema(command: string | null): CommandSchema | undefined {
   if (!command) return undefined;
-  return COMMAND_SCHEMAS[command];
+  return COMMAND_SCHEMA_MAP[command];
 }
 
 export function applyCommandDefaults(
@@ -2044,7 +2047,7 @@ CLI to control iOS and Android devices for AI agents.
 `;
 
   const commands = getCliCommandNames().map((name) => {
-    const schema = COMMAND_SCHEMAS[name];
+    const schema = COMMAND_SCHEMA_MAP[name];
     if (!schema) throw new Error(`Missing command schema for ${name}`);
     return { name, schema, usage: buildCommandListUsage(name, schema) };
   });