omnifocus_mcp 1.0.0 → 1.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4eb86aa8048f5b98edf61273ab7936b859663199e2ad6c73bb11ec55605550d8
-  data.tar.gz: 7dc7b4f11e986aa96d8b9d746d75a16e7222f13627577ca3e3c420ee4df21bb1
+  metadata.gz: b8c375f2413b7dd77c677c5abed0ccb49b4efebd2ed7e8fc36179f65cd763154
+  data.tar.gz: ca70f41c0e96bbb3a5048d1c673a950fe91f252c3b658eb09c99d0462452a35c
 SHA512:
-  metadata.gz: d7886bb913d144e269a8d9605a7e09ac18a9cab49742a62b9bd4f8b835fd034e6f4984ed33dbc38df2709f6ea748b0902b69b6e823da5b7cd58548c645e195ef
-  data.tar.gz: 033366a6ead47fccfb29bdb0e0df36a1817a124ecea767977bd7c397d26252884fc4e57a3f3e4d6e8b41dc397ad9e6bd2265bf532f3f55ee127d796a300ab00c
+  metadata.gz: e2887652751a36fec3f1fbadfbc9feca9c64a9063317f25a1c13a8f0817236c4f2fa0fdf022b4930d8cce7493a8a0b217c72ed100755b55a44a9733888f122a8
+  data.tar.gz: fd235093c277e4bd78d5886512d66489f2524c39c3af875877502bdd7fba3064de3b19287660e7582009eab69a9e7646ca98e0ab3c7b3cab451124f3a4940556

data/CHANGELOG.md

@@ -1,6 +1,18 @@
 # Changelog
 
-## [Unreleased]
+## [1.0.2]
+
+- Remove `bundler/setup` from the executable so the gem runs correctly when
+  installed outside a Bundler-managed environment
+- Refactor database stats generator to eliminate circular logic
+- Remove unused `BatchReport` and `QueryOmnifocusFormatter` classes
+- Reorganise spec suite into per-class files
+
+## [1.0.1] - 2026-06-27
+
+- Fix UTF-8/US-ASCII encoding on stdio so MCP clients receive valid JSON-RPC messages
+- Add `--version` / `-v` CLI flags and log server version on startup
+- Omit empty date and numeric filters from query result formatting
 
 ## [1.0.0] - 2026-05-31
 

data/README.md

@@ -1,7 +1,7 @@
 # omnifocus-mcp (Ruby)
 
-`omnifocus-mcp` is a Ruby MCP server that lets LLM clients (Claude Desktop, MCP
-Inspector, etc.) work with OmniFocus on macOS over stdio. It exposes tools and
+`omnifocus-mcp` is a Ruby MCP server that lets LLM clients (Claude Code / Desktop,
+Cursor, Zed, etc.) work with OmniFocus on macOS over stdio. It exposes tools and
 resources for creating, editing, removing, querying, and reporting on OmniFocus
 tasks, projects, perspectives, and tags.
 
