fix(output): additional bug fixes from second code review

- Fix E2E script: use --help instead of --version to detect TOON binary
  (tr --version outputs "tr 0.1.0" without "toon" string)
- Fix Error() method: output errors in TOON format when TOON is requested
  instead of always using JSON
- Fix error message: say "tru or tr binary" instead of just "tru"

Co-Authored-By: Claude Opus 4.5 <noreply@anthropic.com>

Author: Dicklesworthstone

internal/output/output.go

@@ -116,14 +116,18 @@ func (w *Writer) Success(msg string) {
 
 // Error outputs an error message.
 func (w *Writer) Error(err error) {
-	if w.format == FormatJSON || w.format == FormatTOON {
+	payload := ErrorPayload{
+		Error:   "error",
+		Message: err.Error(),
+		Details: map[string]any{"code": 1},
+	}
+	if w.format == FormatJSON {
 		_ = OutputJSONError(err, 1)
+	} else if w.format == FormatTOON {
+		// Use TOON encoding for error output
+		_ = w.Write(payload)
 	} else if w.format == FormatYAML {
-		_ = OutputYAML(ErrorPayload{
-			Error:   "error",
-			Message: err.Error(),
-			Details: map[string]any{"code": 1},
-		})
+		_ = OutputYAML(payload)
 	} else {
 		fmt.Fprintf(w.errOut, "✗ %s\n", err.Error())
 	}

internal/output/toon.go

@@ -120,7 +120,7 @@ func toonBinaryFromEnv() (string, error) {
 	for _, env := range []string{"TOON_TRU_BIN", "TOON_BIN", "TRU_PATH"} {
 		if val := strings.TrimSpace(os.Getenv(env)); val != "" {
 			if !isToonRustBinary(val) {
-				return "", fmt.Errorf("%s=%q does not appear to be toon_rust (expected tru)", env, val)
+				return "", fmt.Errorf("%s=%q does not appear to be toon_rust (expected tru or tr binary)", env, val)
 			}
 			return val, nil
 		}

scripts/test_toon_e2e.sh

@@ -17,7 +17,7 @@ log "  PASS: slb found at $(command -v slb)"
 # Note: Cargo.toml specifies "tru" but some builds produce "tr"
 if command -v tru >/dev/null 2>&1; then
     log "  PASS: tru found at $(command -v tru)"
-elif command -v tr >/dev/null 2>&1 && tr --version 2>&1 | grep -qi "toon"; then
+elif command -v tr >/dev/null 2>&1 && tr --help 2>&1 | grep -qi "toon"; then
     log "  PASS: tr (TOON) found at $(command -v tr)"
 elif [[ -x /data/projects/toon_rust/target/release/tru ]]; then
     log "  PASS: tru found at /data/projects/toon_rust/target/release/tru"
@@ -69,7 +69,7 @@ toon_output=$(slb version --output toon 2>/dev/null)
 TRU_CMD=""
 if command -v tru >/dev/null 2>&1; then
     TRU_CMD="tru"
-elif command -v tr >/dev/null 2>&1 && tr --version 2>&1 | grep -qi "toon"; then
+elif command -v tr >/dev/null 2>&1 && tr --help 2>&1 | grep -qi "toon"; then
     TRU_CMD="tr"
 elif [[ -x /data/projects/toon_rust/target/release/tru ]]; then
     TRU_CMD="/data/projects/toon_rust/target/release/tru"