chore: when normalizing the tool name drop /tool.gpt if you can

Author: ibuildthecloud

pkg/types/toolname.go

@@ -23,6 +23,9 @@ func ToolNormalizer(tool string) string {
 
 	parts := strings.Split(lastTool, "/")
 	tool = parts[len(parts)-1]
+	if parts[len(parts)-1] == "tool.gpt" && len(parts) > 1 && len(parts[len(parts)-2]) > 1 {
+		tool = parts[len(parts)-2]
+	}
 	if strings.HasSuffix(tool, system.Suffix) {
 		tool = strings.TrimSuffix(tool, filepath.Ext(tool))
 	}

pkg/types/toolname_test.go

@@ -14,6 +14,7 @@ func TestToolNormalizer(t *testing.T) {
 	autogold.Expect("barList").Equal(t, ToolNormalizer("bar_list from ./foo.gpt"))
 	autogold.Expect("write").Equal(t, ToolNormalizer("sys.write"))
 	autogold.Expect("gpt4VVision").Equal(t, ToolNormalizer("github.com/gptscript-ai/gpt4-v-vision"))
+	autogold.Expect("foo").Equal(t, ToolNormalizer("./foo/tool.gpt"))
 }
 
 func TestParse(t *testing.T) {