feat(cli): add custom and compat mode router

Co-authored-by: D <code@dector.space>

Author: DCodeBot

cmd/adb-go/internal/compat/compat.go

@@ -0,0 +1,15 @@
+package compat
+
+import (
+	"fmt"
+	"io"
+)
+
+// Run is a temporary placeholder for adb-compatible mode. The router can select
+// compat mode before the adb-shaped command implementation exists, which lets
+// tests and users verify mode detection independently from the upcoming compat
+// command skeleton.
+func Run(args []string, stdout, stderr io.Writer) int {
+	fmt.Fprintln(stderr, "adb-go compat mode is not implemented yet")
+	return 1
+}

cmd/adb-go/main.go

@@ -3,6 +3,7 @@ package main
 import (
 	"os"
 
+	"github.com/dector/adb-go/cmd/adb-go/internal/compat"
 	"github.com/dector/adb-go/cmd/adb-go/internal/custom"
 )
 
@@ -13,5 +14,5 @@ var version = "dev"
 
 func main() {
 	custom.Version = version
-	os.Exit(custom.Run(os.Args[1:], os.Stdout, os.Stderr))
+	os.Exit(runCLI(os.Args[1:], os.Stdout, os.Stderr, os.Args[0], os.Getenv("ADB_GO_MODE"), custom.Run, compat.Run))
 }

cmd/adb-go/router.go

@@ -0,0 +1,51 @@
+package main
+
+import (
+	"fmt"
+	"io"
+	"path/filepath"
+)
+
+type cliMode int
+
+const (
+	cliModeCustom cliMode = iota
+	cliModeCompat
+)
+
+type cliRunner func(args []string, stdout, stderr io.Writer) int
+
+func runCLI(args []string, stdout, stderr io.Writer, executablePath, envMode string, customRun, compatRun cliRunner) int {
+	mode, err := selectCLIMode(executablePath, envMode)
+	if err != nil {
+		fmt.Fprintln(stderr, err)
+		return 2
+	}
+
+	switch mode {
+	case cliModeCompat:
+		return compatRun(args, stdout, stderr)
+	default:
+		return customRun(args, stdout, stderr)
+	}
+}
+
+func selectCLIMode(executablePath, envMode string) (cliMode, error) {
+	switch envMode {
+	case "":
+		// Fall through to executable-name detection.
+	case "custom":
+		return cliModeCustom, nil
+	case "compat":
+		return cliModeCompat, nil
+	default:
+		return cliModeCustom, fmt.Errorf("invalid ADB_GO_MODE %q: expected \"custom\" or \"compat\"", envMode)
+	}
+
+	switch filepath.Base(executablePath) {
+	case "adb", "adb.exe":
+		return cliModeCompat, nil
+	default:
+		return cliModeCustom, nil
+	}
+}

cmd/adb-go/router_test.go

