coplan-engine 0.2.0 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3e4bc136761076f3c7f12bf4e025f5bfd0c89831c718f50cd88a4e650bb402e8
-  data.tar.gz: a7739fea373261118928c4c488043ca9d2547eac95d4ceeee91f004585e3b317
+  metadata.gz: fc0c571fae079ecc474da55dea08af61a198ca761f6f3c9b5c3b672afe3b838c
+  data.tar.gz: 791565182e62dab38561ae29eeb9794cf0f0087222449b4ef5842525b5e28424
 SHA512:
-  metadata.gz: 0d984b75c02ce889706c1cf1080f61106f5e355d0626d69c502b7f29ec28ef99300ad249d0c57cd1823f46d064f62e641a2c733b60a3df6cab266fc17fef453d
-  data.tar.gz: f70083d0f8ce612a2608e7863fe7606aecefa40e402c582596eccc68576f9cf60e546efd5f98d30c2a59a180d81a2c97e1b831ad9277ec21f54569df3ebf2325
+  metadata.gz: 973c44900f288a2ba876c9ee2df96e47e13668f271c3b5e1de187ddf4d935b4fef63de2dac2753cf1acc82628a4a4e3987c8e8e3ea8cd3e38a9ecd123e7b734e
+  data.tar.gz: e7866646881f7c217cb5b23e0adac89651e6fa47facfe9f4f33049a4e2a7362f8eb209f40dc161dbd43bdd689e643248c050be0044821efeae6abcb97c13aa08

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

