llmemory 0.2.6 → 0.2.7

data/lib/llmemory/short_term/stores/postgres_store.rb

@@ -13,58 +13,103 @@ module Llmemory
           @database_url = database_url || Llmemory.configuration.database_url
           @connection = nil
           @cipher = cipher || Llmemory.build_cipher
+          @table_ready = false
+          @conn_mutex = Mutex.new
         end
 
         def save(user_id, session_id, state)
-          ensure_table!
-          conn.exec_params(
-            <<~SQL,
-              INSERT INTO llmemory_checkpoints (user_id, session_id, state, updated_at)
-              VALUES ($1, $2, $3, $4)
-              ON CONFLICT (user_id, session_id)
-              DO UPDATE SET state = $3, updated_at = $4
-            SQL
-            [user_id, session_id, serialize(state), Time.now.utc.iso8601]
-          )
+          with_conn do |connection|
+            ensure_table!(connection)
+            connection.exec_params(
+              <<~SQL,
+                INSERT INTO llmemory_checkpoints (user_id, session_id, state, updated_at)
+                VALUES ($1, $2, $3, $4)
+                ON CONFLICT (user_id, session_id)
+                DO UPDATE SET state = $3, updated_at = $4
+              SQL
+              [user_id, session_id, serialize(state), Time.now.utc.iso8601]
+            )
+          end
           true
         end
 
         def load(user_id, session_id)
-          ensure_table!
-          result = conn.exec_params(
-            "SELECT state FROM llmemory_checkpoints WHERE user_id = $1 AND session_id = $2",
-            [user_id, session_id]
-          )
-          row = result.first
-          row ? deserialize(row["state"]) : nil
+          with_conn do |connection|
+            ensure_table!(connection)
+            result = connection.exec_params(
+              "SELECT state FROM llmemory_checkpoints WHERE user_id = $1 AND session_id = $2",
+              [user_id, session_id]
+            )
+            row = result.first
+            row ? deserialize(row["state"]) : nil
+          end
         end
 
         def delete(user_id, session_id)
-          ensure_table!
-          conn.exec_params(
-            "DELETE FROM llmemory_checkpoints WHERE user_id = $1 AND session_id = $2",
-            [user_id, session_id]
-          )
+          with_conn do |connection|
+            ensure_table!(connection)
+            connection.exec_params(
+              "DELETE FROM llmemory_checkpoints WHERE user_id = $1 AND session_id = $2",
+              [user_id, session_id]
+            )
+          end
           true
         end
 
+        def update(user_id, session_id, &block)
+          with_conn do |connection|
+            ensure_table!(connection)
+            connection.transaction do
+              result = connection.exec_params(
+                "SELECT state FROM llmemory_checkpoints WHERE user_id = $1 AND session_id = $2 FOR UPDATE",
+                [user_id, session_id]
+              )
+              row = result.first
+              current = row ? deserialize(row["state"]) : nil
+              new_state = yield(current)
+              next new_state if new_state.nil?
+
+              connection.exec_params(
+                <<~SQL,
+                  INSERT INTO llmemory_checkpoints (user_id, session_id, state, updated_at)
+                  VALUES ($1, $2, $3, $4)
+                  ON CONFLICT (user_id, session_id)
+                  DO UPDATE SET state = $3, updated_at = $4
+                SQL
+                [user_id, session_id, serialize(new_state), Time.now.utc.iso8601]
+              )
+              new_state
+            end
+          end
+        end
+
         def list_users
-          ensure_table!
-          result = conn.exec("SELECT DISTINCT user_id FROM llmemory_checkpoints")
-          result.map { |r| r["user_id"] }
+          with_conn do |connection|
+            ensure_table!(connection)
+            result = connection.exec("SELECT DISTINCT user_id FROM llmemory_checkpoints")
+            result.map { |r| r["user_id"] }
+          end
         end
 
         def list_sessions(user_id:)