@@ -0,0 +1,136 @@
+package main
+
+import (
+	"bytes"
+	"fmt"
+	"io"
+	"strings"
+	"testing"
+
+	"github.com/dector/adb-go/cmd/adb-go/internal/compat"
+)
+
+func TestRunCLIDefaultsToCustomMode(t *testing.T) {
+	calls := recordingRunners()
+	var stdout, stderr bytes.Buffer
+
+	code := runCLI([]string{"version"}, &stdout, &stderr, "adb-go", "", calls.custom, calls.compat)
+
+	if code != 10 {
+		t.Fatalf("runCLI exit code = %d, want custom runner code 10", code)
+	}
+	if calls.customCalls != 1 || calls.compatCalls != 0 {
+		t.Fatalf("custom calls = %d, compat calls = %d; want custom only", calls.customCalls, calls.compatCalls)
+	}
+	if got := stdout.String(); !strings.Contains(got, "custom:[version]") {
+		t.Fatalf("stdout = %q, want custom runner output", got)
+	}
+	if stderr.Len() != 0 {
+		t.Fatalf("stderr = %q, want empty", stderr.String())
+	}
+}
+
+func TestRunCLIUsesCustomModeFromEnv(t *testing.T) {
+	calls := recordingRunners()
+	var stdout, stderr bytes.Buffer
+
+	code := runCLI([]string{"help"}, &stdout, &stderr, "adb", "custom", calls.custom, calls.compat)
+
+	if code != 10 {
+		t.Fatalf("runCLI exit code = %d, want custom runner code 10", code)
+	}
+	if calls.customCalls != 1 || calls.compatCalls != 0 {
+		t.Fatalf("custom calls = %d, compat calls = %d; want custom env override", calls.customCalls, calls.compatCalls)
+	}
+}
+
+func TestRunCLIUsesCompatModeFromEnv(t *testing.T) {
+	calls := recordingRunners()
+	var stdout, stderr bytes.Buffer
+
+	code := runCLI([]string{"version"}, &stdout, &stderr, "adb-go", "compat", calls.custom, calls.compat)
+
+	if code != 20 {
+		t.Fatalf("runCLI exit code = %d, want compat runner code 20", code)
+	}
+	if calls.customCalls != 0 || calls.compatCalls != 1 {
+		t.Fatalf("custom calls = %d, compat calls = %d; want compat only", calls.customCalls, calls.compatCalls)
+	}
+	if got := stdout.String(); !strings.Contains(got, "compat:[version]") {
+		t.Fatalf("stdout = %q, want compat runner output", got)
+	}
+}
+
+func TestRunCLIRejectsInvalidEnvMode(t *testing.T) {
+	calls := recordingRunners()
+	var stdout, stderr bytes.Buffer
+
+	code := runCLI([]string{"version"}, &stdout, &stderr, "adb-go", "invalid", calls.custom, calls.compat)
+
+	if code != 2 {
+		t.Fatalf("runCLI exit code = %d, want 2", code)
+	}
+	if calls.customCalls != 0 || calls.compatCalls != 0 {
+		t.Fatalf("custom calls = %d, compat calls = %d; want no runner calls", calls.customCalls, calls.compatCalls)
+	}
+	if stdout.Len() != 0 {
+		t.Fatalf("stdout = %q, want empty", stdout.String())
+	}
+	if got := stderr.String(); !strings.Contains(got, "invalid ADB_GO_MODE") || !strings.Contains(got, `"custom"`) || !strings.Contains(got, `"compat"`) {
+		t.Fatalf("stderr = %q, want invalid mode guidance", got)
+	}
+}
+
+func TestRunCLIUsesCompatModeForADBExecutableBasenames(t *testing.T) {
+	for _, executablePath := range []string{"adb", "/usr/local/bin/adb", "adb.exe", `/opt/android/adb.exe`} {
+		t.Run(executablePath, func(t *testing.T) {
+			calls := recordingRunners()
+			var stdout, stderr bytes.Buffer
+
+			code := runCLI([]string{"devices"}, &stdout, &stderr, executablePath, "", calls.custom, calls.compat)
+
+			if code != 20 {
+				t.Fatalf("runCLI exit code = %d, want compat runner code 20", code)
+			}
+			if calls.customCalls != 0 || calls.compatCalls != 1 {
+				t.Fatalf("custom calls = %d, compat calls = %d; want compat only", calls.customCalls, calls.compatCalls)
+			}
+		})
+	}
+}
+
+func TestCompatPlaceholderReportsNotImplemented(t *testing.T) {
+	var stdout, stderr bytes.Buffer
+	calls := recordingRunners()
+
+	code := runCLI([]string{"devices"}, &stdout, &stderr, "adb", "", calls.custom, compat.Run)
+
+	if code != 1 {
+		t.Fatalf("runCLI compat placeholder exit code = %d, want 1", code)
+	}
+	if stdout.Len() != 0 {
+		t.Fatalf("stdout = %q, want empty", stdout.String())
+	}
+	if got := stderr.String(); !strings.Contains(got, "compat mode is not implemented yet") {
+		t.Fatalf("stderr = %q, want compat placeholder message", got)
+	}
+}
+
+type runnerCalls struct {
+	customCalls int
+	compatCalls int
+}
+
+func recordingRunners() *runnerCalls { return &runnerCalls{} }
+
+func (r *runnerCalls) custom(args []string, stdout, stderr io.Writer) int {
+	r.customCalls++
+	fmt.Fprintf(stdout, "custom:%v\n", args)
+	return 10
+}
+
+func (r *runnerCalls) compat(args []string, stdout, stderr io.Writer) int {
+	r.compatCalls++
+	fmt.Fprintf(stdout, "compat:%v\n", args)
+	return 20
+}

docs/init/PLAN.md

@@ -4,8 +4,8 @@ This plan is organized as small milestones. Each milestone should be implemented
 
 ## Progress
 