@@ -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 {
@@ -619,6 +634,24 @@ img, svg {
   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;
@@ -1004,24 +1037,47 @@ img, svg {
 /* Margin dots */
 .margin-dot {
   position: absolute;
-  width: 12px;
-  height: 12px;
+  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;
+  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.3);
+  transform: scale(1.4);
 }
 
-.margin-dot--open {
-  background: var(--color-primary);
-  box-shadow: 0 0 6px rgba(37, 99, 235, 0.3);
+.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 {

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/helpers/coplan/application_helper.rb

@@ -1,4 +1,48 @@
 module CoPlan
   module ApplicationHelper
+    FAVICON_COLORS = {
+      "production"  => { start: "#3B82F6", stop: "#1E40AF" },
+      "staging"     => { start: "#F59E0B", stop: "#D97706" },
+      "development" => { start: "#10B981", stop: "#047857" },
+    }.freeze
+
+    def coplan_favicon_tag
+      colors = FAVICON_COLORS.fetch(Rails.env, FAVICON_COLORS["development"])
+      svg = <<~SVG
+        <svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 100 100">
+          <defs>
+            <linearGradient id="g" x1="0" y1="0" x2="1" y2="1">
+              <stop offset="0%" stop-color="#{colors[:start]}"/>
+              <stop offset="100%" stop-color="#{colors[:stop]}"/>
+            </linearGradient>
+          </defs>
+          <rect width="100" height="100" rx="22" fill="url(#g)"/>
+          <g opacity=".25" fill="none" stroke="#fff" stroke-width="2" stroke-linecap="round">
+            <line x1="16" y1="18" x2="84" y2="18"/>
+            <line x1="16" y1="28" x2="84" y2="28"/>
+            <line x1="16" y1="38" x2="84" y2="38"/>
+            <line x1="16" y1="48" x2="84" y2="48"/>
+            <line x1="16" y1="58" x2="84" y2="58"/>
+            <line x1="16" y1="68" x2="84" y2="68"/>
+            <line x1="16" y1="78" x2="84" y2="78"/>
+          </g>
+          <circle cx="40" cy="46" r="22" fill="#fff" opacity=".55"/>
+          <path d="M26,62 L18,78 L36,66 Z" fill="#fff" opacity=".55"/>
+          <circle cx="62" cy="54" r="22" fill="#fff" opacity=".55"/>
+          <path d="M76,70 L84,84 L68,72 Z" fill="#fff" opacity=".55"/>
+        </svg>
+      SVG
+
+      data_uri = "data:image/svg+xml,#{ERB::Util.url_encode(svg.strip)}"
+      tag.link(rel: "icon", type: "image/svg+xml", href: data_uri)
+    end
+
+    def coplan_environment_badge
+      return if Rails.env.production?
+
+      label = Rails.env.capitalize
+      colors = FAVICON_COLORS.fetch(Rails.env, FAVICON_COLORS["development"])
+      tag.span(label, class: "env-badge", style: "background: #{colors[:start]};")
+    end
   end
 end

data/app/helpers/coplan/markdown_helper.rb

@@ -11,6 +11,7 @@ module CoPlan
       blockquote hr br
       dd dt dl
       sup sub
+      details summary
     ].freeze
 
     ALLOWED_ATTRIBUTES = %w[id class href src alt title].freeze

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

@@ -6,13 +6,18 @@ export default class extends Controller {
 
   connect() {
     this.currentIndex = -1
+    this.activeMark = null
+    this.activePopover = null
     this.updatePosition()
     this.handleKeydown = this.handleKeydown.bind(this)
+    this.handleScroll = this.handleScroll.bind(this)
     document.addEventListener("keydown", this.handleKeydown)
+    window.addEventListener("scroll", this.handleScroll, { passive: true })
   }
 
   disconnect() {
     document.removeEventListener("keydown", this.handleKeydown)
+    window.removeEventListener("scroll", this.handleScroll)
   }
 
   handleKeydown(event) {
@@ -36,6 +41,14 @@ export default class extends Controller {
         event.preventDefault()
         this.focusReply()
         break
+      case "a":
+        event.preventDefault()
+        this.acceptCurrent()
+        break
+      case "d":
+        event.preventDefault()
+        this.discardCurrent()
+        break
     }
   }
 
@@ -69,42 +82,142 @@ export default class extends Controller {
       el.classList.remove("anchor-highlight--active")
     })
 
+    // Close any currently open popover first — showPopover() throws
+    // InvalidStateError if the same popover is already open, and
+    // auto-dismiss only works when showing a *different* popover.
+    const openPopover = this.findOpenPopover()
+    if (openPopover) {
+      try { openPopover.hidePopover() } catch {}
+    }
+
     // Add active class and scroll into view
     mark.classList.add("anchor-highlight--active")
-    mark.scrollIntoView({ behavior: "smooth", block: "center" })
+    mark.scrollIntoView({ behavior: "instant", block: "center" })
 
     // Open the thread popover if there's one
     const threadId = mark.dataset.threadId
     if (threadId) {
       const popover = document.getElementById(`${threadId}_popover`)
       if (popover) {
-        const markRect = mark.getBoundingClientRect()
+        popover.style.visibility = "hidden"
         popover.showPopover()
-        popover.style.top = `${markRect.top}px`
-        popover.style.left = `${markRect.right + 12}px`
+        this.positionPopoverAtMark(popover, mark)
+        popover.style.visibility = "visible"
+        this.activeMark = mark
+        this.activePopover = popover
       }
     }
 
     this.updatePosition()
   }
 
-  focusReply() {
-    let openPopover
+  handleScroll() {
+    if (!this.activeMark || !this.activePopover) return
     try {
-      openPopover = document.querySelector(".thread-popover:popover-open")
-    } catch {
-      // :popover-open not supported — find the visible popover manually
-      openPopover = Array.from(document.querySelectorAll(".thread-popover[popover]"))
-        .find(el => el.checkVisibility?.())
+      if (!this.activePopover.matches(":popover-open")) {
+        this.activeMark = null
+        this.activePopover = null
+        return
+      }
+    } catch { return }
+    this.positionPopoverAtMark(this.activePopover, this.activeMark)
+  }
+
+  positionPopoverAtMark(popover, mark) {
+    const markRect = mark.getBoundingClientRect()
+    const popoverRect = popover.getBoundingClientRect()
+    const viewportWidth = window.innerWidth
+    const viewportHeight = window.innerHeight
+
+    let top = markRect.top
+    let left = markRect.right + 12
+
+    if (left + popoverRect.width > viewportWidth - 16) {
+      left = markRect.left - popoverRect.width - 12
+    }
+    if (top + popoverRect.height > viewportHeight - 16) {
+      top = viewportHeight - popoverRect.height - 16
     }
-    if (!openPopover) return
+    if (top < 16) top = 16
+    if (left < 16) left = 16
 
-    const textarea = openPopover.querySelector(".thread-popover__reply textarea")
+    popover.style.top = `${top}px`
+    popover.style.left = `${left}px`
+  }
+
+  focusReply() {
+    const popover = this.findOpenPopover()
+    if (!popover) return
+
+    const textarea = popover.querySelector(".thread-popover__reply textarea")
     if (textarea) {
       textarea.focus({ preventScroll: true })
     }
   }
 
+  acceptCurrent() {
+    this.submitPopoverAction("accept")
+  }
+
+  discardCurrent() {
+    this.submitPopoverAction("discard")
+  }
+
+  submitPopoverAction(action) {
+    const popover = this.findOpenPopover()
+    if (!popover) return
+
+    const form = popover.querySelector(`form[data-action-name='${action}']`)
+    if (!form) return
+
+    // Normalize currentIndex if popover was opened via mouse (not j/k)
+    if (this.currentIndex < 0) {
+      this.currentIndex = 0
+    }
+
+    // For accept (pending→todo), the thread stays open so we need to
+    // explicitly advance. For discard, the thread leaves openHighlights
+    // and the current index naturally points to the next one.
+    const shouldAdvance = action === "accept"
+
+    // Watch for the broadcast DOM update that replaces the thread data,
+    // then advance to the next thread once the highlights have changed.
+    const threadsContainer = document.getElementById("plan-threads")
+    if (threadsContainer) {
+      const observer = new MutationObserver(() => {
+        observer.disconnect()
+        this.advanceAfterAction(shouldAdvance)
+      })
+      observer.observe(threadsContainer, { childList: true, subtree: true })
+    }
+
+    form.requestSubmit()
+  }
+
+  advanceAfterAction(shouldAdvance) {
+    const highlights = this.openHighlights
+    if (highlights.length === 0) {
+      this.currentIndex = -1
+      this.updatePosition()
+      return
+    }
+    if (shouldAdvance) {
+      this.currentIndex = (this.currentIndex + 1) % highlights.length
+    } else if (this.currentIndex >= highlights.length) {
+      this.currentIndex = 0
+    }
+    this.navigateTo(highlights[this.currentIndex])
+  }
+
+  findOpenPopover() {
+    try {
+      return document.querySelector(".thread-popover:popover-open")
+    } catch {
+      return Array.from(document.querySelectorAll(".thread-popover[popover]"))
+        .find(el => el.checkVisibility?.())
+    }
+  }
+
   toggleResolved() {
     const planLayout = document.querySelector(".plan-layout")
     if (!planLayout) return

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

@@ -6,8 +6,12 @@ export default class extends Controller {
 
   connect() {
     this.selectedText = null
+    this._activeMark = null
+    this._activePopover = null
     this.contentTarget.addEventListener("mouseup", this.handleMouseUp.bind(this))
     document.addEventListener("mousedown", this.handleDocumentMouseDown.bind(this))
+    this._handleScroll = this._handleScroll.bind(this)
+    window.addEventListener("scroll", this._handleScroll, { passive: true })
     this.highlightAnchors()
 
     // Watch for broadcast-appended threads and re-highlight
@@ -20,6 +24,7 @@ export default class extends Controller {
   disconnect() {
     this.contentTarget.removeEventListener("mouseup", this.handleMouseUp.bind(this))
     document.removeEventListener("mousedown", this.handleDocumentMouseDown.bind(this))
+    window.removeEventListener("scroll", this._handleScroll)
     if (this._threadsObserver) {
       this._threadsObserver.disconnect()
       this._threadsObserver = null
@@ -40,17 +45,33 @@ export default class extends Controller {
 
   checkSelection(event) {
     const selection = window.getSelection()
-    const text = selection.toString().trim()
 
-    if (text.length < 3) {
-      this.popoverTarget.style.display = "none"
+    if (!selection.rangeCount) return
+    const range = selection.getRangeAt(0)
+
+    // Make sure at least part of the selection is within the content area.
+    // Whole-line selections (e.g. triple-click) can set commonAncestorContainer
+    // to a parent element above contentTarget, so we check start/end individually.
+    const startInContent = this.contentTarget.contains(range.startContainer)
+    const endInContent = this.contentTarget.contains(range.endContainer)
+    if (!startInContent) {
       return
     }
 
-    // Make sure selection is within the content area
-    if (!selection.rangeCount) return
-    const range = selection.getRangeAt(0)
-    if (!this.contentTarget.contains(range.commonAncestorContainer)) {
+    // Clamp the range to the last rendered markdown element, not the
+    // content wrapper's lastChild (which is a hidden popover/form control).
+    if (startInContent && !endInContent) {
+      const clampTarget = this.hasPopoverTarget
+        ? this.popoverTarget.previousElementSibling || this.popoverTarget.previousSibling
+        : this.contentTarget.lastChild
+      if (clampTarget) range.setEndAfter(clampTarget)
+    }
+
+    // Extract text after clamping so it only contains content-area text
+    const text = selection.toString().trim()
+
+    if (text.length < 3) {
+      this.popoverTarget.style.display = "none"
       return
     }
 
@@ -111,7 +132,10 @@ export default class extends Controller {
     if (event.detail.success) {
       const form = event.target
       const textarea = form.querySelector("textarea")
-      if (textarea) textarea.value = ""
+      if (textarea) {
+        textarea.value = ""
+        textarea.blur()
+      }
     }
   }
 
@@ -155,40 +179,49 @@ export default class extends Controller {
     const popover = document.getElementById(`${threadId}_popover`)
     if (!popover) return
 
-    // Position the popover near the clicked element
     const trigger = event.currentTarget
-    const triggerRect = trigger.getBoundingClientRect()
 
-    // Hide visually while positioning to prevent flash
     popover.style.visibility = "hidden"
     popover.showPopover()
+    this._positionPopoverAtMark(popover, trigger)
+    popover.style.visibility = "visible"
+
+    this._activeMark = trigger
+    this._activePopover = popover
+  }
 
-    // Position after showing (popover needs to be in top layer first)
+  _handleScroll() {
+    if (!this._activeMark || !this._activePopover) return
+    try {
+      if (!this._activePopover.matches(":popover-open")) {
+        this._activeMark = null
+        this._activePopover = null
+        return
+      }
+    } catch { return }
+    this._positionPopoverAtMark(this._activePopover, this._activeMark)
+  }
+
+  _positionPopoverAtMark(popover, mark) {
+    const markRect = mark.getBoundingClientRect()
     const popoverRect = popover.getBoundingClientRect()
     const viewportWidth = window.innerWidth
     const viewportHeight = window.innerHeight
 
-    // Default: right of the content area, aligned with the trigger
-    let top = triggerRect.top
-    let left = triggerRect.right + 12
+    let top = markRect.top
+    let left = markRect.right + 12
 
-    // If it would overflow right, position to the left
     if (left + popoverRect.width > viewportWidth - 16) {
-      left = triggerRect.left - popoverRect.width - 12
+      left = markRect.left - popoverRect.width - 12
     }
-
-    // If it would overflow bottom, shift up
     if (top + popoverRect.height > viewportHeight - 16) {
       top = viewportHeight - popoverRect.height - 16
     }
-
-    // Ensure it doesn't go outside viewport
     if (top < 16) top = 16
     if (left < 16) left = 16
 
     popover.style.top = `${top}px`
     popover.style.left = `${left}px`
-    popover.style.visibility = "visible"
   }
 
   extractContext(range, selectedText) {
@@ -276,7 +309,9 @@ export default class extends Controller {
       if (anchor && anchor.length > 0) {
         const isOpen = status === "pending" || status === "todo"
         const statusClass = isOpen ? "anchor-highlight--open" : "anchor-highlight--resolved"
-        const mark = this.findAndHighlight(anchor, occurrence, `anchor-highlight ${statusClass}`)
+        const specificClass = isOpen ? `anchor-highlight--${status}` : ""
+        const classes = `anchor-highlight ${statusClass} ${specificClass}`.trim()
+        const mark = this.findAndHighlight(anchor, occurrence, classes)
 
         if (mark && threadId) {
           // Make highlight clickable to open popover
@@ -300,11 +335,12 @@ export default class extends Controller {
 
     const dot = document.createElement("button")
     const isOpen = status === "pending" || status === "todo"
-    dot.className = `margin-dot margin-dot--${isOpen ? "open" : "resolved"}`
+    const openClass = isOpen ? `margin-dot--open margin-dot--${status}` : "margin-dot--resolved"
+    dot.className = `margin-dot ${openClass}`
     dot.style.top = `${markRect.top - marginRect.top}px`
     dot.dataset.threadId = threadId
     dot.addEventListener("click", (e) => this.openThreadPopover(e))
-    dot.title = `${status} comment`
+    dot.setAttribute("aria-label", `${status} comment`)
 
     this.marginTarget.appendChild(dot)
   }

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

@@ -21,6 +21,8 @@ module CoPlan
             apply_insert_under_heading(op, index)
           when "delete_paragraph_containing"
             apply_delete_paragraph_containing(op, index)
+          when "replace_section"
+            apply_replace_section(op, index)
           else
             raise OperationError, "Operation #{index}: unknown op '#{op["op"]}'"
           end
@@ -103,6 +105,47 @@ module CoPlan
         applied_data
       end
 
+      def apply_replace_section(op, index)
+        heading = op["heading"]
+        new_content = op["new_content"]
+
+        raise OperationError, "Operation #{index}: replace_section requires 'heading'" if heading.blank?
+        raise OperationError, "Operation #{index}: replace_section requires 'new_content'" if new_content.nil?
+
+        range = if op.key?("_pre_resolved_ranges")
+          op["_pre_resolved_ranges"][0]
+        else
+          Plans::PositionResolver.call(content: @content, operation: op).ranges[0]
+        end
+
+        # For body-only replacements (include_heading: false), ensure
+        # newlines separate the heading from new content and new content
+        # from the next section.
+        include_heading = op.fetch("include_heading", true)
+        include_heading = include_heading != false && include_heading != "false"
+        effective_content = new_content
+        if !include_heading && range[0] == range[1]
+          # Prepend newline if heading line doesn't end with one
+          if range[0] > 0 && @content[range[0] - 1] != "\n"
+            effective_content = "\n#{effective_content}"
+          end
+          # Append newline if next content starts without one
+          after = @content[range[1]]
+          if after && after != "\n" && !effective_content.end_with?("\n")
+            effective_content = "#{effective_content}\n"
+          end
+        end
+
+        @content = @content[0...range[0]] + effective_content + @content[range[1]..]
+
+        delta = effective_content.length - (range[1] - range[0])
+        applied_data = op.except("_pre_resolved_ranges")
+        applied_data["resolved_range"] = range
+        applied_data["new_range"] = [range[0], range[0] + effective_content.length]
+        applied_data["delta"] = delta
+        applied_data
+      end
+
       def apply_delete_paragraph_containing(op, index)
         needle = op["needle"]
 

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

@@ -65,7 +65,7 @@ module CoPlan
             rebased_ops = []
             @session.operations_json.each do |op_data|
               op_data = op_data.transform_keys(&:to_s)
-              semantic_keys = %w[op old_text new_text heading content needle occurrence replace_all count]
+              semantic_keys = %w[op old_text new_text heading content needle occurrence replace_all count new_content include_heading]
               semantic_op = op_data.slice(*semantic_keys)
 
               if op_data["resolved_range"]
@@ -179,6 +179,31 @@ module CoPlan
 
           raise SessionConflictError,
             "Paragraph at target position no longer contains '#{op_data["needle"]}'"
+        when "replace_section"
+          return unless op_data["heading"]
+          include_heading = op_data.fetch("include_heading", true)
+          include_heading = include_heading != false && include_heading != "false"
+
+          if include_heading
+            first_line_end = content.index("\n", range[0]) || range[1]
+            first_line = content[range[0]...[first_line_end, range[1]].min]
+            return if first_line&.rstrip == op_data["heading"]&.rstrip
+
+            raise SessionConflictError,
+              "Section heading changed at target position. Expected '#{op_data["heading"]}' " \
+              "but found '#{first_line}'"
+          else
+            search_pos = range[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]
+            return if heading_text == op_data["heading"]
+
+            raise SessionConflictError,
+              "Section heading before target position changed. Expected '#{op_data["heading"]}' " \
+              "but found '#{heading_text}'"
+          end
         end
       end
     end

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/_reply_form.html.erb

@@ -1,7 +1,7 @@
 <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 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>

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

@@ -7,7 +7,7 @@
 
   <div popover="auto" id="<%= dom_id(thread) %>_popover" class="thread-popover">
     <div class="thread-popover__header">
-      <span class="badge badge--<%= thread.open? ? 'live' : 'abandoned' %>"><%= thread.status %></span>
+      <span class="badge badge--<%= thread.status %>"><%= thread.status %></span>
       <% if thread.out_of_date? %>
         <span class="badge badge--abandoned">out of date</span>
       <% end %>
@@ -32,7 +32,7 @@
       <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="Reply..." required
+            <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>
@@ -42,9 +42,9 @@
       <div class="thread-popover__actions">
         <% if is_plan_author %>
           <% if thread.status == "pending" %>
-            <%= button_to "Accept", accept_plan_comment_thread_path(plan, thread), method: :patch, class: "btn btn--secondary btn--sm" %>
+            <%= 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", discard_plan_comment_thread_path(plan, thread), method: :patch, class: "btn btn--secondary btn--sm" %>
+          <%= 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 %>

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

@@ -5,6 +5,7 @@
     <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>
@@ -18,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/lib/coplan/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: coplan-engine
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.4.0
 platform: ruby
 authors:
 - Block