fix: adjust relative credential paths for tool refs

Signed-off-by: Donnie Adams <[email protected]>

pkg/controller/creds/creds.go

@@ -4,6 +4,7 @@ import (
 	"fmt"
 	"net/url"
 	"path"
+	"path/filepath"
 	"slices"
 	"strings"
 
@@ -149,17 +150,26 @@ func toolRefsFromTools(parentTool gptscript.Tool, parentRef toolRef, tools []str
 
 func fullToolPathName(parentRef toolRef, name string) string {
 	toolName, subTool := gtypes.SplitToolRef(name)
+
+	// If this tool's path is relative to its parent.
 	if strings.HasPrefix(toolName, ".") {
-		parentToolName, _ := gtypes.SplitToolRef(parentRef.Reference)
-		if !path.IsAbs(parentToolName) {
-			if !strings.HasPrefix(parentToolName, ".") {
-				parentToolName, _ = gtypes.SplitToolRef(parentRef.name)
+		parentRefToolName, _ := gtypes.SplitToolRef(parentRef.Reference)
+		parentToolName, _ := gtypes.SplitToolRef(parentRef.name)
+		if !path.IsAbs(parentRefToolName) {
+			if !strings.HasPrefix(parentRefToolName, ".") {
+				parentRefToolName = parentToolName
 			} else {
-				parentToolName = path.Join(parentRef.name, parentToolName)
+				if rel, err := filepath.Rel(parentToolName, parentRefToolName); err == nil {
+					parentRefToolName = rel
+				}
+				parentRefToolName = path.Join(parentToolName, parentRefToolName)
+				if rel, err := filepath.Rel(parentRefToolName, toolName); err == nil {
+					toolName = rel
+				}
 			}
 		}
 
-		refURL, err := url.Parse(parentToolName)
+		refURL, err := url.Parse(parentRefToolName)
 		if err != nil {
 			return ""
 		}