Merge fcda26b92d into a7ddd79e98

ui/src/components/agents/AgentThreadView.tsx

@@ -29,6 +29,7 @@ import {
   useWorkflowApprovals,
 } from "@/lib/agents/queries"
 import { WorkflowApprovalCard } from "@/components/agents/WorkflowApprovalCard"
+import { useSession } from "@/lib/session"
 
 interface AgentThreadViewProps {
   thread: AgentThread
@@ -135,9 +136,12 @@ export function AgentThreadView({ thread }: AgentThreadViewProps) {
   const approvalsQuery = useWorkflowApprovals(thread.id)
   const approveMutation = useApproveWorkflowPush(thread.id)
   const rejectMutation = useRejectWorkflowPush(thread.id)
+  const session = useSession()
 
-  const approvals = approvalsQuery.data
-  const isApprovalOwner = thread.isOwner ?? false
+  const pendingApprovals = approvalsQuery.data?.filter(
+    (a) => a.status === "pending"
+  )
+  const isApprovalOwner = thread.isOwner ?? session.data?.login === thread.id
 
   const hasWorkflowApprovalError = useMemo(
     () =>
@@ -198,9 +202,9 @@ export function AgentThreadView({ thread }: AgentThreadViewProps) {
           )}
         {hasConversation ? (
           <div className="relative flex min-h-0 flex-1 flex-col overflow-hidden">
-            {approvals && approvals.length > 0 && (
+            {pendingApprovals && pendingApprovals.length > 0 && (
               <div className="shrink-0 px-4 pt-4">
-                {approvals.map((approval) => (
+                {pendingApprovals.map((approval) => (
                   <WorkflowApprovalCard
                     key={approval.fingerprint}
                     approval={approval}