Add type assertion to createTypedTool handlers for improved type safety

cursoragent · cameroncooke · cursoragent · commit cfb0d02c0277 · 2025-08-14T16:49:31.000Z
Co-authored-by: web &lt;web@cameroncooke.com&gt;
diff --git a/src/mcp/tools/device/build_device.ts b/src/mcp/tools/device/build_device.ts
@@ -66,7 +66,7 @@ export default {
     "Builds an app from a project or workspace for a physical Apple device. Provide exactly one of projectPath or workspacePath. Example: build_device({ projectPath: '/path/to/MyProject.xcodeproj', scheme: 'MyScheme' })",
   schema: baseSchemaObject.shape,
   handler: createTypedTool<BuildDeviceParams>(
-    buildDeviceSchema,
+    buildDeviceSchema as z.ZodType<BuildDeviceParams>,
     buildDeviceLogic,
     getDefaultCommandExecutor,
   ),
diff --git a/src/mcp/tools/device/get_device_app_path.ts b/src/mcp/tools/device/get_device_app_path.ts
@@ -161,7 +161,7 @@ export default {
     "Gets the app bundle path for a physical device application (iOS, watchOS, tvOS, visionOS) using either a project or workspace. Provide exactly one of projectPath or workspacePath. Example: get_device_app_path({ projectPath: '/path/to/project.xcodeproj', scheme: 'MyScheme' })",
   schema: baseSchemaObject.shape, // MCP SDK compatibility
   handler: createTypedTool<GetDeviceAppPathParams>(
-    getDeviceAppPathSchema,
+    getDeviceAppPathSchema as z.ZodType<GetDeviceAppPathParams>,
     get_device_app_pathLogic,
     getDefaultCommandExecutor,
   ),
diff --git a/src/mcp/tools/device/test_device.ts b/src/mcp/tools/device/test_device.ts
@@ -253,7 +253,7 @@ export default {
     'Runs tests for an Apple project or workspace on a physical device (iPhone, iPad, Apple Watch, Apple TV, Apple Vision Pro) using xcodebuild test and parses xcresult output. Provide exactly one of projectPath or workspacePath. IMPORTANT: Requires scheme and deviceId. Example: test_device({ projectPath: "/path/to/MyProject.xcodeproj", scheme: "MyScheme", deviceId: "device-uuid" })',
   schema: baseSchemaObject.shape,
   handler: createTypedTool<TestDeviceParams>(
-    testDeviceSchema,
+    testDeviceSchema as z.ZodType<TestDeviceParams>,
     (params: TestDeviceParams) => {
       return testDeviceLogic(
         {
diff --git a/src/mcp/tools/macos/build_macos.ts b/src/mcp/tools/macos/build_macos.ts
@@ -92,7 +92,7 @@ export default {
     "Builds a macOS app using xcodebuild from a project or workspace. Provide exactly one of projectPath or workspacePath. Example: build_macos({ projectPath: '/path/to/MyProject.xcodeproj', scheme: 'MyScheme' })",
   schema: baseSchemaObject.shape, // MCP SDK compatibility
   handler: createTypedTool<BuildMacOSParams>(
-    buildMacOSSchema,
+    buildMacOSSchema as z.ZodType<BuildMacOSParams>,
     buildMacOSLogic,
     getDefaultCommandExecutor,
   ),
diff --git a/src/mcp/tools/macos/build_run_macos.ts b/src/mcp/tools/macos/build_run_macos.ts
@@ -210,7 +210,7 @@ export default {
     "Builds and runs a macOS app from a project or workspace in one step. Provide exactly one of projectPath or workspacePath. Example: build_run_macos({ projectPath: '/path/to/MyProject.xcodeproj', scheme: 'MyScheme' })",
   schema: baseSchemaObject.shape, // MCP SDK compatibility
   handler: createTypedTool<BuildRunMacOSParams>(
-    buildRunMacOSSchema,
+    buildRunMacOSSchema as z.ZodType<BuildRunMacOSParams>,
     (params: BuildRunMacOSParams) =>
       buildRunMacOSLogic(
         {
diff --git a/src/mcp/tools/macos/get_macos_app_path.ts b/src/mcp/tools/macos/get_macos_app_path.ts
@@ -185,7 +185,7 @@ export default {
     "Gets the app bundle path for a macOS application using either a project or workspace. Provide exactly one of projectPath or workspacePath. Example: get_macos_app_path({ projectPath: '/path/to/project.xcodeproj', scheme: 'MyScheme' })",
   schema: baseSchemaObject.shape, // MCP SDK compatibility
   handler: createTypedTool<GetMacosAppPathParams>(
-    getMacosAppPathSchema,
+    getMacosAppPathSchema as z.ZodType<GetMacosAppPathParams>,
     get_macos_app_pathLogic,
     getDefaultCommandExecutor,
   ),
diff --git a/src/mcp/tools/macos/test_macos.ts b/src/mcp/tools/macos/test_macos.ts
@@ -306,7 +306,7 @@ export default {
     'Runs tests for a macOS project or workspace using xcodebuild test and parses xcresult output. Provide exactly one of projectPath or workspacePath. IMPORTANT: Requires scheme. Example: test_macos({ projectPath: "/path/to/MyProject.xcodeproj", scheme: "MyScheme" })',
   schema: baseSchemaObject.shape, // MCP SDK compatibility
   handler: createTypedTool<TestMacosParams>(
-    testMacosSchema,
+    testMacosSchema as z.ZodType<TestMacosParams>,
     (params: TestMacosParams) => {
       return testMacosLogic(params, getDefaultCommandExecutor(), getDefaultFileSystemExecutor());
     },
diff --git a/src/mcp/tools/project-discovery/list_schemes.ts b/src/mcp/tools/project-discovery/list_schemes.ts
@@ -114,7 +114,7 @@ export default {
     "Lists available schemes for either a project or a workspace. Provide exactly one of projectPath or workspacePath. Example: list_schemes({ projectPath: '/path/to/MyProject.xcodeproj' })",
   schema: baseSchemaObject.shape,
   handler: createTypedTool<ListSchemesParams>(
-    listSchemesSchema,
+    listSchemesSchema as z.ZodType<ListSchemesParams>,
     listSchemesLogic,
     getDefaultCommandExecutor,
   ),
diff --git a/src/mcp/tools/project-discovery/show_build_settings.ts b/src/mcp/tools/project-discovery/show_build_settings.ts
@@ -107,7 +107,7 @@ export default {
     "Shows build settings from either a project or workspace using xcodebuild. Provide exactly one of projectPath or workspacePath, plus scheme. Example: show_build_settings({ projectPath: '/path/to/MyProject.xcodeproj', scheme: 'MyScheme' })",
   schema: baseSchemaObject.shape,
   handler: createTypedTool<ShowBuildSettingsParams>(
-    showBuildSettingsSchema,
+    showBuildSettingsSchema as z.ZodType<ShowBuildSettingsParams>,
     showBuildSettingsLogic,
     getDefaultCommandExecutor,
   ),
diff --git a/src/mcp/tools/simulator/get_simulator_app_path.ts b/src/mcp/tools/simulator/get_simulator_app_path.ts
@@ -77,8 +77,6 @@ function constructDestinationString(
   return `platform=${platform}`;
 }
 
-
-
 // Define base schema
 const baseGetSimulatorAppPathSchema = z.object({
   projectPath: z
@@ -296,7 +294,7 @@ export default {
     "Gets the app bundle path for a simulator by UUID or name using either a project or workspace file. IMPORTANT: Requires either projectPath OR workspacePath (not both), plus scheme, platform, and either simulatorId OR simulatorName (not both). Example: get_simulator_app_path({ projectPath: '/path/to/project.xcodeproj', scheme: 'MyScheme', platform: 'iOS Simulator', simulatorName: 'iPhone 16' })",
   schema: baseGetSimulatorAppPathSchema.shape, // MCP SDK compatibility
   handler: createTypedTool<GetSimulatorAppPathParams>(
-    getSimulatorAppPathSchema,
+    getSimulatorAppPathSchema as z.ZodType<GetSimulatorAppPathParams>,
     get_simulator_app_pathLogic,
     getDefaultCommandExecutor,
   ),
diff --git a/src/mcp/tools/utilities/clean.ts b/src/mcp/tools/utilities/clean.ts
@@ -101,7 +101,7 @@ export default {
     "Cleans build products for either a project or a workspace using xcodebuild. Provide exactly one of projectPath or workspacePath. Example: clean({ projectPath: '/path/to/MyProject.xcodeproj', scheme: 'MyScheme' })",
   schema: baseSchemaObject.shape,
   handler: createTypedTool<CleanParams>(
-    cleanSchema,
+    cleanSchema as z.ZodType<CleanParams>,
     cleanLogic,
     getDefaultCommandExecutor,
   ),
diff --git a/src/utils/schema-helpers.ts b/src/utils/schema-helpers.ts
@@ -1,13 +1,13 @@
 /**
  * Schema Helper Utilities
- * 
+ *
  * Shared utility functions for schema validation and preprocessing.
  */
 
 /**
  * Convert empty strings to undefined in an object (shallow transformation)
  * Used for preprocessing Zod schemas with optional fields
- * 
+ *
  * @param value - The value to process
  * @returns The processed value with empty strings converted to undefined
  */
@@ -21,4 +21,4 @@ export function nullifyEmptyStrings(value: unknown): unknown {
     return copy;
   }
   return value;
-}
+}

Original file line number	Diff line number	Diff line change
`@@ -253,7 +253,7 @@ export default {`
`253`	`253`	`'Runs tests for an Apple project or workspace on a physical device (iPhone, iPad, Apple Watch, Apple TV, Apple Vision Pro) using xcodebuild test and parses xcresult output. Provide exactly one of projectPath or workspacePath. IMPORTANT: Requires scheme and deviceId. Example: test_device({ projectPath: "/path/to/MyProject.xcodeproj", scheme: "MyScheme", deviceId: "device-uuid" })',`
`254`	`254`	`schema: baseSchemaObject.shape,`
`255`	`255`	`handler: createTypedTool<TestDeviceParams>(`
`256`		`- testDeviceSchema,`
	`256`	`+ testDeviceSchema as z.ZodType<TestDeviceParams>,`
`257`	`257`	`(params: TestDeviceParams) => {`
`258`	`258`	`return testDeviceLogic(`
`259`	`259`	`{`
Original file line number	Diff line number	Diff line change
`@@ -210,7 +210,7 @@ export default {`
`210`	`210`	`"Builds and runs a macOS app from a project or workspace in one step. Provide exactly one of projectPath or workspacePath. Example: build_run_macos({ projectPath: '/path/to/MyProject.xcodeproj', scheme: 'MyScheme' })",`
`211`	`211`	`schema: baseSchemaObject.shape, // MCP SDK compatibility`
`212`	`212`	`handler: createTypedTool<BuildRunMacOSParams>(`
`213`		`- buildRunMacOSSchema,`
	`213`	`+ buildRunMacOSSchema as z.ZodType<BuildRunMacOSParams>,`
`214`	`214`	`(params: BuildRunMacOSParams) =>`
`215`	`215`	`buildRunMacOSLogic(`
`216`	`216`	`{`