ace-support-models 0.12.3 → 0.12.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 18ccfa94547ed745190987b958199c2f5fa781aa49099d4bd548a219b71f1843
-  data.tar.gz: 8154d0a3c1757220d9f3f4ee42e46e2286db77d2b7ec7fd1ca912237ba1c3364
+  metadata.gz: 0336e5432d5309f300b08f03ff530b23f70a7e5c865aa2eb863d86e7ef87ed99
+  data.tar.gz: 75183c42ed84226a56f99e48c5e93accb2a8d4f29fa97c1970aa8374c14fe35d
 SHA512:
-  metadata.gz: e7b84db686146f09f5b8e1208d5f74c6202fb56829df9a8cf560810a4a100ebb865945a309884c9d20a1eaaa7b155d0920cc4e88cfc6f6cf87b54135990d1e5b
-  data.tar.gz: b6cb44444b31971ee881e4efe0cd90b99f06ef2da7313dff34f995563cde547e68b1e097f9d26112dc9b1f07bdf46c54f986b2443322418b5af3fdd022b4f736
+  metadata.gz: 8509d9953bcae94e7b556fabb82704a5c356a3996c1c8b8eaf63f2433c84514abfe19812244b496b8ef960e9d8221a2f4dc19c0aaf9dad5d354cffd0146df85d
+  data.tar.gz: 4c8a078145ceb0f650ae3268ac641f48aa57f2cdf411c18c9db92d505174f2eda9a3b27a4dafccd3403d8a27ea7d2b943e9532ca80feff3b201d54f781571e53

data/CHANGELOG.md

@@ -7,6 +7,14 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+## [0.12.4] - 2026-09-13
+
+### Fixed
+
+- Preserve Codex local selections, removals, aliases, limits and default order during provider sync; use the bundled native catalog instead of treating models.dev absence as retirement.
+- Discover provider defaults from their owning gems and prevent sync writes into bundled defaults.
+- Persist observed Codex catalog and selection history atomically, keep unknown offers unapplied, and scope sync commits to changed provider files.
+
 
 ## [0.12.3] - 2026-09-02
 

data/lib/ace/support/models/atoms/provider_catalog_reconciler.rb

@@ -0,0 +1,54 @@
+# frozen_string_literal: true
+
+require "digest"
+require "json"
+
+module Ace
+  module Support
+    module Models
+      module Atoms
+        # Reconciles an observed local selection with a bundled native catalog.
+        # Missing entries on first observation carry no evidence of consent.
+        class ProviderCatalogReconciler
+          def self.reconcile(config, catalog)
+            local = ProviderConfigReader.extract_models(config)
+            offered = ProviderConfigReader.extract_models(catalog)
+            previous = config["sync_state"]
+            previous = nil unless valid_state?(previous)
+            removed = previous ? (previous["removed"] + previous["accepted"] - local).uniq : []
+            unknown = previous ? previous["unknown"] - local : offered - local
+            added = previous ? offered - previous["catalog"] - local - removed - unknown : []
+            models = local + added
+            state = {
+              "catalog" => offered,
+              "catalog_digest" => Digest::SHA256.hexdigest(JSON.generate(catalog)),
+              "accepted" => models.dup,
+              "unknown" => unknown,
+              "removed" => removed - local
+            }
+            desired = config.reject { |key, _| key.start_with?("_source_") }
+            # Preserve hash-form local model metadata, as well as order/default.
+            desired["models"] = if config["models"].is_a?(Hash)
+              config["models"].merge(added.to_h { |id| [id, {}] })
+            else
+              models
+            end
+            desired["sync_state"] = state
+            {
+              config: desired, added: added, offered: (unknown & offered),
+              removed: state["removed"], changed: desired != config.reject { |key, _| key.start_with?("_source_") }
+            }
+          end
+
+          def self.valid_state?(state)
+            state.is_a?(Hash) && state["catalog_digest"].is_a?(String) &&
+              %w[catalog accepted unknown removed].all? do |key|
+                state[key].is_a?(Array) && state[key].all? { |id| id.is_a?(String) }
+              end
+          end
+          private_class_method :valid_state?
+        end
+      end
+    end
+  end
+end

