refactor: rename cliutil to conn/output/discovery packages

"util" is an abstract name that violates go-coding-style. Split
into three specific packages matching their concerns:
- cmd/bindercli/conn/ — connection management (Open, GetService)
- cmd/bindercli/output/ — formatting (Formatter, NewFormatter)
- cmd/bindercli/discovery/ — service lookup (FindServiceByDescriptor)

Author: xaionaro@dx.center

cmd/bindercli/cmd_service.go

@@ -13,7 +13,7 @@ import (
 	"github.com/spf13/cobra"
 
 	"github.com/AndroidGoLab/binder/binder"
-	"github.com/AndroidGoLab/binder/cmd/bindercli/cliutil"
+	"github.com/AndroidGoLab/binder/cmd/bindercli/discovery"
 	"github.com/AndroidGoLab/binder/parcel"
 	"github.com/AndroidGoLab/binder/servicemanager"
 )
@@ -105,7 +105,7 @@ func newServiceInspectCmd() *cobra.Command {
 				return err
 			}
 
-			descriptor := cliutil.QueryDescriptor(ctx, svc)
+			descriptor := discovery.QueryDescriptor(ctx, svc)
 
 			mode, err := cmd.Root().PersistentFlags().GetString("format")
 			if err != nil {
@@ -205,12 +205,12 @@ func newServiceMethodsCmd() *cobra.Command {
 				return err
 			}
 
-			descriptor := cliutil.QueryDescriptor(ctx, svc)
+			descriptor := discovery.QueryDescriptor(ctx, svc)
 
 			// InterfaceTransaction may return empty on some services.
 			// Fall back to the static knownServiceNames map (reverse lookup).
 			if descriptor == "" || descriptor == "(unknown)" {
-				for desc, svcName := range cliutil.KnownServiceNames {
+				for desc, svcName := range discovery.KnownServiceNames {
 					if svcName == name {
 						descriptor = desc
 						break

cmd/bindercli/conn.go

@@ -3,11 +3,11 @@
 package main
 
 import (
-	"github.com/AndroidGoLab/binder/cmd/bindercli/cliutil"
+	"github.com/AndroidGoLab/binder/cmd/bindercli/conn"
 )
 
-// Conn is an alias for cliutil.Conn for use within package main.
-type Conn = cliutil.Conn
+// Conn is an alias for conn.Conn for use within package main.
+type Conn = conn.Conn
 
-// OpenConn is a convenience alias for cliutil.OpenConn.
-var OpenConn = cliutil.OpenConn
+// OpenConn is a convenience alias for conn.Open.
+var OpenConn = conn.Open

cmd/bindercli/cliutil/conn.go cmd/bindercli/conn/conn.gocmd/bindercli/cliutil/conn.go renamed to cmd/bindercli/conn/conn.go

@@ -1,6 +1,6 @@
 //go:build linux
 
-package cliutil
+package conn
 
 import (
 	"context"
@@ -23,13 +23,13 @@ type Conn struct {
 	SM        *servicemanager.ServiceManager
 }
 
-// OpenConn opens a binder driver connection and creates a service manager client.
-func OpenConn(
+// Open opens a binder driver connection and creates a service manager client.
+func Open(
 	ctx context.Context,
 	cmd *cobra.Command,
 ) (_conn *Conn, _err error) {
-	logger.Tracef(ctx, "OpenConn")
-	defer func() { logger.Tracef(ctx, "/OpenConn: %v", _err) }()
+	logger.Tracef(ctx, "Open")
+	defer func() { logger.Tracef(ctx, "/Open: %v", _err) }()
 
 	mapSize, err := cmd.Root().PersistentFlags().GetInt("map-size")
 	if err != nil {

…d/bindercli/cliutil/service_discovery.go cmd/bindercli/discovery/discovery.gocmd/bindercli/cliutil/service_discovery.go renamed to cmd/bindercli/discovery/discovery.go cmd/bindercli/cliutil/service_discovery.go renamed to cmd/bindercli/discovery/discovery.go

@@ -1,12 +1,13 @@
 //go:build linux
 
-package cliutil
+package discovery
 
 import (
 	"context"
 	"fmt"
 
 	"github.com/AndroidGoLab/binder/binder"
+	"github.com/AndroidGoLab/binder/cmd/bindercli/conn"
 	"github.com/AndroidGoLab/binder/parcel"
 	"github.com/AndroidGoLab/binder/servicemanager"
 )
@@ -21,26 +22,26 @@ var KnownServiceNames map[string]string
 // slow enumeration, then falls back to listing all services.
 func FindServiceByDescriptor(
 	ctx context.Context,
-	conn *Conn,
+	c *conn.Conn,
 	descriptor string,
 ) (binder.IBinder, error) {
 	// Try the static map of well-known service names first to avoid
 	// slow enumeration of all registered services.
 	if name, ok := KnownServiceNames[descriptor]; ok {
-		svc, err := conn.SM.CheckService(ctx, servicemanager.ServiceName(name))
+		svc, err := c.SM.CheckService(ctx, servicemanager.ServiceName(name))
 		if err == nil && svc != nil {
 			return svc, nil
 		}
 	}
 
 	// Fall back to enumeration.
-	services, err := conn.SM.ListServices(ctx)
+	services, err := c.SM.ListServices(ctx)
 	if err != nil {
 		return nil, fmt.Errorf("listing services: %w", err)
 	}
 
 	for _, name := range services {
-		svc, err := conn.SM.CheckService(ctx, name)
+		svc, err := c.SM.CheckService(ctx, name)
 		if err != nil || svc == nil {
 			continue
 		}

cmd/bindercli/format.go

@@ -1,20 +1,20 @@
 package main
 
 import (
-	"github.com/AndroidGoLab/binder/cmd/bindercli/cliutil"
+	"github.com/AndroidGoLab/binder/cmd/bindercli/output"
 )
 
-// Formatter is an alias for cliutil.Formatter for use within package main.
-type Formatter = cliutil.Formatter
+// Formatter is an alias for output.Formatter for use within package main.
+type Formatter = output.Formatter
 
-// NewFormatter is a convenience alias for cliutil.NewFormatter.
-var NewFormatter = cliutil.NewFormatter
+// NewFormatter is a convenience alias for output.NewFormatter.
+var NewFormatter = output.NewFormatter
 
-// resolveMode wraps cliutil.ResolveMode for backward compatibility
+// resolveMode wraps output.ResolveMode for backward compatibility
 // within package main (used by tests).
 func resolveMode(
 	mode string,
 	isTTY bool,
 ) string {
-	return cliutil.ResolveMode(mode, isTTY)
+	return output.ResolveMode(mode, isTTY)
 }