reorganize to be consistent with the new mcp sdk style

Author: martinemde

Gemfile.lock

@@ -5,7 +5,8 @@ PATH
       mcp (~> 0.1)
       query_packwerk (~> 0.1)
       sorbet-runtime
-      thor (~> 1.2)
+      thor
+      zeitwerk
 
 GEM
   remote: https://rubygems.org/

MCP.md

@@ -36,5 +36,6 @@ Gem::Specification.new do |spec|
   spec.add_dependency 'mcp', '~> 0.1'
   spec.add_dependency 'query_packwerk', '~> 0.1'
   spec.add_dependency 'sorbet-runtime'
-  spec.add_dependency 'thor', '~> 1.2'
+  spec.add_dependency 'thor'
+  spec.add_dependency 'zeitwerk'
 end

chatwerk.gemspec

@@ -1,21 +1,16 @@
 # typed: strict
 # frozen_string_literal: true
 
+require 'zeitwerk'
 require 'query_packwerk'
 require 'sorbet-runtime'
+require 'chatwerk/version'
+
+loader = Zeitwerk::Loader.for_gem
+loader.setup
 
 # Chatwerk provides integration between QueryPackwerk and AI tools
 # via the Model Context Protocol (MCP) server.
 module Chatwerk
-  extend T::Sig
-
-  autoload :API, 'chatwerk/api'
-  autoload :CLI, 'chatwerk/cli'
-  autoload :Error, 'chatwerk/error'
-  autoload :Helpers, 'chatwerk/helpers'
-  autoload :Mcp, 'chatwerk/mcp'
-  autoload :Views, 'chatwerk/views'
-  autoload :VERSION, 'chatwerk/version'
-
   class NotFoundError < Error; end
 end

lib/chatwerk.rb

@@ -2,10 +2,9 @@
 # frozen_string_literal: true
 
 require 'yaml'
-require_relative 'views'
 
 module Chatwerk
-  module API
+  module Api
     class << self
       def print_env
         msg = <<~MESSAGE

lib/chatwerk/api.rb

@@ -2,8 +2,6 @@
 # frozen_string_literal: true
 
 require 'thor'
-require 'chatwerk'
-require 'chatwerk/api'
 
 module Chatwerk
   # CLI interface for Chatwerk using Thor
@@ -25,27 +23,27 @@ def inspect(working_directory = nil)
 
     desc 'print_env', 'Show current environment details'
     def print_env
-      puts API.print_env
+      puts Api.print_env
     end
 
     desc 'packages [PACKAGE_PATH]', 'List all valid packwerk packages, optionally filtered by package path'
     def packages(package_path = nil)
-      puts API.packages(package_path:)
+      puts Api.packages(package_path:)
     end
 
     desc 'package PACKAGE_PATH', 'Show details for a specific package'
     def package(package_path)
-      puts API.package(package_path:)
+      puts Api.package(package_path:)
     end
 
     desc 'package_todos PACKAGE_PATH [CONSTANT_NAME]', 'Show dependency violations FROM this package TO others'
     def package_todos(package_path, constant_name = nil)
-      puts API.package_todos(package_path:, constant_name:)
+      puts Api.package_todos(package_path:, constant_name:)
     end
 
     desc 'package_violations PACKAGE_PATH [CONSTANT_NAME]', 'Show dependency violations TO this package FROM others'
     def package_violations(package_path, constant_name = nil)
-      puts API.package_violations(package_path:, constant_name:)
+      puts Api.package_violations(package_path:, constant_name:)
     end
 
     desc 'version', 'Display Chatwerk version'

lib/chatwerk/cli.rb

@@ -1,189 +1,6 @@
 require 'mcp'
-require 'query_packwerk'
-require 'parse_packwerk'
-require 'yaml'
-require_relative 'views'
-require_relative 'api'
-require_relative 'helpers'
 
 module Chatwerk
