fix: reconcile:on blocking, pending question notifications, and infra improvements (#73)

* feat: soryu-co/soryu - makima: Fix contracts page overflow - constrain layout to viewport height

* feat: soryu-co/soryu - makima: Add git fetch to create_worktree and improve completion prompt merge conflict handling

* WIP: heartbeat checkpoint

* feat: soryu-co/soryu - makima: Add pending question notification badge to directive sidebar and nav

* feat: soryu-co/soryu - makima: Fix reconcile:on blocking - make phaseguard poll indefinitely instead of returning immediately

2 files changed, 32 insertions, 8 deletions

diff --git a/makima/frontend/src/components/NavStrip.tsx b/makima/frontend/src/components/NavStrip.tsx
index 117f4e1..4932427 100644
--- a/makima/frontend/src/components/NavStrip.tsx
+++ b/makima/frontend/src/components/NavStrip.tsx
@@ -1,4 +1,5 @@
 import { useAuth } from "../contexts/AuthContext";
+import { useSupervisorQuestions } from "../contexts/SupervisorQuestionsContext";
 import { RewriteLink } from "./RewriteLink";
 
 interface NavLink {
@@ -19,6 +20,8 @@ const NAV_LINKS: NavLink[] = [
 
 export function NavStrip() {
   const { isAuthenticated, isAuthConfigured, signOut, user } = useAuth();
+  const { pendingQuestions } = useSupervisorQuestions();
+  const directiveQuestionCount = pendingQuestions.filter(q => q.directiveId).length;
 
   const handleSignOut = async () => {
     await signOut();
@@ -38,14 +41,18 @@ export function NavStrip() {
       </span>
       <div className="flex flex-wrap gap-2 items-center flex-1">
         {NAV_LINKS.map((link) => (
-          <RewriteLink
-            key={link.label}
-            to={link.href}
-            disabled={link.requiresAuth && !hasAccess}
-            external={link.external}
-          >
-            {link.label}
-          </RewriteLink>
+          <span key={link.label} className="relative inline-flex items-center">
+            <RewriteLink
+              to={link.href}
+              disabled={link.requiresAuth && !hasAccess}
+              external={link.external}
+            >
+              {link.label}
+            </RewriteLink>
+            {link.label === "Directives" && directiveQuestionCount > 0 && (
+              <span className="ml-0.5 inline-block w-2 h-2 rounded-full bg-amber-400 animate-pulse" title={`${directiveQuestionCount} pending question(s)`} />
+            )}
+          </span>
         ))}
       </div>
       <div className="flex items-center gap-2 pl-2.5 border-l border-[rgba(117,170,252,0.35)]">
diff --git a/makima/frontend/src/components/directives/DirectiveList.tsx b/makima/frontend/src/components/directives/DirectiveList.tsx
index 6393ea7..6a9c486 100644
--- a/makima/frontend/src/components/directives/DirectiveList.tsx
+++ b/makima/frontend/src/components/directives/DirectiveList.tsx
@@ -1,4 +1,6 @@
+import { useMemo } from "react";
 import type { DirectiveSummary, DirectiveStatus } from "../../lib/api";
+import { useSupervisorQuestions } from "../../contexts/SupervisorQuestionsContext";
 
 const STATUS_BADGE: Record<DirectiveStatus, { color: string; label: string }> = {
   draft: { color: "text-[#7788aa] border-[#2a3a5a]", label: "DRAFT" },
@@ -16,6 +18,18 @@ interface DirectiveListProps {
 }
 
 export function DirectiveList({ directives, selectedId, onSelect, onCreate }: DirectiveListProps) {
+  const { pendingQuestions } = useSupervisorQuestions();
+
+  const questionsPerDirective = useMemo(() => {
+    const counts = new Map<string, number>();
+    for (const q of pendingQuestions) {
+      if (q.directiveId) {
+        counts.set(q.directiveId, (counts.get(q.directiveId) || 0) + 1);
+      }
+    }
+    return counts;
+  }, [pendingQuestions]);
+
   return (
     <div className="flex flex-col h-full">
       <div className="flex items-center justify-between px-3 py-2 border-b border-dashed border-[rgba(117,170,252,0.2)]">
@@ -55,6 +69,9 @@ export function DirectiveList({ directives, selectedId, onSelect, onCreate }: Di
                   <span className="text-[12px] font-mono text-white truncate pr-2">
                     {d.title}
                   </span>
+                  {questionsPerDirective.has(d.id) && (
+                    <span className="inline-block w-2.5 h-2.5 rounded-full bg-amber-400 animate-pulse shrink-0" title={`${questionsPerDirective.get(d.id)} pending question(s)`} />
+                  )}
                   <span
                     className={`text-[9px] font-mono ${badge.color} border rounded px-1.5 py-0.5 shrink-0`}
                   >