data/lib/ace/support/models/atoms/provider_config_reader.rb

@@ -11,7 +11,7 @@ module Ace
         # Reads provider configuration files with cascade support:
         # - Project: .ace/llm/providers/
         # - User: ~/.ace/llm/providers/
-        # - Gem: ace-llm/.ace-defaults/llm/providers/ (single source of truth)
+        # - Gem: owning packages' .ace-defaults/llm/providers/
         class ProviderConfigReader
           class << self
             # Find all provider config directories in cascade order
@@ -32,8 +32,7 @@ module Ace
                 dirs << user_dir if user_dir && Dir.exist?(user_dir)
 
                 # Gem-level config (ace-llm/providers/)
-                gem_dir = gem_config_dir
-                dirs << gem_dir if gem_dir && Dir.exist?(gem_dir)
+                dirs.concat(bundled_config_directories)
               end
 
               dirs
@@ -43,7 +42,7 @@ module Ace
             # @param config_dir [String, nil] Override config directory
             # @return [String, nil] Writable directory or nil
             def writable_config_directory(config_dir: nil)
-              dirs = config_directories(config_dir: config_dir)
+              dirs = config_directories(config_dir: config_dir) - bundled_config_directories
               dirs.find { |dir| writable?(dir) }
             end
 
@@ -63,6 +62,25 @@ module Ace
               configs
             end
 
+            # Package defaults are sources, never sync destinations. Discover via
+            # gem metadata without loading provider clients or reversing dependencies.
+            def bundled_config_directories
+              Gem::Specification.latest_specs.filter_map do |spec|
+                next unless spec.name.start_with?("ace-")
+
+                path = File.join(spec.full_gem_path, ".ace-defaults", "llm", "providers")
+                path if Dir.exist?(path)
+              end.sort
+            end
+
+            def bundled_config(name)
+              bundled_config_directories.each do |dir|
+                config = read_file(File.join(dir, "#{name}.yml"))
+                return config if config
+              end
+              nil
+            end
+
             # Read provider configs from a specific directory
             # @param dir [String] Directory path
             # @return [Hash<String, Hash>] Provider name => config hash
@@ -206,25 +224,6 @@ module Ace
               File.join(home, ".ace", "llm", "providers")
             end
 
-            def gem_config_dir
-              # Find ace-llm gem's providers directory (from .ace-defaults/ - single source of truth)
-              if defined?(Ace::LLM)
-                # Try to find via gem spec
-                spec = begin
-                  Gem::Specification.find_by_name("ace-llm")
-                rescue
-                  nil
-                end
-                return File.join(spec.gem_dir, ".ace-defaults", "llm", "providers") if spec
-              end
-
-              # Fallback: look relative to this gem in mono-repo development
-              # This enables development without installing ace-llm as a gem.
-              # Production/installed gem use goes through Gem::Specification above.
-              ace_llm_path = find_ace_llm_path
-              File.join(ace_llm_path, ".ace-defaults", "llm", "providers") if ace_llm_path
-            end
-
             def find_project_root_dir
               dir = Dir.pwd
               while dir != "/"
@@ -236,16 +235,6 @@ module Ace
               nil
             end
 
-            def find_ace_llm_path
-              # Look in common locations relative to this gem
-              candidates = [
-                File.expand_path("../../../../../../ace-llm", __FILE__),
-                File.expand_path("../../../../../../../ace-llm", __FILE__)
-              ]
-
-              candidates.find { |path| Dir.exist?(path) }
-            end
-
             def writable?(dir)
               return false unless Dir.exist?(dir)
 

data/lib/ace/support/models/atoms/provider_config_writer.rb

@@ -3,6 +3,7 @@
 require "yaml"
 require "fileutils"
 require "date"
+require "tempfile"
 
 module Ace
   module Support
@@ -12,6 +13,24 @@ module Ace
         # Updates only the models: section while keeping other fields intact
         class ProviderConfigWriter
           class << self
