🤖 Fix fmt/fmt-check parity with clean Makefile design (#172)

## Problem

`make fmt` and `make fmt-check` had different behaviors:
- Different patterns (Makefile vs scripts/fmt.sh)
- `make fmt` only ran Prettier, `make fmt-check` ran Prettier + Nix +
shell
- No single source of truth

## Solution

Created `fmt.mk` that centralizes all formatting logic:
- `make fmt` → `fmt-prettier` + `fmt-shell` + `fmt-nix`
- `make fmt-check` → `fmt-prettier-check` + `fmt-shell-check` +
`fmt-nix-check`

Both use the same patterns and tools, guaranteed parity by construction.

## Changes

- Add `fmt.mk`: All formatting rules in one place
- Update `Makefile`: Include `fmt.mk`, remove duplicate logic
- Format shell scripts with shfmt
- Always use `bun x prettier` for reproducibility

_Generated with `cmux`_

Author: ammar-agent

Makefile

@@ -18,16 +18,17 @@
 # Adding New Targets:
 #   Add `## Description` after the target to make it appear in `make help`
 
+# Include formatting rules
+include fmt.mk
+
 .PHONY: all build dev start clean help
 .PHONY: build-renderer version build-icons
-.PHONY: lint lint-fix fmt fmt-check fmt-shell fmt-nix fmt-nix-check fmt-shell-check typecheck static-check
+.PHONY: lint lint-fix typecheck static-check
 .PHONY: test test-unit test-integration test-watch test-coverage test-e2e
 .PHONY: dist dist-mac dist-win dist-linux
 .PHONY: docs docs-build docs-watch
 .PHONY: ensure-deps
 
-# Prettier patterns for formatting
-PRETTIER_PATTERNS := 'src/**/*.{ts,tsx,json}' 'tests/**/*.{ts,json}' 'docs/**/*.{md,mdx}' '*.{json,md}'
 TS_SOURCES := $(shell find src -type f \( -name '*.ts' -o -name '*.tsx' \))
 
 # Default target
@@ -124,23 +125,6 @@ lint: ## Run linter and typecheck
 lint-fix: ## Run linter with --fix
 	@./scripts/lint.sh --fix
 
-fmt: ## Format code with Prettier
-	@echo "Formatting TypeScript/JSON/Markdown files..."
-	@bun x prettier --write $(PRETTIER_PATTERNS)
-
-fmt-check: ## Check code formatting
-	@./scripts/fmt.sh --check
-	@./scripts/fmt.sh --nix-check
-
-fmt-shell: ## Format shell scripts with shfmt
-	@./scripts/fmt.sh --shell
-
-fmt-nix: ## Format flake.nix with nix fmt
-	@./scripts/fmt.sh --nix
-
-fmt-nix-check: ## Check flake.nix formatting
-	@./scripts/fmt.sh --nix-check
-
 typecheck: src/version.ts ## Run TypeScript type checking
 	@./scripts/typecheck.sh
 
@@ -196,10 +180,4 @@ clean: ## Clean build artifacts
 # Parallel build optimization - these can run concurrently
 .NOTPARALLEL: build-main  # TypeScript can handle its own parallelism
 
-fmt-shell-check: ## Check shell script formatting
-	@if ! command -v shfmt &>/dev/null; then \
-		echo "shfmt not found. Install with: brew install shfmt"; \
-		exit 1; \
-	fi
-	@echo "Checking shell script formatting..."
-	@shfmt -i 2 -ci -bn -d scripts
+

fmt.mk

@@ -0,0 +1,77 @@
+# Formatting Rules
+# ================
+# This file contains all code formatting logic.
+# Included by the main Makefile.
+
+.PHONY: fmt fmt-check fmt-prettier fmt-prettier-check fmt-shell fmt-shell-check fmt-nix fmt-nix-check
+
+# Centralized patterns - single source of truth
+PRETTIER_PATTERNS := 'src/**/*.{ts,tsx,json}' 'tests/**/*.ts' 'docs/**/*.md' 'package.json' 'tsconfig*.json' 'README.md'
+SHELL_SCRIPTS := scripts
+
+# Always use bun x prettier for reproducibility (uses package.json version)
+PRETTIER := bun x prettier
+
+# Tool availability checks
+SHFMT := $(shell command -v shfmt 2>/dev/null)
+NIX := $(shell command -v nix 2>/dev/null)
+
+fmt: fmt-prettier fmt-shell fmt-nix
+	@echo "==> All formatting complete!"
+
+fmt-check: fmt-prettier-check fmt-shell-check fmt-nix-check
+	@echo "==> All formatting checks passed!"
+
+fmt-prettier:
+	@echo "Formatting TypeScript/JSON/Markdown files..."
+	@$(PRETTIER) --write $(PRETTIER_PATTERNS)
+
+fmt-prettier-check:
+	@echo "Checking TypeScript/JSON/Markdown formatting..."
+	@$(PRETTIER) --check $(PRETTIER_PATTERNS)
+
+fmt-shell:
+ifeq ($(SHFMT),)
+	@echo "Error: shfmt not found. Install with: brew install shfmt"
+	@exit 1
+else
+	@echo "Formatting shell scripts..."
+	@shfmt -i 2 -ci -bn -w $(SHELL_SCRIPTS)
+endif
+
+fmt-shell-check:
+ifeq ($(SHFMT),)
+	@echo "Error: shfmt not found. Install with: brew install shfmt"
+	@exit 1
+else
+	@echo "Checking shell script formatting..."
+	@shfmt -i 2 -ci -bn -d $(SHELL_SCRIPTS)
+endif
+
+fmt-nix:
+ifeq ($(NIX),)
+	@echo "Nix not found; skipping Nix formatting"
+else ifeq ($(wildcard flake.nix),)
+	@echo "flake.nix not found; skipping Nix formatting"
+else
+	@echo "Formatting Nix flake..."
+	@nix fmt -- flake.nix
+endif
+
+fmt-nix-check:
+ifeq ($(NIX),)
+	@echo "Nix not found; skipping Nix format check"
+else ifeq ($(wildcard flake.nix),)
+	@echo "flake.nix not found; skipping Nix format check"
+else
+	@echo "Checking flake.nix formatting..."
+	@tmp_dir=$$(mktemp -d "$${TMPDIR:-/tmp}/fmt-nix-check.XXXXXX"); \
+	trap "rm -rf $$tmp_dir" EXIT; \
+	cp flake.nix "$$tmp_dir/flake.nix"; \
+	(cd "$$tmp_dir" && nix fmt -- flake.nix >/dev/null 2>&1); \
+	if ! cmp -s flake.nix "$$tmp_dir/flake.nix"; then \
+		echo "flake.nix is not formatted correctly. Run 'make fmt-nix' to fix."; \
+		diff -u flake.nix "$$tmp_dir/flake.nix" || true; \
+		exit 1; \
+	fi
+endif

scripts/quick-cp-screenshot.sh

@@ -37,7 +37,7 @@ OUTPUT_FILE="$PROJECT_ROOT/docs/img/$FILENAME.webp"
 
 # Convert PNG to WebP using cwebp (as suggested by lint)
 echo "Converting to WebP..."
-if ! command -v cwebp &> /dev/null; then
+if ! command -v cwebp &>/dev/null; then
   echo "❌ Error: cwebp not found. Install with: brew install webp"
   exit 1
 fi

scripts/setup-macos-signing.sh

@@ -14,20 +14,20 @@ set -euo pipefail
 # Setup code signing certificate
 if [ -n "${MACOS_CERTIFICATE:-}" ]; then
   echo "Setting up code signing certificate..."
-  echo "$MACOS_CERTIFICATE" | base64 -D > /tmp/certificate.p12
-  echo "CSC_LINK=/tmp/certificate.p12" >> "$GITHUB_ENV"
-  echo "CSC_KEY_PASSWORD=$MACOS_CERTIFICATE_PWD" >> "$GITHUB_ENV"
+  echo "$MACOS_CERTIFICATE" | base64 -D >/tmp/certificate.p12
+  echo "CSC_LINK=/tmp/certificate.p12" >>"$GITHUB_ENV"
+  echo "CSC_KEY_PASSWORD=$MACOS_CERTIFICATE_PWD" >>"$GITHUB_ENV"
 else
   echo "⚠️  No code signing certificate provided - building unsigned"
 fi
 
 # Setup notarization credentials
 if [ -n "${AC_APIKEY_ID:-}" ]; then
   echo "Setting up notarization credentials..."
-  echo "$AC_APIKEY_P8_BASE64" | base64 -D > /tmp/AuthKey.p8
-  echo "APPLE_API_KEY=/tmp/AuthKey.p8" >> "$GITHUB_ENV"
-  echo "APPLE_API_KEY_ID=$AC_APIKEY_ID" >> "$GITHUB_ENV"
-  echo "APPLE_API_ISSUER=$AC_APIKEY_ISSUER_ID" >> "$GITHUB_ENV"
+  echo "$AC_APIKEY_P8_BASE64" | base64 -D >/tmp/AuthKey.p8
+  echo "APPLE_API_KEY=/tmp/AuthKey.p8" >>"$GITHUB_ENV"
+  echo "APPLE_API_KEY_ID=$AC_APIKEY_ID" >>"$GITHUB_ENV"
+  echo "APPLE_API_ISSUER=$AC_APIKEY_ISSUER_ID" >>"$GITHUB_ENV"
   echo "✅ Notarization credentials configured"
 else
   echo "⚠️  No notarization credentials - skipping notarization"