From 58befd6eaedf68fa277164481b16affa0d51fcab Mon Sep 17 00:00:00 2001 From: "lilong.129" Date: Sun, 22 Jun 2025 22:54:12 +0800 Subject: [PATCH] refactor: rename buildMCPCallToolRequest to BuildMCPCallToolRequest for consistency across the codebase --- internal/version/VERSION | 2 +- uixt/mcp_server.go | 4 ++-- uixt/mcp_tools_ai.go | 8 ++++---- uixt/mcp_tools_app.go | 14 +++++++------- uixt/mcp_tools_button.go | 6 +++--- uixt/mcp_tools_device.go | 6 +++--- uixt/mcp_tools_input.go | 4 ++-- uixt/mcp_tools_screen.go | 6 +++--- uixt/mcp_tools_swipe.go | 12 ++++++------ uixt/mcp_tools_touch.go | 10 +++++----- uixt/mcp_tools_utility.go | 8 ++++---- uixt/mcp_tools_web.go | 12 ++++++------ 12 files changed, 46 insertions(+), 46 deletions(-) diff --git a/internal/version/VERSION b/internal/version/VERSION index f224e5b0..3c80d5e7 100644 --- a/internal/version/VERSION +++ b/internal/version/VERSION @@ -1 +1 @@ -v5.0.0-beta-2506222142 +v5.0.0-beta-2506222254 diff --git a/uixt/mcp_server.go b/uixt/mcp_server.go index d08f659e..06dfb9c3 100644 --- a/uixt/mcp_server.go +++ b/uixt/mcp_server.go @@ -156,8 +156,8 @@ type ActionTool interface { ConvertActionToCallToolRequest(action option.MobileAction) (mcp.CallToolRequest, error) } -// buildMCPCallToolRequest is a helper function to build mcp.CallToolRequest -func buildMCPCallToolRequest(toolName option.ActionName, arguments map[string]any) mcp.CallToolRequest { +// BuildMCPCallToolRequest is a helper function to build mcp.CallToolRequest +func BuildMCPCallToolRequest(toolName option.ActionName, arguments map[string]any) mcp.CallToolRequest { return mcp.CallToolRequest{ Params: struct { Name string `json:"name"` diff --git a/uixt/mcp_tools_ai.go b/uixt/mcp_tools_ai.go index 7ef8c5d2..bc9a42c0 100644 --- a/uixt/mcp_tools_ai.go +++ b/uixt/mcp_tools_ai.go @@ -65,7 +65,7 @@ func (t *ToolStartToGoal) ConvertActionToCallToolRequest(action option.MobileAct // Extract options to arguments extractActionOptionsToArguments(action.GetOptions(), arguments) - return buildMCPCallToolRequest(t.Name(), arguments), nil + return BuildMCPCallToolRequest(t.Name(), arguments), nil } return mcp.CallToolRequest{}, fmt.Errorf("invalid start to goal params: %v", action.Params) } @@ -125,7 +125,7 @@ func (t *ToolAIAction) ConvertActionToCallToolRequest(action option.MobileAction // Extract options to arguments extractActionOptionsToArguments(action.GetOptions(), arguments) - return buildMCPCallToolRequest(t.Name(), arguments), nil + return BuildMCPCallToolRequest(t.Name(), arguments), nil } return mcp.CallToolRequest{}, fmt.Errorf("invalid AI action params: %v", action.Params) } @@ -190,7 +190,7 @@ func (t *ToolAIQuery) ConvertActionToCallToolRequest(action option.MobileAction) // Extract options to arguments extractActionOptionsToArguments(action.GetOptions(), arguments) - return buildMCPCallToolRequest(t.Name(), arguments), nil + return BuildMCPCallToolRequest(t.Name(), arguments), nil } return mcp.CallToolRequest{}, fmt.Errorf("invalid AI query params: %v", action.Params) } @@ -236,7 +236,7 @@ func (t *ToolFinished) ConvertActionToCallToolRequest(action option.MobileAction arguments := map[string]any{ "content": reason, } - return buildMCPCallToolRequest(t.Name(), arguments), nil + return BuildMCPCallToolRequest(t.Name(), arguments), nil } return mcp.CallToolRequest{}, fmt.Errorf("invalid finished params: %v", action.Params) } diff --git a/uixt/mcp_tools_app.go b/uixt/mcp_tools_app.go index dc20eea0..417d5fac 100644 --- a/uixt/mcp_tools_app.go +++ b/uixt/mcp_tools_app.go @@ -53,7 +53,7 @@ func (t *ToolListPackages) Implement() server.ToolHandlerFunc { } func (t *ToolListPackages) ConvertActionToCallToolRequest(action option.MobileAction) (mcp.CallToolRequest, error) { - return buildMCPCallToolRequest(t.Name(), map[string]any{}), nil + return BuildMCPCallToolRequest(t.Name(), map[string]any{}), nil } // ToolLaunchApp implements the launch_app tool call. @@ -109,7 +109,7 @@ func (t *ToolLaunchApp) ConvertActionToCallToolRequest(action option.MobileActio arguments := map[string]any{ "packageName": packageName, } - return buildMCPCallToolRequest(t.Name(), arguments), nil + return BuildMCPCallToolRequest(t.Name(), arguments), nil } return mcp.CallToolRequest{}, fmt.Errorf("invalid app launch params: %v", action.Params) } @@ -174,7 +174,7 @@ func (t *ToolTerminateApp) ConvertActionToCallToolRequest(action option.MobileAc arguments := map[string]any{ "packageName": packageName, } - return buildMCPCallToolRequest(t.Name(), arguments), nil + return BuildMCPCallToolRequest(t.Name(), arguments), nil } return mcp.CallToolRequest{}, fmt.Errorf("invalid app terminate params: %v", action.Params) } @@ -228,7 +228,7 @@ func (t *ToolAppInstall) ConvertActionToCallToolRequest(action option.MobileActi arguments := map[string]any{ "appUrl": appUrl, } - return buildMCPCallToolRequest(t.Name(), arguments), nil + return BuildMCPCallToolRequest(t.Name(), arguments), nil } return mcp.CallToolRequest{}, fmt.Errorf("invalid app install params: %v", action.Params) } @@ -282,7 +282,7 @@ func (t *ToolAppUninstall) ConvertActionToCallToolRequest(action option.MobileAc arguments := map[string]any{ "packageName": packageName, } - return buildMCPCallToolRequest(t.Name(), arguments), nil + return BuildMCPCallToolRequest(t.Name(), arguments), nil } return mcp.CallToolRequest{}, fmt.Errorf("invalid app uninstall params: %v", action.Params) } @@ -336,7 +336,7 @@ func (t *ToolAppClear) ConvertActionToCallToolRequest(action option.MobileAction arguments := map[string]any{ "packageName": packageName, } - return buildMCPCallToolRequest(t.Name(), arguments), nil + return BuildMCPCallToolRequest(t.Name(), arguments), nil } return mcp.CallToolRequest{}, fmt.Errorf("invalid app clear params: %v", action.Params) } @@ -385,5 +385,5 @@ func (t *ToolGetForegroundApp) Implement() server.ToolHandlerFunc { } func (t *ToolGetForegroundApp) ConvertActionToCallToolRequest(action option.MobileAction) (mcp.CallToolRequest, error) { - return buildMCPCallToolRequest(t.Name(), map[string]any{}), nil + return BuildMCPCallToolRequest(t.Name(), map[string]any{}), nil } diff --git a/uixt/mcp_tools_button.go b/uixt/mcp_tools_button.go index 4f891538..f49ae309 100644 --- a/uixt/mcp_tools_button.go +++ b/uixt/mcp_tools_button.go @@ -59,7 +59,7 @@ func (t *ToolPressButton) ConvertActionToCallToolRequest(action option.MobileAct arguments := map[string]any{ "button": button, } - return buildMCPCallToolRequest(t.Name(), arguments), nil + return BuildMCPCallToolRequest(t.Name(), arguments), nil } return mcp.CallToolRequest{}, fmt.Errorf("invalid press button params: %v", action.Params) } @@ -102,7 +102,7 @@ func (t *ToolHome) Implement() server.ToolHandlerFunc { } func (t *ToolHome) ConvertActionToCallToolRequest(action option.MobileAction) (mcp.CallToolRequest, error) { - return buildMCPCallToolRequest(t.Name(), map[string]any{}), nil + return BuildMCPCallToolRequest(t.Name(), map[string]any{}), nil } // ToolBack implements the back tool call. @@ -143,5 +143,5 @@ func (t *ToolBack) Implement() server.ToolHandlerFunc { } func (t *ToolBack) ConvertActionToCallToolRequest(action option.MobileAction) (mcp.CallToolRequest, error) { - return buildMCPCallToolRequest(t.Name(), map[string]any{}), nil + return BuildMCPCallToolRequest(t.Name(), map[string]any{}), nil } diff --git a/uixt/mcp_tools_device.go b/uixt/mcp_tools_device.go index 2d44cad2..8a2fa84f 100644 --- a/uixt/mcp_tools_device.go +++ b/uixt/mcp_tools_device.go @@ -82,7 +82,7 @@ func (t *ToolListAvailableDevices) Implement() server.ToolHandlerFunc { } func (t *ToolListAvailableDevices) ConvertActionToCallToolRequest(action option.MobileAction) (mcp.CallToolRequest, error) { - return buildMCPCallToolRequest(t.Name(), map[string]any{}), nil + return BuildMCPCallToolRequest(t.Name(), map[string]any{}), nil } // ToolSelectDevice implements the select_device tool call. @@ -122,7 +122,7 @@ func (t *ToolSelectDevice) Implement() server.ToolHandlerFunc { } func (t *ToolSelectDevice) ConvertActionToCallToolRequest(action option.MobileAction) (mcp.CallToolRequest, error) { - return buildMCPCallToolRequest(t.Name(), map[string]any{}), nil + return BuildMCPCallToolRequest(t.Name(), map[string]any{}), nil } // ToolScreenRecord implements the screenrecord tool call. @@ -212,5 +212,5 @@ func (t *ToolScreenRecord) Implement() server.ToolHandlerFunc { } func (t *ToolScreenRecord) ConvertActionToCallToolRequest(action option.MobileAction) (mcp.CallToolRequest, error) { - return buildMCPCallToolRequest(t.Name(), map[string]any{}), nil + return BuildMCPCallToolRequest(t.Name(), map[string]any{}), nil } diff --git a/uixt/mcp_tools_input.go b/uixt/mcp_tools_input.go index 0485ba13..4286e211 100644 --- a/uixt/mcp_tools_input.go +++ b/uixt/mcp_tools_input.go @@ -62,7 +62,7 @@ func (t *ToolInput) ConvertActionToCallToolRequest(action option.MobileAction) ( arguments := map[string]any{ "text": text, } - return buildMCPCallToolRequest(t.Name(), arguments), nil + return BuildMCPCallToolRequest(t.Name(), arguments), nil } // ToolSetIme implements the set_ime tool call. @@ -114,7 +114,7 @@ func (t *ToolSetIme) ConvertActionToCallToolRequest(action option.MobileAction) arguments := map[string]any{ "ime": ime, } - return buildMCPCallToolRequest(t.Name(), arguments), nil + return BuildMCPCallToolRequest(t.Name(), arguments), nil } return mcp.CallToolRequest{}, fmt.Errorf("invalid set ime params: %v", action.Params) } diff --git a/uixt/mcp_tools_screen.go b/uixt/mcp_tools_screen.go index 2d4f5393..eaf38261 100644 --- a/uixt/mcp_tools_screen.go +++ b/uixt/mcp_tools_screen.go @@ -46,7 +46,7 @@ func (t *ToolScreenShot) Implement() server.ToolHandlerFunc { } func (t *ToolScreenShot) ConvertActionToCallToolRequest(action option.MobileAction) (mcp.CallToolRequest, error) { - return buildMCPCallToolRequest(t.Name(), map[string]any{}), nil + return BuildMCPCallToolRequest(t.Name(), map[string]any{}), nil } // ToolGetScreenSize implements the get_screen_size tool call. @@ -92,7 +92,7 @@ func (t *ToolGetScreenSize) Implement() server.ToolHandlerFunc { } func (t *ToolGetScreenSize) ConvertActionToCallToolRequest(action option.MobileAction) (mcp.CallToolRequest, error) { - return buildMCPCallToolRequest(t.Name(), map[string]any{}), nil + return BuildMCPCallToolRequest(t.Name(), map[string]any{}), nil } // ToolGetSource implements the get_source tool call. @@ -148,7 +148,7 @@ func (t *ToolGetSource) ConvertActionToCallToolRequest(action option.MobileActio arguments := map[string]any{ "packageName": packageName, } - return buildMCPCallToolRequest(t.Name(), arguments), nil + return BuildMCPCallToolRequest(t.Name(), arguments), nil } return mcp.CallToolRequest{}, fmt.Errorf("invalid get source params: %v", action.Params) } diff --git a/uixt/mcp_tools_swipe.go b/uixt/mcp_tools_swipe.go index f5354748..8c6108ba 100644 --- a/uixt/mcp_tools_swipe.go +++ b/uixt/mcp_tools_swipe.go @@ -188,7 +188,7 @@ func (t *ToolSwipeDirection) ConvertActionToCallToolRequest(action option.Mobile // Extract all action options extractActionOptionsToArguments(action.GetOptions(), arguments) - return buildMCPCallToolRequest(t.Name(), arguments), nil + return BuildMCPCallToolRequest(t.Name(), arguments), nil } return mcp.CallToolRequest{}, fmt.Errorf("invalid swipe params: %v", action.Params) } @@ -290,7 +290,7 @@ func (t *ToolSwipeCoordinate) ConvertActionToCallToolRequest(action option.Mobil // Extract all action options extractActionOptionsToArguments(action.GetOptions(), arguments) - return buildMCPCallToolRequest(t.Name(), arguments), nil + return BuildMCPCallToolRequest(t.Name(), arguments), nil } return mcp.CallToolRequest{}, fmt.Errorf("invalid swipe advanced params: %v", action.Params) } @@ -364,7 +364,7 @@ func (t *ToolSwipeToTapApp) ConvertActionToCallToolRequest(action option.MobileA // Extract options to arguments extractActionOptionsToArguments(action.GetOptions(), arguments) - return buildMCPCallToolRequest(t.Name(), arguments), nil + return BuildMCPCallToolRequest(t.Name(), arguments), nil } return mcp.CallToolRequest{}, fmt.Errorf("invalid swipe to tap app params: %v", action.Params) } @@ -441,7 +441,7 @@ func (t *ToolSwipeToTapText) ConvertActionToCallToolRequest(action option.Mobile // Extract options to arguments extractActionOptionsToArguments(action.GetOptions(), arguments) - return buildMCPCallToolRequest(t.Name(), arguments), nil + return BuildMCPCallToolRequest(t.Name(), arguments), nil } return mcp.CallToolRequest{}, fmt.Errorf("invalid swipe to tap text params: %v", action.Params) } @@ -529,7 +529,7 @@ func (t *ToolSwipeToTapTexts) ConvertActionToCallToolRequest(action option.Mobil // Extract options to arguments extractActionOptionsToArguments(action.GetOptions(), arguments) - return buildMCPCallToolRequest(t.Name(), arguments), nil + return BuildMCPCallToolRequest(t.Name(), arguments), nil } // ToolDrag implements the drag tool call. @@ -618,7 +618,7 @@ func (t *ToolDrag) ConvertActionToCallToolRequest(action option.MobileAction) (m // Extract all action options extractActionOptionsToArguments(action.GetOptions(), arguments) - return buildMCPCallToolRequest(t.Name(), arguments), nil + return BuildMCPCallToolRequest(t.Name(), arguments), nil } return mcp.CallToolRequest{}, fmt.Errorf("invalid drag parameters: %v", action.Params) } diff --git a/uixt/mcp_tools_touch.go b/uixt/mcp_tools_touch.go index 85fde536..2ff3376e 100644 --- a/uixt/mcp_tools_touch.go +++ b/uixt/mcp_tools_touch.go @@ -86,7 +86,7 @@ func (t *ToolTapXY) ConvertActionToCallToolRequest(action option.MobileAction) ( // Extract options to arguments extractActionOptionsToArguments(action.GetOptions(), arguments) - return buildMCPCallToolRequest(t.Name(), arguments), nil + return BuildMCPCallToolRequest(t.Name(), arguments), nil } return mcp.CallToolRequest{}, fmt.Errorf("invalid tap params: %v", action.Params) } @@ -172,7 +172,7 @@ func (t *ToolTapAbsXY) ConvertActionToCallToolRequest(action option.MobileAction // Extract options to arguments extractActionOptionsToArguments(action.GetOptions(), arguments) - return buildMCPCallToolRequest(t.Name(), arguments), nil + return BuildMCPCallToolRequest(t.Name(), arguments), nil } return mcp.CallToolRequest{}, fmt.Errorf("invalid tap abs params: %v", action.Params) } @@ -243,7 +243,7 @@ func (t *ToolTapByOCR) ConvertActionToCallToolRequest(action option.MobileAction // Extract options to arguments extractActionOptionsToArguments(action.GetOptions(), arguments) - return buildMCPCallToolRequest(t.Name(), arguments), nil + return BuildMCPCallToolRequest(t.Name(), arguments), nil } return mcp.CallToolRequest{}, fmt.Errorf("invalid tap by OCR params: %v", action.Params) } @@ -309,7 +309,7 @@ func (t *ToolTapByCV) ConvertActionToCallToolRequest(action option.MobileAction) // Extract options to arguments extractActionOptionsToArguments(action.GetOptions(), arguments) - return buildMCPCallToolRequest(t.Name(), arguments), nil + return BuildMCPCallToolRequest(t.Name(), arguments), nil } // ToolDoubleTapXY implements the double_tap_xy tool call. @@ -372,7 +372,7 @@ func (t *ToolDoubleTapXY) ConvertActionToCallToolRequest(action option.MobileAct "x": x, "y": y, } - return buildMCPCallToolRequest(t.Name(), arguments), nil + return BuildMCPCallToolRequest(t.Name(), arguments), nil } return mcp.CallToolRequest{}, fmt.Errorf("invalid double tap params: %v", action.Params) } diff --git a/uixt/mcp_tools_utility.go b/uixt/mcp_tools_utility.go index f7877394..32f1c4d3 100644 --- a/uixt/mcp_tools_utility.go +++ b/uixt/mcp_tools_utility.go @@ -92,7 +92,7 @@ func (t *ToolSleep) ConvertActionToCallToolRequest(action option.MobileAction) ( arguments := map[string]any{ "seconds": action.Params, } - return buildMCPCallToolRequest(t.Name(), arguments), nil + return BuildMCPCallToolRequest(t.Name(), arguments), nil } // ToolSleepMS implements the sleep_ms tool call. @@ -160,7 +160,7 @@ func (t *ToolSleepMS) ConvertActionToCallToolRequest(action option.MobileAction) arguments := map[string]any{ "milliseconds": milliseconds, } - return buildMCPCallToolRequest(t.Name(), arguments), nil + return BuildMCPCallToolRequest(t.Name(), arguments), nil } // ToolSleepRandom implements the sleep_random tool call. @@ -204,7 +204,7 @@ func (t *ToolSleepRandom) ConvertActionToCallToolRequest(action option.MobileAct arguments := map[string]any{ "params": params, } - return buildMCPCallToolRequest(t.Name(), arguments), nil + return BuildMCPCallToolRequest(t.Name(), arguments), nil } return mcp.CallToolRequest{}, fmt.Errorf("invalid sleep random params: %v", action.Params) } @@ -247,5 +247,5 @@ func (t *ToolClosePopups) Implement() server.ToolHandlerFunc { } func (t *ToolClosePopups) ConvertActionToCallToolRequest(action option.MobileAction) (mcp.CallToolRequest, error) { - return buildMCPCallToolRequest(t.Name(), map[string]any{}), nil + return BuildMCPCallToolRequest(t.Name(), map[string]any{}), nil } diff --git a/uixt/mcp_tools_web.go b/uixt/mcp_tools_web.go index e5715b9a..dcab952a 100644 --- a/uixt/mcp_tools_web.go +++ b/uixt/mcp_tools_web.go @@ -63,7 +63,7 @@ func (t *ToolWebLoginNoneUI) Implement() server.ToolHandlerFunc { } func (t *ToolWebLoginNoneUI) ConvertActionToCallToolRequest(action option.MobileAction) (mcp.CallToolRequest, error) { - return buildMCPCallToolRequest(t.Name(), map[string]any{}), nil + return BuildMCPCallToolRequest(t.Name(), map[string]any{}), nil } // ToolSecondaryClick implements the secondary_click tool call. @@ -125,7 +125,7 @@ func (t *ToolSecondaryClick) ConvertActionToCallToolRequest(action option.Mobile "x": params[0], "y": params[1], } - return buildMCPCallToolRequest(t.Name(), arguments), nil + return BuildMCPCallToolRequest(t.Name(), arguments), nil } return mcp.CallToolRequest{}, fmt.Errorf("invalid secondary click params: %v", action.Params) } @@ -179,7 +179,7 @@ func (t *ToolHoverBySelector) ConvertActionToCallToolRequest(action option.Mobil arguments := map[string]any{ "selector": selector, } - return buildMCPCallToolRequest(t.Name(), arguments), nil + return BuildMCPCallToolRequest(t.Name(), arguments), nil } return mcp.CallToolRequest{}, fmt.Errorf("invalid hover by selector params: %v", action.Params) } @@ -233,7 +233,7 @@ func (t *ToolTapBySelector) ConvertActionToCallToolRequest(action option.MobileA arguments := map[string]any{ "selector": selector, } - return buildMCPCallToolRequest(t.Name(), arguments), nil + return BuildMCPCallToolRequest(t.Name(), arguments), nil } return mcp.CallToolRequest{}, fmt.Errorf("invalid tap by selector params: %v", action.Params) } @@ -287,7 +287,7 @@ func (t *ToolSecondaryClickBySelector) ConvertActionToCallToolRequest(action opt arguments := map[string]any{ "selector": selector, } - return buildMCPCallToolRequest(t.Name(), arguments), nil + return BuildMCPCallToolRequest(t.Name(), arguments), nil } return mcp.CallToolRequest{}, fmt.Errorf("invalid secondary click by selector params: %v", action.Params) } @@ -361,5 +361,5 @@ func (t *ToolWebCloseTab) ConvertActionToCallToolRequest(action option.MobileAct arguments := map[string]any{ "tabIndex": tabIndex, } - return buildMCPCallToolRequest(t.Name(), arguments), nil + return BuildMCPCallToolRequest(t.Name(), arguments), nil }