+            # Replace config and provenance together; reject edits made after preview.
+            def replace(path, config, expected:)
+              raise ConfigError, "Config changed during sync: #{path}" unless read_config(path) == expected
+
+              content = format_config(config)
+              Tempfile.create([".provider-sync-", ".yml"], File.dirname(path)) do |file|
+                file.chmod(File.stat(path).mode & 0o777)
+                file.write(content)
+                file.flush
+                file.fsync
+                raise ConfigError, "Config changed during sync: #{path}" unless read_config(path) == expected
+
+                backup(path)
+                File.rename(file.path, path)
+              end
+              true
+            end
+
             # Update the models list in a provider config file
             # @param path [String] Path to config file
             # @param models [Array<String>] New list of model IDs

data/lib/ace/support/models/cli/commands/providers/sync.rb

@@ -8,13 +8,13 @@ module Ace
       module CLI
         module Commands
           module Providers
-            # Sync provider YAML configs with models.dev
+            # Sync provider YAML configs with native catalogs or models.dev.
             class Sync < Ace::Support::Cli::Command
               include Ace::Support::Cli::Base
 
-              desc "Sync provider YAML configs with models.dev"
+              desc "Sync provider YAML configs with bundled catalogs and models.dev"
 
-              option :apply, type: :boolean, desc: "Apply changes to config files (default: dry-run)"
+              option :apply, type: :boolean, desc: "Apply eligible changes; unresolved Codex offers require explicit config"
               option :commit, type: :boolean, desc: "Commit changes via ace-git-commit"
               option :provider, type: :string, aliases: ["-p"], desc: "Sync specific provider only"
               option :config_dir, type: :string, desc: "Target config directory"
@@ -47,6 +47,10 @@ module Ace
                   raise Ace::Support::Cli::Error.new(result[:message])
                 end
 
+                if result[:apply_errors]&.any?
+                  raise Ace::Support::Cli::Error.new(result[:apply_errors].join("; "))
+                end
+
                 if options[:json]
                   puts JSON.pretty_generate(result)
                 else

data/lib/ace/support/models/molecules/provider_sync_diff.rb

@@ -1,6 +1,7 @@
 # frozen_string_literal: true
 
 require "date"
+require_relative "../atoms/provider_catalog_reconciler"
 
 module Ace
   module Support
@@ -15,12 +16,13 @@ module Ace
           UNCHANGED = :unchanged
           DEPRECATED = :deprecated
 
-          attr_reader :cache_manager
+          attr_reader :cache_manager, :desired_configs
 
           # Initialize diff generator
           # @param cache_manager [CacheManager, nil] Cache manager for models.dev data
           def initialize(cache_manager: nil)
             @cache_manager = cache_manager || CacheManager.new
+            @desired_configs = {}
           end
 
           # Generate diff for all providers
@@ -30,13 +32,20 @@ module Ace
           # @param show_all [Boolean] Show all models regardless of date (ignores since_date)
           # @return [Hash] Diff results by provider
           def generate(current_configs, provider_filter: nil, since_date: nil, show_all: false)
-            models_dev_data = load_models_dev_data
+            selected = current_configs.select { |name, _| !provider_filter || name == provider_filter }
+            models_dev_data = (selected.keys.all? { |name| name == "codex" }) ? {} : load_models_dev_data
+            @desired_configs = {}
             results = {}
 
             current_configs.each do |provider_name, config|
               # Skip if filtering and this isn't the target provider
               next if provider_filter && provider_name != provider_filter
 
+              if provider_name == "codex"
+                results[provider_name] = diff_provider(config, nil, provider_name: provider_name)
+                next
+              end
+
               # Determine the models.dev ID to use (may be mapped via models_dev_id field)
               models_dev_id = Atoms::ProviderConfigReader.extract_models_dev_id(config)
 
@@ -73,6 +82,8 @@ module Ace
           # @param provider_name [String, nil] Provider name for canonicalization (e.g., "openrouter")
           # @return [Hash] Diff result
           def diff_provider(config, provider_data, since_date: nil, provider_name: nil)
+            return diff_bundled_codex(config) if provider_name == "codex" || config["name"] == "codex"
+
             current_models = Set.new(Atoms::ProviderConfigReader.extract_models(config))
             models_dev_models = extract_models_dev_models(provider_data)
 
