cardinal-ai 0.2.8 → 0.2.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 644f883c694c74ad5189ef319f46beaf3e679a7aa47ae43be9bb316560ba46cf
-  data.tar.gz: a54a728cece60d820acbaef2ad4abdcb8080d4fd888f122700f1266f85b9713f
+  metadata.gz: 8ad9a65f2b86ce70952431f7f4c7689ddf6791213f7667d4bf87c2230381bce6
+  data.tar.gz: adc0e789a102a8382516b9b1eecd06fc911476187ce92ed4030e7e020c7c8ccb
 SHA512:
-  metadata.gz: c4d36b5b5fc1936cdea3946cc53977708d15c2035fd1e6e54cf9f5d06679d8c1e40fa056e8e955ffa3f9447bc7c8213c990ebcb581ecf862d44fc57b8b0d01d8
-  data.tar.gz: 840bb89331ac1d362b81a6194d5887f1729702274e217fd921af5493bffd05f32a0047607b2a4ca0b72046ba4263cb85e93e2f770c3adb499fc703c298ef93b7
+  metadata.gz: 73e01d661c1341d873927ce0504de1f7f7e946f6fa7611bd96d4bdcb39e391fc55cb4f012fc66c67f7cf60e271a56bd11c7ca58a170cb9ff2bb0baebb708be5a
+  data.tar.gz: 1dee5696b49d701fa0f9ef4ee4f9d4b1e4a69c1b3a5d77b3d4f8cfe5379133024fcc853e9b91f89f0078183d0055e2b7b58c78669108b37f89e8614916ec7050

data/app/assets/stylesheets/cardinal.css

@@ -87,6 +87,27 @@ a { color: var(--blue); text-decoration: none; }
   font-size: 13px;
 }
 
+/* Board search & filter (card #51): global box center-top, per-column 🔍. */
+.topbar-center { flex: 1; display: flex; justify-content: center; padding: 0 14px; }
+.global-search {
+  width: min(340px, 38vw); background: var(--surface-2); border: 1px solid var(--border);
+  border-radius: 6px; color: var(--text); padding: 5px 10px;
+}
+.global-search::placeholder, .col-search::placeholder { color: var(--text-dim); }
+.col-tools { display: flex; align-items: center; gap: 6px; }
+.col-search-toggle {
+  background: none; border: 0; padding: 0 2px; cursor: pointer;
+  font-size: 12px; opacity: .55; line-height: 1;
+}
+.col-search-toggle:hover { opacity: 1; }
+.col-search {
+  display: none; margin: 0 0 8px; width: 100%;
+  background: var(--surface-2); border: 1px solid var(--border); border-radius: 6px;
+  color: var(--text); padding: 4px 8px; font-size: 12px;
+}
+.col-search.open { display: block; }
+.filter-hidden { display: none !important; }
+
 .pull-form { display: inline; }
 #repo-pull-status { font-size: 0.85rem; }
 #repo-pull-status .pull-ok  { color: var(--green); }

data/app/controllers/cards_controller.rb

@@ -56,6 +56,7 @@ class CardsController < ApplicationController
     attrs.delete(:pr_url) if @card.pr_url.present?
     @card.update!(attrs)
     log_changelog!
+    log_config_change!
 
     respond_to do |format|
       # Explicitly patch the board face in this tab too — Turbo suppresses a
@@ -146,8 +147,12 @@ class CardsController < ApplicationController
   end
 
   def card_params
-    attrs = params.require(:card).permit(:title, :description, :tags, :branch_name, :pr_url, :summary, :compact)
+    attrs = params.require(:card).permit(:title, :description, :tags, :branch_name, :pr_url, :summary, :compact, :model, :effort)
     attrs[:tags] = attrs[:tags].to_s.split(",").map(&:strip).reject(&:blank?) if attrs.key?(:tags)
+    # Blank model/effort from the "Use column default" option mean "no override" —
+    # store nil so effective_* falls back to the column (card #33).
+    attrs[:model] = attrs[:model].presence if attrs.key?(:model)
+    attrs[:effort] = attrs[:effort].presence if attrs.key?(:effort)
     attrs.to_h.symbolize_keys
   end
 
