type-ruby
diff --git a/‎lib/t_ruby.rb‎
Lines changed: 3 additions & 0 deletions b/‎lib/t_ruby.rb‎
Lines changed: 3 additions & 0 deletions
diff --git a/‎lib/t_ruby/cache.rb‎
Lines changed: 40 additions & 10 deletions b/‎lib/t_ruby/cache.rb‎
Lines changed: 40 additions & 10 deletions
diff --git a/‎lib/t_ruby/cli.rb‎
Lines changed: 13 additions & 8 deletions b/‎lib/t_ruby/cli.rb‎
Lines changed: 13 additions & 8 deletions
diff --git a/‎lib/t_ruby/compiler.rb‎
Lines changed: 155 additions & 0 deletions b/‎lib/t_ruby/compiler.rb‎
Lines changed: 155 additions & 0 deletions
@@ -22,6 +22,9 @@
 require_relative "t_ruby/intersection_type_parser"
 require_relative "t_ruby/type_erasure"
 require_relative "t_ruby/error_handler"
+require_relative "t_ruby/diagnostic"
+require_relative "t_ruby/diagnostic_formatter"
+require_relative "t_ruby/error_reporter"
 require_relative "t_ruby/declaration_generator"
 require_relative "t_ruby/compiler"
 require_relative "t_ruby/lsp_server"
 
@@ -318,7 +318,7 @@ def initialize(compiler, cache: nil)
     def needs_compile?(file_path)
       return true unless File.exist?(file_path)
 
-      current_hash = file_hash(file_path)
+      current_hash = compute_file_hash(file_path)
       stored_hash = @file_hashes[file_path]
 
       return true if stored_hash.nil? || stored_hash != current_hash
@@ -333,7 +333,7 @@ def compile(file_path)
       return @compiled_files[file_path] unless needs_compile?(file_path)
 
       result = @compiler.compile(file_path)
-      @file_hashes[file_path] = file_hash(file_path)
+      @file_hashes[file_path] = compute_file_hash(file_path)
       @compiled_files[file_path] = result
 
       result
@@ -365,9 +365,14 @@ def clear
       @cache.stats # Just accessing for potential cleanup
     end
 
+    # Update file hash after external compile (for watcher integration)
+    def update_file_hash(file_path)
+      @file_hashes[file_path] = compute_file_hash(file_path)
+    end
+
     private
 
-    def file_hash(file_path)
+    def compute_file_hash(file_path)
       return nil unless File.exist?(file_path)
 
       Digest::SHA256.hexdigest(File.read(file_path))
@@ -683,27 +688,52 @@ def compile_with_ir(file_path)
     end
 
     # Compile all with cross-file checking
+    # Returns diagnostics using unified Diagnostic format
     def compile_all_with_checking(file_paths)
       results = {}
-      errors = []
+      all_diagnostics = []
 
       # First pass: compile and register all files
       file_paths.each do |file_path|
-        results[file_path] = compile_with_ir(file_path)
-      rescue StandardError => e
-        errors << { file: file_path, error: e.message }
+        source = File.exist?(file_path) ? File.read(file_path) : nil
+
+        begin
+          results[file_path] = compile_with_ir(file_path)
+        rescue TypeCheckError => e
+          all_diagnostics << Diagnostic.from_type_check_error(e, file: file_path, source: source)
+        rescue ParseError => e
+          all_diagnostics << Diagnostic.from_parse_error(e, file: file_path, source: source)
+        rescue Scanner::ScanError => e
+          all_diagnostics << Diagnostic.from_scan_error(e, file: file_path, source: source)
+        rescue StandardError => e
+          all_diagnostics << Diagnostic.new(
+            code: "TR0001",
+            message: e.message,
+            file: file_path,
+            line: 1,
+            column: 1
+          )
+        end
       end
 
       # Second pass: cross-file type checking
       if @cross_file_checker
         check_result = @cross_file_checker.check_all
-        errors.concat(check_result[:errors])
+        check_result[:errors].each do |e|
+          all_diagnostics << Diagnostic.new(
+            code: "TR2002",
+            message: e[:message],
+            file: e[:file],
+            line: 1,
+            column: 1
+          )
+        end
       end
 
       {
         results: results,
-        errors: errors,
-        success: errors.empty?,
+        diagnostics: all_diagnostics,
+        success: all_diagnostics.empty?,
       }
     end
 
 
@@ -214,14 +214,19 @@ def compile(input_file, config_path: nil)
       config = Config.new(config_path)
       compiler = Compiler.new(config)
 
-      output_path = compiler.compile(input_file)
-      puts "Compiled: #{input_file} -> #{output_path}"
-    rescue TypeCheckError => e
-      puts "Type error: #{e.message}"
-      exit 1
-    rescue ArgumentError => e
-      puts "Error: #{e.message}"
-      exit 1
+      result = compiler.compile_with_diagnostics(input_file)
+
+      if result[:success]
+        puts "Compiled: #{input_file} -> #{result[:output_path]}"
+      else
+        formatter = DiagnosticFormatter.new(use_colors: $stdout.tty?)
+        result[:diagnostics].each do |diagnostic|
+          puts formatter.format(diagnostic)
+        end
+        puts
+        puts formatter.send(:format_summary, result[:diagnostics])
+        exit 1
+      end
     end
 
     # Extract config path from --config or -c flag
 
@@ -76,6 +76,161 @@ def compile(input_path)
       output_path
     end
 