-          ensure_table!
-          result = conn.exec_params(
-            "SELECT session_id FROM llmemory_checkpoints WHERE user_id = $1",
-            [user_id]
-          )
-          result.map { |r| r["session_id"] }
+          with_conn do |connection|
+            ensure_table!(connection)
+            result = connection.exec_params(
+              "SELECT session_id FROM llmemory_checkpoints WHERE user_id = $1",
+              [user_id]
+            )
+            result.map { |r| r["session_id"] }
+          end
         end
 
         private
 
+        def with_conn
+          @conn_mutex.synchronize do
+            yield(conn)
+          end
+        end
+
         def conn
           @connection ||= begin
             require "pg"
@@ -72,8 +117,10 @@ module Llmemory
           end
         end
 
-        def ensure_table!
-          conn.exec(<<~SQL)
+        def ensure_table!(connection)
+          return if @table_ready
+
+          connection.exec(<<~SQL)
             CREATE TABLE IF NOT EXISTS llmemory_checkpoints (
               user_id TEXT NOT NULL,
               session_id TEXT NOT NULL,
@@ -82,6 +129,7 @@ module Llmemory
               PRIMARY KEY (user_id, session_id)
             )
           SQL
+          @table_ready = true
         end
 
         def serialize(state)

data/lib/llmemory/short_term/stores/redis_store.rb

@@ -2,6 +2,8 @@
 
 require_relative "base"
 require_relative "../../crypto/field_helpers"
+require_relative "key_codec"
+require_relative "../session_lifecycle"
 
 module Llmemory
   module ShortTerm
@@ -9,39 +11,96 @@ module Llmemory
       class RedisStore < Base
         include Llmemory::Crypto::FieldHelpers
 
+        KEY_PREFIX = "llmemory:checkpoint"
+        MAX_CAS_RETRIES = 5
+
         def initialize(redis_url: nil, cipher: nil)
           @redis_url = redis_url || Llmemory.configuration.redis_url
           @redis = nil
           @cipher = cipher || Llmemory.build_cipher
+          @conn_mutex = Mutex.new
         end
 
         def save(user_id, session_id, state)
-          redis.set(key_for(user_id, session_id), serialize(state), ex: 86400 * 7) # 7 days TTL
+          with_redis do |client|
+            key = key_for(user_id, session_id)
+            payload = serialize(state)
+            if pseudo_session?(session_id)
+              client.set(key, payload)
+            else
+              client.set(key, payload, ex: session_ttl_seconds)
+            end
+          end
           true
         end
 
         def load(user_id, session_id)
-          data = redis.get(key_for(user_id, session_id))
-          data ? deserialize(data) : nil
+          with_redis do |client|
+            data = client.get(key_for(user_id, session_id))
+            data ? deserialize(data) : nil
+          end
         end
 
         def delete(user_id, session_id)
-          redis.del(key_for(user_id, session_id))
+          with_redis { |client| client.del(key_for(user_id, session_id)) }
           true
         end
 
+        def update(user_id, session_id, &block)
+          key = key_for(user_id, session_id)
+          retries = 0
+
+          loop do
+            result = with_redis do |client|
+              client.watch(key) do
+                raw = client.get(key)
+                current = raw ? deserialize(raw) : nil
+                new_state = yield(current)
+                next new_state if new_state.nil?
+
+                payload = serialize(new_state)
+                if pseudo_session?(session_id)
+                  client.multi { |multi| multi.set(key, payload) }
+                else
+                  client.multi { |multi| multi.set(key, payload, ex: session_ttl_seconds) }
+                end
+                new_state
+              end
+            end
+            return result unless result.nil?
+
+            retries += 1
+            raise Llmemory::StoreError, "Redis CAS update failed after #{MAX_CAS_RETRIES} retries" if retries >= MAX_CAS_RETRIES
+          end
+        end
+
         def list_users