-- Current milestone: M63 — Add CLI mode router.
-- Completed milestone range: Milestones 17–62 completed the initial CLI shell/push/pull work, CLI documentation, Linux USB transport design, transport abstraction, Linux USB discovery, Linux usbfs bulk transport, high-level USB connection API, CLI USB connection option, USB documentation, adb-go-specific target listing, explicit ADB authentication support, the client APK install helper, the CLI `install-apk` command, APK install documentation, logcat library/CLI/documentation support, property helpers, screencap support, reboot library/CLI/documentation support, foreground port forwarding support, the minimal adb-god daemon foundation, Linux systemd user-service install/lifecycle controls, Linux systemd user-service status reporting, daemon diagnostics, daemon service logs, daemon service reinstall, CLI version reporting, CLI error-message improvements, integration-test documentation, exported package documentation/examples, the daemon-backed persistent forwarding design, the daemon forwarding protocol model, daemon-owned forwarding listener registration, TCP target bridging for persistent forwards, CLI persistent forwarding controls, persistent forwarding diagnostics, and the extracted custom CLI mode package.
+- Current milestone: M64 — Add adb-compatible CLI skeleton.
+- Completed milestone range: Milestones 17–63 completed the initial CLI shell/push/pull work, CLI documentation, Linux USB transport design, transport abstraction, Linux USB discovery, Linux usbfs bulk transport, high-level USB connection API, CLI USB connection option, USB documentation, adb-go-specific target listing, explicit ADB authentication support, the client APK install helper, the CLI `install-apk` command, APK install documentation, logcat library/CLI/documentation support, property helpers, screencap support, reboot library/CLI/documentation support, foreground port forwarding support, the minimal adb-god daemon foundation, Linux systemd user-service install/lifecycle controls, Linux systemd user-service status reporting, daemon diagnostics, daemon service logs, daemon service reinstall, CLI version reporting, CLI error-message improvements, integration-test documentation, exported package documentation/examples, the daemon-backed persistent forwarding design, the daemon forwarding protocol model, daemon-owned forwarding listener registration, TCP target bridging for persistent forwards, CLI persistent forwarding controls, persistent forwarding diagnostics, the extracted custom CLI mode package, and the CLI custom/compat mode router.
 - Active focus: split the CLI into clearly separated custom and adb-compatibility modes. Custom mode preserves the current adb-go UX. Compat mode will target current Android SDK Platform-Tools `adb` CLI behavior closely enough that a future `adb` symlink can use adb-go as a drop-in replacement for supported workflows.
 - Completed USB direction: Linux-only first, using the kernel usbfs interface under `/dev/bus/usb` behind build tags. This remains pure Go because it talks to device files and ioctls directly instead of linking native USB libraries.
 
@@ -70,28 +70,28 @@ Done when:
 
 ## M63 — Add CLI mode router
 
-Status: Not started
+Status: Done
 
 Commit: `feat(cli): add custom and compat mode router`
 
 Tasks:
 
-- [ ] Replace `cmd/adb-go/main.go` with a tiny router that only detects mode and dispatches to the selected implementation.
-- [ ] Select compat mode when `ADB_GO_MODE=compat` or the executable basename is exactly `adb` or `adb.exe`.
-- [ ] Select custom mode when `ADB_GO_MODE=custom` or when no compat signal is present.
-- [ ] Reject any other non-empty `ADB_GO_MODE` value with exit code `2`.
-- [ ] Do not support bootstrap flags such as `--compat` or `--custom`.
-- [ ] Add a temporary compat placeholder that returns a clear “compat mode is not implemented yet” error with exit code `1`.
+- [x] Replace `cmd/adb-go/main.go` with a tiny router that only detects mode and dispatches to the selected implementation.
+- [x] Select compat mode when `ADB_GO_MODE=compat` or the executable basename is exactly `adb` or `adb.exe`.
+- [x] Select custom mode when `ADB_GO_MODE=custom` or when no compat signal is present.
+- [x] Reject any other non-empty `ADB_GO_MODE` value with exit code `2`.
+- [x] Do not support bootstrap flags such as `--compat` or `--custom`.
+- [x] Add a temporary compat placeholder that returns a clear “compat mode is not implemented yet” error with exit code `1`.
 
 Tests:
 
-- [ ] Router tests cover default custom mode, `ADB_GO_MODE=custom`, `ADB_GO_MODE=compat`, invalid `ADB_GO_MODE`, and `adb`/`adb.exe` basename detection.
-- [ ] Existing custom mode CLI tests continue to pass.
-- [ ] `go test ./...` passes
+- [x] Router tests cover default custom mode, `ADB_GO_MODE=custom`, `ADB_GO_MODE=compat`, invalid `ADB_GO_MODE`, and `adb`/`adb.exe` basename detection.
+- [x] Existing custom mode CLI tests continue to pass.
+- [x] `go test ./...` passes
 
 Done when:
 
-- [ ] The binary can route cleanly between custom mode and a compat placeholder without changing custom behavior.
+- [x] The binary can route cleanly between custom mode and a compat placeholder without changing custom behavior.
 
 ## M64 — Add adb-compatible CLI skeleton