fix: resolve merge conflicts with master (integrate DOG features into compact header)makima/soryu-co-soryu---makima--resolve-merge-conflicts-i-f750d00d

- Resolved conflict in OrderDetail.tsx: kept PR compact header layout
  with inline badges while adding DOG badge from master
- DOG selector in Actions section preserved from master
- orders.tsx correctly passes dogs prop to OrderDetail (auto-merged correctly)
- directives.tsx auto-merged correctly with DOG props for DirectiveDetail
- Frontend builds successfully with no TypeScript errors

Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>

1 files changed, 2 insertions, 0 deletions

diff --git a/makima/src/server/handlers/orders.rs b/makima/src/server/handlers/orders.rs
index 1251f79..03719cb 100644
--- a/makima/src/server/handlers/orders.rs
+++ b/makima/src/server/handlers/orders.rs
@@ -32,6 +32,7 @@ use crate::server::state::SharedState;
         ("type" = Option<String>, Query, description = "Filter by order type"),
         ("priority" = Option<String>, Query, description = "Filter by priority"),
         ("directive_id" = Option<Uuid>, Query, description = "Filter by directive ID"),
+        ("dog_id" = Option<Uuid>, Query, description = "Filter by DOG (Directive Order Group) ID"),
         ("search" = Option<String>, Query, description = "Text search across title, description, and directive name"),
     ),
     responses(
@@ -62,6 +63,7 @@ pub async fn list_orders(
         query.order_type.as_deref(),
         query.priority.as_deref(),
         query.directive_id,
+        query.dog_id,
         query.search.as_deref(),
     )
     .await