coach_zed 0.7.0 → 0.8.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 42078dac83da8db61434faa687eb655e700e4d7602227fe7868c57428dfcb759
-  data.tar.gz: d160f2894666ae27bcebbcb095e73a85213c8f9c3f06ce4a7f0ab0b0745abfdc
+  metadata.gz: 4e97024f8b6766bd4d08c6811960bbd5d75e10ca7cbeb4032fe4167e6b1f823f
+  data.tar.gz: b0861f0e335a273a49703b1bcd17be48697ec1008c3bf2541a809e6ddb09aa02
 SHA512:
-  metadata.gz: a4c29470d8c22cb1cb0627b73688e9460101c3a31445c91f1613cbd29c44e654ecb9d42446012afc7a9fb244e14f5f451b48f86c5ae0bf54eb38e07df3563961
-  data.tar.gz: bb54afff27dd32108cb527a5f50d949709037013078733af6f0e930ad39c21e64cb26666ae2a3a62549b104a127121575ebb63e77e98259a99f375a5ebf1d214
+  metadata.gz: 5ea3e7f3d8fea32340b42179590ab8e7c607d7a3e1daba4a2735246a54443b5519066c6a9bf20de1eed66745ac6279b8b7d32dfeab2edbb9984368cc810f94ea
+  data.tar.gz: e1fd57f9709a06e7a1975fab46f62e28c31998ec3834882a09a2da81578b7daced1baf9e72fd14fed26b12e1b07a3fff86fbbe5a8ee3f0daad104bcf68a9b108

data/CHANGELOG.md

