kairos-chain 2.0.4 → 2.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b588bb2644a34f10c7879784f2b9d4e7a61626d5d810d9d6a47289b1325b2c40
-  data.tar.gz: 19e2b7b74fd32902f23148cda0d81de5b5aacaaadab49b36678fe14518b81037
+  metadata.gz: 7256c06e2fd204672e04f33e2b88bed3f302188b6d97cb5fe736e142b84580bd
+  data.tar.gz: c95abbd55c084474595a81e257eee4a5ad08168b47c2d069669dfe8ca49c7ed7
 SHA512:
-  metadata.gz: 9e9bb0bfd4ccdf847650358cb45478d182c8ad7721c78756aa8fb8b0ccbfeb3cb01c9e9ad38b4d8d192235cd4b2878fcd34161d29aa9abfeabee094d19d940fa
-  data.tar.gz: cb4f6f5e7f4dc19bd23567b9905e1397d8df510a941c6df5d3f16f68a9265377b584bd7b7a96d28622a29a5e6cb47b794c7723573c23f9a3eaef6df2bfac4c42
+  metadata.gz: 9552b83a0ebb90e312837ddad5b0086d620be6c92a2e83fdb93d0cec6eb043dcc6b6f37254e52cb2dc9d6e276d7154a9256360487e45c0cf41c25597bd202e4c
+  data.tar.gz: 40636983d68a243b1ba7d7907c59550f6ec15e35ba234f6cd975a6b539f6a416b4da973388310e3bd877cc32ffe25e196ae223aeb736a027330b4a8325eab13a

data/CHANGELOG.md