+    # Compile a file and return result with diagnostics
+    # This is the unified compilation interface for CLI and Watcher
+    # @param input_path [String] Path to the input file
+    # @return [Hash] Result with :success, :output_path, :diagnostics keys
+    def compile_with_diagnostics(input_path)
+      source = File.exist?(input_path) ? File.read(input_path) : nil
+      all_diagnostics = []
+
+      # Run analyze first to get all diagnostics (colon spacing, etc.)
+      if source
+        all_diagnostics = analyze(source, file: input_path)
+      end
+
+      begin
+        output_path = compile(input_path)
+        # Compilation succeeded, but we may still have diagnostics from analyze
+        {
+          success: all_diagnostics.empty?,
+          output_path: all_diagnostics.empty? ? output_path : nil,
+          diagnostics: all_diagnostics,
+        }
+      rescue TypeCheckError => e
+        # Skip if already reported by analyze (same message and location)
+        new_diag = Diagnostic.from_type_check_error(e, file: input_path, source: source)
+        unless all_diagnostics.any? { |d| d.message == new_diag.message && d.line == new_diag.line }
+          all_diagnostics << new_diag
+        end
+        {
+          success: false,
+          output_path: nil,
+          diagnostics: all_diagnostics,
+        }
+      rescue ParseError => e
+        new_diag = Diagnostic.from_parse_error(e, file: input_path, source: source)
+        unless all_diagnostics.any? { |d| d.message == new_diag.message && d.line == new_diag.line }
+          all_diagnostics << new_diag
+        end
+        {
+          success: false,
+          output_path: nil,
+          diagnostics: all_diagnostics,
+        }
+      rescue Scanner::ScanError => e
+        new_diag = Diagnostic.from_scan_error(e, file: input_path, source: source)
+        unless all_diagnostics.any? { |d| d.message == new_diag.message && d.line == new_diag.line }
+          all_diagnostics << new_diag
+        end
+        {
+          success: false,
+          output_path: nil,
+          diagnostics: all_diagnostics,
+        }
+      rescue ArgumentError => e
+        all_diagnostics << Diagnostic.new(
+          code: "TR0001",
+          message: e.message,
+          file: input_path,
+          severity: Diagnostic::SEVERITY_ERROR
+        )
+        {
+          success: false,
+          output_path: nil,
+          diagnostics: all_diagnostics,
+        }
+      end
+    end
+
+    # Analyze source code without compiling - returns diagnostics only
+    # This is the unified analysis interface for LSP and other tools
+    # @param source [String] T-Ruby source code
+    # @param file [String] File path for error reporting (optional)
+    # @return [Array<Diagnostic>] Array of diagnostic objects
+    def analyze(source, file: "<source>")
+      diagnostics = []
+      source_lines = source.split("\n")
+
+      # Run ErrorHandler checks (syntax validation, duplicate definitions, etc.)
+      error_handler = ErrorHandler.new(source)
+      errors = error_handler.check
+      errors.each do |error|
+        # Parse line number from "Line N: message" format
+        next unless error =~ /^Line (\d+):\s*(.+)$/
+
+        line_num = Regexp.last_match(1).to_i
+        message = Regexp.last_match(2)
+        source_line = source_lines[line_num - 1] if line_num.positive?
+        diagnostics << Diagnostic.new(
+          code: "TR1002",
+          message: message,
+          file: file,
+          line: line_num,
+          column: 1,
+          source_line: source_line,
+          severity: Diagnostic::SEVERITY_ERROR
+        )
+      end
+
+      # Run TokenDeclarationParser for colon spacing and declaration syntax validation
+      begin
+        scanner = Scanner.new(source)
+        tokens = scanner.scan_all
+        decl_parser = ParserCombinator::TokenDeclarationParser.new
+        decl_parser.parse_program(tokens)
+
+        if decl_parser.has_errors?
+          decl_parser.errors.each do |err|
+            source_line = source_lines[err.line - 1] if err.line.positive? && err.line <= source_lines.length
+            diagnostics << Diagnostic.new(
+              code: "TR1003",
+              message: err.message,
+              file: file,
+              line: err.line,
+              column: err.column,
+              source_line: source_line,
+              severity: Diagnostic::SEVERITY_ERROR
+            )
+          end
+        end
+      rescue Scanner::ScanError
+        # Scanner errors will be caught below in the main parse section
+      rescue StandardError
+        # Ignore TokenDeclarationParser errors for now - regex parser is authoritative
+      end
+
+      begin
+        # Parse source with regex-based parser for IR generation
+        parser = Parser.new(source)
+        parser.parse
+
+        # Run type checking if enabled and IR is available
+        if type_check? && parser.ir_program
+          begin
+            check_types(parser.ir_program, file)
+          rescue TypeCheckError => e
+            diagnostics << Diagnostic.from_type_check_error(e, file: file, source: source)
+          end
+        end
+      rescue ParseError => e
+        diagnostics << Diagnostic.from_parse_error(e, file: file, source: source)
+      rescue Scanner::ScanError => e
+        diagnostics << Diagnostic.from_scan_error(e, file: file, source: source)
+      rescue StandardError => e
+        diagnostics << Diagnostic.new(
+          code: "TR0001",
+          message: e.message,
+          file: file,
+          line: 1,
+          column: 1,
+          severity: Diagnostic::SEVERITY_ERROR
+        )
+      end
+
+      diagnostics
+    end
+
     # Compile T-Ruby source code from a string (useful for WASM/playground)
     # @param source [String] T-Ruby source code
     # @param options [Hash] Options for compilation