-          keys = redis.keys("llmemory:checkpoint:*:*")
-          keys.map { |k| k.split(":")[2] }.uniq
+          scan_keys("#{KEY_PREFIX}:*").filter_map do |k|
+            parts = k.split(":", 4)
+            next unless parts.size >= 4
+
+            KeyCodec.decode(parts[2])
+          end.uniq
         end
 
         def list_sessions(user_id:)
-          keys = redis.keys("llmemory:checkpoint:#{user_id}:*")
-          keys.map { |k| k.split(":", 4).last }
+          encoded_user = KeyCodec.encode(user_id)
+          scan_keys("#{KEY_PREFIX}:#{encoded_user}:*").filter_map do |k|
+            parts = k.split(":", 4)
+            next unless parts.size >= 4
+
+            KeyCodec.decode(parts[3])
+          end
         end
 
         private
 
+        def with_redis
+          @conn_mutex.synchronize do
+            yield(redis)
+          end
+        end
+
         def redis
           @redis ||= begin
             require "redis"
@@ -49,8 +108,16 @@ module Llmemory
           end
         end
 
+        def scan_keys(match)
+          keys = []
+          with_redis do |client|
+            client.scan_each(match: match) { |key| keys << key }
+          end
+          keys
+        end
+
         def key_for(user_id, session_id)
-          "llmemory:checkpoint:#{user_id}:#{session_id}"
+          "#{KEY_PREFIX}:#{KeyCodec.encode(user_id)}:#{KeyCodec.encode(session_id)}"
         end
 
         def serialize(state)
@@ -60,6 +127,15 @@ module Llmemory
         def deserialize(data)
           deserialize_state(data)
         end
+
+        def pseudo_session?(session_id)
+          SessionLifecycle.pseudo_session?(session_id)
+        end
+
+        def session_ttl_seconds
+          ttl = Llmemory.configuration.redis_session_ttl_seconds
+          ttl.positive? ? ttl : 86_400 * 30
+        end
       end
     end
   end

data/lib/llmemory/short_term/stores.rb

@@ -1,5 +1,6 @@
 # frozen_string_literal: true
 
+require_relative "stores/key_codec"
 require_relative "stores/base"
 require_relative "stores/memory_store"
 require_relative "stores/redis_store"
@@ -12,8 +13,14 @@ module Llmemory
       # Shared by Checkpoint, SessionLifecycle and WorkingMemory.
       def self.build(store_type = nil, cipher: nil)
         resolved_cipher = cipher || Llmemory.build_cipher
-        case (store_type || Llmemory.configuration.short_term_store).to_sym
-        when :memory then MemoryStore.new(cipher: resolved_cipher)
+        type = (store_type || Llmemory.configuration.short_term_store).to_sym
+        case type
+        when :memory
+          if Llmemory.configuration.shared_memory_stores
+            shared_memory_store(resolved_cipher)
+          else
+            MemoryStore.new(cipher: resolved_cipher)
+          end
         when :redis then RedisStore.new(cipher: resolved_cipher)
         when :postgres then PostgresStore.new(cipher: resolved_cipher)
         when :active_record, :activerecord
@@ -23,6 +30,14 @@ module Llmemory
           MemoryStore.new(cipher: resolved_cipher)
         end
       end
+
+      def self.shared_memory_store(cipher)
+        @shared_memory_store ||= MemoryStore.new(cipher: cipher)
+      end
+
+      def self.reset_shared_singletons!
+        @shared_memory_store = nil
+      end
     end
   end
 end

data/lib/llmemory/vector_store/active_record_store.rb

@@ -1,12 +1,14 @@
 # frozen_string_literal: true
 
 require_relative "base"
+require_relative "../../active_record_helpers"
 
 module Llmemory
   module VectorStore
     # Persists embeddings in llmemory_embeddings (pgvector).
     # Use when long_term_store is :active_record so hybrid search finds persisted embeddings.
     class ActiveRecordStore < Base
+      include Llmemory::ActiveRecordHelpers
       def initialize(embedding_provider: nil, source_type: "edge", cipher: nil)
         self.class.load_model!
         @embedding_provider = embedding_provider