@@ -166,4 +171,16 @@ class CardsController < ApplicationController
                  text: "Details edited: #{changed.join(", ")}")
     end
   end
+
+  # A model/effort override is not a routine detail edit — it changes what the
+  # card will spend on. Log each change explicitly with its old→new value (the
+  # "config_change" kind, card #33) instead of coalescing it into the changelog
+  # above, so the timeline records exactly what the money will run on and when.
+  def log_config_change!
+    (@card.previous_changes.keys & %w[model effort]).each do |field|
+      old, new = @card.previous_changes[field].map { |v| v.presence || "column default" }
+      @card.log!("config_change", actor: "user", field: field, old: old, new: new,
+                 text: "#{field.capitalize} changed: #{old} → #{new}")
+    end
+  end
 end

data/app/helpers/application_helper.rb

@@ -13,6 +13,16 @@ module ApplicationHelper
     options
   end
 
+  # Model options for a card's per-card override (card #33). Same list as the
+  # column gear, but the blank option reads "Use column default (<model>)" so the
+  # fallback names the concrete model the card runs on when left unset.
+  def card_model_options(card)
+    options = model_options(card.model)
+    default = card.column.model_short.presence
+    options[0] = ["Use column default#{" (#{default})" if default}", ""]
+    options
+  end
+
   # Timeline text is Markdown (agents write it constantly). escape_html turns
   # any raw HTML in the text into visible text instead of live DOM — an agent
   # pasting `<div class=...>` inside a code fence must never restyle the page.

data/app/javascript/controllers/filter_controller.js

@@ -0,0 +1,103 @@
+import { Controller } from "@hotwired/stimulus"
+
+// Board search & filter (card #51): one global query (topbar center) plus
+// optional per-column queries (🔍 in each column header). A card must match
+// both the global query and its own column's query; non-matches hide.
+//
+// Filter state lives HERE, not in the DOM — Turbo morphs and column stream
+// replaces rebuild board markup at will, so a MutationObserver restores input
+// values and re-applies hiding after every re-render.
+export default class extends Controller {
+  static targets = ["global"]
+
+  connect() {
+    this.state = { global: "", cols: {} }
+    this.slash = (e) => {
+      if (e.key === "/" && !e.target.closest("input, textarea, [contenteditable]")) {
+        e.preventDefault()
+        this.globalTarget.focus()
+      }
+    }
+    document.addEventListener("keydown", this.slash)
+    // childList only: our own class/value writes are attribute mutations and
+    // must not re-trigger (no observe loop).
+    this.observer = new MutationObserver(() => this.schedule())
+    this.observer.observe(this.element, { childList: true, subtree: true })
+  }
+
+  disconnect() {
+    document.removeEventListener("keydown", this.slash)
+    this.observer?.disconnect()
+    clearTimeout(this.timer)
+  }
+
+  schedule() {
+    clearTimeout(this.timer)
+    this.timer = setTimeout(() => this.restore(), 60)
+  }
+
+  global(event) {
+    this.state.global = event.target.value
+    this.apply()
+  }
+
+  column(event) {
+    this.state.cols[event.target.dataset.colId] = event.target.value
+    this.apply()
+  }
+
+  toggle(event) {
+    const col = event.currentTarget.closest(".column")
+    const input = col.querySelector(".col-search")
+    if (input.classList.toggle("open")) {
+      input.focus()
+    } else {
+      input.value = ""
+      this.state.cols[col.dataset.colId] = ""
+      this.apply()
+    }
+  }
+
+  // Esc inside a search box clears just that box.
+  clear(event) {
+    if (event.key !== "Escape") return
+    event.target.value = ""
+    if (this.hasGlobalTarget && event.target === this.globalTarget) {
+      this.state.global = ""
+    } else {
+      this.state.cols[event.target.dataset.colId] = ""
+    }
+    event.target.blur()
+    this.apply()
+  }
+
+  // After a morph or column replace rebuilt markup: put state back into any
+  // re-rendered inputs (never fighting one the user is typing in), re-open
+  // column boxes that hold a query, then re-hide.
+  restore() {
+    if (this.hasGlobalTarget && document.activeElement !== this.globalTarget) {
+      this.globalTarget.value = this.state.global
+    }
+    this.element.querySelectorAll(".col-search").forEach(input => {
+      const q = this.state.cols[input.dataset.colId] || ""
+      if (document.activeElement !== input) input.value = q
+      if (q !== "") input.classList.add("open")
+    })
+    this.apply()
+  }
+
+  apply() {
+    const g = this.norm(this.state.global)
+    this.element.querySelectorAll(".card[data-search]").forEach(card => {
+      const colId = card.closest(".column")?.dataset.colId
+      const c = this.norm(this.state.cols[colId])
+      const hay = card.dataset.search
+      const hit = (!g || hay.includes(g)) && (!c || hay.includes(c))
+      card.classList.toggle("filter-hidden", !hit)
+    })
+  }
+
+  norm(value) {
+    return (value || "").trim().toLowerCase()
+  }
+}

data/app/jobs/assistant_reply_job.rb

@@ -45,7 +45,9 @@ class AssistantReplyJob < ApplicationJob
   # assistant's last reply, not just the latest message.
   def converse(card, kickoff:)
     repo = card.board.local_path.presence
-    common = { model: card.column.model.presence || FALLBACK_MODEL,
+    # Effective model honors a per-card override (card #33) — the same
+    # effective_model the worker uses, so one card resolves one model everywhere.
+    common = { model: card.effective_model.presence || FALLBACK_MODEL,
                tools: repo ? "Read,Glob,Grep" : nil,
                cwd: repo, max_turns: MAX_TURNS, with_session: true }
 

data/app/jobs/merge_pr_job.rb

@@ -7,11 +7,17 @@ class MergePrJob < ApplicationJob
     card = Card.find(card_id)
     return if card.pr_url.blank? || card.pr_state == "merged"
     return unless checks_green?(card)
+    return unless mergeable?(card)
 
     # Best-effort undraft — a QA column may already have done it, and gh
     # errors on an already-ready PR; the merge step is the real gate.
     Open3.capture2e("gh", "pr", "ready", card.pr_url)
-    run_step(card, ["gh", "pr", "merge", card.pr_url, "--squash", "--delete-branch"]) or return
+    unless run_step(card, ["gh", "pr", "merge", card.pr_url, "--squash", "--delete-branch"])
+      # The floor (card #55): a card whose merge failed must never sit in
+      # Done claiming done — block it so the attention dropdown surfaces it.
+      card.update!(status: "blocked")
+      return
+    end
 
     card.update!(pr_state: "merged")
     card.log!("status_change", text: "PR squash-merged and branch deleted — shipped 🎉")
@@ -40,6 +46,25 @@ class MergePrJob < ApplicationJob
     false
   end
 
+  # A sibling card's merge can conflict this one after its CI ran (card #55) —
+  # mergeability is a separate axis from checks. Ask before attempting so the
+  # conflict parks with a clean reason instead of a raw gh error. UNKNOWN
+  # (GitHub still computing) and gh hiccups fall through to the merge attempt,
+  # which remains the authority.
+  def mergeable?(card)
+    out, status = Open3.capture2e("gh", "pr", "view", card.pr_url, "--json", "mergeable")
+    return true unless status.success?
+    return true unless JSON.parse(out)["mergeable"] == "CONFLICTING"
+
+    card.log!("error", text: "Merge conflict with #{card.board.default_branch} — not merged. " \
+                             "Another card's merge likely landed first. Drag this card back to " \
+                             "In Progress for a conflict-resolution run, then bring it back here.")
+    card.update!(status: "blocked")
+    false
+  rescue JSON::ParserError
+    true
+  end
+
   def run_step(card, cmd)
     out, status = Open3.capture2e(*cmd)
     return true if status.success?

data/app/jobs/start_run_job.rb

@@ -21,7 +21,9 @@ class StartRunJob < ApplicationJob
       return
     end
 
-    session = card.agent_sessions.create!(status: "provisioning", model: column.model)
+    # Record the model the session actually runs on — the card's effective
+    # (possibly overridden) model, not the raw column default (card #33).
+    session = card.agent_sessions.create!(status: "provisioning", model: card.effective_model)
     run = session.runs.create!(status: "queued", briefing: { "card" => card.title, "column" => column.name })
     Agent::Runner.start(run)
   end

data/app/models/card.rb

@@ -1,4 +1,6 @@
 class Card < ApplicationRecord
+  include ModelLabeling
+
   STATUSES = %w[
     draft discussing queued working needs_input blocked failed
     work_complete in_review changes_requested approved done archived
@@ -76,6 +78,27 @@ class Card < ApplicationRecord
     events.where(kind: "progress").last&.payload&.[]("text")
   end
 
+  # Per-card model/effort override (card #33). Nil fields mean "use the column
+  # default", so existing cards are unaffected. Read fresh at every segment
+  # spawn (start, restart, resume) by the runner and the planning assistant, so
+  # a change takes effect on the next segment — never on an already-running one.
+  def effective_model  = model.presence || column.model
+  def effective_effort = effort.presence || column.effort
+
+  # Does this card override either half of the column's "how much brain" pair?
+  # Drives the de-magic marker on the card face: the board must never hide that
+  # a card will spend on a model other than its column's default.
+  def config_overridden? = model.present? || effort.present?
+
+  # "Opus - High*" — the effective model label for card faces and footers, with
+  # a trailing * when overridden so the override is visible without opening the
+  # card. Nil when no model resolves (AI off / unset), matching Column#model_label.
+  def effective_model_label
+    label = model_label_of(effective_model, effective_effort)
+    return if label.blank?
+    config_overridden? ? "#{label}*" : label
+  end
+
   # Running tally across every run on the card — the closed-card cost footer
   # (card #20). Sums stopped/restarted segments so the total reflects real spend.
   def total_cost = runs.sum(:cost)

data/app/models/column.rb

@@ -1,4 +1,6 @@
 class Column < ApplicationRecord
+  include ModelLabeling
+
   ARCHETYPES = %w[inbox planning execution review terminal].freeze
 
   belongs_to :board
@@ -105,17 +107,11 @@ class Column < ApplicationRecord
   end
 
   # "claude-sonnet-4-6" → "sonnet", for compact chips on card faces.
-  def model_short
-    model.to_s[/claude-([a-z]+)/, 1] || model
-  end
+  def model_short = model_short_of(model)
 
   # "Opus - High" — human label for cost footers (card #20). Effort is optional,
   # so a model with no configured effort renders just "Opus".
-  def model_label
-    return if model.blank?
-    label = model_short.to_s.capitalize
-    effort.present? ? "#{label} - #{effort.to_s.capitalize}" : label
-  end
+  def model_label = model_label_of(model, effort)
 
   validates :name, presence: true
   validates :position, presence: true

data/app/models/concerns/model_labeling.rb

@@ -0,0 +1,20 @@
+# Shared model-name formatting for the two places a model+effort pair is
+# resolved and shown: a Column's own policy and a Card's effective (possibly
+# overridden) config. Kept in one place so a card face and its column can never
+# disagree about how a model reads — the board must not misreport what spends.
+module ModelLabeling
+  extend ActiveSupport::Concern
+
+  # "claude-sonnet-4-6" → "sonnet"; passes through a non-claude name unchanged.
+  def model_short_of(model_name)
+    model_name.to_s[/claude-([a-z]+)/, 1] || model_name.presence
+  end
+
+  # "Opus - High" — human label from a model + optional effort. Effort is
+  # optional, so a model with no effort renders just "Opus". Blank model → nil.
+  def model_label_of(model_name, effort_name)
+    return if model_name.blank?
+    label = model_short_of(model_name).to_s.capitalize
+    effort_name.present? ? "#{label} - #{effort_name.to_s.capitalize}" : label
+  end
+end

data/app/models/event.rb

@@ -1,7 +1,7 @@
 class Event < ApplicationRecord
   KINDS = %w[
     user_message agent_message assistant_message
-    status_change column_move move_rejected plan_proposed plan_approved
+    status_change config_change column_move move_rejected plan_proposed plan_approved
     question answer progress
     tool_call tool_result artifact_created
     run_started run_finished final_report error

data/app/services/agent/runner.rb

@@ -125,8 +125,11 @@ module Agent
         # list itself, not a request in the prompt.
         cmd += ["--tools", "Read,Glob,Grep,Edit,Write"] unless column.shell_access?
       end
-      cmd += ["--model", column.model] if column.model.present?
-      cmd += ["--effort", column.effort] if column.effort.present?
+      # Effective (possibly card-overridden) config, read fresh here at spawn
+      # time — so a mid-run override takes effect on the next segment (start,
+      # restart, resume), never on one already streaming (card #33).
+      cmd += ["--model", card.effective_model] if card.effective_model.present?
+      cmd += ["--effort", card.effective_effort] if card.effective_effort.present?
       cmd += ["--resume", run.external_session_id] if resuming && run.external_session_id.present?
 
       result = {}

data/app/views/boards/show.html.erb

@@ -1,5 +1,6 @@
 <%= turbo_stream_from @board %>
 
+<div data-controller="filter">
 <header class="topbar">
   <div class="topbar-left">
     <h1>Cardinal AI <span class="sep">▸</span> <span id="board-name"><%= @board.name %></span></h1>
@@ -37,6 +38,11 @@
     <% end %>
     <span id="repo-pull-status"></span>
   </div>
+  <div class="topbar-center">
+    <input type="search" id="global-search" class="global-search" placeholder="Search cards…  /"
+           data-filter-target="global"
+           data-action="input->filter#global keydown->filter#clear">
+  </div>
   <div class="topbar-right">
     <button type="button" class="theme-toggle"
             data-controller="theme" data-action="theme#toggle">☀ Light</button>
@@ -108,6 +114,7 @@
     <%= render "columns/column", column: column %>
   <% end %>
 </main>
+</div>
 
 <%= turbo_frame_tag "modal", data: { turbo_permanent: true } do %>
   <%= render "cards/detail" if @card %>

data/app/views/cards/_card.html.erb

@@ -1,4 +1,5 @@
-<article class="card status-<%= card.status %>" id="<%= dom_id(card) %>" data-card-id="<%= card.number %>">
+<article class="card status-<%= card.status %>" id="<%= dom_id(card) %>" data-card-id="<%= card.number %>"
+         data-search="<%= [card.title, "##{card.number}", Array(card.tags).join(" "), card.description.to_s.truncate(400)].join(" ").downcase %>">
   <%= link_to card_path(card), class: "card-link", data: { turbo_frame: "modal", turbo_action: "advance" } do %>
     <div class="card-title">
       <%= card.title %>
@@ -38,7 +39,7 @@
       <% else %>
         <span class="footer-pr"></span>
       <% end %>
-      <span class="footer-center"><%= "🤖 #{card.column.model_label}" if has_cost && card.column.model_label %></span>
+      <span class="footer-center"><%= "🤖 #{card.effective_model_label}" if has_cost && card.effective_model_label %></span>
       <span class="footer-cost"><%= "$#{card.total_cost.round(2)}" if has_cost %></span>
     </div>
   <% end %>

data/app/views/cards/_detail.html.erb

@@ -140,6 +140,38 @@
             <% end %>
           <% end %>
 
+          <%# Per-card model/effort override (card #33). Its own autosave form so a
+              change saves and re-renders the card face (override marker) without
+              replacing this modal mid-interaction. The summary names the effective
+              state even when collapsed — the board must not hide what will spend. %>
+          <div class="model-override" data-controller="autosave">
+            <%= form_with model: @card, data: { autosave_target: "form", action: "change->autosave#save" } do |f| %>
+              <%= hidden_field_tag :autosave, "1" %>
+              <details class="advanced-rules">
+                <summary>
+                  🧠 Model:
+                  <% if @card.config_overridden? %>
+                    <strong>override</strong> (<%= @card.effective_model_label&.delete_suffix("*") || "none" %>)
+                  <% else %>
+                    column default (<%= @card.column.model_label || "none" %>)
+                  <% end %>
+                  <span class="autosave-status" data-autosave-target="status"></span>
+                </summary>
+                <div class="field-row">
+                  <div>
+                    <label>Model <%= info_tip("Overrides the column's model for THIS card only — worker runs and this card's planning replies both. Leave on \"Use column default\" to follow the column.") %></label>
+                    <%= f.select :model, card_model_options(@card), selected: @card.model.to_s %>
+                  </div>
+                  <div>
+                    <label>Effort <%= info_tip("How hard the model thinks per step, for this card only. Higher = smarter but slower and pricier. Leave on default to follow the column.") %></label>
+                    <%= f.select :effort, [["Use column default", ""], "low", "medium", "high", "max"], selected: @card.effort %>
+                  </div>
+                </div>
+                <p class="hint">Overrides this card's model and effort. Only model + effort — budget, timeout, and concurrency are column policy. Takes effect on the next run segment (a run already going finishes on the model it started with).</p>
+              </details>
+            <% end %>
+          </div>
+
           <h3>Work</h3>
           <% runs = @card.runs.order(:id) %>
           <% parked = runs.select(&:needs_input?).last %>
@@ -187,7 +219,7 @@
 
           <% if latest && (latest.cost.positive? || latest.output_tokens.positive?) %>
             <div class="work-footer">
-              <span class="footer-left"><%= "🤖 #{@card.column.model_label}" if @card.column.model_label %></span>
+              <span class="footer-left"><%= "🤖 #{@card.effective_model_label}" if @card.effective_model_label %></span>
               <span class="footer-cost">$<%= latest.cost.round(2) %> · <%= latest.output_tokens %> out</span>
             </div>
           <% end %>

data/app/views/columns/_column.html.erb

@@ -8,9 +8,16 @@
                     data: { turbo_frame: "modal" } %>
       <% end %>
     </span>
-    <%= link_to "⚙", edit_column_path(column), class: "gear", title: "Column settings",
-                data: { turbo_frame: "modal" } %>
+    <span class="col-tools">
+      <button type="button" class="col-search-toggle" title="Filter this column"
+              data-action="filter#toggle">🔍</button>
+      <%= link_to "⚙", edit_column_path(column), class: "gear", title: "Column settings",
+                  data: { turbo_frame: "modal" } %>
+    </span>
   </header>
+  <input type="search" class="col-search" placeholder="Filter <%= column.name %>…"
+         data-col-id="<%= column.id %>"
+         data-action="input->filter#column keydown->filter#clear">
   <p class="drop-hint">→ <%= column.drag_hint %></p>
   <div class="cards<%= " cards-clickable" if column.inbox? %>"
        data-controller="board-column"

data/db/migrate/20260704231436_add_model_and_effort_to_cards.rb

@@ -0,0 +1,6 @@
+class AddModelAndEffortToCards < ActiveRecord::Migration[8.1]
+  def change
+    add_column :cards, :model, :string
+    add_column :cards, :effort, :string
+  end
+end

data/lib/cardinal/version.rb

@@ -1,3 +1,3 @@
 module Cardinal
-  VERSION = "0.2.8"
+  VERSION = "0.2.9"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cardinal-ai
 version: !ruby/object:Gem::Version
-  version: 0.2.8
+  version: 0.2.9
 platform: ruby
 authors:
 - Jason Ellis
@@ -176,6 +176,7 @@ files:
 - app/javascript/controllers/clipboard_controller.js
 - app/javascript/controllers/composer_controller.js
 - app/javascript/controllers/dismiss_controller.js
+- app/javascript/controllers/filter_controller.js
 - app/javascript/controllers/index.js
 - app/javascript/controllers/modal_controller.js
 - app/javascript/controllers/reveal_controller.js
@@ -200,6 +201,7 @@ files:
 - app/models/board.rb
 - app/models/card.rb
 - app/models/column.rb
+- app/models/concerns/model_labeling.rb
 - app/models/event.rb
 - app/models/run.rb
 - app/services/agent/runner.rb
@@ -264,6 +266,7 @@ files:
 - db/migrate/20260704120000_add_repo_brief_to_boards.rb
 - db/migrate/20260704130000_add_summary_to_cards.rb
 - db/migrate/20260704140000_add_compact_to_cards.rb
+- db/migrate/20260704231436_add_model_and_effort_to_cards.rb
 - db/queue_schema.rb
 - db/seeds.rb
 - docker/agent/Dockerfile