@@ -60,21 +60,9 @@ This tool was heavily inspired by [OmniFocus MCP Server](https://github.com/them
 gem install omnifocus-mcp
 ```
 
-## Run
-
-```sh
-omnifocus-mcp
-```
-
-The server speaks MCP over stdio. Test it with the MCP inspector:
-
-```sh
-npx @modelcontextprotocol/inspector omnifocus-mcp
-```
-
 ## Configure an MCP Client
 
-After installing the executable, add this server to any MCP client that supports
+After installing the executable, add this config to any MCP client that supports
 stdio servers:
 
 ```json
@@ -93,7 +81,7 @@ stdio servers:
 This server uses [fast-mcp](https://github.com/yjacquin/fast-mcp) 1.6, which
 does not currently expose MCP server instructions during client initialization.
 To give an MCP client better guidance, copy the instructions below into a skill,
-rule, your project's `AGENTS.md`, or another client-specific instruction file.
+rule, your project's `AGENTS.md`, or your client-specific instruction file.
 
 ```text
 OmniFocus MCP server for macOS task management.
@@ -145,3 +133,6 @@ If a run is killed mid-flight, you can sweep leftover items with:
 ```sh
 bundle exec ruby spec/integration/cleanup.rb
 ```
+
+You should backup your OmniFocus database before using this tool. Refer to the
+warranty information in the LICENSE.

data/bin/omnifocus-mcp

@@ -1,7 +1,14 @@
 #!/usr/bin/env ruby
 # frozen_string_literal: true
 
-require "bundler/setup"
-require "omnifocus_mcp"
+# Keep in sync with OmnifocusMcp::VERSION_ARGS in lib/omnifocus_mcp/version.rb.
+VERSION_ARGS = %w[--version -v version].freeze
+
+if ARGV.intersect?(VERSION_ARGS)
+  require "omnifocus_mcp/version"
+  puts OmnifocusMcp::VERSION
+  exit 0
+end
 
-OmnifocusMcp::Mcp.start
+require "omnifocus_mcp"
+OmnifocusMcp::Cli.run

data/lib/omnifocus_mcp/cli.rb

@@ -0,0 +1,25 @@
+# frozen_string_literal: true
+
+module OmnifocusMcp
+  # Command-line entry point for the `omnifocus-mcp` executable.
+  module Cli
+    module_function
+
+    def run(argv = ARGV)
+      if version_requested?(argv)
+        print_version
+        exit 0
+      end
+
+      Mcp.start
+    end
+
+    def version_requested?(argv)
+      argv.intersect?(OmnifocusMcp::VERSION_ARGS)
+    end
+
+    def print_version
+      puts VERSION
+    end
+  end
+end

data/lib/omnifocus_mcp/infrastructure/script_runner.rb

@@ -24,6 +24,7 @@ module OmnifocusMcp
 
       class << self
         def default = @default ||= new
+        def reset! = @default = new
 
         def runner = default.runner
 
@@ -31,10 +32,6 @@ module OmnifocusMcp
           default.runner = runner
         end
 
-        def reset!
-          @default = new
-        end
-
         def execute_jxa(script) = default.execute_jxa(script)
         def execute_omnifocus_source(source, args: nil) = default.execute_omnifocus_source(source, args: args)
         def execute_omnifocus_script(script_path, args: nil) = default.execute_omnifocus_script(script_path, args: args)

data/lib/omnifocus_mcp/json_rpc_compat.rb

@@ -10,12 +10,17 @@ module OmnifocusMcp
     module_function
 
     def apply!
+      $stdin.set_encoding(Encoding::UTF_8) if $stdin.respond_to?(:set_encoding)
       patch_server_send_error!
       patch_stdio_transport!
     end
 
     def normalize_id(id) = id.nil? ? UNKNOWN_REQUEST_ID : id
 
+    # MCP clients send UTF-8 JSON, but stdio may be US-ASCII-labelled (same as
+    # osascript stdout in ScriptRunner). Re-label before strip/parse.
+    def normalize_line(line) = line.to_s.dup.force_encoding(Encoding::UTF_8).strip
+
     def patch_server_send_error!
       return if server_send_error_patched?
 
@@ -29,6 +34,7 @@ module OmnifocusMcp
     end
     private_class_method :patch_server_send_error!
 
+    # rubocop:disable Metrics
     def patch_stdio_transport!
       return if stdio_transport_patched?
 
@@ -40,7 +46,7 @@ module OmnifocusMcp
           @running = true
 
           while @running && (line = $stdin.gets)
-            stripped = line.strip
+            stripped = OmnifocusMcp::JsonRpcCompat.normalize_line(line)
             next if stripped.empty?
 
             begin
@@ -60,6 +66,7 @@ module OmnifocusMcp
         end
       end
     end
+    # rubocop:enable Metrics
     private_class_method :patch_stdio_transport!
 
     def server_send_error_patched?

data/lib/omnifocus_mcp/mcp.rb

@@ -41,7 +41,10 @@ module OmnifocusMcp
       end
     end
 
-    def start = build_server.start
+    def start
+      OmnifocusMcp.logger.warn("Starting #{server_name} v#{server_version}")
+      build_server.start
+    end
 
     private
 

data/lib/omnifocus_mcp/tools/database_stats.rb

@@ -1,9 +1,5 @@
 # frozen_string_literal: true
 
-require_relative "../result"
-require_relative "../infrastructure/js_embed"
-require_relative "../infrastructure/script_runner"
-
 module OmnifocusMcp
   module Tools
     # Lightweight database overview helpers that don't require pulling the
@@ -12,11 +8,7 @@ module OmnifocusMcp
     # Provides:
     #   * {.get_database_stats} — counts + last-modified timestamp
     #   * {.get_changes_since}  — incremental change feed since a timestamp
-    # rubocop:disable Metrics/ModuleLength
     module DatabaseStats
-      # Lightweight database statistics: counts + last-modified timestamp.
-      #
-      # @return [OmnifocusMcp::Result] +ok+ carries the stats Hash; +error+ carries a user-facing message.
       class << self
         def get_database_stats
           require_relative "operations/database_stats"
@@ -32,153 +24,7 @@ module OmnifocusMcp
 
           Operations::DatabaseStats.get_changes_since(since)
         end
-
-        STATS_SCRIPT = <<~JS
-          (() => {
-            try {
-              const allTasks = flattenedTasks;
-              const activeTasks = allTasks.filter(task =>
-                task.taskStatus !== Task.Status.Completed &&
-                task.taskStatus !== Task.Status.Dropped
-              );
-
-              const allProjects = flattenedProjects;
-              const activeProjects = allProjects.filter(project =>
-                project.status === Project.Status.Active
-              );
-
-              const overdueCount = activeTasks.filter(task =>
-                task.taskStatus === Task.Status.Overdue
-              ).length;
-
-              const nextActionCount = activeTasks.filter(task =>
-                task.taskStatus === Task.Status.Next
-              ).length;
-
-              const flaggedCount = activeTasks.filter(task => task.flagged).length;
-              const inboxCount = activeTasks.filter(task => task.inInbox).length;
-
-              let lastModified = new Date(0);
-              allTasks.forEach(task => {
-                if (task.modificationDate && task.modificationDate > lastModified) {
-                  lastModified = task.modificationDate;
-                }
-              });
-
-              return JSON.stringify({
-                taskCount: allTasks.length,
-                activeTaskCount: activeTasks.length,
-                projectCount: allProjects.length,
-                activeProjectCount: activeProjects.length,
-                folderCount: flattenedFolders.length,
-                tagCount: flattenedTags.filter(tag => tag.active).length,
-                overdueCount: overdueCount,
-                nextActionCount: nextActionCount,
-                flaggedCount: flaggedCount,
-                inboxCount: inboxCount,
-                lastModified: lastModified.toISOString()
-              });
-
-            } catch (error) {
-              return JSON.stringify({
-                error: "Failed to get database stats: " + error.toString()
-              });
-            }
-          })();
-        JS
-
-        # rubocop:disable Metrics/MethodLength
-        def changes_script(since_iso)
-          escaped_since = Infrastructure::JsEmbed.double_quoted_string(since_iso)
-
-          <<~JS
-            (() => {
-              try {
-                const sinceDate = new Date("#{escaped_since}");
-
-                const allTasks = flattenedTasks;
-
-                const newTasks = allTasks.filter(task =>
-                  task.creationDate && task.creationDate > sinceDate
-                ).map(task => ({
-                  id: task.id.primaryKey,
-                  name: task.name,
-                  creationDate: task.creationDate.toISOString()
-                }));
-
-                const updatedTasks = allTasks.filter(task =>
-                  task.modificationDate &&
-                  task.modificationDate > sinceDate &&
-                  task.creationDate &&
-                  task.creationDate <= sinceDate
-                ).map(task => ({
-                  id: task.id.primaryKey,
-                  name: task.name,
-                  modificationDate: task.modificationDate.toISOString()
-                }));
-
-                const completedTasks = allTasks.filter(task =>
-                  task.completionDate &&
-                  task.completionDate > sinceDate
-                ).map(task => ({
-                  id: task.id.primaryKey,
-                  name: task.name,
-                  completionDate: task.completionDate.toISOString()
-                }));
-
-                const allProjects = flattenedProjects;
-
-                const newProjects = allProjects.filter(project =>
-                  project.creationDate && project.creationDate > sinceDate
-                ).map(project => ({
-                  id: project.id.primaryKey,
-                  name: project.name,
-                  creationDate: project.creationDate.toISOString()
-                }));
-
-                const updatedProjects = allProjects.filter(project =>
-                  project.modificationDate &&
-                  project.modificationDate > sinceDate &&
-                  project.creationDate &&
-                  project.creationDate <= sinceDate
-                ).map(project => ({
-                  id: project.id.primaryKey,
-                  name: project.name,
-                  modificationDate: project.modificationDate.toISOString()
-                }));
-
-                return JSON.stringify({
-                  newTasks: newTasks,
-                  updatedTasks: updatedTasks,
-                  completedTasks: completedTasks,
-                  newProjects: newProjects,
-                  updatedProjects: updatedProjects
-                });
-
-              } catch (error) {
-                return JSON.stringify({
-                  error: "Failed to get changes: " + error.toString()
-                });
-              }
-            })();
-          JS
-        end
-        # rubocop:enable Metrics/MethodLength
-
-        private
-
-        # Collapse a {Infrastructure::ScriptRunner} {Result} into a {Result} over the parsed Hash payload.
-        def script_payload_result(execution)
-          execution.and_then do |payload|
-            if payload.is_a?(Hash) && payload["error"]
-              Result.error(payload["error"])
-            else
-              Result.ok(payload)
-            end
-          end
-        end
       end
     end
-    # rubocop:enable Metrics/ModuleLength
   end
 end

data/lib/omnifocus_mcp/tools/definitions/{add_omnifocus_task_tool.rb → add_omni_focus_task_tool.rb}

@@ -4,14 +4,14 @@ require "fast_mcp"
 
 require_relative "mcp_envelope"
 require_relative "operation_factory"
-require_relative "../messages/add_omnifocus_task"
-require_relative "../operations/add_omnifocus_task"
+require_relative "../messages/add_omni_focus_task"
+require_relative "../operations/add_omni_focus_task"
 require_relative "../params"
 
 module OmnifocusMcp
   module Tools
     module Definitions
-      # `FastMcp::Tool` for `add_omnifocus_task`.
+      # `FastMcp::Tool` for `add_omni_focus_task`.
       class AddOmniFocusTaskTool < FastMcp::Tool
         tool_name "add_omnifocus_task"
         description "Add a new task to OmniFocus"

data/lib/omnifocus_mcp/tools/definitions/date_formatter.rb

@@ -24,13 +24,11 @@ module OmnifocusMcp
           private
 
           def us_short_date(date)
-            # TODO: Fix the formatting. Make Rubocop happy
-            format("%d/%d/%d", date.month, date.day, date.year)
+            format("%<month>d/%<day>d/%<year>d", month: date.month, day: date.day, year: date.year)
           end
 
           def us_compact_date(date)
-            # TODO: Fix the formatting. Make Rubocop happy
-            format("%d/%d", date.month, date.day)
+            format("%<month>d/%<day>d", month: date.month, day: date.day)
           end
 
           def format_parsed(iso)

data/lib/omnifocus_mcp/tools/generators/database_stats.rb

@@ -1,14 +1,145 @@
 # frozen_string_literal: true
 
-require_relative "../database_stats"
+require_relative "../../infrastructure/js_embed"
 
 module OmnifocusMcp
   module Tools
     module Generators
       class DatabaseStats
         class << self
-          def stats_script = Tools::DatabaseStats.singleton_class.const_get(:STATS_SCRIPT)
-          def changes_script(...) = Tools::DatabaseStats.changes_script(...)
+          STATS_SCRIPT = <<~JS
+            (() => {
+              try {
+                const allTasks = flattenedTasks;
+                const activeTasks = allTasks.filter(task =>
+                  task.taskStatus !== Task.Status.Completed &&
+                  task.taskStatus !== Task.Status.Dropped
+                );
+
+                const allProjects = flattenedProjects;
+                const activeProjects = allProjects.filter(project =>
+                  project.status === Project.Status.Active
+                );
+
+                const overdueCount = activeTasks.filter(task =>
+                  task.taskStatus === Task.Status.Overdue
+                ).length;
+
+                const nextActionCount = activeTasks.filter(task =>
+                  task.taskStatus === Task.Status.Next
+                ).length;
+
+                const flaggedCount = activeTasks.filter(task => task.flagged).length;
+                const inboxCount = activeTasks.filter(task => task.inInbox).length;
+
+                let lastModified = new Date(0);
+                allTasks.forEach(task => {
+                  if (task.modificationDate && task.modificationDate > lastModified) {
+                    lastModified = task.modificationDate;
+                  }
+                });
+
+                return JSON.stringify({
+                  taskCount: allTasks.length,
+                  activeTaskCount: activeTasks.length,
+                  projectCount: allProjects.length,
+                  activeProjectCount: activeProjects.length,
+                  folderCount: flattenedFolders.length,
+                  tagCount: flattenedTags.filter(tag => tag.active).length,
+                  overdueCount: overdueCount,
+                  nextActionCount: nextActionCount,
+                  flaggedCount: flaggedCount,
+                  inboxCount: inboxCount,
+                  lastModified: lastModified.toISOString()
+                });
+
+              } catch (error) {
+                return JSON.stringify({
+                  error: "Failed to get database stats: " + error.toString()
+                });
+              }
+            })();
+          JS
+
+          def stats_script = STATS_SCRIPT
+
+          # rubocop:disable Metrics/MethodLength
+          def changes_script(since_iso)
+            escaped_since = Infrastructure::JsEmbed.double_quoted_string(since_iso)
+
+            <<~JS
+              (() => {
+                try {
+                  const sinceDate = new Date("#{escaped_since}");
+
+                  const allTasks = flattenedTasks;
+
+                  const newTasks = allTasks.filter(task =>
+                    task.creationDate && task.creationDate > sinceDate
+                  ).map(task => ({
+                    id: task.id.primaryKey,
+                    name: task.name,
+                    creationDate: task.creationDate.toISOString()
+                  }));
+
+                  const updatedTasks = allTasks.filter(task =>
+                    task.modificationDate &&
+                    task.modificationDate > sinceDate &&
+                    task.creationDate &&
+                    task.creationDate <= sinceDate
+                  ).map(task => ({
+                    id: task.id.primaryKey,
+                    name: task.name,
+                    modificationDate: task.modificationDate.toISOString()
+                  }));
+
+                  const completedTasks = allTasks.filter(task =>
+                    task.completionDate &&
+                    task.completionDate > sinceDate
+                  ).map(task => ({
+                    id: task.id.primaryKey,
+                    name: task.name,
+                    completionDate: task.completionDate.toISOString()
+                  }));
+
+                  const allProjects = flattenedProjects;
+
+                  const newProjects = allProjects.filter(project =>
+                    project.creationDate && project.creationDate > sinceDate
+                  ).map(project => ({
+                    id: project.id.primaryKey,
+                    name: project.name,
+                    creationDate: project.creationDate.toISOString()
+                  }));
+
+                  const updatedProjects = allProjects.filter(project =>
+                    project.modificationDate &&
+                    project.modificationDate > sinceDate &&
+                    project.creationDate &&
+                    project.creationDate <= sinceDate
+                  ).map(project => ({
+                    id: project.id.primaryKey,
+                    name: project.name,
+                    modificationDate: project.modificationDate.toISOString()
+                  }));
+
+                  return JSON.stringify({
+                    newTasks: newTasks,
+                    updatedTasks: updatedTasks,
+                    completedTasks: completedTasks,
+                    newProjects: newProjects,
+                    updatedProjects: updatedProjects
+                  });
+
+                } catch (error) {
+                  return JSON.stringify({
+                    error: "Failed to get changes: " + error.toString()
+                  });
+                }
+              })();
+            JS
+          end
+          # rubocop:enable Metrics/MethodLength
         end
       end
     end

data/lib/omnifocus_mcp/tools/generators/edit_item.rb

@@ -43,12 +43,10 @@ module OmnifocusMcp
             params = Params::McpBoundary.coerce(Params::EditItemParams, params)
             return missing_identifier_error if Utils::Blank.blank?(params.id, params.name)
 
-            id = Infrastructure::AppleScript.escape(params.id.to_s)
             name = Infrastructure::AppleScript.escape(params.name.to_s)
             item_type = params.item_type.to_s
-
+            id = Infrastructure::AppleScript.escape(params.id.to_s)
             date_pre_scripts, date_assignments = collect_date_assignments(params)
-
             [
               date_pre_scripts.join("\n\n"),
               Infrastructure::AppleScript.tell_document(document_body(item_type, id, name, params, date_assignments))

data/lib/omnifocus_mcp/tools/generators/query_omnifocus.rb

@@ -84,25 +84,24 @@ module OmnifocusMcp
           # Build the full JXA query script for the given params.
           def generate_query_script(params)
             params = Params::McpBoundary.coerce(Params::QueryOmnifocusParams, params)
+
             entity = params.entity.to_s
-            filters = params.filters || {}
-            fields = params.fields
-            limit = params.limit
-            sort_by = params.sort_by
-            sort_order = params.sort_order
-            include_completed = params.include_completed == true
-            summary = params.summary == true
 
+            filters = params.filters || {}
             filter_conditions = generate_filter_conditions(entity:, filters:)
-            field_mapping = generate_field_mapping(entity, fields:)
-            sort_property = resolve_sort_field(sort_by)
-            sort_logic = sort_property ? generate_sort_logic(sort_property, sort_order:) : ""
+
+            field_mapping = generate_field_mapping(entity:, fields: params.fields)
+
+            sort_property = resolve_sort_field(params.sort_by)
+            sort_logic = sort_property ? generate_sort_logic(sort_property, sort_order: params.sort_order) : ""
+
+            limit = params.limit
             limit_logic = limit.is_a?(Integer) && limit.positive? ? "filtered = filtered.slice(0, #{limit});" : ""
 
             build_query_script(
               entity: entity,
-              include_completed: include_completed,
-              summary: summary,
+              include_completed: params.include_completed == true,
+              summary: params.summary == true,
               filter_conditions: filter_conditions,
               field_mapping: field_mapping,
               sort_logic: sort_logic,
@@ -159,7 +158,7 @@ module OmnifocusMcp
           # Build the per-item field-projection block. With no `fields` array
           # (nil or empty), returns the default field set for the entity.
           # Otherwise builds explicit mappings for each requested field.
-          def generate_field_mapping(entity, fields: nil)
+          def generate_field_mapping(entity:, fields: nil)
             if fields.nil? || fields.empty?
               return default_task_mapping if entity == "tasks"
               return default_project_mapping if entity == "projects"
@@ -233,10 +232,7 @@ module OmnifocusMcp
 
           def apply_tag_status_filters(filters:, conditions:, entity:)
             if entity == "tasks" && filters[:tags] && !filters[:tags].empty?
-              tag_condition = filters[:tags].map do |tag|
-                %(item.tags.some(t => t.name === "#{escape_jxa(tag)}"))
-              end.join(" || ")
-              conditions << "if (!(#{tag_condition})) return false;"
+              conditions << tag_filter_condition(filters[:tags])
             end
 
             return unless filters[:status] && !filters[:status].empty?
@@ -250,6 +246,13 @@ module OmnifocusMcp
             conditions << "if (!(#{status_condition})) return false;"
           end
 
+          def tag_filter_condition(tags)
+            tag_condition = tags.map do |tag|
+              %(item.tags.some(t => t.name === "#{escape_jxa(tag)}"))
+            end.join(" || ")
+            "if (!(#{tag_condition})) return false;"
+          end
+
           def apply_task_date_filters(filters:, conditions:)
             conditions << "if (item.flagged !== #{filters[:flagged]}) return false;" unless filters[:flagged].nil?
 
@@ -260,12 +263,11 @@ module OmnifocusMcp
             push_same_day(conditions:, field: "dueDate", value: filters[:due_on])
             push_same_day(conditions:, field: "deferDate", value: filters[:defer_on])
             push_same_day(conditions:, field: "plannedDate", value: filters[:planned_on])
-
-            push_within_past(conditions:, field: "added", value: filters[:added_within])
             push_same_day(conditions:, field: "added", value: filters[:added_on])
+            push_same_day(conditions:, field: "completionDate", value: filters[:completed_on])
 
+            push_within_past(conditions:, field: "added", value: filters[:added_within])
             push_within_past(conditions:, field: "completionDate", value: filters[:completed_within])
-            push_same_day(conditions:, field: "completionDate", value: filters[:completed_on])
           end
 
           def apply_task_misc_filters(filters:, conditions:)

data/lib/omnifocus_mcp/tools/operations/{add_omnifocus_task.rb → add_omni_focus_task.rb}

@@ -3,7 +3,7 @@
 require_relative "../../infrastructure/script_runner"
 require_relative "../../parsers/apple_script_envelope"
 require_relative "../../result"
-require_relative "../generators/add_omnifocus_task"
+require_relative "../generators/add_omni_focus_task"
 require_relative "../params"
 
 module OmnifocusMcp

data/lib/omnifocus_mcp/tools/operations/batch_add_items/bulk_executor.rb

@@ -4,7 +4,7 @@ require_relative "../../../parsers/apple_script_envelope"
 require_relative "../../../infrastructure/script_runner"
 require_relative "../../../utils/blank"
 require_relative "../../../result"
-require_relative "../../generators/add_omnifocus_task"
+require_relative "../../generators/add_omni_focus_task"
 require_relative "param_builder"
 
 module OmnifocusMcp

data/lib/omnifocus_mcp/tools/operations/batch_add_items/planner.rb

@@ -20,6 +20,7 @@ module OmnifocusMcp
           def prepare!
             mark_cycle_failures(cycle_messages: cycle_detector.detect)
             mark_unknown_parent_temp_id
+            self
           end
 
           # Stable order: by hierarchy_level (nil -> 0), then original index.

data/lib/omnifocus_mcp/tools/operations/batch_add_items.rb

@@ -3,7 +3,7 @@
 require_relative "../../infrastructure/script_runner"
 require_relative "../../result"
 require_relative "../params"
-require_relative "add_omnifocus_task"
+require_relative "add_omni_focus_task"
 require_relative "add_project"
 require_relative "batch_add_items/planner"
 require_relative "batch_add_items/batch_item"
@@ -33,10 +33,10 @@ module OmnifocusMcp
         def call(items)
           batch_items = Array(items).map { |item| coerce_item(item) }
                                     .then { |coerced| build_batch_items(coerced) }
-          planner = Planner.new(batch_items).tap(&:prepare!)
 
           return OmnifocusMcp::Result.ok(batch_items.map(&:result)) if try_bulk_add!(batch_items:)
 
+          planner = Planner.new(batch_items).prepare!
           process_items(ordered: planner.processing_order, planner:)
           planner.finalize_unresolved!
 

data/lib/omnifocus_mcp/tools/operations/batch_remove_items.rb

@@ -32,8 +32,10 @@ module OmnifocusMcp
 
         def coerce_item(item)
           case item
-          when Params::BatchRemoveItemParams then item
-          when Hash then Params::BatchRemoveItemParams.from_hash(item)
+          when Params::BatchRemoveItemParams
+            item
+          when Hash
+            Params::BatchRemoveItemParams.from_hash(item)
           else raise ArgumentError, "expected BatchRemoveItemParams or Hash, got #{item.class}"
           end
         end

data/lib/omnifocus_mcp/tools/presenters/query_results.rb

@@ -11,6 +11,7 @@ module OmnifocusMcp
       # Exposes `format_tasks`, `format_projects`, `format_folders`,
       # `format_query_results`, `format_filters`. Used by
       # {Definitions::QueryOmnifocusTool} to build the user-facing text reply.
+      # rubocop:disable Metrics
       module QueryResults
         class << self
           def format_query_results(items:, entity:, filters: nil)
@@ -49,15 +50,15 @@ module OmnifocusMcp
             parts << "has note: #{f["hasNote"]}" unless f["hasNote"].nil?
             parts << "inbox: #{f["inbox"]}"      unless f["inbox"].nil?
 
-            parts << format_on(label: "due", value: f["dueOn"]) unless f["dueOn"].nil?
-            parts << format_on(label: "defer", value: f["deferOn"]) unless f["deferOn"].nil?
-            parts << format_on(label: "planned", value: f["plannedOn"]) unless f["plannedOn"].nil?
+            parts << format_on(label: "due", value: f["dueOn"]) if f["dueOn"]
+            parts << format_on(label: "defer", value: f["deferOn"]) if f["deferOn"]
+            parts << format_on(label: "planned", value: f["plannedOn"]) if f["plannedOn"]
 
-            parts << "added within #{f["addedWithin"]} days" unless f["addedWithin"].nil?
-            parts << "added on day #{f["addedOn"]}" unless f["addedOn"].nil?
+            parts << "added within #{f["addedWithin"]} days" if f["addedWithin"]
+            parts << "added on day #{f["addedOn"]}" if f["addedOn"]
             parts << "repeating: #{f["isRepeating"]}" unless f["isRepeating"].nil?
-            parts << "completed within #{f["completedWithin"]} days" unless f["completedWithin"].nil?
-            parts << "completed on day #{f["completedOn"]}" unless f["completedOn"].nil?
+            parts << "completed within #{f["completedWithin"]} days" if f["completedWithin"]
+            parts << "completed on day #{f["completedOn"]}" if f["completedOn"]
 
             parts.join(", ")
           end
@@ -178,6 +179,7 @@ module OmnifocusMcp
           end
         end
       end
+      # rubocop:enable Metrics
     end
   end
 end

data/lib/omnifocus_mcp/version.rb

@@ -1,5 +1,6 @@
 # frozen_string_literal: true
 
 module OmnifocusMcp
-  VERSION = "1.0.0"
+  VERSION = "1.0.2"
+  VERSION_ARGS = %w[--version -v version].freeze
 end

data/lib/omnifocus_mcp.rb

@@ -22,7 +22,6 @@ require_relative "omnifocus_mcp/utils/apple_script_envelope"
 require_relative "omnifocus_mcp/utils/apple_script_helpers"
 require_relative "omnifocus_mcp/utils/blank"
 require_relative "omnifocus_mcp/utils/date_filter"
-require_relative "omnifocus_mcp/utils/date_formatting"
 require_relative "omnifocus_mcp/utils/iso_date"
 require_relative "omnifocus_mcp/utils/script_execution"
 
@@ -39,13 +38,13 @@ require_relative "omnifocus_mcp/tools/generators/query_omnifocus"
 require_relative "omnifocus_mcp/tools/generators/query_omnifocus_debug"
 require_relative "omnifocus_mcp/tools/generators/database_stats"
 require_relative "omnifocus_mcp/tools/generators/add_project"
-require_relative "omnifocus_mcp/tools/generators/add_omnifocus_task"
+require_relative "omnifocus_mcp/tools/generators/add_omni_focus_task"
 require_relative "omnifocus_mcp/tools/generators/edit_item"
 require_relative "omnifocus_mcp/tools/generators/remove_item"
 require_relative "omnifocus_mcp/tools/operations/query_omnifocus"
 require_relative "omnifocus_mcp/tools/operations/query_omnifocus_debug"
 require_relative "omnifocus_mcp/tools/operations/database_stats"
-require_relative "omnifocus_mcp/tools/operations/add_omnifocus_task"
+require_relative "omnifocus_mcp/tools/operations/add_omni_focus_task"
 require_relative "omnifocus_mcp/tools/operations/add_project"
 require_relative "omnifocus_mcp/tools/operations/batch_add_items"
 require_relative "omnifocus_mcp/tools/operations/batch_remove_items"
@@ -61,16 +60,16 @@ require_relative "omnifocus_mcp/tools/presenters/list_perspectives"
 require_relative "omnifocus_mcp/tools/presenters/list_tags"
 require_relative "omnifocus_mcp/tools/presenters/perspective_view"
 require_relative "omnifocus_mcp/tools/presenters/query_reply"
-require_relative "omnifocus_mcp/tools/batch_report"
+
 require_relative "omnifocus_mcp/tools/database_stats"
 require_relative "omnifocus_mcp/tools/presenters/query_results"
-require_relative "omnifocus_mcp/tools/query_omnifocus_formatter"
+
 require_relative "omnifocus_mcp/tools/query_statuses"
 require_relative "omnifocus_mcp/tools/definitions/date_formatter"
 require_relative "omnifocus_mcp/tools/definitions/key_normalizer"
 require_relative "omnifocus_mcp/tools/definitions/mcp_envelope"
 require_relative "omnifocus_mcp/tools/definitions/operation_factory"
-require_relative "omnifocus_mcp/tools/messages/add_omnifocus_task"
+require_relative "omnifocus_mcp/tools/messages/add_omni_focus_task"
 require_relative "omnifocus_mcp/tools/messages/add_project"
 require_relative "omnifocus_mcp/tools/messages/batch_remove_items"
 require_relative "omnifocus_mcp/tools/messages/edit_item"
@@ -78,7 +77,7 @@ require_relative "omnifocus_mcp/tools/messages/list_tools"
 require_relative "omnifocus_mcp/tools/messages/remove_item"
 
 # Tool definitions wrap primitives for MCP exposure.
-require_relative "omnifocus_mcp/tools/definitions/add_omnifocus_task_tool"
+require_relative "omnifocus_mcp/tools/definitions/add_omni_focus_task_tool"
 require_relative "omnifocus_mcp/tools/definitions/add_project_tool"
 require_relative "omnifocus_mcp/tools/definitions/batch_add_items_tool"
 require_relative "omnifocus_mcp/tools/definitions/batch_remove_items_tool"
@@ -100,3 +99,4 @@ require_relative "omnifocus_mcp/resources/today_resource"
 
 # MCP bootstrap depends on everything above.
 require_relative "omnifocus_mcp/mcp"
+require_relative "omnifocus_mcp/cli"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: omnifocus_mcp
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.0.2
 platform: ruby
 authors:
 - Henry Maddocks
@@ -40,9 +40,9 @@ files:
 - Rakefile
 - bin/omnifocus-mcp
 - lib/omnifocus_mcp.rb
+- lib/omnifocus_mcp/cli.rb
 - lib/omnifocus_mcp/config.rb
 - lib/omnifocus_mcp/infrastructure.rb
-- lib/omnifocus_mcp/infrastructure/.keep
 - lib/omnifocus_mcp/infrastructure/apple_script.rb
 - lib/omnifocus_mcp/infrastructure/apple_script_date_builder.rb
 - lib/omnifocus_mcp/infrastructure/js_embed.rb
@@ -51,7 +51,6 @@ files:
 - lib/omnifocus_mcp/logger.rb
 - lib/omnifocus_mcp/mcp.rb
 - lib/omnifocus_mcp/parsers.rb
-- lib/omnifocus_mcp/parsers/.keep
 - lib/omnifocus_mcp/parsers/apple_script_envelope.rb
 - lib/omnifocus_mcp/resources/base.rb
 - lib/omnifocus_mcp/resources/flagged_resource.rb
@@ -61,9 +60,8 @@ files:
 - lib/omnifocus_mcp/resources/stats_resource.rb
 - lib/omnifocus_mcp/resources/today_resource.rb
 - lib/omnifocus_mcp/result.rb
-- lib/omnifocus_mcp/tools/batch_report.rb
 - lib/omnifocus_mcp/tools/database_stats.rb
-- lib/omnifocus_mcp/tools/definitions/add_omnifocus_task_tool.rb
+- lib/omnifocus_mcp/tools/definitions/add_omni_focus_task_tool.rb
 - lib/omnifocus_mcp/tools/definitions/add_project_tool.rb
 - lib/omnifocus_mcp/tools/definitions/batch_add_items_tool.rb
 - lib/omnifocus_mcp/tools/definitions/batch_remove_items_tool.rb
@@ -78,8 +76,7 @@ files:
 - lib/omnifocus_mcp/tools/definitions/query_omnifocus_tool.rb
 - lib/omnifocus_mcp/tools/definitions/remove_item_tool.rb
 - lib/omnifocus_mcp/tools/generators.rb
-- lib/omnifocus_mcp/tools/generators/.keep
-- lib/omnifocus_mcp/tools/generators/add_omnifocus_task.rb
+- lib/omnifocus_mcp/tools/generators/add_omni_focus_task.rb
 - lib/omnifocus_mcp/tools/generators/add_project.rb
 - lib/omnifocus_mcp/tools/generators/database_stats.rb
 - lib/omnifocus_mcp/tools/generators/edit_item.rb
@@ -90,14 +87,14 @@ files:
 - lib/omnifocus_mcp/tools/generators/query_omnifocus_debug.rb
 - lib/omnifocus_mcp/tools/generators/remove_item.rb
 - lib/omnifocus_mcp/tools/messages.rb
-- lib/omnifocus_mcp/tools/messages/add_omnifocus_task.rb
+- lib/omnifocus_mcp/tools/messages/add_omni_focus_task.rb
 - lib/omnifocus_mcp/tools/messages/add_project.rb
 - lib/omnifocus_mcp/tools/messages/batch_remove_items.rb
 - lib/omnifocus_mcp/tools/messages/edit_item.rb
 - lib/omnifocus_mcp/tools/messages/list_tools.rb
 - lib/omnifocus_mcp/tools/messages/remove_item.rb
 - lib/omnifocus_mcp/tools/operations.rb
-- lib/omnifocus_mcp/tools/operations/add_omnifocus_task.rb
+- lib/omnifocus_mcp/tools/operations/add_omni_focus_task.rb
 - lib/omnifocus_mcp/tools/operations/add_project.rb
 - lib/omnifocus_mcp/tools/operations/batch_add_items.rb
 - lib/omnifocus_mcp/tools/operations/batch_add_items/batch_item.rb
@@ -123,14 +120,12 @@ files:
 - lib/omnifocus_mcp/tools/presenters/perspective_view.rb
 - lib/omnifocus_mcp/tools/presenters/query_reply.rb
 - lib/omnifocus_mcp/tools/presenters/query_results.rb
-- lib/omnifocus_mcp/tools/query_omnifocus_formatter.rb
 - lib/omnifocus_mcp/tools/query_statuses.rb
 - lib/omnifocus_mcp/utils/apple_script.rb
 - lib/omnifocus_mcp/utils/apple_script_envelope.rb
 - lib/omnifocus_mcp/utils/apple_script_helpers.rb
 - lib/omnifocus_mcp/utils/blank.rb
 - lib/omnifocus_mcp/utils/date_filter.rb
-- lib/omnifocus_mcp/utils/date_formatting.rb
 - lib/omnifocus_mcp/utils/iso_date.rb
 - lib/omnifocus_mcp/utils/omnifocus_scripts/getPerspectiveView.js
 - lib/omnifocus_mcp/utils/omnifocus_scripts/listPerspectives.js

data/lib/omnifocus_mcp/infrastructure/.keep

@@ -1 +0,0 @@
-

data/lib/omnifocus_mcp/parsers/.keep

@@ -1 +0,0 @@
-

data/lib/omnifocus_mcp/tools/batch_report.rb

@@ -1,9 +0,0 @@
-# frozen_string_literal: true
-
-require_relative "presenters/batch_report"
-
-module OmnifocusMcp
-  module Tools
-    BatchReport = Presenters::BatchReport
-  end
-end

data/lib/omnifocus_mcp/tools/generators/.keep

@@ -1 +0,0 @@
-

data/lib/omnifocus_mcp/tools/query_omnifocus_formatter.rb

@@ -1,9 +0,0 @@
-# frozen_string_literal: true
-
-require_relative "presenters/query_results"
-
-module OmnifocusMcp
-  module Tools
-    QueryOmnifocusFormatter = Presenters::QueryResults
-  end
-end

data/lib/omnifocus_mcp/utils/date_formatting.rb

@@ -1,9 +0,0 @@
-# frozen_string_literal: true
-
-require_relative "../infrastructure/apple_script_date_builder"
-
-module OmnifocusMcp
-  module Utils
-    DateFormatting = Infrastructure::AppleScriptDateBuilder
-  end
-end