@@ -4,6 +4,15 @@ All notable changes to the `kairos-chain` gem will be documented in this file.
 
 This project follows [Semantic Versioning](https://semver.org/).
 
+## [2.0.5] - 2026-02-25
+
+### Fixed
+
+- **Deadlock**: `PendingChanges#summary` caused `deadlock; recursive locking` by calling `includes_l0_change?`, `includes_promotion?`, `includes_demotion?` from within a `@mutex.synchronize` block. Separated lock acquisition (public API) from logic (private `_`-prefixed methods).
+- **Atomicity**: `check_trigger_conditions` now executes within a single lock, preventing race conditions between individual predicate checks.
+
+---
+
 ## [2.0.4] - 2026-02-25
 
 ### Fixed
@@ -186,6 +195,8 @@ This project follows [Semantic Versioning](https://semver.org/).
 - Skill promotion with Persona Assembly
 - Tool guide and metadata system
 
+[2.0.5]: https://github.com/masaomi/KairosChain_2026/compare/v2.0.4...v2.0.5
+[2.0.4]: https://github.com/masaomi/KairosChain_2026/compare/v2.0.3...v2.0.4
 [2.0.3]: https://github.com/masaomi/KairosChain_2026/compare/v2.0.2...v2.0.3
 [2.0.2]: https://github.com/masaomi/KairosChain_2026/compare/v2.0.1...v2.0.2
 [2.0.1]: https://github.com/masaomi/KairosChain_2026/compare/v2.0.0...v2.0.1

data/lib/kairos_mcp/state_commit/pending_changes.rb

@@ -57,36 +57,28 @@ module KairosMcp
         #
         # @return [Boolean] True if L0 changes exist
         def includes_l0_change?
-          @mutex.synchronize do
-            @changes.any? { |c| c[:layer] == 'L0' }
-          end
+          @mutex.synchronize { _includes_l0_change? }
         end
 
         # Check if there are any promotions
         #
         # @return [Boolean] True if promotions exist
         def includes_promotion?
-          @mutex.synchronize do
-            @changes.any? { |c| c[:action] == 'promote' }
-          end
+          @mutex.synchronize { _includes_promotion? }
         end
 
         # Check if there are any demotions
         #
         # @return [Boolean] True if demotions exist
         def includes_demotion?
-          @mutex.synchronize do
-            @changes.any? { |c| c[:action] == 'demote' || c[:action] == 'archive' }
-          end
+          @mutex.synchronize { _includes_demotion? }
         end
 
         # Get L1 changes count
         #
         # @return [Integer] Number of L1 changes
         def l1_changes_count
-          @mutex.synchronize do
-            @changes.count { |c| c[:layer] == 'L1' }
-          end
+          @mutex.synchronize { _l1_changes_count }
         end
 
         # Get L2 changes count
@@ -127,28 +119,7 @@ module KairosMcp
         #
         # @return [Hash] Summary with counts per layer and action
         def summary
-          @mutex.synchronize do
-            {
-              total: @changes.size,
-              by_layer: {
-                L0: @changes.count { |c| c[:layer] == 'L0' },
-                L1: @changes.count { |c| c[:layer] == 'L1' },
-                L2: @changes.count { |c| c[:layer] == 'L2' }
-              },
-              by_action: {
-                create: @changes.count { |c| c[:action] == 'create' },
-                update: @changes.count { |c| c[:action] == 'update' },
-                delete: @changes.count { |c| c[:action] == 'delete' },
-                promote: @changes.count { |c| c[:action] == 'promote' },
-                demote: @changes.count { |c| c[:action] == 'demote' },
-                archive: @changes.count { |c| c[:action] == 'archive' },
-                unarchive: @changes.count { |c| c[:action] == 'unarchive' }
-              },
-              has_l0_change: includes_l0_change?,
-              has_promotion: includes_promotion?,
-              has_demotion: includes_demotion?
-            }
-          end
+          @mutex.synchronize { _build_summary }
         end
 
         # Check trigger conditions for auto-commit
@@ -158,28 +129,71 @@ module KairosMcp
         def check_trigger_conditions(config)
           return { should_commit: false, trigger: nil } unless config
 
-          # Check event-based triggers
-          if config.dig('on_events', 'l0_change') && includes_l0_change?
+          @mutex.synchronize { _check_trigger_conditions(config) }
+        end
+
+        private
+
+        def _includes_l0_change?
+          @changes.any? { |c| c[:layer] == 'L0' }
+        end
+
+        def _includes_promotion?
+          @changes.any? { |c| c[:action] == 'promote' }
+        end
+
+        def _includes_demotion?
+          @changes.any? { |c| c[:action] == 'demote' || c[:action] == 'archive' }
+        end
+
+        def _l1_changes_count
+          @changes.count { |c| c[:layer] == 'L1' }
+        end
+
+        def _build_summary
+          {
+            total: @changes.size,
+            by_layer: {
+              L0: @changes.count { |c| c[:layer] == 'L0' },
+              L1: @changes.count { |c| c[:layer] == 'L1' },
+              L2: @changes.count { |c| c[:layer] == 'L2' }
+            },
+            by_action: {
+              create: @changes.count { |c| c[:action] == 'create' },
+              update: @changes.count { |c| c[:action] == 'update' },
+              delete: @changes.count { |c| c[:action] == 'delete' },
+              promote: @changes.count { |c| c[:action] == 'promote' },
+              demote: @changes.count { |c| c[:action] == 'demote' },
+              archive: @changes.count { |c| c[:action] == 'archive' },
+              unarchive: @changes.count { |c| c[:action] == 'unarchive' }
+            },
+            has_l0_change: _includes_l0_change?,
+            has_promotion: _includes_promotion?,
+            has_demotion: _includes_demotion?
+          }
+        end
+
+        def _check_trigger_conditions(config)
+          if config.dig('on_events', 'l0_change') && _includes_l0_change?
             return { should_commit: true, trigger: 'l0_change' }
           end
 
-          if config.dig('on_events', 'promotion') && includes_promotion?
+          if config.dig('on_events', 'promotion') && _includes_promotion?
             return { should_commit: true, trigger: 'promotion' }
           end
 
-          if config.dig('on_events', 'demotion') && includes_demotion?
+          if config.dig('on_events', 'demotion') && _includes_demotion?
             return { should_commit: true, trigger: 'demotion' }
           end
 
-          # Check threshold-based triggers
           if config.dig('change_threshold', 'enabled')
             l1_threshold = config.dig('change_threshold', 'l1_changes') || 5
-            if l1_changes_count >= l1_threshold
+            if _l1_changes_count >= l1_threshold
               return { should_commit: true, trigger: 'l1_threshold' }
             end
 
             total_threshold = config.dig('change_threshold', 'total_changes') || 10
-            if total_changes_count >= total_threshold
+            if @changes.size >= total_threshold
               return { should_commit: true, trigger: 'total_threshold' }
             end
           end

data/lib/kairos_mcp/version.rb

@@ -1,4 +1,4 @@
 module KairosMcp
-  VERSION = "2.0.4"
+  VERSION = "2.0.5"
   CHANGELOG_URL = "https://github.com/masaomi/KairosChain_2026/blob/main/CHANGELOG.md"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: kairos-chain
 version: !ruby/object:Gem::Version
-  version: 2.0.4
+  version: 2.0.5
 platform: ruby
 authors:
 - Masa Hatakeyama