-  # Print environment information tool
-  class PrintEnvTool < MCP::Tool
-    description 'Get the current working directory and environment path of the MCP server, ensuring correct directory context'
-
-    input_schema(
-      properties: {},
-      required: []
-    )
-
-    class << self
-      def call(server_context:)
-        msg = <<~MESSAGE
-          Relay these exact details to the user:
-          Current Directory: #{Dir.pwd}
-          Environment: #{ENV.fetch('PWD', nil)}
-        MESSAGE
-        Helpers.chdir do
-          msg << "Chdir'd to #{Helpers.pwd}\n"
-        end
-        msg << ENV.to_h.map { |key, value| "#{key}=#{value}" }.join("\n")
-
-        MCP::Tool::Response.new([{
-                                  type: 'text',
-                                  text: msg
-                                }])
-      end
-    end
-  end
-
-  # List packages tool
-  class PackagesTool < MCP::Tool
-    description <<~DESC
-      List all valid packwerk packages (aka packs) in the project.
-      Use this to find or list packages, optionally matching a substring of the package_path.
-    DESC
-
-    input_schema(
-      properties: {
-        package_path: {
-          type: 'string',
-          description: "A partial package path name to constrain the results (e.g. 'packs/product_services/payments/banks' or 'payments/banks')."
-        }
-      },
-      required: []
-    )
-
-    class << self
-      def call(server_context:, package_path: nil)
-        result = API.packages(package_path: package_path)
-
-        MCP::Tool::Response.new([{
-                                  type: 'text',
-                                  text: result
-                                }])
-      end
-    end
-  end
-
-  # Show package details tool
-  class PackageTool < MCP::Tool
-    description <<~DESC
-      Show the details for a specific package.
-
-      Output format:
-      - Package details, including dependencies and configuration
-    DESC
-
-    input_schema(
-      properties: {
-        package_path: {
-          type: 'string',
-          description: "A full relative package path (e.g. 'packs/product_services/payments/banks')."
-        }
-      },
-      required: ['package_path']
-    )
-
-    class << self
-      def call(package_path:, server_context:)
-        Helpers.chdir
-        result = API.package(package_path: package_path)
-
-        MCP::Tool::Response.new([{
-                                  type: 'text',
-                                  text: result
-                                }])
-      end
-    end
-  end
-
-  # Package todos (violations FROM this package) tool
-  class PackageTodosTool < MCP::Tool
-    description <<~DESC
-      Find code that violates dependency boundaries FROM this package TO other packages.
-
-      Output formats:
-      - Without constant_name: List of violated constants with counts
-        Example: "::OtherPackage::SomeClass # 3 violations"
-      - With constant_name: Detailed examples and locations
-        Example:
-          ::OtherPackage::SomeClass
-            example: OtherPackage::SomeClass.new
-            files:
-              - app/services/my_service.rb
-    DESC
-
-    input_schema(
-      properties: {
-        package_path: {
-          type: 'string',
-          description: "The relative path of a directory containing a package.yml file (e.g. 'packs/product_services/payments/origination_banks')."
-        },
-        constant_name: {
-          type: 'string',
-          description: "The name of a constant to filter the results by. If provided, a more detailed list of code usage examples will be returned. (e.g. '::OtherPackage::SomeClass')"
-        }
-      },
-      required: ['package_path']
-    )
-
-    class << self
-      def call(package_path:, server_context:, constant_name: nil)
-        Helpers.chdir
-        result = API.package_todos(package_path: package_path, constant_name: constant_name)
-
-        MCP::Tool::Response.new([{
-                                  type: 'text',
-                                  text: result
-                                }])
-      end
-    end
-  end
-
-  # Package violations (violations TO this package) tool
-  class PackageViolationsTool < MCP::Tool
-    description <<~DESC
-      Find code that violates dependency boundaries TO this package FROM other packages.
-
-      Output formats:
-      - Without constant_name: List of violated constants with counts
-        Example: "::ThisPackage::SomeClass: 3 violations"
-      - With constant_name: Detailed examples and locations
-        Example:
-          # Constant `::ThisPackage::SomeClass`
-            ## Example:
-              ThisPackage::SomeClass.new
-            ### Files:
-              app/services/other_service.rb
-    DESC
-
-    input_schema(
-      properties: {
-        package_path: {
-          type: 'string',
-          description: "The relative path of a directory containing a package.yml file (e.g. 'packs/product_services/payments/origination_banks'). AKA a 'pack' or 'package'."
-        },
-        constant_name: {
-          type: 'string',
-          description: 'The name of a constant to filter the results by. If provided, a more detailed list of code usage examples will be returned.'
-        }
-      },
-      required: ['package_path']
-    )
-
-    class << self
-      def call(package_path:, server_context:, constant_name: nil)
-        Helpers.chdir
-        result = API.package_violations(package_path: package_path, constant_name: constant_name)
-
-        MCP::Tool::Response.new([{
-                                  type: 'text',
-                                  text: result
-                                }])
-      end
-    end
-  end
-
   # MCP Server setup
   class Mcp
     def self.server
@@ -192,11 +9,11 @@ def self.server
         name: name,
         version: Chatwerk::VERSION,
         tools: [
-          PrintEnvTool,
-          PackagesTool,
-          PackageTool,
-          PackageTodosTool,
-          PackageViolationsTool
+          Tools::PrintEnvTool,
+          Tools::PackagesTool,
+          Tools::PackageTool,
+          Tools::PackageTodosTool,
+          Tools::PackageViolationsTool
         ]
       )
     end