fix: multiple cp improvements

- Write UID/GID to tar archive for archive mode support
- Use path.Base for guest paths (Windows compatibility)
- Close HTTP response body on WebSocket dial failure
- Update hypeman-go dependency

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.20251223015448-3fc21a9216cf
+	github.com/onkernel/hypeman-go v0.7.1-0.20251223024018-6970d69a9e1e
 	github.com/tidwall/gjson v1.18.0
 	github.com/tidwall/pretty v1.2.1
 	github.com/urfave/cli-docs/v3 v3.0.0-alpha6

go.sum

@@ -105,8 +105,8 @@ 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.20251223015448-3fc21a9216cf h1:vGNpWu/QZcBXqzeRx1qV/jN8JPGqveWn/xsqbrlQv1A=
-github.com/onkernel/hypeman-go v0.7.1-0.20251223015448-3fc21a9216cf/go.mod h1:Wtm4ewVGGPZc2ySeeuQISQyJxujyQuyDjXyksVkIyy8=
+github.com/onkernel/hypeman-go v0.7.1-0.20251223024018-6970d69a9e1e h1:XY7ZZOqyYfSVhGOtx+Z7rK4RyvqYWgfseTmqGTXIGMI=
+github.com/onkernel/hypeman-go v0.7.1-0.20251223024018-6970d69a9e1e/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

@@ -297,6 +297,7 @@ func statGuestPath(ctx context.Context, baseURL, apiKey, instanceID, guestPath s
 	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))
 		}
@@ -593,6 +594,7 @@ func createDirOnInstanceWithUidGid(ctx context.Context, baseURL, apiKey, instanc
 	ws, resp, err := dialer.DialContext(ctx, wsURL, headers)
 	if err != nil {
 		if resp != nil {
+			defer resp.Body.Close()
 			body, _ := io.ReadAll(resp.Body)
 			return fmt.Errorf("websocket connect failed (HTTP %d): %s", resp.StatusCode, string(body))
 		}
@@ -673,7 +675,8 @@ func copyFromInstance(ctx context.Context, baseURL, apiKey, instanceID, srcPath,
 			// Will create file at dstPath
 		} else if dstIsDir {
 			// Copy into directory using basename
-			resolvedDst = filepath.Join(dstPath, filepath.Base(srcPath))
+			// Use path.Base for guest srcPath (always forward slashes)
+			resolvedDst = filepath.Join(dstPath, path.Base(srcPath))
 		}
 		// else: overwrite existing file
 	} else {
@@ -866,6 +869,7 @@ func copyFromInstanceToStdout(ctx context.Context, baseURL, apiKey, instanceID,
 	ws, resp, err := dialer.DialContext(ctx, wsURL, headers)
 	if err != nil {
 		if resp != nil {
+			defer resp.Body.Close()
 			body, _ := io.ReadAll(resp.Body)
 			return fmt.Errorf("websocket connect failed (HTTP %d): %s", resp.StatusCode, string(body))
 		}
@@ -931,6 +935,8 @@ func copyFromInstanceToStdout(ctx context.Context, baseURL, apiKey, instanceID,
 						Name:     header.Path + "/",
 						Mode:     int64(header.Mode),
 						ModTime:  time.Unix(header.Mtime, 0),
+						Uid:      int(header.Uid),
+						Gid:      int(header.Gid),
 					}
 					if err := tw.WriteHeader(tarHeader); err != nil {
 						return fmt.Errorf("write tar dir header: %w", err)
@@ -943,6 +949,8 @@ func copyFromInstanceToStdout(ctx context.Context, baseURL, apiKey, instanceID,
 						Linkname: header.LinkTarget,
 						Mode:     int64(header.Mode),
 						ModTime:  time.Unix(header.Mtime, 0),
+						Uid:      int(header.Uid),
+						Gid:      int(header.Gid),
 					}
 					if err := tw.WriteHeader(tarHeader); err != nil {
 						return fmt.Errorf("write tar symlink header: %w", err)
@@ -987,6 +995,8 @@ func writeTarEntry(tw *tar.Writer, header *cpFileHeader, data []byte) error {
 		Size:     int64(len(data)),
 		Mode:     int64(header.Mode),
 		ModTime:  time.Unix(header.Mtime, 0),
+		Uid:      int(header.Uid),
+		Gid:      int(header.Gid),
 	}
 	if err := tw.WriteHeader(tarHeader); err != nil {
 		return fmt.Errorf("write tar header: %w", err)