refactor: use SDK's autogenerated Stat endpoint instead of WebSocket

- Replace manual WebSocket stat implementation with client.Instances.Stat()
- Update statGuestPath to use SDK client
- Update copyToInstance and copyFromInstance to pass client
- Remove unused cpStatResponse type
- Update hypeman-go dependency to include Stat method

Author: rgarcia

go.mod

@@ -12,7 +12,7 @@ require (
 	github.com/gorilla/websocket v1.5.3
 	github.com/itchyny/json2yaml v0.1.4
 	github.com/muesli/reflow v0.3.0
-	github.com/onkernel/hypeman-go v0.7.1-0.20251223031652-14904a03ecca
+	github.com/onkernel/hypeman-go v0.7.1-0.20251223032806-c8e386b69845
 	github.com/tidwall/gjson v1.18.0
 	github.com/tidwall/pretty v1.2.1
 	github.com/urfave/cli-docs/v3 v3.0.0-alpha6
@@ -74,3 +74,5 @@ require (
 	google.golang.org/genproto/googleapis/rpc v0.0.0-20250825161204-c5933d9347a5 // indirect
 	google.golang.org/grpc v1.75.1 // indirect
 )
+
+replace github.com/onkernel/hypeman-go => ../hypeman-go

go.sum

@@ -105,8 +105,6 @@ github.com/muesli/reflow v0.3.0 h1:IFsN6K9NfGtjeggFP+68I4chLZV2yIKsXJFNZ+eWh6s=
 github.com/muesli/reflow v0.3.0/go.mod h1:pbwTDkVPibjO2kyvBQRBxTWEEGDGq0FlB1BIKtnHY/8=
 github.com/muesli/termenv v0.16.0 h1:S5AlUN9dENB57rsbnkPyfdGuWIlkmzJjbFf0Tf5FWUc=
 github.com/muesli/termenv v0.16.0/go.mod h1:ZRfOIKPFDYQoDFF4Olj7/QJbW60Ol/kL1pU3VfY/Cnk=
-github.com/onkernel/hypeman-go v0.7.1-0.20251223031652-14904a03ecca h1:wGYuHtNqniugAm655MU4xN+SwIGbuK3FLGq9psXXtDE=
-github.com/onkernel/hypeman-go v0.7.1-0.20251223031652-14904a03ecca/go.mod h1:Wtm4ewVGGPZc2ySeeuQISQyJxujyQuyDjXyksVkIyy8=
 github.com/opencontainers/go-digest v1.0.0 h1:apOUWs51W5PlhuyGyz9FCeeBIOUDA/6nW8Oi/yOhh5U=
 github.com/opencontainers/go-digest v1.0.0/go.mod h1:0JzlMkj0TRzQZfJkVvzbP0HBR3IKzErnv2BNG4W4MAM=
 github.com/opencontainers/image-spec v1.1.1 h1:y0fUlFfIZhPF1W537XOLg0/fcx6zcHCJwooC2xJA040=

pkg/cmd/cp.go

@@ -67,19 +67,6 @@ type cpError struct {
 	Path    string `json:"path,omitempty"`
 }
 
-// cpStatResponse contains information about a path in the guest
-type cpStatResponse struct {
-	Type       string `json:"type"`
-	Exists     bool   `json:"exists"`
-	IsDir      bool   `json:"is_dir"`
-	IsFile     bool   `json:"is_file"`
-	IsSymlink  bool   `json:"is_symlink,omitempty"`
-	LinkTarget string `json:"link_target,omitempty"`
-	Mode       uint32 `json:"mode"`
-	Size       int64  `json:"size"`
-	Error      string `json:"error,omitempty"`
-}
-
 var cpCmd = cli.Command{
 	Name:      "cp",
 	Usage:     "Copy files/folders between an instance and the local filesystem",
@@ -181,13 +168,13 @@ func handleCp(ctx context.Context, cmd *cli.Command) error {
 		if dstPath == "-" {
 			return copyFromInstanceToStdout(ctx, baseURL, apiKey, instanceID, srcPath, followLinks, archive)
 		}
-		return copyFromInstance(ctx, baseURL, apiKey, instanceID, srcPath, dstPath, followLinks, quiet, archive)
+		return copyFromInstance(ctx, &client, baseURL, apiKey, instanceID, srcPath, dstPath, followLinks, quiet, archive)
 	} else {
 		// Copy from local (or stdin if srcPath is "-") to instance
 		if srcPath == "-" {
 			return copyFromStdinToInstance(ctx, baseURL, apiKey, instanceID, dstPath, archive)
 		}
-		return copyToInstance(ctx, baseURL, apiKey, instanceID, srcPath, dstPath, quiet, archive, followLinks)
+		return copyToInstance(ctx, &client, baseURL, apiKey, instanceID, srcPath, dstPath, quiet, archive, followLinks)
 	}
 }
 
@@ -277,61 +264,27 @@ func sanitizeTarPath(basePath, entryName string) (string, error) {
 	return targetPath, nil
 }
 
-// statGuestPath queries the guest for information about a path
-func statGuestPath(ctx context.Context, baseURL, apiKey, instanceID, guestPath string, followLinks bool) (*cpStatResponse, error) {
-	wsURL, err := buildCpWsURL(baseURL, instanceID)
-	if err != nil {
-		return nil, err
-	}
-
-	headers := http.Header{}
-	headers.Set("Authorization", fmt.Sprintf("Bearer %s", apiKey))
-
-	dialer := &websocket.Dialer{}
-	ws, resp, err := dialer.DialContext(ctx, wsURL, headers)
-	if err != nil {
-		if resp != nil {
-			defer resp.Body.Close()
-			body, _ := io.ReadAll(resp.Body)
-			return nil, fmt.Errorf("websocket connect failed (HTTP %d): %s", resp.StatusCode, string(body))
-		}
-		return nil, fmt.Errorf("websocket connect failed: %w", err)
-	}
-	defer ws.Close()
-
-	// Send stat request
-	req := cpRequest{
-		Direction:   "stat",
-		GuestPath:   guestPath,
-		FollowLinks: followLinks,
+// statGuestPath queries the guest for information about a path using the SDK's Stat endpoint
+func statGuestPath(ctx context.Context, client *hypeman.Client, instanceID, guestPath string, followLinks bool) (*hypeman.PathInfo, error) {
+	params := hypeman.InstanceStatParams{
+		Path: guestPath,
 	}
-	reqJSON, _ := json.Marshal(req)
-	if err := ws.WriteMessage(websocket.TextMessage, reqJSON); err != nil {
-		return nil, fmt.Errorf("send request: %w", err)
+	if followLinks {
+		params.FollowLinks = hypeman.Bool(true)
 	}
 
-	// Read response
-	_, message, err := ws.ReadMessage()
+	pathInfo, err := client.Instances.Stat(ctx, instanceID, params)
 	if err != nil {
-		return nil, fmt.Errorf("read response: %w", err)
-	}
-
-	var statResp cpStatResponse
-	if err := json.Unmarshal(message, &statResp); err != nil {
-		return nil, fmt.Errorf("parse response: %w", err)
+		return nil, fmt.Errorf("stat path: %w", err)
 	}
 
-	if statResp.Type == "error" {
-		return nil, fmt.Errorf("stat failed: %s", statResp.Error)
-	}
-
-	return &statResp, nil
+	return pathInfo, nil
 }
 
 // resolveDestPath resolves the destination path following docker cp semantics
 // srcPath is the local source path, dstPath is the guest destination path
 // Returns the resolved guest path
-func resolveDestPath(ctx context.Context, baseURL, apiKey, instanceID, srcPath, dstPath string) (string, error) {
+func resolveDestPath(ctx context.Context, client *hypeman.Client, instanceID, srcPath, dstPath string) (string, error) {
 	srcInfo, err := os.Stat(srcPath)
 	if err != nil {
 		return "", fmt.Errorf("cannot stat source: %w", err)
@@ -350,11 +303,15 @@ func resolveDestPath(ctx context.Context, baseURL, apiKey, instanceID, srcPath,
 	dstEndsWithSlash := strings.HasSuffix(dstPath, "/")
 
 	// Stat the destination in guest
-	dstStat, err := statGuestPath(ctx, baseURL, apiKey, instanceID, dstPath, true)
+	dstStat, err := statGuestPath(ctx, client, instanceID, dstPath, true)
 	if err != nil {
 		return "", fmt.Errorf("stat destination: %w", err)
 	}
 
+	// Use bool fields directly from PathInfo
+	isDir := dstStat.IsDir
+	isFile := dstStat.IsFile
+
 	// Docker cp path resolution rules:
 	// 1. If SRC is a file:
 	//    - DEST doesn't exist: save as DEST
@@ -377,7 +334,7 @@ func resolveDestPath(ctx context.Context, baseURL, apiKey, instanceID, srcPath,
 			// Save as DEST
 			return dstPath, nil
 		}
-		if dstStat.IsDir {
+		if isDir {
 			// Copy into directory using basename
 			// Use path.Join for guest paths (always forward slashes)
 			return path.Join(dstPath, filepath.Base(srcPath)), nil
@@ -387,7 +344,7 @@ func resolveDestPath(ctx context.Context, baseURL, apiKey, instanceID, srcPath,
 	}
 
 	// Source is a directory
-	if dstStat.Exists && dstStat.IsFile {
+	if dstStat.Exists && isFile {
 		return "", fmt.Errorf("cannot copy a directory to a file")
 	}
 
@@ -426,7 +383,7 @@ func buildCpWsURL(baseURL, instanceID string) (string, error) {
 }
 
 // copyToInstance copies a local file/directory to the instance
-func copyToInstance(ctx context.Context, baseURL, apiKey, instanceID, srcPath, dstPath string, quiet, archive, followLinks bool) error {
+func copyToInstance(ctx context.Context, client *hypeman.Client, baseURL, apiKey, instanceID, srcPath, dstPath string, quiet, archive, followLinks bool) error {
 	// Check for /. suffix (copy contents only)
 	copyContentsOnly := strings.HasSuffix(srcPath, string(filepath.Separator)+".") || strings.HasSuffix(srcPath, "/.")
 	originalSrcPath := srcPath
@@ -442,7 +399,7 @@ func copyToInstance(ctx context.Context, baseURL, apiKey, instanceID, srcPath, d
 	}
 
 	// Resolve destination path using docker cp semantics
-	resolvedDst, err := resolveDestPath(ctx, baseURL, apiKey, instanceID, originalSrcPath, dstPath)
+	resolvedDst, err := resolveDestPath(ctx, client, instanceID, originalSrcPath, dstPath)
 	if err != nil {
 		return err
 	}
@@ -634,7 +591,7 @@ func createDirOnInstanceWithUidGid(ctx context.Context, baseURL, apiKey, instanc
 }
 
 // copyFromInstance copies a file/directory from the instance to local using the SDK
-func copyFromInstance(ctx context.Context, baseURL, apiKey, instanceID, srcPath, dstPath string, followLinks, quiet, archive bool) error {
+func copyFromInstance(ctx context.Context, client *hypeman.Client, baseURL, apiKey, instanceID, srcPath, dstPath string, followLinks, quiet, archive bool) error {
 	// Check for /. suffix (copy contents only) on guest source path
 	copyContentsOnly := strings.HasSuffix(srcPath, "/.")
 	if copyContentsOnly {
@@ -645,22 +602,25 @@ func copyFromInstance(ctx context.Context, baseURL, apiKey, instanceID, srcPath,
 	dstEndsWithSlash := strings.HasSuffix(dstPath, "/") || strings.HasSuffix(dstPath, string(filepath.Separator))
 
 	// Stat the guest source to check if it's file or directory
-	srcStat, err := statGuestPath(ctx, baseURL, apiKey, instanceID, srcPath, followLinks)
+	srcStat, err := statGuestPath(ctx, client, instanceID, srcPath, followLinks)
 	if err != nil {
 		return fmt.Errorf("stat source: %w", err)
 	}
 	if !srcStat.Exists {
 		return fmt.Errorf("source path %s does not exist in guest", srcPath)
 	}
 
+	// Use bool field directly from PathInfo
+	srcIsDir := srcStat.IsDir
+
 	// Stat the local destination
 	dstInfo, dstErr := os.Stat(dstPath)
 	dstExists := dstErr == nil
 	dstIsDir := dstExists && dstInfo.IsDir()
 
 	// Apply docker cp path resolution for "from" direction
 	resolvedDst := dstPath
-	if !srcStat.IsDir {
+	if !srcIsDir {
 		// Source is a file
 		if !dstExists {
 			if dstEndsWithSlash {