@@ -1,3 +1,12 @@
+## [](https://github.com/rossta/coach_zed/compare/v0.7.0...v) (2026-06-28)
+
+### Features
+
+* merge schedules in json ([b8343be](https://github.com/rossta/coach_zed/commit/b8343bee863437f9313e6e0d4782aaa05a199fe5))
+
+### Bug Fixes
+
+* dedupe overlapping appended feed events ([d19060e](https://github.com/rossta/coach_zed/commit/d19060ed42ee960e73fdebf151c3195978d44b51))
 ## [](https://github.com/rossta/coach_zed/compare/v0.6.0...v) (2026-06-18)
 
 ### Features

data/lib/coach_zed/feed_writer.rb

@@ -5,24 +5,18 @@ require "time"
 
 class CoachZed
   class FeedWriter
-    def initialize(schedule:, start_date:, existing_feed_content: nil, calendar_name: nil)
+    def initialize(schedule:, calendar_name: nil)
       @schedule = schedule
-      @start_date = start_date
-      @existing_feed_content = existing_feed_content
       @calendar_name = calendar_name
     end
 
     def build
-      if existing_feed_content
-        append_to_existing_feed(existing_feed_content)
-      else
-        fresh_feed
-      end
+      fresh_feed
     end
 
     private
 
-    attr_reader :schedule, :start_date, :existing_feed_content, :calendar_name
+    attr_reader :schedule, :calendar_name
 
     def fresh_feed
       lines = header_lines
@@ -31,11 +25,6 @@ class CoachZed
       lines.join("\r\n") + "\r\n"
     end
 
-    def append_to_existing_feed(existing_feed)
-      event_block = event_lines.join("\r\n") + "\r\n"
-      existing_feed.sub(/END:VCALENDAR\s*\z/, "#{event_block}END:VCALENDAR\r\n")
-    end
-
     def header_lines
       [
         "BEGIN:VCALENDAR",
@@ -50,10 +39,10 @@ class CoachZed
 
     def event_lines
       schedule.fetch("days").flat_map do |day|
-        date = start_date + (day.fetch("day_number").to_i - 1)
+        date = Date.strptime(day.fetch("date"), "%Y-%m-%d")
         [
           "BEGIN:VEVENT",
-          "UID:#{schedule.fetch("schedule_id")}-#{format("%02d", day.fetch("day_number").to_i)}@coach_zed",
+          "UID:#{date.strftime("%Y%m%d")}@coach_zed",
           "DTSTAMP:#{generated_timestamp}",
           "DTSTART;VALUE=DATE:#{date.strftime("%Y%m%d")}",
           "DTEND;VALUE=DATE:#{(date + 1).strftime("%Y%m%d")}",

data/lib/coach_zed/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 class CoachZed
-  VERSION = "0.7.0"
+  VERSION = "0.8.0"
 end

data/lib/coach_zed.rb

@@ -4,6 +4,7 @@ require "date"
 require "digest"
 require "json"
 require "pathname"
+require "time"
 require "yaml"
 
 require_relative "coach_zed/version"
@@ -19,7 +20,7 @@ class CoachZed
   Result = Data.define(:schedule_path, :ics_path, :webcal_path, :schedule)
 
   class Config
-    attr_accessor :workout_catalog_dir, :model, :output_dir, :feed_output_basename, :feed_title, :existing_feed_path
+    attr_accessor :workout_catalog_dir, :model, :output_dir, :feed_output_basename, :feed_title, :existing_feed_path, :existing_schedule_path, :merge_policy
 
     def initialize(
       workout_catalog_dir: nil,
@@ -27,7 +28,9 @@ class CoachZed
       output_dir: nil,
       feed_output_basename: nil,
       feed_title: nil,
-      existing_feed_path: nil
+      existing_feed_path: nil,
+      existing_schedule_path: nil,
+      merge_policy: nil
     )
       @workout_catalog_dir = workout_catalog_dir
       @model = model
@@ -35,6 +38,8 @@ class CoachZed
       @feed_output_basename = feed_output_basename
       @feed_title = feed_title
       @existing_feed_path = existing_feed_path
+      @existing_schedule_path = existing_schedule_path
+      @merge_policy = merge_policy
     end
 
     def apply(hash)
@@ -100,7 +105,9 @@ class CoachZed
     output_dir: nil,
     feed_output_basename: nil,
     feed_title: nil,
-    existing_feed_path: nil
+    existing_feed_path: nil,
+    existing_schedule_path: nil,
+    merge_policy: nil
   )
     config = self.class.config
 
@@ -114,31 +121,43 @@ class CoachZed
     @feed_title = feed_title.nil? ? config.feed_title : feed_title
     resolved_existing_feed_path = existing_feed_path.nil? ? config.existing_feed_path : existing_feed_path
     @existing_feed_path = resolved_existing_feed_path && Pathname(resolved_existing_feed_path)
+    resolved_existing_schedule_path = existing_schedule_path.nil? ? config.existing_schedule_path : existing_schedule_path
+    resolved_existing_schedule_path =
+      if resolved_existing_schedule_path.nil? && @existing_feed_path
+        Pathname(@existing_feed_path.to_s.sub(/\.ics\z/, ".json"))
+      else
+        resolved_existing_schedule_path
+      end
+    @existing_schedule_path = resolved_existing_schedule_path && Pathname(resolved_existing_schedule_path)
+    @merge_policy = merge_policy.nil? ? config.merge_policy : merge_policy
   end
 
-  def generate_schedule(start_date:, consultation_prompt: nil, consultation_prompt_path: nil, generation_mode: nil)
+  def generate_schedule(start_date:, consultation_prompt: nil, consultation_prompt_path: nil, generation_mode: nil, merge_policy: nil)
     prompt_text = resolve_prompt_text(consultation_prompt, consultation_prompt_path)
     catalog = Catalog::Loader.new(@workout_catalog_dir).load
     generation_mode = normalize_generation_mode(generation_mode)
-    existing_feed = load_existing_feed if generation_mode != :refresh
-    start_date = generation_start_date(start_date, existing_feed:, generation_mode:)
-    generation_days = generation_days_for(start_date, generation_mode:, existing_feed:)
-    existing_feed_context = existing_feed&.to_context(limit_days: 28)
-    schedule_key = schedule_key_for(prompt_text, start_date, catalog, generation_days, existing_feed_context)
+    merge_policy = normalize_merge_policy(merge_policy || @merge_policy || generation_mode)
+    existing_schedule = load_existing_schedule if merge_policy == :append
+    existing_feed = load_existing_feed if existing_schedule.nil? && generation_mode != :refresh
+    start_date = generation_start_date(start_date, existing_schedule:, generation_mode:, merge_policy:)
+    generation_days = generation_days_for(start_date, generation_mode:, existing_schedule:, merge_policy:)
+    existing_context = existing_schedule ? schedule_context(existing_schedule, limit_days: 28) : existing_feed&.to_context(limit_days: 28)
+    schedule_key = schedule_key_for(prompt_text, start_date, catalog, generation_days, existing_context, merge_policy)
     prompt = PromptBuilder.new(
       consultation_prompt: prompt_text,
       catalog: catalog,
       start_date: start_date,
       schedule_key: schedule_key,
       generation_days: generation_days,
-      existing_feed_context: existing_feed_context
+      existing_feed_context: existing_context
     ).build
     raw_schedule = @ai_client.generate(prompt:)
     schedule = ScheduleParser.parse(raw_schedule)
-    schedule = normalize_schedule(schedule, start_date:, prompt_text:, schedule_key:, catalog:, generation_days:)
+    schedule = normalize_schedule(schedule, start_date:, prompt_text:, schedule_key:, catalog:, generation_days:, merge_policy:)
+    schedule = merge_schedule(existing_schedule, schedule, merge_policy)
 
     schedule_path = write_schedule(schedule, schedule_key)
-    feed_paths = write_feeds(schedule, start_date:, existing_feed:)
+    feed_paths = write_feeds(schedule)
 
     Result.new(
       schedule_path: schedule_path,
@@ -150,7 +169,7 @@ class CoachZed
 
   private
 
-  attr_reader :workout_catalog_dir, :ai_client, :output_dir, :schedule_output_dir, :feed_output_dir, :feed_output_basename, :feed_title, :existing_feed_path
+  attr_reader :workout_catalog_dir, :ai_client, :output_dir, :schedule_output_dir, :feed_output_dir, :feed_output_basename, :feed_title, :existing_feed_path, :existing_schedule_path, :merge_policy
 
   def wrap_client(client, model:)
     return client if client.is_a?(Clients::RubyOpenAI)
@@ -195,6 +214,15 @@ class CoachZed
     FeedReader.load_existing(existing_feed_path)
   end
 
+  def load_existing_schedule
+    return nil if existing_schedule_path.nil?
+    return nil unless existing_schedule_path.exist?
+
+    schedule = JSON.parse(existing_schedule_path.read)
+    ScheduleParser.validate!(schedule)
+    schedule
+  end
+
   def normalize_generation_mode(value)
     return nil if value.nil?
 
@@ -206,33 +234,48 @@ class CoachZed
     end
   end
 
-  def generation_start_date(start_date, existing_feed:, generation_mode:)
+  def normalize_merge_policy(value)
+    return :replace if value.nil?
+
+    case value.to_sym
+    when :replace, :append
+      value.to_sym
+    else
+      raise ArgumentError, "unsupported merge policy: #{value}"
+    end
+  end
+
+  def generation_start_date(start_date, existing_schedule:, generation_mode:, merge_policy:)
     return normalize_date(start_date) if generation_mode == :refresh
 
-    last_date = existing_feed&.last_date
-    return normalize_date(start_date) if last_date.nil?
+    if merge_policy == :append
+      last_date = existing_schedule&.fetch("days")&.map { |day| Date.parse(day.fetch("date")) }&.max
+      return normalize_date(start_date) if last_date.nil?
 
-    last_date + 1
+      last_date + 1
+    else
+      normalize_date(start_date)
+    end
   end
 
-  def generation_days_for(start_date, generation_mode:, existing_feed:)
-    return 7 if generation_mode == :append && existing_feed
-    return 28 if generation_mode == :append
-    return 7 if existing_feed
+  def generation_days_for(start_date, generation_mode:, existing_schedule:, merge_policy:)
+    return 7 if merge_policy == :append && existing_schedule
+    return 28 if merge_policy == :append
     return 28 if generation_mode.nil?
 
     upcoming_sunday = start_date + ((7 - start_date.wday) % 7)
     (upcoming_sunday - start_date).to_i + 29
   end
 
-  def schedule_key_for(prompt_text, start_date, catalog, generation_days, existing_feed_context)
+  def schedule_key_for(prompt_text, start_date, catalog, generation_days, existing_context, merge_policy)
     Digest::SHA256.hexdigest(
       [
         prompt_text.strip,
         start_date.iso8601,
         generation_days,
         catalog_digest(catalog),
-        existing_feed_context.to_s
+        merge_policy.to_s,
+        existing_context.to_s
       ].join("\n")
     )[0...12] || ""
   end
@@ -241,7 +284,7 @@ class CoachZed
     Digest::SHA256.hexdigest(catalog.map(&:fingerprint).join("\n"))
   end
 
-  def normalize_schedule(schedule, start_date:, prompt_text:, schedule_key:, catalog:, generation_days:)
+  def normalize_schedule(schedule, start_date:, prompt_text:, schedule_key:, catalog:, generation_days:, merge_policy:)
     catalog_texts = catalog.to_h { |entry| [entry.relative_path, entry.path.read] }
     days = schedule.fetch("days")
     normalized_days = days.each_with_index.map do |day, index|
@@ -266,10 +309,31 @@ class CoachZed
       "catalog_directory" => workout_catalog_dir.to_s,
       "catalog_count" => catalog.count,
       "program_length_days" => schedule.fetch("program_length_days", generation_days).to_i,
+      "merge_policy" => merge_policy.to_s,
+      "generated_at" => Time.now.utc.iso8601,
       "days" => normalized_days
     )
   end
 
+  def merge_schedule(existing_schedule, schedule, merge_policy)
+    return schedule if merge_policy == :replace || existing_schedule.nil?
+
+    existing_by_date = existing_schedule.fetch("days").to_h { |day| [day.fetch("date"), day] }
+    merged_by_date = existing_by_date.merge(schedule.fetch("days").to_h { |day| [day.fetch("date"), day] })
+
+    merged_days = merged_by_date.values.sort_by { |day| Date.parse(day.fetch("date")) }
+    merged_days = merged_days.each_with_index.map do |day, index|
+      day.merge("day_number" => index + 1)
+    end
+
+    schedule.merge(
+      "merged_from_schedule_id" => existing_schedule["schedule_id"],
+      "start_date" => merged_days.first&.fetch("date"),
+      "program_length_days" => merged_days.length,
+      "days" => merged_days
+    )
+  end
+
   def write_schedule(schedule, schedule_key)
     schedule_output_dir.mkpath
     path = schedule_output_dir.join(schedule_filename(schedule_key))
@@ -277,13 +341,11 @@ class CoachZed
     path
   end
 
-  def write_feeds(schedule, start_date:, existing_feed:)
+  def write_feeds(schedule)
     feed_output_dir.mkpath
     base_path = feed_output_dir.join(feed_basename)
     feed = FeedWriter.new(
       schedule:,
-      start_date:,
-      existing_feed_content: existing_feed&.feed_content,
       calendar_name: feed_title
     ).build
     ics_path = base_path.sub_ext(".ics")
@@ -300,4 +362,16 @@ class CoachZed
   def feed_basename
     feed_output_basename || "schedule"
   end
+
+  def schedule_context(schedule, limit_days: 28)
+    days = schedule.fetch("days")
+    recent_days = days.last(limit_days)
+
+    recent_days.map do |day|
+      pieces = [day.fetch("date")]
+      pieces << ((day["day_type"] == "workout") ? day.fetch("workout").fetch("title") : "Rest")
+      pieces << day["notes"] if day["notes"] && !day["notes"].to_s.empty?
+      pieces.join(" | ")
+    end.join("\n")
+  end
 end

data/sig/coach_zed.rbs

@@ -27,6 +27,8 @@ class CoachZed
     attr_accessor feed_output_basename: String?
     attr_accessor feed_title: String?
     attr_accessor existing_feed_path: String?
+    attr_accessor existing_schedule_path: String?
+    attr_accessor merge_policy: String?
 
     def initialize: (
       ?workout_catalog_dir: String?,
@@ -34,7 +36,9 @@ class CoachZed
       ?output_dir: String?,
       ?feed_output_basename: String?,
       ?feed_title: String?,
-      ?existing_feed_path: String?
+      ?existing_feed_path: String?,
+      ?existing_schedule_path: String?,
+      ?merge_policy: String?
     ) -> void
 
     def apply: (Hash[untyped, untyped]) -> void
@@ -55,6 +59,8 @@ class CoachZed
   attr_reader feed_output_basename: String?
   attr_reader feed_title: String?
   attr_reader existing_feed_path: Pathname?
+  attr_reader existing_schedule_path: Pathname?
+  attr_reader merge_policy: String?
 
   def initialize: (
     client: untyped,
@@ -63,14 +69,17 @@ class CoachZed
     ?output_dir: String?,
     ?feed_output_basename: String?,
     ?feed_title: String?,
-    ?existing_feed_path: String?
+    ?existing_feed_path: String?,
+    ?existing_schedule_path: String?,
+    ?merge_policy: String?
   ) -> void
 
   def generate_schedule: (
     start_date: untyped,
     ?consultation_prompt: String?,
     ?consultation_prompt_path: String?,
-    ?generation_mode: Symbol?
+    ?generation_mode: Symbol?,
+    ?merge_policy: Symbol?
   ) -> Result
 
   private
@@ -79,16 +88,20 @@ class CoachZed
   def resolve_prompt_text: (String? consultation_prompt, String? consultation_prompt_path) -> String
   def normalize_date: (untyped value) -> Date
   def load_existing_feed: -> CoachZed::FeedReader?
+  def load_existing_schedule: -> Hash[String, untyped]?
   def normalize_generation_mode: (untyped value) -> Symbol?
-  def generation_start_date: (untyped start_date, existing_feed: CoachZed::FeedReader?, generation_mode: Symbol?) -> Date
-  def generation_days_for: (Date start_date, generation_mode: Symbol?, existing_feed: CoachZed::FeedReader?) -> Integer
-  def schedule_key_for: (String prompt_text, Date start_date, Array[CoachZed::Catalog::Entry] catalog, Integer generation_days, String? existing_feed_context) -> String
+  def normalize_merge_policy: (untyped value) -> Symbol?
+  def generation_start_date: (untyped start_date, existing_schedule: Hash[String, untyped]?, generation_mode: Symbol?, merge_policy: Symbol?) -> Date
+  def generation_days_for: (Date start_date, generation_mode: Symbol?, existing_schedule: Hash[String, untyped]?, merge_policy: Symbol?) -> Integer
+  def schedule_key_for: (String prompt_text, Date start_date, Array[CoachZed::Catalog::Entry] catalog, Integer generation_days, String? existing_context, Symbol? merge_policy) -> String
   def catalog_digest: (Array[CoachZed::Catalog::Entry] catalog) -> String
-  def normalize_schedule: (Hash[String, untyped] schedule, start_date: Date, prompt_text: String, schedule_key: String, catalog: Array[CoachZed::Catalog::Entry], generation_days: Integer) -> Hash[String, untyped]
+  def normalize_schedule: (Hash[String, untyped] schedule, start_date: Date, prompt_text: String, schedule_key: String, catalog: Array[CoachZed::Catalog::Entry], generation_days: Integer, merge_policy: Symbol?) -> Hash[String, untyped]
+  def merge_schedule: (Hash[String, untyped]?, Hash[String, untyped], Symbol?) -> Hash[String, untyped]
   def write_schedule: (Hash[String, untyped] schedule, String schedule_key) -> Pathname
-  def write_feeds: (Hash[String, untyped] schedule, start_date: Date, existing_feed: CoachZed::FeedReader?) -> Hash[Symbol, Pathname]
+  def write_feeds: (Hash[String, untyped] schedule) -> Hash[Symbol, Pathname]
   def schedule_filename: (String schedule_key) -> String
   def feed_basename: -> String
+  def schedule_context: (Hash[String, untyped] schedule, ?limit_days: Integer) -> String
 
   module Catalog
     class Entry
@@ -196,14 +209,10 @@ class CoachZed
 
   class FeedWriter
     attr_reader schedule: Hash[String, untyped]
-    attr_reader start_date: Date
-    attr_reader existing_feed_content: String?
     attr_reader calendar_name: String?
 
     def initialize: (
       schedule: Hash[String, untyped],
-      start_date: Date,
-      ?existing_feed_content: String?,
       ?calendar_name: String?
     ) -> void
 
@@ -212,7 +221,6 @@ class CoachZed
     private
 
     def fresh_feed: -> String
-    def append_to_existing_feed: (String existing_feed) -> String
     def header_lines: -> Array[String]
     def event_lines: -> Array[String]
     def schedule_name: -> String

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: coach_zed
 version: !ruby/object:Gem::Version
-  version: 0.7.0
+  version: 0.8.0
 platform: ruby
 authors:
 - Ross Kaffenberger