feat: merge tokens + error rail + progress bars branch

Author: meeghele

.clang-tidy

@@ -0,0 +1,51 @@
+# Clang-tidy configuration for mini-ccstatus
+# Focuses on type safety, readability, and modern C practices
+
+Checks: >
+  -*,
+  bugprone-*,
+  -bugprone-easily-swappable-parameters,
+  cert-*,
+  clang-analyzer-*,
+  concurrency-*,
+  modernize-*,
+  -modernize-use-trailing-return-type,
+  performance-*,
+  portability-*,
+  readability-*,
+  -readability-identifier-length,
+  -readability-magic-numbers,
+  -readability-function-cognitive-complexity,
+  misc-*,
+  -misc-unused-parameters
+
+CheckOptions:
+  - key: readability-identifier-naming.FunctionCase
+    value: lower_case
+  - key: readability-identifier-naming.VariableCase
+    value: lower_case
+  - key: readability-identifier-naming.ParameterCase
+    value: lower_case
+  - key: readability-identifier-naming.MacroDefinitionCase
+    value: UPPER_CASE
+  - key: readability-identifier-naming.EnumConstantCase
+    value: UPPER_CASE
+  - key: readability-identifier-naming.ConstantCase
+    value: UPPER_CASE
+  - key: readability-identifier-naming.GlobalConstantCase
+    value: UPPER_CASE
+  - key: readability-identifier-naming.StaticConstantCase
+    value: UPPER_CASE
+  - key: readability-identifier-naming.StructCase
+    value: lower_case
+  - key: readability-identifier-naming.TypedefCase
+    value: lower_case
+  - key: bugprone-reserved-identifier.AllowedIdentifiers
+    value: '_*'
+  - key: cert-err33-c.CheckedFunctions
+    value: '::aligned_alloc;::asctime_s;::at_quick_exit;::atexit;::bsearch;::bsearch_s;::btowc;::c16rtomb;::c32rtomb;::calloc;::clock;::cnd_broadcast;::cnd_init;::cnd_signal;::cnd_timedwait;::cnd_wait;::ctime_s;::fclose;::fflush;::fgetc;::fgetpos;::fgets;::fgetwc;::fopen;::fopen_s;::fprintf;::fprintf_s;::fputc;::fputs;::fputwc;::fputws;::fread;::freopen;::freopen_s;::fscanf;::fscanf_s;::fseek;::fsetpos;::ftell;::fwprintf;::fwprintf_s;::fwrite;::fwscanf;::fwscanf_s;::getc;::getchar;::getenv;::getenv_s;::gets_s;::getwc;::getwchar;::gmtime;::gmtime_s;::localtime;::localtime_s;::malloc;::mbrtoc16;::mbrtoc32;::mbsrtowcs;::mbsrtowcs_s;::mbstowcs;::mbstowcs_s;::memchr;::mktime;::mtx_init;::mtx_lock;::mtx_timedlock;::mtx_trylock;::mtx_unlock;::printf_s;::putc;::putwc;::raise;::realloc;::remove;::rename;::scanf;::scanf_s;::setlocale;::setvbuf;::signal;::snprintf;::snprintf_s;::sprintf;::sprintf_s;::sscanf;::sscanf_s;::strchr;::strerror_s;::strftime;::strpbrk;::strrchr;::strstr;::strtod;::strtof;::strtoimax;::strtok;::strtok_s;::strtol;::strtold;::strtoll;::strtoul;::strtoull;::strtoumax;::strxfrm;::swprintf;::swprintf_s;::swscanf;::swscanf_s;::thrd_create;::thrd_detach;::thrd_join;::thrd_sleep;::time;::timespec_get;::tmpfile;::tmpfile_s;::tmpnam;::tmpnam_s;::tss_create;::tss_get;::tss_set;::ungetc;::ungetwc;::vfprintf;::vfprintf_s;::vfscanf;::vfscanf_s;::vfwprintf;::vfwprintf_s;::vfwscanf;::vfwscanf_s;::vprintf_s;::vscanf;::vscanf_s;::vsnprintf;::vsnprintf_s;::vsprintf;::vsprintf_s;::vsscanf;::vsscanf_s;::vswprintf;::vswprintf_s;::vswscanf;::vswscanf_s;::vwprintf_s;::vwscanf;::vwscanf_s;::wcrtomb;::wcschr;::wcsftime;::wcspbrk;::wcsrchr;::wcsrtombs;::wcsrtombs_s;::wcsstr;::wcstod;::wcstof;::wcstoimax;::wcstok;::wcstok_s;::wcstol;::wcstold;::wcstoll;::wcstombs;::wcstombs_s;::wcstoul;::wcstoull;::wcstoumax;::wcsxfrm;::wctob;::wctrans;::wctype;::wmemchr;::wprintf_s;::wscanf;::wscanf_s;'
+
+WarningsAsErrors: ''
+HeaderFilterRegex: '(src|lib)/.*\.h$'
+AnalyzeTemporaryDtors: false
+FormatStyle: file