@@ -35,14 +37,16 @@ module Llmemory
       def store(id:, embedding:, metadata: {}, user_id: nil)
         return id if user_id.nil? || user_id.to_s.empty?
         text_content = (metadata || {}).dig("text") || (metadata || {}).dig(:text)
-        rec = Llmemory::VectorStore::ActiveRecordEmbedding.find_or_initialize_by(
-          user_id: user_id.to_s,
-          source_type: @source_type,
-          source_id: id.to_s
-        )
-        rec.embedding = embedding.to_a.map(&:to_f)
-        rec.text_content = encrypt_text_content(text_content)
-        rec.save!
+        with_unique_retry do
+          rec = Llmemory::VectorStore::ActiveRecordEmbedding.find_or_initialize_by(
+            user_id: user_id.to_s,
+            source_type: @source_type,
+            source_id: id.to_s
+          )
+          rec.embedding = embedding.to_a.map(&:to_f)
+          rec.text_content = encrypt_text_content(text_content)
+          rec.save!
+        end
         id
       end
 
@@ -81,6 +85,17 @@ module Llmemory
         search(query_embedding, top_k: top_k, user_id: user_id)
       end
 
+      def delete(id:, user_id: nil)
+        return false if user_id.nil? || user_id.to_s.empty?
+
+        Llmemory::VectorStore::ActiveRecordEmbedding.where(
+          user_id: user_id.to_s,
+          source_type: @source_type,
+          source_id: id.to_s
+        ).delete_all
+        true
+      end
+
       private
 
       def encrypt_text_content(text)

data/lib/llmemory/vector_store/base.rb

@@ -14,6 +14,10 @@ module Llmemory
       def search(query_embedding, top_k: 10)
         raise NotImplementedError, "#{self.class}#search must be implemented"
       end
+
+      def delete(id:, user_id: nil)
+        raise NotImplementedError, "#{self.class}#delete must be implemented"
+      end
     end
   end
 end

data/lib/llmemory/vector_store/memory_store.rb

@@ -55,6 +55,15 @@ module Llmemory
         search(query_embedding, top_k: top_k, user_id: user_id)
       end
 
+      def delete(id:, user_id: nil)
+        if user_id
+          @entries.delete("#{user_id}:#{id}")
+        else
+          @entries.delete_if { |_key, data| data[:source_id].to_s == id.to_s }
+        end
+        true
+      end
+
       private
 
       def decrypt_metadata(meta)

data/lib/llmemory/vector_store/openai_embeddings.rb

@@ -5,18 +5,21 @@ require "json"
 require "digest"
 require_relative "base"
 require_relative "../llm/usage"
+require_relative "../llm/http_client"
 
 module Llmemory
   module VectorStore
     class OpenAIEmbeddings < Base
+      include Llmemory::LLM::HttpClient
       DEFAULT_MODEL = "text-embedding-3-small"
       DEFAULT_DIMS = 1536
 
       attr_reader :last_usage
 
-      def initialize(api_key: nil, model: nil)
+      def initialize(api_key: nil, model: nil, base_url: nil)
         @api_key = api_key || Llmemory.configuration.llm_api_key
         @model = model || DEFAULT_MODEL
+        @base_url = base_url || Llmemory.configuration.llm_base_url || "https://api.openai.com/v1"
         @cache = {}
         @cache_order = []
         @last_usage = Llmemory::LLM::Usage.zero
@@ -64,7 +67,7 @@ module Llmemory
         result = nil
         payload = { provider: :openai, model: @model, text_chars: text.to_s.length }
         Llmemory::Instrumentation.instrument(:llm_embed, payload) do
-          response = connection.post("embeddings") do |req|
+          response = post_with_resilience(connection, "embeddings") do |req|
             req.headers["Authorization"] = "Bearer #{@api_key}"
             req.headers["Content-Type"] = "application/json"
             req.body = { input: text.to_s.strip, model: @model }.to_json
