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>

2 files changed, 11 insertions, 0 deletions

diff --git a/makima/frontend/src/routes/directives.tsx b/makima/frontend/src/routes/directives.tsx
index f1b430d..8de0335 100644
--- a/makima/frontend/src/routes/directives.tsx
+++ b/makima/frontend/src/routes/directives.tsx
@@ -4,6 +4,7 @@ import { Masthead } from "../components/Masthead";
 import { DirectiveList } from "../components/directives/DirectiveList";
 import { DirectiveDetail } from "../components/directives/DirectiveDetail";
 import { useDirectives, useDirective } from "../hooks/useDirectives";
+import { useDogs } from "../hooks/useDogs";
 import { useAuth } from "../contexts/AuthContext";
 import { getRepositorySuggestions, startDirective, pauseDirective, updateDirective, type RepositoryHistoryEntry, type DirectiveSummary } from "../lib/api";
 
@@ -13,6 +14,7 @@ export default function DirectivesPage() {
   const { id: selectedId } = useParams<{ id: string }>();
   const { directives, loading: listLoading, create, remove, refresh: refreshList } = useDirectives();
   const { directive, refresh: refreshDetail, update, start, pause, advance, completeStep, failStep, skipStep, updateGoal, cleanup, pickUpOrders, createPR } = useDirective(selectedId);
+  const { dogs, loading: dogsLoading, create: createDog, update: updateDog, remove: removeDog, pickUpOrders: pickUpDogOrders } = useDogs(selectedId);
 
   const [showCreate, setShowCreate] = useState(false);
   const [newTitle, setNewTitle] = useState("");
@@ -259,6 +261,12 @@ export default function DirectivesPage() {
               onCleanup={cleanup}
               onPickUpOrders={pickUpOrders}
               onCreatePR={createPR}
+              dogs={dogs}
+              dogsLoading={dogsLoading}
+              onCreateDog={createDog}
+              onUpdateDog={updateDog}
+              onDeleteDog={removeDog}
+              onPickUpDogOrders={pickUpDogOrders}
             />
           ) : (
             <div className="flex-1 flex items-center justify-center h-full">
diff --git a/makima/frontend/src/routes/orders.tsx b/makima/frontend/src/routes/orders.tsx
index 5744bdd..cc1e1ad 100644
--- a/makima/frontend/src/routes/orders.tsx
+++ b/makima/frontend/src/routes/orders.tsx
@@ -5,6 +5,7 @@ import { OrderList } from "../components/orders/OrderList";
 import { OrderDetail } from "../components/orders/OrderDetail";
 import { useOrders, useOrder } from "../hooks/useOrders";
 import { useDirectives } from "../hooks/useDirectives";
+import { useDogs } from "../hooks/useDogs";
 import { useAuth } from "../contexts/AuthContext";
 import { updateOrder, deleteOrder } from "../lib/api";
 import type { Order, OrderStatus, OrderType, OrderPriority } from "../lib/api";
@@ -19,6 +20,7 @@ export default function OrdersPage() {
   const { orders, loading: listLoading, create, refresh: refreshList } = useOrders(statusFilter, typeFilter);
   const { order, refresh: refreshDetail, update, remove: removeOrder, linkDirective, convertToStep } = useOrder(selectedId);
   const { directives } = useDirectives();
+  const { dogs } = useDogs(order?.directiveId ?? undefined);
 
   const [showCreate, setShowCreate] = useState(false);
   const [newTitle, setNewTitle] = useState("");
@@ -256,6 +258,7 @@ export default function OrdersPage() {
             <OrderDetail
               order={order}
               directives={directives}
+              dogs={dogs}
               onUpdate={handleUpdate}
               onDelete={handleDelete}
               onLinkDirective={handleLinkDirective}