fix: pass archive flag to copyFromInstanceToStdout

- Add archive parameter to copyFromInstanceToStdout
- Only preserve UID/GID in tar headers when archive mode is enabled
- 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.20251223025630-30d438f9919f
+	github.com/onkernel/hypeman-go v0.7.1-0.20251223031652-14904a03ecca
 	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.20251223025630-30d438f9919f h1:5Tnk4IxErhHxg1D2z+OSfpC2RtISoqRlZEsPsvyZVLk=
-github.com/onkernel/hypeman-go v0.7.1-0.20251223025630-30d438f9919f/go.mod h1:Wtm4ewVGGPZc2ySeeuQISQyJxujyQuyDjXyksVkIyy8=
+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

@@ -179,7 +179,7 @@ func handleCp(ctx context.Context, cmd *cli.Command) error {
 	if srcIsRemote {
 		// Copy from instance to local (or stdout if dstPath is "-")
 		if dstPath == "-" {
-			return copyFromInstanceToStdout(ctx, baseURL, apiKey, instanceID, srcPath, followLinks)
+			return copyFromInstanceToStdout(ctx, baseURL, apiKey, instanceID, srcPath, followLinks, archive)
 		}
 		return copyFromInstance(ctx, baseURL, apiKey, instanceID, srcPath, dstPath, followLinks, quiet, archive)
 	} else {
@@ -851,7 +851,7 @@ func copyTarFileToInstance(ctx context.Context, baseURL, apiKey, instanceID stri
 }
 
 // copyFromInstanceToStdout copies files from the instance and writes a tar archive to stdout
-func copyFromInstanceToStdout(ctx context.Context, baseURL, apiKey, instanceID, srcPath string, followLinks bool) error {
+func copyFromInstanceToStdout(ctx context.Context, baseURL, apiKey, instanceID, srcPath string, followLinks, archive bool) error {
 	wsURL, err := buildCpWsURL(baseURL, instanceID)
 	if err != nil {
 		return err
@@ -912,7 +912,7 @@ func copyFromInstanceToStdout(ctx context.Context, baseURL, apiKey, instanceID,
 			case "header":
 				// Flush previous file if any (but not symlinks - they have no data)
 				if currentHeader != nil && !currentHeader.IsDir && !currentHeader.IsSymlink {
-					if err := writeTarEntry(tw, currentHeader, fileData); err != nil {
+					if err := writeTarEntry(tw, currentHeader, fileData, archive); err != nil {
 						return err
 					}
 					fileData = nil
@@ -931,8 +931,11 @@ 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),
+					}
+					// Only preserve UID/GID in archive mode
+					if archive {
+						tarHeader.Uid = int(header.Uid)
+						tarHeader.Gid = int(header.Gid)
 					}
 					if err := tw.WriteHeader(tarHeader); err != nil {
 						return fmt.Errorf("write tar dir header: %w", err)
@@ -945,8 +948,11 @@ 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),
+					}
+					// Only preserve UID/GID in archive mode
+					if archive {
+						tarHeader.Uid = int(header.Uid)
+						tarHeader.Gid = int(header.Gid)
 					}
 					if err := tw.WriteHeader(tarHeader); err != nil {
 						return fmt.Errorf("write tar symlink header: %w", err)
@@ -956,7 +962,7 @@ func copyFromInstanceToStdout(ctx context.Context, baseURL, apiKey, instanceID,
 			case "end":
 				// Write final file data if any
 				if currentHeader != nil && !currentHeader.IsDir && !currentHeader.IsSymlink {
-					if err := writeTarEntry(tw, currentHeader, fileData); err != nil {
+					if err := writeTarEntry(tw, currentHeader, fileData, archive); err != nil {
 						return err
 					}
 					fileData = nil
@@ -989,15 +995,18 @@ func copyFromInstanceToStdout(ctx context.Context, baseURL, apiKey, instanceID,
 }
 
 // writeTarEntry writes a file entry to the tar archive
-func writeTarEntry(tw *tar.Writer, header *cpFileHeader, data []byte) error {
+func writeTarEntry(tw *tar.Writer, header *cpFileHeader, data []byte, archive bool) error {
 	tarHeader := &tar.Header{
 		Typeflag: tar.TypeReg,
 		Name:     header.Path,
 		Size:     int64(len(data)),
 		Mode:     int64(header.Mode),
 		ModTime:  time.Unix(header.Mtime, 0),
-		Uid:      int(header.Uid),
-		Gid:      int(header.Gid),
+	}
+	// Only preserve UID/GID in archive mode
+	if archive {
+		tarHeader.Uid = int(header.Uid)
+		tarHeader.Gid = int(header.Gid)
 	}
 	if err := tw.WriteHeader(tarHeader); err != nil {
 		return fmt.Errorf("write tar header: %w", err)