feat(cli): render QR in terminal by default

Author: Paulkm2006

README.md

@@ -89,7 +89,7 @@ bin/codeoff-cli restart appserver
 bin/codeoff-cli restart tunnel
 ```
 
-CLI output is human-readable by default. Add `--json` for machine-readable output; `connect` writes a connection QR PNG and `pair` writes a pairing QR PNG to the current directory, or to a directory selected with `--qr-dir PATH`. Add `--qr-terminal` to render the QR in the terminal.
+CLI output is human-readable by default. Add `--json` for machine-readable output; `connect` writes a connection QR PNG and `pair` writes a pairing QR PNG when `--qr-dir PATH` is provided. Without `--qr-dir`, the QR is rendered in the terminal; `--qr-terminal` can also render it alongside a PNG.
 
 Use `--cf-tunnel-mode external --cf-tunnel-url https://example.com` for an existing Cloudflare application tunnel. Override the daemon state file with `--state PATH`.
 

README.zh-CN.md

@@ -89,7 +89,7 @@ bin/codeoff-cli restart appserver
 bin/codeoff-cli restart tunnel
 ```
 
-CLI 默认输出人类可读文本，添加 `--json` 可输出机器可读 JSON。`connect` 会将连接二维码 PNG、`pair` 会将配对二维码 PNG 写入当前目录，也可以通过 `--qr-dir PATH` 指定输出目录；添加 `--qr-terminal` 可直接在终端渲染二维码。
+CLI 默认输出人类可读文本，添加 `--json` 可输出机器可读 JSON。指定 `--qr-dir PATH` 时，`connect` 会将连接二维码 PNG、`pair` 会将配对二维码 PNG 写入该目录；不指定时默认直接在终端渲染，添加 `--qr-terminal` 可在写入 PNG 的同时渲染。
 
 已有 Cloudflare 应用 Tunnel 时，使用 `--cf-tunnel-mode external --cf-tunnel-url https://example.com`。可通过 `--state PATH` 覆盖 daemon 状态文件路径。
 

cmd/codeoff-cli/main.go

@@ -69,7 +69,7 @@ type pairing struct {
 func main() {
 	statePath := flag.String("state", "", "daemon state file")
 	flag.BoolVar(&jsonOutput, "json", false, "print machine-readable JSON")
-	flag.StringVar(&qrDir, "qr-dir", ".", "directory for generated QR code PNG files")
+	flag.StringVar(&qrDir, "qr-dir", "", "directory for QR PNG files (default: render in terminal)")
 	flag.BoolVar(&qrTerminal, "qr-terminal", false, "render the QR code in the terminal")
 	flag.Usage = usage
 	flag.Parse()
@@ -193,7 +193,7 @@ func printPair(c *client) {
 		"tunnelAddress":   status.Tunnel.URL,
 	}
 	payload["pairingCode"] = pair.Token
-	qrPath, qrErr := writeQRCode(payload, qrDir)
+	qrPath, qrErr := outputQRCode(payload)
 	if jsonOutput {
 		output := map[string]any{
 			"serverUuid":      status.ServerUUID,
@@ -210,13 +210,13 @@ func printPair(c *client) {
 		return
 	}
 	fmt.Printf("Pairing code: %s\nExpires: %s\n", pair.Token, formatTime(pair.ExpiresAt))
-	if qrTerminal {
+	if qrTerminal || qrDir == "" {
 		fmt.Println("QR code:")
 		printTerminalQRCode(payload)
 	}
 	if qrPath != "" {
 		fmt.Printf("QR code: %s\n", qrPath)
-	} else {
+	} else if qrErr != nil {
 		fmt.Printf("QR code: unavailable (%s)\n", qrErr)
 	}
 }
@@ -232,7 +232,7 @@ func printConnect(c *client) {
 		"listenAddresses": status.ControlAddrs,
 		"tunnelAddress":   status.Tunnel.URL,
 	}
-	qrPath, qrErr := writeQRCode(payload, qrDir)
+	qrPath, qrErr := outputQRCode(payload)
 	if jsonOutput {
 		output := map[string]any{
 			"serverUuid":      status.ServerUUID,
@@ -247,17 +247,24 @@ func printConnect(c *client) {
 		return
 	}
 	fmt.Println("Connection QR code")
-	if qrTerminal {
+	if qrTerminal || qrDir == "" {
 		fmt.Println("QR code:")
 		printTerminalQRCode(payload)
 	}
 	if qrPath != "" {
 		fmt.Printf("QR code: %s\n", qrPath)
-	} else {
+	} else if qrErr != nil {
 		fmt.Printf("QR code: unavailable (%s)\n", qrErr)
 	}
 }
 
+func outputQRCode(payload any) (string, error) {
+	if qrDir == "" {
+		return "", nil
+	}
+	return writeQRCode(payload, qrDir)
+}
+
 func writeQRCode(payload any, dir string) (string, error) {
 	if dir == "" {
 		dir = "."
@@ -386,7 +393,7 @@ Commands:
 Flags:
   --state PATH             Daemon state file
   --json                   Print machine-readable JSON
-  --qr-dir DIR             QR output directory (default: current directory)
+  --qr-dir DIR             QR PNG output directory (default: terminal)
   --qr-terminal             Render QR code in the terminal
 
 Examples: