coplan-engine 0.1.3 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 129983ca7890cb3869a1c594ebde86720d3ba80e14861b9ad613c3311eec30b0
-  data.tar.gz: 93ee7fa05f6f3676bc414a9f9794a3a04c80cee7181efcab89d484816f72cd79
+  metadata.gz: fc0c571fae079ecc474da55dea08af61a198ca761f6f3c9b5c3b672afe3b838c
+  data.tar.gz: 791565182e62dab38561ae29eeb9794cf0f0087222449b4ef5842525b5e28424
 SHA512:
-  metadata.gz: 291848526406f7b918dd2cf86e161ccec3e85eecf73277325af84fb320ea78b4fd64c260c0f539ba6bf0e59b747906c2d173fdf39c1920c72522537ae62fe0ae
-  data.tar.gz: 8f5af631ce15ede7498305751f51a89dfc71136448196a959e4aa3223e5c00fde1955645aefa507db117f72269d8ab256d7bad1053c56cb34a218b509e9cd6e6
+  metadata.gz: 973c44900f288a2ba876c9ee2df96e47e13668f271c3b5e1de187ddf4d935b4fef63de2dac2753cf1acc82628a4a4e3987c8e8e3ea8cd3e38a9ecd123e7b734e
+  data.tar.gz: e7866646881f7c217cb5b23e0adac89651e6fa47facfe9f4f33049a4e2a7362f8eb209f40dc161dbd43bdd689e643248c050be0044821efeae6abcb97c13aa08

data/app/assets/stylesheets/coplan/application.css

@@ -31,7 +31,7 @@
   --space-2xl: 3rem;
 
   /* Typography */
-  --font-sans: -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, Helvetica, Arial, sans-serif;
+  --font-sans: 'Lexend', -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, Helvetica, Arial, sans-serif;
   --font-mono: "SF Mono", SFMono-Regular, ui-monospace, Menlo, monospace;
   --text-sm: 0.875rem;
   --text-base: 1rem;
@@ -119,6 +119,17 @@ img, svg {
   border-radius: 6px;
 }
 
+.env-badge {
+  font-size: 10px;
+  font-weight: 600;
+  color: #fff;
+  padding: 1px 6px;
+  border-radius: 4px;
+  text-transform: uppercase;
+  letter-spacing: 0.5px;
+  line-height: 1.4;
+}
+
 .site-nav__brand:hover {
   text-decoration: none;
   color: var(--color-primary);
@@ -268,6 +279,10 @@ img, svg {
 .badge--developing  { background: #dbeafe; color: var(--color-status-developing); }
 .badge--live        { background: #d1fae5; color: var(--color-status-live); }
 .badge--abandoned   { background: #f3f4f6; color: var(--color-status-abandoned); }
+.badge--pending     { background: #fef3c7; color: var(--color-status-considering); }
+.badge--todo        { background: #dbeafe; color: var(--color-status-developing); }
+.badge--discarded   { background: #f3f4f6; color: var(--color-status-abandoned); }
+.badge--resolved    { background: #d1fae5; color: var(--color-status-live); }
 
 /* Forms */
 .form-group {
@@ -514,7 +529,7 @@ img, svg {
 
 .markdown-rendered p {
   margin-bottom: var(--space-md);
-  line-height: 1.7;
+  line-height: 1.9;
 }
 
 .markdown-rendered ul,
@@ -525,7 +540,7 @@ img, svg {
 
 .markdown-rendered li {
   margin-bottom: var(--space-xs);
-  line-height: 1.7;
+  line-height: 1.9;
 }
 
 .markdown-rendered pre {
@@ -605,20 +620,55 @@ img, svg {
 
 /* Anchor text highlights */
 .anchor-highlight {
-  background: rgba(255, 213, 79, 0.3);
-  border-bottom: 2px solid rgba(255, 179, 0, 0.5);
   cursor: pointer;
   transition: background 0.2s;
 }
 
-.anchor-highlight:hover {
-  background: rgba(255, 213, 79, 0.5);
+.anchor-highlight--open {
+  background: rgba(108, 140, 255, 0.12);
+  border-bottom: 2px solid rgba(108, 140, 255, 0.6);
+  cursor: pointer;
+}
+
+.anchor-highlight--open:hover {
+  background: rgba(108, 140, 255, 0.22);
+}
+
+.anchor-highlight--pending {
+  background: rgba(245, 158, 11, 0.12);
+  border-bottom: 2px solid rgba(245, 158, 11, 0.6);
+}
+
+.anchor-highlight--pending:hover {
+  background: rgba(245, 158, 11, 0.22);
+}
+
+.anchor-highlight--todo {
+  background: rgba(59, 130, 246, 0.12);
+  border-bottom: 2px solid rgba(59, 130, 246, 0.6);
+}
+
+.anchor-highlight--todo:hover {
+  background: rgba(59, 130, 246, 0.22);
+}
+
+.anchor-highlight--resolved {
+  background: none;
+  border-bottom: none;
+  cursor: default;
+  pointer-events: none;
+}
+
+.plan-layout--show-resolved .anchor-highlight--resolved {
+  border-bottom: 1px dashed var(--color-text-muted);
+  cursor: pointer;
+  pointer-events: auto;
 }
 
 .anchor-highlight--active {
-  background: rgba(255, 179, 0, 0.4);
-  border-bottom: 2px solid var(--color-warning);
-  outline: 2px solid rgba(255, 179, 0, 0.3);
+  background: rgba(108, 140, 255, 0.25);
+  border-bottom: 2px solid var(--color-primary);
+  outline: 2px solid rgba(108, 140, 255, 0.3);
   outline-offset: 1px;
 }
 
@@ -653,87 +703,35 @@ img, svg {
   border-radius: 0 var(--radius) var(--radius) 0;
 }
 
-/* Plan layout (content + sidebar) */
+/* Plan layout */
 .plan-layout {
   position: relative;
-}
-
-.plan-layout__content {
-  max-width: 60%;
-  position: relative;
-}
-
-.plan-layout__sidebar {
-  position: absolute;
-  top: 0;
-  right: 0;
-  width: 22rem;
-}
-
-@media (max-width: 900px) {
-  .plan-layout__content {
-    max-width: 100%;
-  }
-
-  .plan-layout__sidebar {
-    position: static;
-    width: 100%;
-    margin-top: var(--space-lg);
-  }
-}
-.sidebar-heading {
-  font-size: var(--text-lg);
-  font-weight: 700;
-  margin-bottom: var(--space-md);
-}
-
-/* Comment tabs */
-.comment-tabs__nav {
   display: flex;
   gap: 0;
-  border-bottom: 2px solid var(--color-border);
-  margin-bottom: var(--space-md);
 }
 
-.comment-tab {
-  padding: var(--space-xs) var(--space-md);
-  font-size: var(--text-sm);
-  font-weight: 600;
-  color: var(--color-text-muted);
-  background: none;
-  border: none;
-  border-bottom: 2px solid transparent;
-  margin-bottom: -2px;
-  cursor: pointer;
-}
-
-.comment-tab:hover {
-  color: var(--color-text);
-}
-
-.comment-tab--active {
-  color: var(--color-primary);
-  border-bottom-color: var(--color-primary);
-}
-
-.comment-tab__count {
-  background: var(--color-border);
-  color: var(--color-text-muted);
-  font-size: 0.7rem;
-  padding: 1px 6px;
-  border-radius: 10px;
-  margin-left: 4px;
+.plan-layout__margin {
+  width: 40px;
+  flex-shrink: 0;
+  position: relative;
 }
 
-.comment-tab--active .comment-tab__count {
-  background: var(--color-primary);
-  color: white;
+.plan-layout__content {
+  position: relative;
+  flex: 1;
+  min-width: 0;
 }
 
 /* Comment form */
 .comment-form {
-  margin-bottom: var(--space-md);
+  position: absolute;
+  z-index: 100;
+  width: 360px;
   padding: var(--space-md);
+  background: var(--color-surface);
+  border: 1px solid var(--color-border);
+  border-radius: var(--radius);
+  box-shadow: var(--shadow-lg);
 }
 
 .comment-form .form-group {
@@ -757,13 +755,6 @@ img, svg {
   box-shadow: 0 0 0 3px rgba(37, 99, 235, 0.1);
 }
 
-/* Comment threads list */
-.comment-threads-list {
-  display: flex;
-  flex-direction: column;
-  gap: var(--space-md);
-}
-
 /* Comment thread */
 .comment-thread {
   padding: var(--space-md);
@@ -960,3 +951,195 @@ img, svg {
   color: var(--color-text-muted);
   margin-top: var(--space-xs);
 }
+
+/* Thread popover data containers (hidden, provide data for JS) */
+.thread-popover-data {
+  display: contents;
+}
+
+/* Thread popover (native HTML Popover API) */
+.thread-popover {
+  position: fixed;
+  margin: 0;
+  padding: var(--space-md);
+  background: var(--color-surface);
+  border: 1px solid var(--color-border);
+  border-radius: var(--radius);
+  box-shadow: var(--shadow-lg);
+  width: 380px;
+  max-height: 60vh;
+  overflow-y: auto;
+  z-index: 200;
+}
+
+.thread-popover::backdrop {
+  background: transparent;
+}
+
+.thread-popover__header {
+  display: flex;
+  gap: var(--space-xs);
+  align-items: center;
+  margin-bottom: var(--space-sm);
+}
+
+.thread-popover__quote {
+  border-left: 3px solid rgba(108, 140, 255, 0.6);
+  padding: var(--space-xs) var(--space-sm);
+  margin: 0 0 var(--space-sm) 0;
+  font-size: var(--text-sm);
+  color: var(--color-text-muted);
+  background: rgba(108, 140, 255, 0.05);
+  border-radius: 0 var(--radius) var(--radius) 0;
+}
+
+.thread-popover__comments {
+  display: flex;
+  flex-direction: column;
+  gap: var(--space-xs);
+}
+
+.thread-popover__reply {
+  margin-top: var(--space-sm);
+  padding-top: var(--space-sm);
+  border-top: 1px solid var(--color-border);
+}
+
+.thread-popover__reply textarea {
+  width: 100%;
+  padding: var(--space-sm);
+  font-family: var(--font-sans);
+  font-size: var(--text-sm);
+  border: 1px solid var(--color-border);
+  border-radius: var(--radius);
+  resize: vertical;
+  min-height: 3rem;
+}
+
+.thread-popover__reply textarea:focus {
+  outline: none;
+  border-color: var(--color-primary);
+  box-shadow: 0 0 0 3px rgba(37, 99, 235, 0.1);
+}
+
+.thread-popover__reply .form-group {
+  margin-bottom: var(--space-xs);
+}
+
+.thread-popover__actions {
+  display: flex;
+  gap: var(--space-xs);
+  margin-top: var(--space-sm);
+  padding-top: var(--space-sm);
+  border-top: 1px solid var(--color-border);
+}
+
+/* Margin dots */
+.margin-dot {
+  position: absolute;
+  width: 10px;
+  height: 10px;
+  border-radius: 50%;
+  border: 2px solid transparent;
+  background-clip: padding-box;
+  cursor: pointer;
+  left: 14px;
+  transition: transform 0.15s, box-shadow 0.15s, border-color 0.15s;
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  padding: 0;
+  outline: none;
+}
+
+.margin-dot::after {
+  content: "";
+  position: absolute;
+  inset: -8px;
+  border-radius: 50%;
+}
+
+.margin-dot:hover {
+  transform: scale(1.4);
+}
+
+.margin-dot:focus-visible {
+  outline: 2px solid var(--color-primary);
+  outline-offset: 2px;
+}
+
+.margin-dot--pending {
+  background: var(--color-status-considering);
+  border-color: rgba(245, 158, 11, 0.3);
+  box-shadow: 0 0 6px rgba(245, 158, 11, 0.25);
+}
+
+.margin-dot--todo {
+  background: var(--color-status-developing);
+  border-color: rgba(59, 130, 246, 0.3);
+  box-shadow: 0 0 6px rgba(59, 130, 246, 0.25);
+}
+
+.margin-dot--resolved {
+  background: var(--color-text-muted);
+  opacity: 0.4;
+  display: none;
+}
+
+.plan-layout--show-resolved .margin-dot--resolved {
+  display: flex;
+}
+
+/* Ensure content doesn't get hidden behind fixed toolbar */
+body:has(.comment-toolbar) .main-content {
+  padding-bottom: 3.5rem;
+}
+
+/* Comment toolbar (bottom-pinned) */
+.comment-toolbar {
+  position: fixed;
+  bottom: 0;
+  left: 0;
+  right: 0;
+  background: var(--color-surface);
+  border-top: 1px solid var(--color-border);
+  padding: var(--space-sm) var(--space-lg);
+  display: flex;
+  align-items: center;
+  gap: var(--space-lg);
+  z-index: 50;
+  justify-content: center;
+  box-shadow: 0 -2px 8px rgba(0, 0, 0, 0.05);
+}
+
+.comment-toolbar__count {
+  font-size: var(--text-sm);
+  font-weight: 600;
+  color: var(--color-text);
+}
+
+.comment-toolbar__nav {
+  display: flex;
+  align-items: center;
+  gap: var(--space-xs);
+}
+
+.comment-toolbar__position {
+  font-size: var(--text-sm);
+  color: var(--color-text-muted);
+  min-width: 4rem;
+  text-align: center;
+}
+
+.comment-toolbar__toggle {
+  font-size: var(--text-sm);
+  color: var(--color-text-muted);
+  cursor: pointer;
+  display: flex;
+  align-items: center;
+  gap: var(--space-xs);
+}
+
+.comment-toolbar__toggle input[type="checkbox"] {
+  cursor: pointer;
+}

data/app/controllers/coplan/api/v1/comments_controller.rb

@@ -56,7 +56,7 @@ module CoPlan
           render json: { thread_id: thread.id, status: thread.status }
         end
 
-        def dismiss
+        def discard
           thread = @plan.comment_threads.find_by(id: params[:id])
           unless thread
             render json: { error: "Comment thread not found" }, status: :not_found
@@ -64,12 +64,12 @@ module CoPlan
           end
 
           policy = CommentThreadPolicy.new(current_user, thread)
-          unless policy.dismiss?
+          unless policy.discard?
             render json: { error: "Not authorized" }, status: :forbidden
             return
           end
 
-          thread.dismiss!(current_user)
+          thread.discard!(current_user)
           broadcast_thread_update(thread)
 
           render json: { thread_id: thread.id, status: thread.status }
@@ -104,10 +104,10 @@ module CoPlan
         private
 
         def broadcast_new_thread(thread)
-          Broadcaster.prepend_to(
+          Broadcaster.append_to(
             @plan,
-            target: "comment-threads",
-            partial: "coplan/comment_threads/thread",
+            target: "plan-threads",
+            partial: "coplan/comment_threads/thread_popover",
             locals: { thread: thread, plan: @plan }
           )
         end
@@ -116,7 +116,7 @@ module CoPlan
           Broadcaster.replace_to(
             @plan,
             target: ActionView::RecordIdentifier.dom_id(thread),
-            partial: "coplan/comment_threads/thread",
+            partial: "coplan/comment_threads/thread_popover",
             locals: { thread: thread, plan: @plan }
           )
         end

data/app/controllers/coplan/api/v1/operations_controller.rb

@@ -281,6 +281,44 @@ module CoPlan
                 return
               end
             end
+          when "replace_section"
+            return unless op["heading"]
+            include_heading = op.fetch("include_heading", true)
+            include_heading = include_heading != false && include_heading != "false"
+
+            transformed_ranges.each do |tr|
+              if include_heading
+                # Verify the heading is the first line of the section range
+                first_line_end = content.index("\n", tr[0]) || tr[1]
+                first_line = content[tr[0]...[first_line_end, tr[1]].min]
+                unless first_line&.rstrip == op["heading"]&.rstrip
+                  render json: {
+                    error: "Conflict: section at target position has changed",
+                    current_revision: @plan.current_revision,
+                    expected_heading: op["heading"],
+                    found: content[tr[0]...tr[1]]&.slice(0, 200)
+                  }, status: :conflict
+                  return
+                end
+              else
+                # Body-only: verify the heading appears on the line before tr[0].
+                # Walk backwards past any blank lines to find the heading text.
+                search_pos = tr[0]
+                search_pos -= 1 while search_pos > 0 && content[search_pos - 1] == "\n"
+                heading_line_end = search_pos
+                heading_line_start = search_pos > 0 ? (content.rindex("\n", search_pos - 1) || -1) + 1 : 0
+                heading_text = content[heading_line_start...heading_line_end]
+                unless heading_text == op["heading"]
+                  render json: {
+                    error: "Conflict: section heading before target position has changed",
+                    current_revision: @plan.current_revision,
+                    expected_heading: op["heading"],
+                    found: heading_text
+                  }, status: :conflict
+                  return
+                end
+              end
+            end
           end
         end
 

data/app/controllers/coplan/comment_threads_controller.rb

@@ -3,11 +3,15 @@ module CoPlan
     include ActionView::RecordIdentifier
 
     before_action :set_plan
-    before_action :set_thread, only: [:resolve, :accept, :dismiss, :reopen]
+    before_action :set_thread, only: [:resolve, :accept, :discard, :reopen]
 
     def create
       authorize!(@plan, :show?)
 
+      # Author's own comments start as "todo" (self-assigned work item);
+      # non-author comments start as "pending" (awaiting author triage).
+      initial_status = current_user.id == @plan.created_by_user_id ? "todo" : "pending"
+
       thread = @plan.comment_threads.new(
         plan_version: @plan.current_plan_version,
         anchor_text: params[:comment_thread][:anchor_text].presence,
@@ -15,7 +19,8 @@ module CoPlan
         anchor_occurrence: params[:comment_thread][:anchor_occurrence].presence&.to_i,
         start_line: params[:comment_thread][:start_line].presence,
         end_line: params[:comment_thread][:end_line].presence,
-        created_by_user: current_user
+        created_by_user: current_user,
+        status: initial_status
       )
 
       thread.save!
@@ -26,8 +31,14 @@ module CoPlan
         body_markdown: params[:comment_thread][:body_markdown]
       )
 
-      broadcast_new_thread(thread)
-      broadcast_tab_counts
+      if thread.anchored?
+        Broadcaster.append_to(
+          @plan,
+          target: "plan-threads",
+          partial: "coplan/comment_threads/thread_popover",
+          locals: { thread: thread, plan: @plan }
+        )
+      end
 
       respond_with_stream_or_redirect("Comment added.")
     end
@@ -35,34 +46,28 @@ module CoPlan
     def resolve
       authorize!(@thread, :resolve?)
       @thread.resolve!(current_user)
-      broadcast_thread_move(@thread, from: "comment-threads", to: "resolved-comment-threads")
+      broadcast_thread_replace(@thread)
       respond_with_stream_or_redirect("Thread resolved.")
     end
 
     def accept
       authorize!(@thread, :accept?)
       @thread.accept!(current_user)
-      broadcast_thread_move(@thread, from: "comment-threads", to: "resolved-comment-threads")
+      broadcast_thread_replace(@thread)
       respond_with_stream_or_redirect("Thread accepted.")
     end
 
-    def dismiss
-      authorize!(@thread, :dismiss?)
-      @thread.dismiss!(current_user)
-      broadcast_thread_move(@thread, from: "comment-threads", to: "resolved-comment-threads")
-      respond_with_stream_or_redirect("Thread dismissed.")
+    def discard
+      authorize!(@thread, :discard?)
+      @thread.discard!(current_user)
+      broadcast_thread_replace(@thread)
+      respond_with_stream_or_redirect("Thread discarded.")
     end
 
     def reopen
       authorize!(@thread, :reopen?)
-      @thread.update!(status: "open", resolved_by_user: nil)
-      # Out-of-date threads stay in the archived list even when reopened,
-      # since the active scope excludes out_of_date rows.
-      if @thread.out_of_date?
-        broadcast_thread_replace(@thread)
-      else
-        broadcast_thread_move(@thread, from: "resolved-comment-threads", to: "comment-threads")
-      end
+      @thread.update!(status: "pending", resolved_by_user: nil)
+      broadcast_thread_replace(@thread)
       respond_with_stream_or_redirect("Thread reopened.")
     end
 
@@ -76,15 +81,6 @@ module CoPlan
       @thread = @plan.comment_threads.find(params[:id])
     end
 
-    def broadcast_new_thread(thread)
-      Broadcaster.prepend_to(
-        @plan,
-        target: "comment-threads",
-        partial: "coplan/comment_threads/thread",
-        locals: { thread: thread, plan: @plan }
-      )
-    end
-
     # Broadcasts update all clients (including the submitter) via WebSocket.
     # The empty turbo_stream response prevents Turbo from navigating (which causes scroll-to-top).
     def respond_with_stream_or_redirect(message)
@@ -94,56 +90,14 @@ module CoPlan
       end
     end
 
-    # Replaces a thread in place (status changed but stays in the same list).
+    # Replaces a thread in place (status changed).
     def broadcast_thread_replace(thread)
       Broadcaster.replace_to(
         @plan,
         target: dom_id(thread),
-        partial: "coplan/comment_threads/thread",
+        partial: "coplan/comment_threads/thread_popover",
         locals: { thread: thread, plan: @plan }
       )
-      broadcast_tab_counts
-    end
-
-    # Moves a thread between Open/Resolved lists and updates tab counts.
-    def broadcast_thread_move(thread, from:, to:)
-      Broadcaster.remove_to(@plan, target: dom_id(thread))
-      Broadcaster.append_to(
-        @plan,
-        target: to,
-        partial: "coplan/comment_threads/thread",
-        locals: { thread: thread, plan: @plan }
-      )
-      broadcast_tab_counts
-    end
-
-    def broadcast_tab_counts
-      threads = @plan.comment_threads
-      open_count = threads.active.count
-      resolved_count = threads.archived.count
-
-      Broadcaster.update_to(
-        @plan,
-        target: "open-thread-count",
-        html: open_count > 0 ? open_count.to_s : ""
-      )
-      Broadcaster.update_to(
-        @plan,
-        target: "resolved-thread-count",
-        html: resolved_count > 0 ? resolved_count.to_s : ""
-      )
-
-      # Toggle empty-state placeholders
-      Broadcaster.replace_to(
-        @plan,
-        target: "open-threads-empty",
-        html: %(<p class="text-sm text-muted" id="open-threads-empty" #{'style="display: none;"' if open_count > 0}>No open comments.</p>)
-      )
-      Broadcaster.replace_to(
-        @plan,
-        target: "resolved-threads-empty",
-        html: %(<p class="text-sm text-muted" id="resolved-threads-empty" #{'style="display: none;"' if resolved_count > 0}>No resolved comments.</p>)
-      )
     end
   end
 end

data/app/controllers/coplan/plans_controller.rb

@@ -10,9 +10,7 @@ module CoPlan
 
     def show
       authorize!(@plan, :show?)
-      threads = @plan.comment_threads.includes(:comments, :created_by_user, :plan_version).order(created_at: :asc)
-      @active_threads = threads.active
-      @archived_threads = threads.archived
+      @threads = @plan.comment_threads.includes(:comments, :created_by_user).order(:created_at)
     end
 
     def edit