@@ -162,10 +173,15 @@ module Ace
             total_limit_updates = 0
             providers_synced = 0
             providers_skipped = 0
+            providers_unresolved = 0
 
             results.each do |_provider, result|
               if result[:status] == :ok
-                providers_synced += 1
+                if Array(result[:offered]).any?
+                  providers_unresolved += 1
+                else
+                  providers_synced += 1
+                end
                 total_added += result[:added].size
                 total_removed += result[:removed].size
                 total_unchanged += result[:unchanged].size
@@ -183,6 +199,7 @@ module Ace
               deprecated: total_deprecated,
               limit_updates: total_limit_updates,
               providers_synced: providers_synced,
+              providers_unresolved: providers_unresolved,
               providers_skipped: providers_skipped
             }
           end
@@ -194,12 +211,26 @@ module Ace
             results.any? do |_provider, result|
               next false unless result[:status] == :ok
 
-              result[:added].any? || result[:removed].any? || result[:limits_changed]
+              result[:added].any? || result[:removed].any? || result[:limits_changed] || result[:config_changed]
             end
           end
 
           private
 
+          def diff_bundled_codex(config)
+            catalog = Atoms::ProviderConfigReader.bundled_config("codex")
+            raise ConfigError, "Bundled Codex catalog not found" unless catalog
+
+            reconciliation = Atoms::ProviderCatalogReconciler.reconcile(config, catalog)
+            @desired_configs["codex"] = reconciliation[:config]
+            {
+              status: :ok, source: :bundled, added: reconciliation[:added], removed: [], deprecated: [],
+              unchanged: Atoms::ProviderConfigReader.extract_models(config),
+              offered: reconciliation[:offered], preserved_removals: reconciliation[:removed],
+              config_changed: reconciliation[:changed], limits_changed: false
+            }
+          end
+
           def load_models_dev_data
             data = cache_manager.read
             raise CacheError, "No models.dev cache found. Run 'ace-models sync' first." unless data

data/lib/ace/support/models/organisms/provider_sync_orchestrator.rb

@@ -31,11 +31,10 @@ module Ace
           # @param since [String, Date, nil] Only show models released after this date
           # @return [Hash] Result with status and details
           def sync(config_dir: nil, provider: nil, apply: false, commit: false, show_all: false, since: nil)
-            # Ensure cache is fresh
-            ensure_cache_fresh
-
             # Read current provider configs
             current_configs = Atoms::ProviderConfigReader.read_all(config_dir: config_dir)
+            selected_names = current_configs.keys.select { |name| !provider || name == provider }
+            ensure_cache_fresh unless selected_names == ["codex"] || provider == "codex"
 
             if current_configs.empty?
               return {
@@ -75,7 +74,7 @@ module Ace
 
               # Commit if requested and apply succeeded
               if commit && result[:applied]
-                result[:committed] = commit_changes(result[:summary])
+                result[:committed] = commit_changes(result[:summary], apply_result[:paths])
               end
             end
 
@@ -87,7 +86,7 @@ module Ace
           # @return [String] Formatted output
           def format_result(result)
             lines = []
-            lines << "Syncing provider configs with models.dev..."
+            lines << "Syncing provider configs with bundled catalogs and models.dev..."
 
             # Show date filter info
             if result[:show_all]
@@ -120,6 +119,10 @@ module Ace
               lines << "  (#{summary[:providers_skipped]} providers not found in models.dev)"
             end
 
+            if summary[:providers_unresolved].to_i > 0
+              lines << "  (#{summary[:providers_unresolved]} providers have unresolved catalog offers)"
+            end
+
             # Add action hints
             lines << ""
             if result[:changes_detected]
@@ -133,6 +136,8 @@ module Ace
               else
                 lines << "Run with --apply to update config files."
               end
+            elsif result[:diff].values.any? { |diff| Array(diff[:offered]).any? }
+              lines << "Unresolved catalog offers remain; add desired models explicitly to your provider configuration."
             else
               lines << "All providers are up to date."
             end
@@ -172,10 +177,11 @@ module Ace
           def apply_changes(diff_results, current_configs)
             errors = []
             success = true
+            paths = []
 
             diff_results.each do |provider_name, diff|
               next unless diff[:status] == :ok
-              next if diff[:added].empty? && diff[:removed].empty? && !diff[:limits_changed]
+              next if diff[:added].empty? && diff[:removed].empty? && !diff[:limits_changed] && !diff[:config_changed]
 
               begin
                 config = current_configs[provider_name]
@@ -187,6 +193,20 @@ module Ace
                   next
                 end
 
+                if Atoms::ProviderConfigReader.bundled_config_directories.include?(File.dirname(source_file))
+                  raise ConfigError, "Cannot write bundled provider defaults: #{source_file}"
+                end
+
+                if diff[:source] == :bundled
+                  expected = config.reject { |key, _| key.start_with?("_source_") }
+                  Atoms::ProviderConfigWriter.replace(
+                    source_file, @diff_generator.desired_configs.fetch(provider_name), expected: expected
+                  )
+                  paths << source_file
+                  output.puts "Updated: #{source_file}"
+                  next
+                end
+
                 # Calculate new model list
                 current_models = Atoms::ProviderConfigReader.extract_models(config)
                 new_models = (current_models + diff[:added] - diff[:removed]).uniq.sort
@@ -201,6 +221,7 @@ module Ace
                   limits: diff[:desired_limits]
                 )
                 output.puts "Updated: #{source_file}"
