coplan-engine 0.1.3 → 0.4.0

data/app/services/coplan/plans/position_resolver.rb

@@ -20,6 +20,8 @@ module CoPlan
           resolve_insert_under_heading
         when "delete_paragraph_containing"
           resolve_delete_paragraph_containing
+        when "replace_section"
+          resolve_replace_section
         else
           raise OperationError, "Unknown operation: #{@op["op"]}"
         end
@@ -153,6 +155,115 @@ module CoPlan
         paragraphs
       end
 
+      def resolve_replace_section
+        heading = @op["heading"]
+        raise OperationError, "replace_section requires 'heading'" if heading.blank?
+        raise OperationError, "replace_section requires 'new_content'" if @op["new_content"].nil?
+
+        include_heading = @op.fetch("include_heading", true)
+        # Normalize: accept both string and boolean
+        include_heading = include_heading != false && include_heading != "false"
+
+        headings = parse_headings(@content)
+        matches = headings.select { |h| h[:text] == heading }
+
+        if matches.empty?
+          raise OperationError, "replace_section: heading_not_found — no heading matching '#{heading}'"
+        end
+
+        if matches.length > 1
+          match_details = matches.map { |m| { heading: m[:text], line: m[:line] } }
+          raise OperationError, "replace_section: ambiguous_heading — found #{matches.length} headings matching '#{heading}': #{match_details.inspect}"
+        end
+
+        match = matches.first
+        target_level = match[:level]
+
+        # Section starts at the heading line start
+        section_start = match[:line_start]
+
+        # Section ends at the next heading of equal or higher level, or EOF
+        next_heading = headings.find { |h| h[:line_start] > match[:line_start] && h[:level] <= target_level }
+        section_end = next_heading ? next_heading[:line_start] : @content.length
+
+        # Strip all trailing newlines from the section range so the separator
+        # between sections falls outside the replaced range. This ensures
+        # replacement content won't merge into the next heading.
+        section_end = section_end.to_i
+        while section_end > section_start && @content[section_end - 1] == "\n"
+          section_end -= 1
+        end
+
+        range = if include_heading
+          [section_start, section_end]
+        else
+          # Skip past the heading line itself
+          heading_line_end = @content.index("\n", section_start)
+          if heading_line_end
+            body_start = heading_line_end + 1
+            # Skip blank line after heading
+            while body_start < section_end && @content[body_start] == "\n"
+              body_start += 1
+            end
+            # When trailing newlines are stripped, section_end can retreat
+            # behind body_start. Use an empty range at body_start to avoid
+            # an inverted range and keep the insertion point after the heading newline.
+            [body_start, [body_start, section_end].max]
+          else
+            # Heading is the only line — body is empty
+            [section_end, section_end]
+          end
+        end
+
+        Resolution.new(op: "replace_section", ranges: [range])
+      end
+
+      # Parse markdown headings, respecting code fences (``` blocks).
+      # Returns an array of hashes: { text:, level:, line:, line_start:, line_end: }
+      def parse_headings(content)
+        headings = []
+        in_code_fence = false
+        fence_char = nil
+        fence_length = 0
+        line_number = 0
+        pos = 0
+
+        content.each_line do |line|
+          line_number += 1
+          line_start = pos
+          line_end = pos + line.length
+          stripped = line.chomp
+
+          fence_match = stripped.match(/\A(`{3,}|~{3,})(.*)\z/)
+          if fence_match
+            fence_chars = fence_match[1]
+            info_string = fence_match[2]
+            if in_code_fence
+              # Close only if fence char and length match, and no info string
+              if fence_chars[0] == fence_char && fence_chars.length >= fence_length && info_string.strip.empty?
+                in_code_fence = false
+              end
+            else
+              in_code_fence = true
+              fence_char = fence_chars[0]
+              fence_length = fence_chars.length
+            end
+          elsif !in_code_fence && (m = stripped.match(/\A(\#{1,6})\s+(.+)/))
+            headings << {
+              level: m[1].length,
+              text: stripped,
+              line: line_number,
+              line_start: line_start,
+              line_end: line_end
+            }
+          end
+
+          pos = line_end
+        end
+
+        headings
+      end
+
       # Determine the character range to delete so that removing
       # content[range[0]...range[1]] produces clean output with
       # correct paragraph spacing.

data/app/views/coplan/comment_threads/_new_comment_form.html.erb

@@ -8,7 +8,8 @@
       <blockquote class="comment-form__quote" data-coplan--text-selection-target="anchorQuote"></blockquote>
     </div>
     <div class="form-group">
-      <textarea name="comment_thread[body_markdown]" id="comment_thread_body_markdown" rows="3" placeholder="Write a comment..." required></textarea>
+      <textarea name="comment_thread[body_markdown]" id="comment_thread_body_markdown" rows="3" placeholder="Write a comment..." required
+        data-controller="coplan--comment-form" data-action="keydown->coplan--comment-form#submitOnEnter"></textarea>
     </div>
     <div class="comment-form__actions">
       <button type="submit" class="btn btn--primary btn--sm">Comment</button>

data/app/views/coplan/comment_threads/_reply_form.html.erb

@@ -1,7 +1,8 @@
 <div class="comment-thread__reply" id="<%= dom_id(thread, :reply_form) %>">
   <%= form_with url: plan_comment_thread_comments_path(plan, thread), method: :post, data: { action: "turbo:submit-end->coplan--text-selection#resetReplyForm" } do |f| %>
     <div class="form-group">
-      <textarea name="comment[body_markdown]" rows="2" placeholder="Reply..." required></textarea>
+      <textarea name="comment[body_markdown]" rows="2" placeholder="Press r to reply" required
+        data-controller="coplan--comment-form" data-action="keydown->coplan--comment-form#submitOnEnter"></textarea>
     </div>
     <button type="submit" class="btn btn--secondary btn--sm">Reply</button>
   <% end %>

data/app/views/coplan/comment_threads/_thread.html.erb

@@ -5,7 +5,7 @@
      data-thread-id="<%= thread.id %>">
   <div class="comment-thread__header">
     <div class="comment-thread__meta">
-      <span class="badge badge--<%= thread.status == 'open' ? 'live' : 'abandoned' %>"><%= thread.status %></span>
+      <span class="badge badge--<%= thread.open? ? 'live' : 'abandoned' %>"><%= thread.status %></span>
       <% if thread.out_of_date? %>
         <span class="badge badge--abandoned">out of date</span>
       <% end %>
@@ -26,16 +26,13 @@
   <% is_plan_author = viewer.nil? || plan.created_by_user_id == viewer.id %>
   <% is_thread_author = viewer.nil? || thread.created_by_user_id == viewer.id %>
 
-  <% if thread.status == "open" %>
+  <% if thread.open? %>
     <%= render partial: "coplan/comment_threads/reply_form", locals: { thread: thread, plan: plan } %>
 
     <div class="comment-thread__actions">
-      <% if is_plan_author || is_thread_author %>
-        <%= link_to "Resolve", resolve_plan_comment_thread_path(plan, thread), data: { turbo_method: :patch }, class: "btn btn--secondary btn--sm" %>
-      <% end %>
       <% if is_plan_author %>
         <%= link_to "Accept", accept_plan_comment_thread_path(plan, thread), data: { turbo_method: :patch }, class: "btn btn--secondary btn--sm" %>
-        <%= link_to "Dismiss", dismiss_plan_comment_thread_path(plan, thread), data: { turbo_method: :patch }, class: "btn btn--secondary btn--sm" %>
+        <%= link_to "Discard", discard_plan_comment_thread_path(plan, thread), data: { turbo_method: :patch }, class: "btn btn--secondary btn--sm" %>
       <% end %>
     </div>
   <% else %>

data/app/views/coplan/comment_threads/_thread_popover.html.erb

@@ -0,0 +1,58 @@
+<div class="thread-popover-data"
+     id="<%= dom_id(thread) %>"
+     data-anchor-text="<%= thread.anchor_text %>"
+     data-anchor-occurrence="<%= thread.anchor_occurrence_index %>"
+     data-thread-id="<%= thread.id %>"
+     data-thread-status="<%= thread.status %>">
+
+  <div popover="auto" id="<%= dom_id(thread) %>_popover" class="thread-popover">
+    <div class="thread-popover__header">
+      <span class="badge badge--<%= thread.status %>"><%= thread.status %></span>
+      <% if thread.out_of_date? %>
+        <span class="badge badge--abandoned">out of date</span>
+      <% end %>
+    </div>
+
+    <% if thread.anchored? %>
+      <blockquote class="thread-popover__quote"><%= thread.anchor_preview %></blockquote>
+    <% end %>
+
+    <div class="thread-popover__comments" id="<%= dom_id(thread, :comments) %>">
+      <% thread.comments.each do |comment| %>
+        <%= render partial: "coplan/comments/comment", locals: { comment: comment } %>
+      <% end %>
+    </div>
+
+    <%# current_user may not be available during Turbo Stream broadcasts %>
+    <% viewer = local_assigns.fetch(:current_user, nil) %>
+    <% is_plan_author = viewer.nil? || plan.created_by_user_id == viewer&.id %>
+    <% is_thread_author = viewer.nil? || thread.created_by_user_id == viewer&.id %>
+
+    <% if thread.open? %>
+      <div class="thread-popover__reply">
+        <%= form_with url: plan_comment_thread_comments_path(plan, thread), method: :post, data: { action: "turbo:submit-end->coplan--text-selection#resetReplyForm" } do |f| %>
+          <div class="form-group">
+            <textarea name="comment[body_markdown]" rows="2" placeholder="Press r to reply" required
+              data-controller="coplan--comment-form" data-action="keydown->coplan--comment-form#submitOnEnter"></textarea>
+          </div>
+          <button type="submit" class="btn btn--secondary btn--sm">Reply</button>
+        <% end %>
+      </div>
+
+      <div class="thread-popover__actions">
+        <% if is_plan_author %>
+          <% if thread.status == "pending" %>
+            <%= button_to "Accept (a)", accept_plan_comment_thread_path(plan, thread), method: :patch, class: "btn btn--secondary btn--sm", form: { "data-action-name": "accept" } %>
+          <% end %>
+          <%= button_to "Discard (d)", discard_plan_comment_thread_path(plan, thread), method: :patch, class: "btn btn--secondary btn--sm", form: { "data-action-name": "discard" } %>
+        <% end %>
+      </div>
+    <% else %>
+      <% if is_plan_author || is_thread_author %>
+        <div class="thread-popover__actions">
+          <%= button_to "Reopen", reopen_plan_comment_thread_path(plan, thread), method: :patch, class: "btn btn--secondary btn--sm" %>
+        </div>
+      <% end %>
+    <% end %>
+  </div>
+</div>

data/app/views/coplan/plans/show.html.erb

@@ -5,6 +5,7 @@
 <div class="plan-content card">
   <% if @plan.current_content.present? %>
     <div class="plan-layout" data-controller="coplan--text-selection" data-coplan--text-selection-plan-id-value="<%= @plan.id %>">
+      <div class="plan-layout__margin" data-coplan--text-selection-target="margin"></div>
       <div class="plan-layout__content" data-coplan--text-selection-target="content">
         <%= render_markdown(@plan.current_content) %>
 
@@ -13,39 +14,14 @@
             💬 Comment
           </button>
         </div>
-      </div>
 
-      <div class="plan-layout__sidebar">
         <%= render partial: "coplan/comment_threads/new_comment_form", locals: { plan: @plan } %>
+      </div>
 
-        <div class="comment-tabs" data-controller="coplan--tabs" data-coplan--tabs-active-class="comment-tab--active">
-          <div class="comment-tabs__nav">
-            <button class="comment-tab comment-tab--active" data-coplan--tabs-target="tab" data-action="coplan--tabs#switch coplan--text-selection#repositionThreads" data-index="0">
-              Open <span class="comment-tab__count" id="open-thread-count"><%= @active_threads.size if @active_threads.any? %></span>
-            </button>
-            <button class="comment-tab" data-coplan--tabs-target="tab" data-action="coplan--tabs#switch coplan--text-selection#repositionThreads" data-index="1">
-              Resolved <span class="comment-tab__count" id="resolved-thread-count"><%= @archived_threads.size if @archived_threads.any? %></span>
-            </button>
-          </div>
-
-          <div class="comment-tabs__panel" data-coplan--tabs-target="panel">
-            <div class="comment-threads-list" id="comment-threads">
-              <% @active_threads.each do |thread| %>
-                <%= render partial: "coplan/comment_threads/thread", locals: { thread: thread, plan: @plan, current_user: current_user } %>
-              <% end %>
-              <p class="text-sm text-muted" id="open-threads-empty" <% if @active_threads.any? %>style="display: none;"<% end %>>No open comments.</p>
-            </div>
-          </div>
-
-          <div class="comment-tabs__panel" data-coplan--tabs-target="panel" style="display: none;">
-            <div class="comment-threads-list" id="resolved-comment-threads">
-              <% @archived_threads.each do |thread| %>
-                <%= render partial: "coplan/comment_threads/thread", locals: { thread: thread, plan: @plan, current_user: current_user } %>
-              <% end %>
-              <p class="text-sm text-muted" id="resolved-threads-empty" <% if @archived_threads.any? %>style="display: none;"<% end %>>No resolved comments.</p>
-            </div>
-          </div>
-        </div>
+      <div id="plan-threads" data-coplan--text-selection-target="threads">
+        <% @threads.select(&:anchored?).each do |thread| %>
+          <%= render partial: "coplan/comment_threads/thread_popover", locals: { thread: thread, plan: @plan, current_user: current_user } %>
+        <% end %>
       </div>
     </div>
   <% else %>
@@ -54,3 +30,19 @@
     </div>
   <% end %>
 </div>
+
+<% open_count = @threads.count(&:open?) %>
+<% if @threads.any? %>
+  <div class="comment-toolbar" data-controller="coplan--comment-nav" data-coplan--comment-nav-plan-id-value="<%= @plan.id %>">
+    <span class="comment-toolbar__count">💬 <%= open_count %> open</span>
+    <div class="comment-toolbar__nav">
+      <button class="btn btn--secondary btn--sm" data-action="coplan--comment-nav#prev" title="Previous comment">↑</button>
+      <span class="comment-toolbar__position" data-coplan--comment-nav-target="position"></span>
+      <button class="btn btn--secondary btn--sm" data-action="coplan--comment-nav#next" title="Next comment">↓</button>
+    </div>
+    <label class="comment-toolbar__toggle">
+      <input type="checkbox" data-action="coplan--comment-nav#toggleResolved" data-coplan--comment-nav-target="resolvedToggle">
+      Show resolved (<%= @threads.count { |t| !t.open? } %>)
+    </label>
+  </div>
+<% end %>

data/app/views/layouts/coplan/application.html.erb

@@ -5,7 +5,11 @@
     <meta name="viewport" content="width=device-width,initial-scale=1">
     <%= csrf_meta_tags %>
     <%= csp_meta_tag %>
+    <%= coplan_favicon_tag %>
     <%= yield :head %>
+    <link rel="preconnect" href="https://fonts.googleapis.com">
+    <link rel="preconnect" href="https://fonts.gstatic.com" crossorigin>
+    <link href="https://fonts.googleapis.com/css2?family=Lexend:wght@300;400;500;600;700&display=swap" rel="stylesheet">
     <%= stylesheet_link_tag "coplan/application", "data-turbo-track": "reload" %>
     <%= javascript_importmap_tags %>
   </head>
@@ -15,6 +19,7 @@
         <%= link_to coplan.root_path, class: "site-nav__brand" do %>
           <%= image_tag "coplan/coplan-logo-sm.png", alt: "CoPlan", class: "site-nav__logo" %>
           CoPlan
+          <%= coplan_environment_badge %>
         <% end %>
         <ul class="site-nav__links">
           <% if signed_in? %>

data/config/routes.rb

@@ -7,7 +7,7 @@ CoPlan::Engine.routes.draw do
       member do
         patch :resolve
         patch :accept
-        patch :dismiss
+        patch :discard
         patch :reopen
       end
       resources :comments, only: [:create]
@@ -31,7 +31,7 @@ CoPlan::Engine.routes.draw do
         resources :comments, only: [:create], controller: "comments" do
           post :reply, on: :member
           patch :resolve, on: :member
-          patch :dismiss, on: :member
+          patch :discard, on: :member
         end
       end
     end

data/db/migrate/20260320145453_migrate_comment_thread_statuses.rb

@@ -0,0 +1,31 @@
+class MigrateCommentThreadStatuses < ActiveRecord::Migration[8.0]
+  def up
+    # open → pending (default for new comments from non-authors)
+    # accepted → resolved (collapse accepted into resolved)
+    # dismissed → discarded (rename)
+    # resolved stays resolved
+    #
+    # We also add "todo" as a new status (author agrees with feedback).
+    # Existing "open" threads become "pending" since we can't determine authorship here.
+    execute <<~SQL
+      UPDATE coplan_comment_threads SET status = 'pending' WHERE status = 'open'
+    SQL
+    execute <<~SQL
+      UPDATE coplan_comment_threads SET status = 'discarded' WHERE status = 'dismissed'
+    SQL
+    execute <<~SQL
+      UPDATE coplan_comment_threads SET status = 'resolved' WHERE status = 'accepted'
+    SQL
+    change_column_default :coplan_comment_threads, :status, "pending"
+  end
+
+  def down
+    change_column_default :coplan_comment_threads, :status, "open"
+    execute <<~SQL
+      UPDATE coplan_comment_threads SET status = 'open' WHERE status IN ('pending', 'todo')
+    SQL
+    execute <<~SQL
+      UPDATE coplan_comment_threads SET status = 'dismissed' WHERE status = 'discarded'
+    SQL
+  end
+end

data/lib/coplan/version.rb

@@ -1,3 +1,3 @@
 module CoPlan
-  VERSION = "0.1.3"
+  VERSION = "0.4.0"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: coplan-engine
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.4.0
 platform: ruby
 authors:
 - Block
@@ -159,9 +159,10 @@ files:
 - app/helpers/coplan/application_helper.rb
 - app/helpers/coplan/comments_helper.rb
 - app/helpers/coplan/markdown_helper.rb
+- app/javascript/controllers/coplan/comment_form_controller.js
+- app/javascript/controllers/coplan/comment_nav_controller.js
 - app/javascript/controllers/coplan/dropdown_controller.js
 - app/javascript/controllers/coplan/line_selection_controller.js
-- app/javascript/controllers/coplan/tabs_controller.js
 - app/javascript/controllers/coplan/text_selection_controller.js
 - app/jobs/coplan/application_job.rb
 - app/jobs/coplan/automated_review_job.rb
@@ -197,6 +198,7 @@ files:
 - app/views/coplan/comment_threads/_new_comment_form.html.erb
 - app/views/coplan/comment_threads/_reply_form.html.erb
 - app/views/coplan/comment_threads/_thread.html.erb
+- app/views/coplan/comment_threads/_thread_popover.html.erb
 - app/views/coplan/comments/_comment.html.erb
 - app/views/coplan/dashboard/show.html.erb
 - app/views/coplan/plan_versions/index.html.erb
@@ -216,6 +218,7 @@ files:
 - config/routes.rb
 - db/migrate/20260226200000_create_coplan_schema.rb
 - db/migrate/20260313210000_expand_content_markdown_to_mediumtext.rb
+- db/migrate/20260320145453_migrate_comment_thread_statuses.rb
 - lib/coplan.rb
 - lib/coplan/configuration.rb
 - lib/coplan/engine.rb

data/app/javascript/controllers/coplan/tabs_controller.js

@@ -1,18 +0,0 @@
-import { Controller } from "@hotwired/stimulus"
-
-export default class extends Controller {
-  static targets = ["tab", "panel"]
-  static classes = ["active"]
-
-  switch(event) {
-    const index = parseInt(event.currentTarget.dataset.index)
-
-    this.tabTargets.forEach((tab, i) => {
-      tab.classList.toggle(this.activeClass, i === index)
-    })
-
-    this.panelTargets.forEach((panel, i) => {
-      panel.style.display = i === index ? "" : "none"
-    })
-  }
-}