.gitignore

@@ -1,4 +1,7 @@
-obj/
-obj-debug/
 bin/
+obj/
+log/
 benchmark/REPORT.md
+compile_commands.json
+.cache/
+tests/test_token_calculator

Makefile

@@ -5,74 +5,164 @@
 CC ?= cc
 CPPFLAGS ?=
 CFLAGS ?= -O3 -pipe -march=native -flto -DNDEBUG
-WARNFLAGS ?= -Wall -Wextra -Wpedantic -Wno-sign-conversion
-LDFLAGS ?=
+# Type-safety warning flags (strict mode)
+WARNFLAGS ?= -Wall -Wextra -Wpedantic \
+             -Wconversion -Wsign-conversion \
+             -Wcast-qual -Wformat=2 \
+             -Wstrict-overflow=5 -Wwrite-strings -Wundef \
+             -Wshadow -Wpointer-arith \
+             -Wcast-align -Wstrict-prototypes
+LDFLAGS ?= -lm
 
 TARGET := mini-ccstatus
 OBJ_DIR := obj
 BIN_DIR := bin
-OBJECTS := $(OBJ_DIR)/mini-ccstatus.o $(OBJ_DIR)/cJSON.o
+SRC_DIR := src
+LIB_DIR := lib
+TST_DIR := tests
+LOG_DIR := log
+
+# Source and object files
+SOURCES := main.c \
+           $(SRC_DIR)/cache.c \
+           $(SRC_DIR)/cli_parser.c \
+           $(SRC_DIR)/json_parser.c \
+           $(SRC_DIR)/token_calculator.c \
+           $(SRC_DIR)/display.c \
+           $(SRC_DIR)/safe_conv.c \
+           $(LIB_DIR)/cjson/cJSON.c
+
+# Release build configuration
+OBJ_DIR_RELEASE := $(OBJ_DIR)/release
+OBJECTS := $(addprefix $(OBJ_DIR_RELEASE)/, $(patsubst %.c,%.o,$(notdir $(SOURCES))))
+
+# Common compilation settings
+COMPILE_FLAGS := $(CPPFLAGS) -I. -I$(LIB_DIR)
+COMMON_DEPS := $(SRC_DIR)/*.h $(LIB_DIR)/cjson/cJSON.h
 
 # Debug build configuration (for valgrind and debugging)
-CFLAGS_DEBUG := -g -O0 $(WARNFLAGS)
-TARGET_DEBUG := mini-ccstatus-debug
-OBJ_DIR_DEBUG := obj-debug
-OBJECTS_DEBUG := $(OBJ_DIR_DEBUG)/mini-ccstatus.o $(OBJ_DIR_DEBUG)/cJSON.o
+CFLAGS_DEBUG_BASE := -g -O0 $(WARNFLAGS)
+CFLAGS_DEBUG  := $(CFLAGS_DEBUG_BASE) -fanalyzer
+TARGET_DEBUG  := mini-ccstatus-debug
+OBJ_DIR_DEBUG := $(OBJ_DIR)/debug
+OBJECTS_DEBUG := $(addprefix $(OBJ_DIR_DEBUG)/, $(patsubst %.c,%.o,$(notdir $(SOURCES))))
+
+# Debug logging build configuration (debug + -DDEBUG for DEBUG_LOG macros)
+CFLAGS_DEBUG_LOG  := $(CFLAGS_DEBUG_BASE) -DDEBUG
+TARGET_DEBUG_LOG  := mini-ccstatus-debug-log
+OBJ_DIR_DEBUG_LOG := $(OBJ_DIR)/debug-log
+OBJECTS_DEBUG_LOG := $(addprefix $(OBJ_DIR_DEBUG_LOG)/, $(patsubst %.c,%.o,$(notdir $(SOURCES))))
 
 # Test scripts
-DEMO_SCRIPT := tests/stdout.sh
-TEST_SCRIPT := tests/coverage.sh
-TEST_MEMORY := tests/memory.sh
-TEST_VALGRIND := tests/valgrind.sh
+DEMO_QUIET_SCRIPT   := $(TST_DIR)/stdout_quiet.sh
+DEMO_VERBOSE_SCRIPT := $(TST_DIR)/stdout_verbose.sh
+UNIT_TEST_SCRIPT    := $(TST_DIR)/run_unit_tests.sh
+TEST_SCRIPT         := $(TST_DIR)/coverage.sh
+TEST_MEMORY         := $(TST_DIR)/memory.sh
+TEST_VALGRIND       := $(TST_DIR)/valgrind.sh
+
+# Test fixtures
 FIXTURES := fixtures/*.json
 
-default: $(BIN_DIR)/$(TARGET) demo
+default: $(BIN_DIR)/$(TARGET) demo-simple
 
 .PHONY: all
-all: clean default test valgrind
+all: clean build-all demo-all test valgrind
 
+.PHONY: build-all
+build-all: $(BIN_DIR)/$(TARGET) $(BIN_DIR)/$(TARGET_DEBUG) $(BIN_DIR)/$(TARGET_DEBUG_LOG)
+
+.PHONY: demo-all
+demo-all: log-dir demo-simple demo-debug
+
+.PHONY: log-dir
+log-dir:
+	@mkdir -p $(LOG_DIR)
+
+# Main target
 $(BIN_DIR)/$(TARGET): $(OBJECTS) | $(BIN_DIR)
 	$(CC) $(OBJECTS) $(LDFLAGS) -o $@
 
-$(OBJ_DIR)/mini-ccstatus.o: mini-ccstatus.c lib/cjson/cJSON.h | $(OBJ_DIR)
-	$(CC) $(CPPFLAGS) $(CFLAGS) $(WARNFLAGS) -I. -Ilib -c $< -o $@
+# Tell Make where to find source files
+vpath %.c . $(SRC_DIR) $(LIB_DIR)/cjson
 
-$(OBJ_DIR)/cJSON.o: lib/cjson/cJSON.c lib/cjson/cJSON.h | $(OBJ_DIR)
-	$(CC) $(CPPFLAGS) $(CFLAGS) $(WARNFLAGS) -I. -Ilib -c $< -o $@
+# Pattern rule for release build (VPATH handles source file lookup)
+$(OBJ_DIR_RELEASE)/%.o: %.c $(COMMON_DEPS) | $(OBJ_DIR_RELEASE)
+	$(CC) $(COMPILE_FLAGS) $(CFLAGS) $(WARNFLAGS) -c $< -o $@
 
-$(OBJ_DIR) $(BIN_DIR):
+$(OBJ_DIR_RELEASE) $(OBJ_DIR_DEBUG) $(OBJ_DIR_DEBUG_LOG) $(BIN_DIR):
 	mkdir -p $@
 
-# Debug build targets
+# Debug build target
 $(BIN_DIR)/$(TARGET_DEBUG): $(OBJECTS_DEBUG) | $(BIN_DIR)
 	$(CC) $(OBJECTS_DEBUG) $(LDFLAGS) -o $@
 
-$(OBJ_DIR_DEBUG)/mini-ccstatus.o: mini-ccstatus.c lib/cjson/cJSON.h | $(OBJ_DIR_DEBUG)
-	$(CC) $(CPPFLAGS) $(CFLAGS_DEBUG) -I. -Ilib -c $< -o $@
-
-$(OBJ_DIR_DEBUG)/cJSON.o: lib/cjson/cJSON.c lib/cjson/cJSON.h | $(OBJ_DIR_DEBUG)
-	$(CC) $(CPPFLAGS) $(CFLAGS_DEBUG) -I. -Ilib -c $< -o $@
-
-$(OBJ_DIR_DEBUG):
-	mkdir -p $@
+# Pattern rule for debug build (VPATH handles source file lookup)
+$(OBJ_DIR_DEBUG)/%.o: %.c $(COMMON_DEPS) | $(OBJ_DIR_DEBUG)
+	$(CC) $(COMPILE_FLAGS) $(CFLAGS_DEBUG) -c $< -o $@
 
 .PHONY: debug
 debug: $(BIN_DIR)/$(TARGET_DEBUG)
 
-.PHONY: test
-test: $(BIN_DIR)/$(TARGET) $(TEST_SCRIPT) $(TEST_MEMORY) $(FIXTURES)
-	$(TEST_SCRIPT)
-	$(TEST_MEMORY)
+# Debug logging build target (with -DDEBUG for DEBUG_LOG macros)
+$(BIN_DIR)/$(TARGET_DEBUG_LOG): $(OBJECTS_DEBUG_LOG) | $(BIN_DIR)
+	$(CC) $(OBJECTS_DEBUG_LOG) $(LDFLAGS) -o $@
+
+# Pattern rule for debug-log build (VPATH handles source file lookup)
+$(OBJ_DIR_DEBUG_LOG)/%.o: %.c $(COMMON_DEPS) | $(OBJ_DIR_DEBUG_LOG)
+	$(CC) $(COMPILE_FLAGS) $(CFLAGS_DEBUG_LOG) -c $< -o $@
 
-.PHONY: demo
-demo: $(BIN_DIR)/$(TARGET) $(DEMO_SCRIPT)
-	$(DEMO_SCRIPT)
-	VERBOSE=true $(DEMO_SCRIPT)
+.PHONY: debug-log
+debug-log: $(BIN_DIR)/$(TARGET_DEBUG_LOG)
+
+.PHONY: test
+test: $(BIN_DIR)/$(TARGET) $(UNIT_TEST_SCRIPT) $(TEST_SCRIPT) $(TEST_MEMORY) $(FIXTURES) log-dir
+	@echo "Running tests (logs: $(LOG_DIR)/test-*.log)..."
+	$(UNIT_TEST_SCRIPT) 2>&1 | tee $(LOG_DIR)/test-unit.log
+	$(TEST_SCRIPT) 2>&1 | tee $(LOG_DIR)/test-coverage.log
+	$(TEST_MEMORY) 2>&1 | tee $(LOG_DIR)/test-memory.log
+
+.PHONY: demo-simple
+demo-simple: $(BIN_DIR)/$(TARGET) $(DEMO_QUIET_SCRIPT) $(DEMO_VERBOSE_SCRIPT)
+	$(DEMO_QUIET_SCRIPT)
+	$(DEMO_VERBOSE_SCRIPT)
+
+.PHONY: demo-debug
+demo-debug: $(BIN_DIR)/$(TARGET_DEBUG_LOG) log-dir
+	@echo "Running with debug logging enabled..."
+	@cat fixtures/status.json | $(BIN_DIR)/$(TARGET_DEBUG_LOG) > $(LOG_DIR)/demo-debug-basic.log 2>&1
+	@cat $(LOG_DIR)/demo-debug-basic.log
+	@echo ""
+	@echo "Running with --all flag and debug logging..."
+	@cat fixtures/test_status_with_transcript.json | $(BIN_DIR)/$(TARGET_DEBUG_LOG) --all > $(LOG_DIR)/demo-debug-all.log 2>&1
+	@cat $(LOG_DIR)/demo-debug-all.log
+	@echo ""
+	@echo "Debug logs saved to $(LOG_DIR)/demo-debug-*.log"
 
 .PHONY: valgrind
-valgrind: $(TEST_VALGRIND)
-	$(TEST_VALGRIND)
+valgrind: $(TEST_VALGRIND) log-dir
+	@echo "Running valgrind tests (logs: $(LOG_DIR)/test-valgrind.log)..."
+	$(TEST_VALGRIND) 2>&1 | tee $(LOG_DIR)/test-valgrind.log
+
+# Static analysis targets
+.PHONY: lint
+lint:
+	@echo "Running clang-tidy static analysis..."
+	@clang-tidy $(SOURCES) -- -I. -I$(LIB_DIR) $(CPPFLAGS) $(WARNFLAGS)
+
+.PHONY: analyze
+analyze: debug
+	@echo "Running GCC static analyzer..."
+	@$(MAKE) clean
+	@$(MAKE) debug 2>&1 | grep -E '(warning:|error:)' || echo "No analyzer warnings found"
+
+.PHONY: clang
+clang:
+	@echo "Generating compile_commands.json for clangd..."
+	-@bear -- $(MAKE) clean
+	-@bear -- $(MAKE)
+	@echo "compile_commands.json generated successfully"
 
 .PHONY: clean
 clean:
-	rm -rfv $(BIN_DIR) $(OBJ_DIR) $(OBJ_DIR_DEBUG)
+	rm -rfv $(BIN_DIR) $(OBJ_DIR) $(OBJ_DIR_DEBUG) $(OBJ_DIR_DEBUG_LOG) $(LOG_DIR) compile_commands.json