+                paths << source_file
               rescue ConfigError => e
                 errors << "#{provider_name}: #{e.message}"
                 success = false
@@ -210,17 +231,17 @@ module Ace
               end
             end
 
-            {success: success, errors: errors}
+            {success: success && paths.any?, errors: errors, paths: paths}
           end
 
-          def commit_changes(summary)
+          def commit_changes(summary, paths)
             message = "chore(providers): Sync model lists with models.dev\n\n" \
                       "Added: #{summary[:added]} models\n" \
                       "Removed: #{summary[:removed]} models"
 
             # Try to use ace-git-commit if available
             begin
-              system("ace-git-commit", "-m", message)
+              system("ace-git-commit", *paths, "-m", message)
               $?.success?
             rescue Errno::ENOENT
               output.puts "Warning: ace-git-commit not found. Please commit changes manually."
@@ -230,6 +251,14 @@ module Ace
 
           def format_provider_diff(provider_name, diff)
             lines = []
+            if diff[:source] == :bundled
+              lines << "#{provider_name}: (bundled catalog)"
+              diff[:added].each { |model| lines << "  + #{model} (eligible catalog addition)" }
+              diff[:offered].each { |model| lines << "  ? #{model} (offer only; explicit configuration required)" }
+              diff[:preserved_removals].each { |model| lines << "  = #{model} (local removal preserved)" }
+              lines << "  ~ record observed catalog and selection" if diff[:config_changed]
+              return lines.join("\n")
+            end
 
             # Show models_dev_id mapping if different from provider name
             lines << if diff[:models_dev_id]

data/lib/ace/support/models/version.rb

@@ -3,7 +3,7 @@
 module Ace
   module Support
     module Models
-      VERSION = "0.12.3"
+      VERSION = "0.12.4"
     end
   end
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: ace-support-models
 version: !ruby/object:Gem::Version
-  version: 0.12.3
+  version: 0.12.4
 platform: ruby
 authors:
 - Michal Czyz
 bindir: exe
 cert_chain: []
-date: 2026-09-05 00:00:00.000000000 Z
+date: 2026-09-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ace-support-core
@@ -90,6 +90,7 @@ files:
 - lib/ace/support/models/atoms/json_parser.rb
 - lib/ace/support/models/atoms/model_filter.rb
 - lib/ace/support/models/atoms/model_name_canonicalizer.rb
+- lib/ace/support/models/atoms/provider_catalog_reconciler.rb
 - lib/ace/support/models/atoms/provider_config_reader.rb
 - lib/ace/support/models/atoms/provider_config_writer.rb
 - lib/ace/support/models/cli.rb