@@ -90,11 +93,7 @@ module Llmemory
       end
 
       def connection
-        @connection ||= Faraday.new(url: "https://api.openai.com/v1") do |f|
-          f.request :json
-          f.response :json
-          f.adapter Faraday.default_adapter
-        end
+        @connection ||= build_faraday_connection(@base_url)
       end
 
       def store(id:, embedding:, metadata: {})

data/lib/llmemory/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Llmemory
-  VERSION = "0.2.6"
+  VERSION = "0.2.7"
 end

data/lib/llmemory/working_memory.rb

@@ -36,18 +36,21 @@ module Llmemory
     end
 
     def set(slot, value)
-      state = read
-      state[slot.to_sym] = value
-      persist(state)
+      @store.update(@user_id, @store_key) do |state|
+        state = symbolize(state || {})
+        state[slot.to_sym] = value
+        state
+      end
       value
     end
 
     # Bulk update in a single write.
     def update(**slots)
-      state = read
-      slots.each { |k, v| state[k.to_sym] = v }
-      persist(state)
-      state
+      @store.update(@user_id, @store_key) do |state|
+        state = symbolize(state || {})
+        slots.each { |k, v| state[k.to_sym] = v }
+        state
+      end
     end
 
     # Slots set by the caller beyond the predefined typed ones.

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: llmemory
 version: !ruby/object:Gem::Version
-  version: 0.2.6
+  version: 0.2.7
 platform: ruby
 authors:
 - llmemory
@@ -65,20 +65,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '3.12'
-- !ruby/object:Gem::Dependency
-  name: vcr
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '6.2'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '6.2'
 - !ruby/object:Gem::Dependency
   name: webmock
   requirement: !ruby/object:Gem::Requirement
@@ -141,6 +127,7 @@ files:
 - lib/llmemory.rb
 - lib/llmemory/actions.rb
 - lib/llmemory/actions/reason.rb
+- lib/llmemory/active_record_helpers.rb
 - lib/llmemory/cli.rb
 - lib/llmemory/cli/commands/base.rb
 - lib/llmemory/cli/commands/episodic.rb
@@ -174,6 +161,7 @@ files:
 - lib/llmemory/llm.rb
 - lib/llmemory/llm/anthropic.rb
 - lib/llmemory/llm/base.rb
+- lib/llmemory/llm/http_client.rb
 - lib/llmemory/llm/openai.rb
 - lib/llmemory/llm/response.rb
 - lib/llmemory/llm/tracking_client.rb
@@ -236,6 +224,7 @@ files:
 - lib/llmemory/mcp.rb
 - lib/llmemory/mcp/authentication.rb
 - lib/llmemory/mcp/server.rb
+- lib/llmemory/mcp/store_helpers.rb
 - lib/llmemory/mcp/tools/memory_add_message.rb
 - lib/llmemory/mcp/tools/memory_consolidate.rb
 - lib/llmemory/mcp/tools/memory_episode_record.rb
@@ -265,6 +254,7 @@ files:
 - lib/llmemory/retrieval/engine.rb
 - lib/llmemory/retrieval/feedback_store.rb
 - lib/llmemory/retrieval/mmr_reranker.rb
+- lib/llmemory/retrieval/multi_source.rb
 - lib/llmemory/retrieval/temporal_ranker.rb
 - lib/llmemory/short_term.rb
 - lib/llmemory/short_term/checkpoint.rb
@@ -275,6 +265,7 @@ files:
 - lib/llmemory/short_term/stores/active_record_checkpoint.rb
 - lib/llmemory/short_term/stores/active_record_store.rb
 - lib/llmemory/short_term/stores/base.rb
+- lib/llmemory/short_term/stores/key_codec.rb
 - lib/llmemory/short_term/stores/memory_store.rb
 - lib/llmemory/short_term/stores/postgres_store.rb
 - lib/llmemory/short_term/stores/redis_store.rb