agent-relay-server 0.119.7 → 0.119.10

package/public/assets/{work-queue-D7opMqtU.js → work-queue-BfWNDp7U.js}

@@ -1,2 +1,2 @@
-import{An as e,a as t,ht as n,nr as r,vn as i}from"./lucide-react-Dc3ZwCBi.js";import{f as a,t as o}from"./store-OLe8gFh0.js";import{K as s,ct as c,d as l}from"./display-exQDWum3.js";import{t as u}from"./badge-BhUZ1cAb.js";import{t as d}from"./button-C-V4oij1.js";import{Ot as f,St as p,U as m}from"./index-TamtghSr.js";import{r as h,t as g}from"./card-Br1JLjTH.js";var _=r(),v={open:`bg-blue-500/10 text-blue-400 border-blue-500/20`,blocked:`bg-yellow-500/10 text-yellow-400 border-yellow-500/20`,claimed:`bg-emerald-500/10 text-emerald-400 border-emerald-500/20`,in_progress:`bg-purple-500/10 text-purple-400 border-purple-500/20`};function y(){let e=a(),t=o(e=>e.agentsById),r=o(e=>e.compose),i=o(e=>e.set),s=o(e=>e.doClaimTask),c=o(e=>e.doClaim),d=o(e=>e.openTaskEvents),h=o(e=>e.showError),g=o(e=>e.openConfirm),v=o(e=>e.doDeleteMessage),y=o(e=>e.doUpdateTaskStatus),x=p(),S=f(),C=S.filter(e=>e.claimable).length;function w(e){if(!r.from){h(`Validation`,`Select a "Claim as" agent first.`);return}e.sourceType===`task`&&e.task?s(e.task.id):e.sourceType===`message`&&e.message&&c(e.message.id)}function T(e){g(`Cancel Item`,`Cancel "${e.title||(e.sourceType===`task`?`T${e.id}`:`Message #${e.id}`)}"? This cannot be undone.`,()=>{e.sourceType===`task`&&e.task?y(e.task,`canceled`):e.sourceType===`message`&&e.message&&v(e.message.id)})}function E(e){e.task&&d(e.task)}return(0,_.jsxs)(`div`,{className:`space-y-4`,children:[(0,_.jsxs)(`div`,{className:`flex items-center justify-between flex-wrap gap-2`,children:[(0,_.jsxs)(`div`,{className:`flex items-center gap-2`,children:[(0,_.jsx)(n,{className:`w-5 h-5 text-muted-foreground`}),(0,_.jsx)(`h2`,{className:`text-lg font-semibold`,children:`Work Queue`}),C>0&&(0,_.jsxs)(u,{className:`bg-orange-500/20 text-orange-400 border-orange-500/30 border`,children:[C,` claimable`]})]}),(0,_.jsxs)(`div`,{className:`flex items-center gap-2`,children:[(0,_.jsx)(`label`,{className:`text-xs text-muted-foreground shrink-0`,children:`Claim as`}),(0,_.jsxs)(`select`,{className:`rounded-md border border-input bg-background px-3 py-1.5 text-sm`,value:r.from,onChange:e=>i({compose:{...r,from:e.target.value}}),children:[(0,_.jsx)(`option`,{value:``,children:`Select agent...`}),x.map(e=>(0,_.jsx)(`option`,{value:e.id,children:l(e)},e.id))]})]})]}),(0,_.jsx)(m,{className:`h-[calc(100dvh-11rem)]`,children:(0,_.jsxs)(`div`,{className:`space-y-2 pr-2`,children:[S.length===0&&(0,_.jsx)(`div`,{className:`text-center text-muted-foreground py-16 text-sm`,children:`Work queue is empty`}),S.map(n=>(0,_.jsx)(b,{item:n,now:e,agentName:e=>t[e]?l(t[e]):e.slice(-10),onClaim:()=>w(n),onCancel:()=>T(n),onEvents:n.task?()=>E(n):void 0},n.id))]})})]})}function b({item:n,now:r,agentName:a,onClaim:o,onCancel:l,onEvents:f}){let p=c[n.severity]||c.info,m=v[n.status]||`bg-zinc-500/10 text-zinc-400 border-zinc-500/20`;return(0,_.jsx)(g,{className:n.claimable?`ring-1 ring-orange-500/30`:``,children:(0,_.jsx)(h,{className:`p-3`,children:(0,_.jsxs)(`div`,{className:`flex items-start gap-3`,children:[(0,_.jsxs)(`div`,{className:`flex-1 min-w-0`,children:[(0,_.jsxs)(`div`,{className:`flex items-center gap-2 flex-wrap mb-1`,children:[(0,_.jsx)(`span`,{className:`font-medium text-sm truncate`,children:n.title}),(0,_.jsx)(u,{variant:`outline`,className:`text-xs px-1.5 py-0 border ${p}`,children:n.severity}),(0,_.jsx)(u,{variant:`outline`,className:`text-xs px-1.5 py-0 border ${m}`,children:n.status}),n.sourceType===`message`&&(0,_.jsx)(u,{variant:`outline`,className:`text-xs px-1.5 py-0 border border-zinc-500/20 text-zinc-400`,children:`msg`})]}),n.body&&(0,_.jsx)(`p`,{className:`text-xs text-muted-foreground line-clamp-2 mb-2`,children:n.body}),(0,_.jsxs)(`div`,{className:`flex items-center gap-3 text-xs text-muted-foreground flex-wrap`,children:[n.owner&&(0,_.jsxs)(`span`,{title:`Owner`,children:[(0,_.jsx)(i,{className:`w-3 h-3 inline mr-1`}),a(n.owner)]}),n.source&&(0,_.jsx)(`span`,{className:`font-mono`,children:n.source}),(0,_.jsxs)(`span`,{title:String(n.updatedAt),children:[(0,_.jsx)(e,{className:`w-3 h-3 inline mr-1`}),s(r,n.updatedAt)]})]})]}),(0,_.jsxs)(`div`,{className:`flex flex-col gap-1 shrink-0`,children:[n.claimable&&(0,_.jsxs)(d,{size:`sm`,className:`h-7 text-xs bg-orange-600 hover:bg-orange-700 text-white`,onClick:o,children:[(0,_.jsx)(i,{className:`w-3.5 h-3.5 mr-1`}),` Claim`]}),f&&(0,_.jsx)(d,{size:`sm`,variant:`outline`,className:`h-7 text-xs`,onClick:f,children:`Events`}),(0,_.jsxs)(d,{size:`sm`,variant:`outline`,className:`h-7 text-xs text-red-400 hover:text-red-300 hover:bg-red-500/10 border-red-500/20`,onClick:l,children:[(0,_.jsx)(t,{className:`w-3.5 h-3.5 mr-1`}),` Cancel`]})]})]})})})}export{y as WorkQueueView};
-//# sourceMappingURL=work-queue-D7opMqtU.js.map
+import{An as e,a as t,ht as n,nr as r,vn as i}from"./lucide-react-Dc3ZwCBi.js";import{f as a,t as o}from"./store-OLe8gFh0.js";import{K as s,ct as c,d as l}from"./display-exQDWum3.js";import{t as u}from"./badge-BhUZ1cAb.js";import{t as d}from"./button-C-V4oij1.js";import{Ot as f,St as p,U as m}from"./index-CqcAqQKW.js";import{r as h,t as g}from"./card-Br1JLjTH.js";var _=r(),v={open:`bg-blue-500/10 text-blue-400 border-blue-500/20`,blocked:`bg-yellow-500/10 text-yellow-400 border-yellow-500/20`,claimed:`bg-emerald-500/10 text-emerald-400 border-emerald-500/20`,in_progress:`bg-purple-500/10 text-purple-400 border-purple-500/20`};function y(){let e=a(),t=o(e=>e.agentsById),r=o(e=>e.compose),i=o(e=>e.set),s=o(e=>e.doClaimTask),c=o(e=>e.doClaim),d=o(e=>e.openTaskEvents),h=o(e=>e.showError),g=o(e=>e.openConfirm),v=o(e=>e.doDeleteMessage),y=o(e=>e.doUpdateTaskStatus),x=p(),S=f(),C=S.filter(e=>e.claimable).length;function w(e){if(!r.from){h(`Validation`,`Select a "Claim as" agent first.`);return}e.sourceType===`task`&&e.task?s(e.task.id):e.sourceType===`message`&&e.message&&c(e.message.id)}function T(e){g(`Cancel Item`,`Cancel "${e.title||(e.sourceType===`task`?`T${e.id}`:`Message #${e.id}`)}"? This cannot be undone.`,()=>{e.sourceType===`task`&&e.task?y(e.task,`canceled`):e.sourceType===`message`&&e.message&&v(e.message.id)})}function E(e){e.task&&d(e.task)}return(0,_.jsxs)(`div`,{className:`space-y-4`,children:[(0,_.jsxs)(`div`,{className:`flex items-center justify-between flex-wrap gap-2`,children:[(0,_.jsxs)(`div`,{className:`flex items-center gap-2`,children:[(0,_.jsx)(n,{className:`w-5 h-5 text-muted-foreground`}),(0,_.jsx)(`h2`,{className:`text-lg font-semibold`,children:`Work Queue`}),C>0&&(0,_.jsxs)(u,{className:`bg-orange-500/20 text-orange-400 border-orange-500/30 border`,children:[C,` claimable`]})]}),(0,_.jsxs)(`div`,{className:`flex items-center gap-2`,children:[(0,_.jsx)(`label`,{className:`text-xs text-muted-foreground shrink-0`,children:`Claim as`}),(0,_.jsxs)(`select`,{className:`rounded-md border border-input bg-background px-3 py-1.5 text-sm`,value:r.from,onChange:e=>i({compose:{...r,from:e.target.value}}),children:[(0,_.jsx)(`option`,{value:``,children:`Select agent...`}),x.map(e=>(0,_.jsx)(`option`,{value:e.id,children:l(e)},e.id))]})]})]}),(0,_.jsx)(m,{className:`h-[calc(100dvh-11rem)]`,children:(0,_.jsxs)(`div`,{className:`space-y-2 pr-2`,children:[S.length===0&&(0,_.jsx)(`div`,{className:`text-center text-muted-foreground py-16 text-sm`,children:`Work queue is empty`}),S.map(n=>(0,_.jsx)(b,{item:n,now:e,agentName:e=>t[e]?l(t[e]):e.slice(-10),onClaim:()=>w(n),onCancel:()=>T(n),onEvents:n.task?()=>E(n):void 0},n.id))]})})]})}function b({item:n,now:r,agentName:a,onClaim:o,onCancel:l,onEvents:f}){let p=c[n.severity]||c.info,m=v[n.status]||`bg-zinc-500/10 text-zinc-400 border-zinc-500/20`;return(0,_.jsx)(g,{className:n.claimable?`ring-1 ring-orange-500/30`:``,children:(0,_.jsx)(h,{className:`p-3`,children:(0,_.jsxs)(`div`,{className:`flex items-start gap-3`,children:[(0,_.jsxs)(`div`,{className:`flex-1 min-w-0`,children:[(0,_.jsxs)(`div`,{className:`flex items-center gap-2 flex-wrap mb-1`,children:[(0,_.jsx)(`span`,{className:`font-medium text-sm truncate`,children:n.title}),(0,_.jsx)(u,{variant:`outline`,className:`text-xs px-1.5 py-0 border ${p}`,children:n.severity}),(0,_.jsx)(u,{variant:`outline`,className:`text-xs px-1.5 py-0 border ${m}`,children:n.status}),n.sourceType===`message`&&(0,_.jsx)(u,{variant:`outline`,className:`text-xs px-1.5 py-0 border border-zinc-500/20 text-zinc-400`,children:`msg`})]}),n.body&&(0,_.jsx)(`p`,{className:`text-xs text-muted-foreground line-clamp-2 mb-2`,children:n.body}),(0,_.jsxs)(`div`,{className:`flex items-center gap-3 text-xs text-muted-foreground flex-wrap`,children:[n.owner&&(0,_.jsxs)(`span`,{title:`Owner`,children:[(0,_.jsx)(i,{className:`w-3 h-3 inline mr-1`}),a(n.owner)]}),n.source&&(0,_.jsx)(`span`,{className:`font-mono`,children:n.source}),(0,_.jsxs)(`span`,{title:String(n.updatedAt),children:[(0,_.jsx)(e,{className:`w-3 h-3 inline mr-1`}),s(r,n.updatedAt)]})]})]}),(0,_.jsxs)(`div`,{className:`flex flex-col gap-1 shrink-0`,children:[n.claimable&&(0,_.jsxs)(d,{size:`sm`,className:`h-7 text-xs bg-orange-600 hover:bg-orange-700 text-white`,onClick:o,children:[(0,_.jsx)(i,{className:`w-3.5 h-3.5 mr-1`}),` Claim`]}),f&&(0,_.jsx)(d,{size:`sm`,variant:`outline`,className:`h-7 text-xs`,onClick:f,children:`Events`}),(0,_.jsxs)(d,{size:`sm`,variant:`outline`,className:`h-7 text-xs text-red-400 hover:text-red-300 hover:bg-red-500/10 border-red-500/20`,onClick:l,children:[(0,_.jsx)(t,{className:`w-3.5 h-3.5 mr-1`}),` Cancel`]})]})]})})})}export{y as WorkQueueView};
+//# sourceMappingURL=work-queue-BfWNDp7U.js.map

package/public/assets/{work-queue-D7opMqtU.js.map → work-queue-BfWNDp7U.js.map}

@@ -1 +1 @@
-{"version":3,"file":"work-queue-D7opMqtU.js","names":[],"sources":["../../dashboard/src/components/views/work-queue.tsx"],"sourcesContent":["import { useRelayStore, useNow } from '@/store'\nimport { useWorkQueueItems, useComposeAgents } from '@/hooks/use-selectors'\nimport { Card, CardContent } from '@/components/ui/card'\nimport { Badge } from '@/components/ui/badge'\nimport { Button } from '@/components/ui/button'\nimport { ScrollArea } from '@/components/ui/scroll-area'\nimport { ListChecks, CheckCircle2, Calendar, X } from 'lucide-react'\nimport { displayName, timeAgo } from '@/lib/display'\nimport { SEVERITY_COLORS } from '@/lib/constants'\nimport type { WorkQueueItem } from '@/types'\n\nconst STATUS_COLORS: Record<string, string> = {\n  open: 'bg-blue-500/10 text-blue-400 border-blue-500/20',\n  blocked: 'bg-yellow-500/10 text-yellow-400 border-yellow-500/20',\n  claimed: 'bg-emerald-500/10 text-emerald-400 border-emerald-500/20',\n  in_progress: 'bg-purple-500/10 text-purple-400 border-purple-500/20',\n}\n\nexport function WorkQueueView() {\n  const now = useNow()\n  const agentsById = useRelayStore((s) => s.agentsById)\n  const compose = useRelayStore((s) => s.compose)\n  const set = useRelayStore((s) => s.set)\n  const doClaimTask = useRelayStore((s) => s.doClaimTask)\n  const doClaim = useRelayStore((s) => s.doClaim)\n  const openTaskEvents = useRelayStore((s) => s.openTaskEvents)\n  const showError = useRelayStore((s) => s.showError)\n  const openConfirm = useRelayStore((s) => s.openConfirm)\n  const doDeleteMessage = useRelayStore((s) => s.doDeleteMessage)\n  const doUpdateTaskStatus = useRelayStore((s) => s.doUpdateTaskStatus)\n\n  const composeAgents = useComposeAgents()\n  const items = useWorkQueueItems()\n\n  const claimableCount = items.filter((i) => i.claimable).length\n\n  function handleClaim(item: WorkQueueItem) {\n    if (!compose.from) { showError('Validation', 'Select a \"Claim as\" agent first.'); return }\n    if (item.sourceType === 'task' && item.task) doClaimTask(item.task.id)\n    else if (item.sourceType === 'message' && item.message) doClaim(item.message.id)\n  }\n\n  function handleCancel(item: WorkQueueItem) {\n    const label = item.title || (item.sourceType === 'task' ? `T${item.id}` : `Message #${item.id}`)\n    openConfirm('Cancel Item', `Cancel \"${label}\"? This cannot be undone.`, () => {\n      if (item.sourceType === 'task' && item.task) doUpdateTaskStatus(item.task, 'canceled')\n      else if (item.sourceType === 'message' && item.message) doDeleteMessage(item.message.id)\n    })\n  }\n\n  function handleEvents(item: WorkQueueItem) {\n    if (item.task) openTaskEvents(item.task)\n  }\n\n  return (\n    <div className=\"space-y-4\">\n      <div className=\"flex items-center justify-between flex-wrap gap-2\">\n        <div className=\"flex items-center gap-2\">\n          <ListChecks className=\"w-5 h-5 text-muted-foreground\" />\n          <h2 className=\"text-lg font-semibold\">Work Queue</h2>\n          {claimableCount > 0 && (\n            <Badge className=\"bg-orange-500/20 text-orange-400 border-orange-500/30 border\">\n              {claimableCount} claimable\n            </Badge>\n          )}\n        </div>\n        <div className=\"flex items-center gap-2\">\n          <label className=\"text-xs text-muted-foreground shrink-0\">Claim as</label>\n          <select\n            className=\"rounded-md border border-input bg-background px-3 py-1.5 text-sm\"\n            value={compose.from}\n            onChange={(e) => set({ compose: { ...compose, from: e.target.value } })}\n          >\n            <option value=\"\">Select agent...</option>\n            {composeAgents.map((a) => <option key={a.id} value={a.id}>{displayName(a)}</option>)}\n          </select>\n        </div>\n      </div>\n\n      <ScrollArea className=\"h-[calc(100dvh-11rem)]\">\n        <div className=\"space-y-2 pr-2\">\n          {items.length === 0 && (\n            <div className=\"text-center text-muted-foreground py-16 text-sm\">Work queue is empty</div>\n          )}\n          {items.map((item) => (\n            <WorkQueueCard\n              key={item.id}\n              item={item}\n              now={now}\n              agentName={(id) => agentsById[id] ? displayName(agentsById[id]) : id.slice(-10)}\n              onClaim={() => handleClaim(item)}\n              onCancel={() => handleCancel(item)}\n              onEvents={item.task ? () => handleEvents(item) : undefined}\n            />\n          ))}\n        </div>\n      </ScrollArea>\n    </div>\n  )\n}\n\nfunction WorkQueueCard({\n  item, now, agentName, onClaim, onCancel, onEvents,\n}: {\n  item: WorkQueueItem\n  now: number\n  agentName: (id: string) => string\n  onClaim: () => void\n  onCancel: () => void\n  onEvents?: () => void\n}) {\n  const severityClass = SEVERITY_COLORS[item.severity] || SEVERITY_COLORS.info\n  const statusClass = STATUS_COLORS[item.status] || 'bg-zinc-500/10 text-zinc-400 border-zinc-500/20'\n\n  return (\n    <Card className={item.claimable ? 'ring-1 ring-orange-500/30' : ''}>\n      <CardContent className=\"p-3\">\n        <div className=\"flex items-start gap-3\">\n          <div className=\"flex-1 min-w-0\">\n            <div className=\"flex items-center gap-2 flex-wrap mb-1\">\n              <span className=\"font-medium text-sm truncate\">{item.title}</span>\n              <Badge variant=\"outline\" className={`text-xs px-1.5 py-0 border ${severityClass}`}>{item.severity}</Badge>\n              <Badge variant=\"outline\" className={`text-xs px-1.5 py-0 border ${statusClass}`}>{item.status}</Badge>\n              {item.sourceType === 'message' && (\n                <Badge variant=\"outline\" className=\"text-xs px-1.5 py-0 border border-zinc-500/20 text-zinc-400\">msg</Badge>\n              )}\n            </div>\n            {item.body && (\n              <p className=\"text-xs text-muted-foreground line-clamp-2 mb-2\">{item.body}</p>\n            )}\n            <div className=\"flex items-center gap-3 text-xs text-muted-foreground flex-wrap\">\n              {item.owner && (\n                <span title=\"Owner\">\n                  <CheckCircle2 className=\"w-3 h-3 inline mr-1\" />{agentName(item.owner)}\n                </span>\n              )}\n              {item.source && (\n                <span className=\"font-mono\">{item.source}</span>\n              )}\n              <span title={String(item.updatedAt)}>\n                <Calendar className=\"w-3 h-3 inline mr-1\" />{timeAgo(now, item.updatedAt)}\n              </span>\n            </div>\n          </div>\n          <div className=\"flex flex-col gap-1 shrink-0\">\n            {item.claimable && (\n              <Button size=\"sm\" className=\"h-7 text-xs bg-orange-600 hover:bg-orange-700 text-white\" onClick={onClaim}>\n                <CheckCircle2 className=\"w-3.5 h-3.5 mr-1\" /> Claim\n              </Button>\n            )}\n            {onEvents && (\n              <Button size=\"sm\" variant=\"outline\" className=\"h-7 text-xs\" onClick={onEvents}>\n                Events\n              </Button>\n            )}\n            <Button size=\"sm\" variant=\"outline\" className=\"h-7 text-xs text-red-400 hover:text-red-300 hover:bg-red-500/10 border-red-500/20\" onClick={onCancel}>\n              <X className=\"w-3.5 h-3.5 mr-1\" /> Cancel\n            </Button>\n          </div>\n        </div>\n      </CardContent>\n    </Card>\n  )\n}\n"],"mappings":"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"}
+{"version":3,"file":"work-queue-BfWNDp7U.js","names":[],"sources":["../../dashboard/src/components/views/work-queue.tsx"],"sourcesContent":["import { useRelayStore, useNow } from '@/store'\nimport { useWorkQueueItems, useComposeAgents } from '@/hooks/use-selectors'\nimport { Card, CardContent } from '@/components/ui/card'\nimport { Badge } from '@/components/ui/badge'\nimport { Button } from '@/components/ui/button'\nimport { ScrollArea } from '@/components/ui/scroll-area'\nimport { ListChecks, CheckCircle2, Calendar, X } from 'lucide-react'\nimport { displayName, timeAgo } from '@/lib/display'\nimport { SEVERITY_COLORS } from '@/lib/constants'\nimport type { WorkQueueItem } from '@/types'\n\nconst STATUS_COLORS: Record<string, string> = {\n  open: 'bg-blue-500/10 text-blue-400 border-blue-500/20',\n  blocked: 'bg-yellow-500/10 text-yellow-400 border-yellow-500/20',\n  claimed: 'bg-emerald-500/10 text-emerald-400 border-emerald-500/20',\n  in_progress: 'bg-purple-500/10 text-purple-400 border-purple-500/20',\n}\n\nexport function WorkQueueView() {\n  const now = useNow()\n  const agentsById = useRelayStore((s) => s.agentsById)\n  const compose = useRelayStore((s) => s.compose)\n  const set = useRelayStore((s) => s.set)\n  const doClaimTask = useRelayStore((s) => s.doClaimTask)\n  const doClaim = useRelayStore((s) => s.doClaim)\n  const openTaskEvents = useRelayStore((s) => s.openTaskEvents)\n  const showError = useRelayStore((s) => s.showError)\n  const openConfirm = useRelayStore((s) => s.openConfirm)\n  const doDeleteMessage = useRelayStore((s) => s.doDeleteMessage)\n  const doUpdateTaskStatus = useRelayStore((s) => s.doUpdateTaskStatus)\n\n  const composeAgents = useComposeAgents()\n  const items = useWorkQueueItems()\n\n  const claimableCount = items.filter((i) => i.claimable).length\n\n  function handleClaim(item: WorkQueueItem) {\n    if (!compose.from) { showError('Validation', 'Select a \"Claim as\" agent first.'); return }\n    if (item.sourceType === 'task' && item.task) doClaimTask(item.task.id)\n    else if (item.sourceType === 'message' && item.message) doClaim(item.message.id)\n  }\n\n  function handleCancel(item: WorkQueueItem) {\n    const label = item.title || (item.sourceType === 'task' ? `T${item.id}` : `Message #${item.id}`)\n    openConfirm('Cancel Item', `Cancel \"${label}\"? This cannot be undone.`, () => {\n      if (item.sourceType === 'task' && item.task) doUpdateTaskStatus(item.task, 'canceled')\n      else if (item.sourceType === 'message' && item.message) doDeleteMessage(item.message.id)\n    })\n  }\n\n  function handleEvents(item: WorkQueueItem) {\n    if (item.task) openTaskEvents(item.task)\n  }\n\n  return (\n    <div className=\"space-y-4\">\n      <div className=\"flex items-center justify-between flex-wrap gap-2\">\n        <div className=\"flex items-center gap-2\">\n          <ListChecks className=\"w-5 h-5 text-muted-foreground\" />\n          <h2 className=\"text-lg font-semibold\">Work Queue</h2>\n          {claimableCount > 0 && (\n            <Badge className=\"bg-orange-500/20 text-orange-400 border-orange-500/30 border\">\n              {claimableCount} claimable\n            </Badge>\n          )}\n        </div>\n        <div className=\"flex items-center gap-2\">\n          <label className=\"text-xs text-muted-foreground shrink-0\">Claim as</label>\n          <select\n            className=\"rounded-md border border-input bg-background px-3 py-1.5 text-sm\"\n            value={compose.from}\n            onChange={(e) => set({ compose: { ...compose, from: e.target.value } })}\n          >\n            <option value=\"\">Select agent...</option>\n            {composeAgents.map((a) => <option key={a.id} value={a.id}>{displayName(a)}</option>)}\n          </select>\n        </div>\n      </div>\n\n      <ScrollArea className=\"h-[calc(100dvh-11rem)]\">\n        <div className=\"space-y-2 pr-2\">\n          {items.length === 0 && (\n            <div className=\"text-center text-muted-foreground py-16 text-sm\">Work queue is empty</div>\n          )}\n          {items.map((item) => (\n            <WorkQueueCard\n              key={item.id}\n              item={item}\n              now={now}\n              agentName={(id) => agentsById[id] ? displayName(agentsById[id]) : id.slice(-10)}\n              onClaim={() => handleClaim(item)}\n              onCancel={() => handleCancel(item)}\n              onEvents={item.task ? () => handleEvents(item) : undefined}\n            />\n          ))}\n        </div>\n      </ScrollArea>\n    </div>\n  )\n}\n\nfunction WorkQueueCard({\n  item, now, agentName, onClaim, onCancel, onEvents,\n}: {\n  item: WorkQueueItem\n  now: number\n  agentName: (id: string) => string\n  onClaim: () => void\n  onCancel: () => void\n  onEvents?: () => void\n}) {\n  const severityClass = SEVERITY_COLORS[item.severity] || SEVERITY_COLORS.info\n  const statusClass = STATUS_COLORS[item.status] || 'bg-zinc-500/10 text-zinc-400 border-zinc-500/20'\n\n  return (\n    <Card className={item.claimable ? 'ring-1 ring-orange-500/30' : ''}>\n      <CardContent className=\"p-3\">\n        <div className=\"flex items-start gap-3\">\n          <div className=\"flex-1 min-w-0\">\n            <div className=\"flex items-center gap-2 flex-wrap mb-1\">\n              <span className=\"font-medium text-sm truncate\">{item.title}</span>\n              <Badge variant=\"outline\" className={`text-xs px-1.5 py-0 border ${severityClass}`}>{item.severity}</Badge>\n              <Badge variant=\"outline\" className={`text-xs px-1.5 py-0 border ${statusClass}`}>{item.status}</Badge>\n              {item.sourceType === 'message' && (\n                <Badge variant=\"outline\" className=\"text-xs px-1.5 py-0 border border-zinc-500/20 text-zinc-400\">msg</Badge>\n              )}\n            </div>\n            {item.body && (\n              <p className=\"text-xs text-muted-foreground line-clamp-2 mb-2\">{item.body}</p>\n            )}\n            <div className=\"flex items-center gap-3 text-xs text-muted-foreground flex-wrap\">\n              {item.owner && (\n                <span title=\"Owner\">\n                  <CheckCircle2 className=\"w-3 h-3 inline mr-1\" />{agentName(item.owner)}\n                </span>\n              )}\n              {item.source && (\n                <span className=\"font-mono\">{item.source}</span>\n              )}\n              <span title={String(item.updatedAt)}>\n                <Calendar className=\"w-3 h-3 inline mr-1\" />{timeAgo(now, item.updatedAt)}\n              </span>\n            </div>\n          </div>\n          <div className=\"flex flex-col gap-1 shrink-0\">\n            {item.claimable && (\n              <Button size=\"sm\" className=\"h-7 text-xs bg-orange-600 hover:bg-orange-700 text-white\" onClick={onClaim}>\n                <CheckCircle2 className=\"w-3.5 h-3.5 mr-1\" /> Claim\n              </Button>\n            )}\n            {onEvents && (\n              <Button size=\"sm\" variant=\"outline\" className=\"h-7 text-xs\" onClick={onEvents}>\n                Events\n              </Button>\n            )}\n            <Button size=\"sm\" variant=\"outline\" className=\"h-7 text-xs text-red-400 hover:text-red-300 hover:bg-red-500/10 border-red-500/20\" onClick={onCancel}>\n              <X className=\"w-3.5 h-3.5 mr-1\" /> Cancel\n            </Button>\n          </div>\n        </div>\n      </CardContent>\n    </Card>\n  )\n}\n"],"mappings":"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"}

package/public/index.html

@@ -12,7 +12,7 @@
   <link rel="icon" type="image/svg+xml" href="data:image/svg+xml,%3Csvg xmlns='http://www.w3.org/2000/svg' viewBox='0 0 32 32'%3E%3Crect width='32' height='32' rx='6' fill='%2309090b'/%3E%3Ccircle cx='16' cy='16' r='4.5' fill='%2358a6ff'/%3E%3Ccircle cx='6' cy='8' r='2.5' fill='%233fb950'/%3E%3Ccircle cx='26' cy='8' r='2.5' fill='%233fb950'/%3E%3Ccircle cx='6' cy='24' r='2.5' fill='%233fb950'/%3E%3Ccircle cx='26' cy='24' r='2.5' fill='%233fb950'/%3E%3Cline x1='8' y1='9.5' x2='13' y2='14' stroke='%2330363d' stroke-width='1.5'/%3E%3Cline x1='24' y1='9.5' x2='19' y2='14' stroke='%2330363d' stroke-width='1.5'/%3E%3Cline x1='8' y1='22.5' x2='13' y2='18' stroke='%2330363d' stroke-width='1.5'/%3E%3Cline x1='24' y1='22.5' x2='19' y2='18' stroke='%2330363d' stroke-width='1.5'/%3E%3C/svg%3E">
   <link rel="manifest" href="manifest.webmanifest">
   <link rel="apple-touch-icon" href="icons/agent-relay-192.png">
-  <script type="module" crossorigin src="./assets/index-TamtghSr.js"></script>
+  <script type="module" crossorigin src="./assets/index-CqcAqQKW.js"></script>
   <link rel="modulepreload" crossorigin href="./assets/chunk-CilyBKbf.js">
   <link rel="modulepreload" crossorigin href="./assets/preload-helper-C_JMBXql.js">
   <link rel="modulepreload" crossorigin href="./assets/lucide-react-Dc3ZwCBi.js">
@@ -36,7 +36,7 @@
   <link rel="modulepreload" crossorigin href="./assets/agent-type-icon-BEz393ra.js">
   <link rel="modulepreload" crossorigin href="./assets/button-C-V4oij1.js">
   <link rel="modulepreload" crossorigin href="./assets/copy-button-BStzXgtd.js">
-  <link rel="modulepreload" crossorigin href="./assets/formatted-body-BHm145gP.js">
+  <link rel="modulepreload" crossorigin href="./assets/formatted-body-DYUVqWym.js">
   <link rel="modulepreload" crossorigin href="./assets/task-chip-kxk4eNm1.js">
   <link rel="modulepreload" crossorigin href="./assets/badge-BhUZ1cAb.js">
   <link rel="modulepreload" crossorigin href="./assets/input-CtLT7WXi.js">

package/runner/plugins/claude/.claude-plugin/plugin.json

@@ -1,7 +1,7 @@
 {
   "name": "agent-relay-runner",
   "description": "Thin Agent Relay runner bridge for Claude Code",
-  "version": "0.119.7",
+  "version": "0.119.10",
   "agentRelayContracts": {
     "providerPluginProtocol": 1
   }

package/src/db/index.ts

@@ -16,6 +16,7 @@ export * from "./integrations.ts";
 export * from "./pairs.ts";
 export * from "./artifacts.ts";
 export * from "./messages.ts";
+export * from "./work-evidence.ts";
 export * from "./delivery.ts";
 export * from "./message-reads.ts";
 export * from "./inbox.ts";

package/src/db/migrations.ts

@@ -218,10 +218,19 @@ export function applyMigrations(): void {
   `);
   getDb().run("CREATE INDEX IF NOT EXISTS idx_workspace_merge_pauses_expires ON workspace_merge_pauses(expires_at)");
 
+  const workspaceCols = getDb().query("PRAGMA table_info(workspaces)").all() as any[];
+  const workspaceColNames = workspaceCols.map((c: any) => c.name);
+  if (!workspaceColNames.includes("orchestrator_id")) {
+    getDb().run("ALTER TABLE workspaces ADD COLUMN orchestrator_id TEXT");
+  }
+  getDb().run("CREATE INDEX IF NOT EXISTS idx_workspaces_orchestrator ON workspaces(orchestrator_id)");
+
   const cols = getDb().query("PRAGMA table_info(messages)").all() as any[];
   const colNames = cols.map((c: any) => c.name);
   if (!colNames.includes("thread_id")) {
     getDb().run("ALTER TABLE messages ADD COLUMN thread_id INTEGER");
+  }
+  if (!colNames.includes("reply_to")) {
     getDb().run("ALTER TABLE messages ADD COLUMN reply_to INTEGER REFERENCES messages(id)");
   }
   if (!colNames.includes("reply_expected")) {
@@ -274,6 +283,10 @@ export function applyMigrations(): void {
     "UPDATE messages SET claim_expires_at = coalesce(claimed_at, ?) + ? WHERE claimed_by IS NOT NULL AND claim_expires_at IS NULL",
   ).run(Date.now(), CLAIM_LEASE_MS);
   getDb().run("CREATE INDEX IF NOT EXISTS idx_msg_thread ON messages(thread_id)");
+  // (reply_to, from_agent) powers the reply-obligation NOT EXISTS subquery in
+  // listPendingReplyObligations. It must stay migration-owned because reply_to is
+  // an ALTER-added column on legacy DBs (#963).
+  getDb().run("CREATE INDEX IF NOT EXISTS idx_msg_reply_to ON messages(reply_to, from_agent)");
   getDb().run("CREATE UNIQUE INDEX IF NOT EXISTS idx_msg_idempotency ON messages(from_agent, idempotency_key) WHERE idempotency_key IS NOT NULL");
   getDb().run("CREATE INDEX IF NOT EXISTS idx_msg_delivery_status ON messages(delivery_status)");
   getDb().run("CREATE INDEX IF NOT EXISTS idx_msg_claimed_expires ON messages(claimed_by, claim_expires_at, id) WHERE claimed_by IS NOT NULL");

package/src/db/orchestrators.ts

@@ -309,7 +309,7 @@ export function orchestratorHeartbeat(id: string, runtime: OrchestratorRuntimeIn
 }
 
 export function updateManagedAgents(id: string, agents: ManagedAgent[]): Orchestrator | null {
-  for (const agent of agents) upsertWorkspaceFromManagedAgent(agent);
+  for (const agent of agents) upsertWorkspaceFromManagedAgent(agent, id);
   electWorkspaceStewards();
   const enriched = agents.map((agent) => {
     const workspaceId = agent.workspace?.id;

package/src/db/provider-quotas.ts

@@ -8,9 +8,7 @@ import { parseStringArray } from "./shared.ts";
 import type { AgentCard, CodexResetCredits, ProviderQuotaError, ProviderQuotaMatrix, ProviderQuotaRecord, ProviderQuotaSnapshot, ProviderQuotaUpdateInput, QuotaState } from "../types";
 
 const PROVIDER_QUOTA_STALE_AFTER_MS = 10 * 60_000;
-const QUOTA_UTILIZATION_EPSILON = 1e-9;
 const QUOTA_RESET_BOUNDARY_ADVANCE_MS = 5_000;
-const QUOTA_RESET_UTILIZATION_MAX = 0.01;
 const FIVE_HOUR_MS = 5 * 60 * 60_000;
 
 registerAccountKeyAliases("codex", (accountKey) => {
@@ -250,30 +248,6 @@ function quotaWindowKey(window: QuotaState["windows"][number]): string {
   return `${window.name}:${window.unit}`;
 }
 
-function quotaResetBoundaryAdvanced(existing: QuotaState["windows"][number], incoming: QuotaState["windows"][number]): boolean {
-  return quotaResetBoundaryMoved(existing, incoming)
-    && incoming.resetsAt! - existing.resetsAt! > QUOTA_RESET_BOUNDARY_ADVANCE_MS;
-}
-
-function quotaResetBoundaryMoved(existing: QuotaState["windows"][number], incoming: QuotaState["windows"][number]): boolean {
-  return typeof existing.resetsAt === "number"
-    && Number.isFinite(existing.resetsAt)
-    && typeof incoming.resetsAt === "number"
-    && Number.isFinite(incoming.resetsAt)
-    && incoming.resetsAt > existing.resetsAt;
-}
-
-function quotaWindowLooksReset(existing: QuotaState["windows"][number], incoming: QuotaState["windows"][number]): boolean {
-  return incoming.utilization <= QUOTA_RESET_UTILIZATION_MAX
-    && quotaResetBoundaryMoved(existing, incoming);
-}
-
-function quotaWindowUtilizationRegressed(existing: QuotaState["windows"][number], incoming: QuotaState["windows"][number]): boolean {
-  return incoming.utilization + QUOTA_UTILIZATION_EPSILON < existing.utilization
-    && !quotaResetBoundaryAdvanced(existing, incoming)
-    && !quotaWindowLooksReset(existing, incoming);
-}
-
 function publicQuotaState(quota: StoredQuotaState, now?: number): QuotaState {
   let emulated = false;
   const windows = quota.windows.map((window) => {
@@ -404,8 +378,7 @@ function mergeQuotaWindows(existing: StoredQuotaState | undefined, incoming: Quo
     // Per-window source precedence: #712/#716 are handled by the symmetric three-way split below.
     // Higher existing → keep (no regression check needed; lower-priority input simply loses).
     // Higher incoming → accept (no regression check needed; higher-priority source is authoritative).
-    // Same priority  → apply the regression guard (rejects improbable utilization drops from noisy
-    //                  same-quality sources, e.g. a wedged probe self-report; #725 §4.3).
+    // Same priority  → newest per-window sample wins; older/equal samples are stale.
     const existingPriority = quotaSourcePriority(existingSource);
     const incomingPriority = quotaSourcePriority(incoming.source);
     if (existingPriority > incomingPriority) {
@@ -418,12 +391,7 @@ function mergeQuotaWindows(existing: StoredQuotaState | undefined, incoming: Quo
       mergedTimes.set(key, incoming.updatedAt); mergedSources.set(key, incoming.source);
       return incomingWindow;
     }
-    // Same-priority sources: prefer the newer reading. Keep the regression guard for noisy
-    // self-reports, but let authoritative API ingest correct a stale/maxed WHAM sample (#750).
-    if (incoming.updatedAt < existingUpdatedAt) {
-      mergedTimes.set(key, existingUpdatedAt); mergedSources.set(key, existingSource); return window;
-    }
-    if (incoming.source !== "ingest" && quotaWindowUtilizationRegressed(window, incomingWindow)) {
+    if (incoming.updatedAt <= existingUpdatedAt) {
       mergedTimes.set(key, existingUpdatedAt); mergedSources.set(key, existingSource); return window;
     }
     acceptedIncomingWindow = true;

package/src/db/schema.ts

@@ -163,14 +163,10 @@ export function initDb(path: string = "agent-relay.db"): Database {
     -- queries (delivery, polling, etc.) are served identically.
     -- idx_msg_resolved_to_id is created in applyMigrations() AFTER the
     -- resolved_to_agent ALTER — never inline here (same hazard as #483/#559).
+    -- idx_msg_reply_to is also migration-owned because reply_to was added by ALTER.
     CREATE INDEX IF NOT EXISTS idx_msg_to_id ON messages(to_target, id);
     CREATE INDEX IF NOT EXISTS idx_msg_created ON messages(created_at);
     CREATE INDEX IF NOT EXISTS idx_msg_channel ON messages(channel);
-    -- (reply_to, from_agent) powers the reply-obligation NOT EXISTS subquery in
-    -- listPendingReplyObligations. Without it that subquery full-scans messages
-    -- per candidate row (O(n^2)): ~8.6s at 4k rows, which blew the 5s Stop-hook
-    -- timeout and wedged turns in "busy" (#199).
-    CREATE INDEX IF NOT EXISTS idx_msg_reply_to ON messages(reply_to, from_agent);
     CREATE TABLE IF NOT EXISTS scheduled_timers (
       id TEXT PRIMARY KEY,
       target TEXT NOT NULL,
@@ -585,6 +581,7 @@ export function initDb(path: string = "agent-relay.db"): Database {
       mode TEXT NOT NULL,
       requested_mode TEXT,
       status TEXT NOT NULL DEFAULT 'active',
+      orchestrator_id TEXT,
       owner_agent_id TEXT,
       owner_policy_name TEXT,
       owner_automation_run_id TEXT,
@@ -596,6 +593,7 @@ export function initDb(path: string = "agent-relay.db"): Database {
       cleaned_at INTEGER
     );
     CREATE INDEX IF NOT EXISTS idx_workspaces_repo_status ON workspaces(repo_root, status);
+    -- idx_workspaces_orchestrator created in applyMigrations() AFTER orchestrator_id ALTER (#949)
     CREATE INDEX IF NOT EXISTS idx_workspaces_owner_agent ON workspaces(owner_agent_id);
     CREATE INDEX IF NOT EXISTS idx_workspaces_policy ON workspaces(owner_policy_name);
 

package/src/db/work-evidence.ts

@@ -0,0 +1,38 @@
+import { getDb } from "./connection.ts";
+import { MSG_SELECT, rowToMessage } from "./mappers.ts";
+import type { Message } from "../types";
+
+export function hasArtifactCreatedBy(createdBy: string, since: number = 0): boolean {
+  const row = getDb().query(`
+    SELECT 1
+    FROM artifacts a
+    JOIN artifact_blobs b ON b.digest = a.blob_digest
+    WHERE a.created_by = ?
+      AND a.created_at >= ?
+      AND a.size > 0
+      AND b.size > 0
+      AND EXISTS (
+        SELECT 1
+        FROM artifact_links l
+        WHERE l.artifact_id = a.id
+          AND l.entity_type IN ('message', 'task')
+      )
+    LIMIT 1
+  `).get(createdBy, since);
+  return Boolean(row);
+}
+
+export function listFinalResponseCaptureMessages(from: string, since: number = 0, limit: number = 20): Message[] {
+  const safeLimit = Math.min(Math.max(Math.floor(limit), 1), 100);
+  const rows = getDb().query(`
+    ${MSG_SELECT}
+    WHERE m.from_agent = ?
+      AND m.kind = 'chat'
+      AND m.created_at >= ?
+      AND json_extract(m.payload, '$.responseCapture.type') = 'response'
+      AND json_extract(m.payload, '$.responseCapture.final') = 1
+    ORDER BY m.id DESC
+    LIMIT ?
+  `).all(from, since, safeLimit) as any[];
+  return rows.map(rowToMessage);
+}

package/src/db/workspaces.ts

@@ -97,6 +97,7 @@ function rowToWorkspace(row: any): WorkspaceRecord {
     mode: row.mode,
     requestedMode: row.requested_mode ?? undefined,
     status: row.status,
+    orchestratorId: row.orchestrator_id ?? undefined,
     ownerAgentId: row.owner_agent_id ?? undefined,
     ownerPolicyName: row.owner_policy_name ?? undefined,
     ownerAutomationRunId: row.owner_automation_run_id ?? undefined,
@@ -140,7 +141,7 @@ function spawnCommandLandMetadata(spawnRequestId: string | undefined): ReturnTyp
   return workspaceLandMetadataFrom(parseJson<Record<string, unknown>>(row?.params, {}));
 }
 
-export function upsertWorkspaceFromManagedAgent(agent: ManagedAgent): WorkspaceRecord | null {
+export function upsertWorkspaceFromManagedAgent(agent: ManagedAgent, orchestratorId?: string): WorkspaceRecord | null {
   const workspace = agent.workspace;
   if (!workspace) return null;
   if (workspace.mode === "isolated" && workspace.id && workspace.repoRoot && workspace.worktreePath) {
@@ -174,6 +175,7 @@ export function upsertWorkspaceFromManagedAgent(agent: ManagedAgent): WorkspaceR
       mode: workspace.mode,
       requestedMode: workspace.requestedMode,
       status: preserveStatus ? existing!.status : (workspace.status ?? "active"),
+      orchestratorId: existing?.orchestratorId ?? orchestratorId,
       ownerAgentId: agent.agentId || undefined,
       ownerPolicyName: agent.policyName,
       ownerAutomationRunId: agent.automationRunId,
@@ -215,8 +217,8 @@ export function upsertWorkspaceFromManagedAgent(agent: ManagedAgent): WorkspaceR
 export function upsertWorkspace(input: Omit<WorkspaceRecord, "createdAt" | "updatedAt"> & Partial<Pick<WorkspaceRecord, "createdAt" | "updatedAt">>): WorkspaceRecord {
   const now = Date.now();
   getDb().query(`
-    INSERT INTO workspaces (id, repo_root, source_cwd, worktree_path, branch, base_ref, base_sha, mode, requested_mode, status, owner_agent_id, owner_policy_name, owner_automation_run_id, steward_agent_id, metadata, created_at, updated_at, ready_at, cleaned_at)
-    VALUES ($id, $repoRoot, $sourceCwd, $worktreePath, $branch, $baseRef, $baseSha, $mode, $requestedMode, $status, $ownerAgentId, $ownerPolicyName, $ownerAutomationRunId, $stewardAgentId, $metadata, $createdAt, $updatedAt, $readyAt, $cleanedAt)
+    INSERT INTO workspaces (id, repo_root, source_cwd, worktree_path, branch, base_ref, base_sha, mode, requested_mode, status, orchestrator_id, owner_agent_id, owner_policy_name, owner_automation_run_id, steward_agent_id, metadata, created_at, updated_at, ready_at, cleaned_at)
+    VALUES ($id, $repoRoot, $sourceCwd, $worktreePath, $branch, $baseRef, $baseSha, $mode, $requestedMode, $status, $orchestratorId, $ownerAgentId, $ownerPolicyName, $ownerAutomationRunId, $stewardAgentId, $metadata, $createdAt, $updatedAt, $readyAt, $cleanedAt)
     ON CONFLICT(id) DO UPDATE SET
       repo_root = excluded.repo_root,
       source_cwd = excluded.source_cwd,
@@ -227,6 +229,7 @@ export function upsertWorkspace(input: Omit<WorkspaceRecord, "createdAt" | "upda
       mode = excluded.mode,
       requested_mode = excluded.requested_mode,
       status = excluded.status,
+      orchestrator_id = coalesce(excluded.orchestrator_id, workspaces.orchestrator_id),
       owner_agent_id = coalesce(excluded.owner_agent_id, workspaces.owner_agent_id),
       owner_policy_name = coalesce(excluded.owner_policy_name, workspaces.owner_policy_name),
       owner_automation_run_id = coalesce(excluded.owner_automation_run_id, workspaces.owner_automation_run_id),
@@ -246,6 +249,7 @@ export function upsertWorkspace(input: Omit<WorkspaceRecord, "createdAt" | "upda
     $mode: input.mode,
     $requestedMode: input.requestedMode ?? null,
     $status: input.status,
+    $orchestratorId: input.orchestratorId ?? null,
     $ownerAgentId: input.ownerAgentId ?? null,
     $ownerPolicyName: input.ownerPolicyName ?? null,
     $ownerAutomationRunId: input.ownerAutomationRunId ?? null,

package/src/lifecycle-manager.ts

@@ -1,5 +1,5 @@
 import { createCommand } from "./commands-db";
-import { isPathWithinBase } from "./utils";
+import { workspaceOwnerOrchestrator } from "./workspace-host";
 import { agentProviderState } from "./provider-state";
 import { createActivityEvent, deleteWorkspace, getAgent, getDb, getOrchestrator, listOrchestrators, listWorkspaces } from "./db";
 import {
@@ -584,9 +584,7 @@ export class LifecycleManager {
     if (!candidates.length) return;
     const orchestrators = listOrchestrators();
     for (const ws of candidates) {
-      const orch = orchestrators.find(
-        (candidate) => candidate.status === "online" && isPathWithinBase(ws.sourceCwd, candidate.baseDir),
-      );
+      const orch = workspaceOwnerOrchestrator(ws, orchestrators);
       if (!orch) continue;
       const command = createCommand({
         type: "workspace.reconcile",

package/src/maintenance/jobs.ts

@@ -27,7 +27,7 @@ import { isAgentUnavailable } from "../db/agent-predicates";
 import { flushQueuedDirectMessages } from "../services/managed-running";
 import { notifyAgentOffline } from "../agent-lifecycle-events";
 import { diagnoseAgentDeath } from "../agent-death-diagnosis";
-import { autoMergeCleanFastForwards } from "../workspace-auto-merge";
+import { autoMergeCleanFastForwards, runAutoMergeWatchdog } from "../workspace-auto-merge";
 import { reapOrphanedWorktrees } from "../workspace-orphans";
 import { getLifecycleManager } from "../lifecycle-manager";
 import { applyCommandToRecipe } from "../recipe-runner";
@@ -485,6 +485,15 @@ export const definitions: MaintenanceJobDefinition[] = [
     timeoutMs: 60 * 1000,
     handler: autoMergeCleanFastForwards,
   },
+  {
+    id: "workspace-auto-merge-watchdog",
+    title: "Workspace auto-merge watchdog",
+    description: "Restarts stale per-repo auto-merge loops when ready/review_requested work exists but no auto-merge cycle has completed recently.",
+    intervalMs: 60 * 1000,
+    runOnStart: false,
+    timeoutMs: 10 * 1000,
+    handler: runAutoMergeWatchdog,
+  },
   {
     id: "workspace-idle-refresh",
     title: "Workspace idle refresh",

package/src/maintenance/workspaces.ts

@@ -13,13 +13,14 @@ import {
   updateWorkspaceStatus,
   setWorkspaceBranch,
 } from "../db";
-import type { WorkspaceMergePreview, WorkspaceStatus } from "../types";
+import type { WorkspaceMergePreview, WorkspaceRecord, WorkspaceStatus } from "../types";
 import { notifyStewardHandoff, reconcileLandedWorkspace } from "../branch-landed";
 import { resolveStewardIdentity } from "../steward-identity";
 import { getStewardConfig } from "../config-store";
 import { preparePrCompletionScan, reconcileLandedPr } from "../workspace-pr-completion";
 import { applyBranchFreshness, fetchHostMergePreview, workspacePathWithinBase } from "../workspace-probe";
 import { wakeRepoSteward } from "../workspace-auto-merge";
+import { workspaceOwnerOrchestrator } from "../workspace-host";
 import {
   CONFLICT_SCAN_STATUSES,
   DAY_MS,
@@ -44,7 +45,7 @@ export async function scanWorkspaceConflicts(): Promise<Record<string, unknown>>
   const reviewerArmed: string[] = [], reviewerChangesRequested: string[] = [], relayPrMerged: string[] = [], relayPrWaiting: string[] = [];
 
   for (const ws of candidates) {
-    const orch = orchestrators.find((candidate) => workspacePathWithinBase(ws.sourceCwd, candidate.baseDir));
+    const orch = workspaceOwnerOrchestrator(ws, orchestrators, { requireApiUrl: true });
     if (!orch?.apiUrl) continue;
     const preview = await fetchHostMergePreview(orch.apiUrl, ws, { checkPr: LANDED_RECONCILE_STATUSES.has(ws.status) });
     if (!preview || (preview as { available?: false }).available === false) continue;
@@ -129,6 +130,31 @@ export async function scanWorkspaceConflicts(): Promise<Record<string, unknown>>
   return { scanned: candidates.length, flagged, cleared, merged, prRecycled, notifiedStewards, reviewerArmed, reviewerChangesRequested, relayPrMerged, relayPrWaiting };
 }
 
+type AutoAbandonDecision =
+  | { kind: "abandon" }
+  | { kind: "defer"; reason: string }
+  | { kind: "landed"; preview: WorkspaceMergePreview };
+
+function previewProvesLanded(preview: WorkspaceMergePreview): boolean {
+  const cleanWorktree = (preview.dirtyCount ?? 0) === 0;
+  return preview.landed === true
+    || preview.prMerged === true
+    || preview.noop === true
+    || (cleanWorktree && (preview.unmergedAhead === 0 || preview.ahead === 0));
+}
+
+async function reviewAutoAbandonDecision(ws: WorkspaceRecord, orchestrators: ReturnType<typeof listOrchestrators>): Promise<AutoAbandonDecision> {
+  const owner = workspaceOwnerOrchestrator(ws, orchestrators, { requireApiUrl: true });
+  if (!owner?.apiUrl) return ws.orchestratorId ? { kind: "defer", reason: "owner-unavailable" } : { kind: "abandon" };
+  const preview = await fetchHostMergePreview(owner.apiUrl, ws, { checkPr: true });
+  if (!preview || (preview as { available?: false }).available === false) return { kind: "defer", reason: "owner-unavailable" };
+  const p = preview as WorkspaceMergePreview;
+  if (p.error) return { kind: "defer", reason: "preview-error" };
+  if (previewProvesLanded(p)) return { kind: "landed", preview: p };
+  if ((p.dirtyCount ?? 0) > 0) return { kind: "defer", reason: "dirty-worktree" };
+  return { kind: "abandon" };
+}
+
 export async function workspaceGC(): Promise<Record<string, unknown>> {
   const now = Date.now();
   const cutoff = now - WORKSPACE_RETENTION_MS;
@@ -147,6 +173,7 @@ export async function workspaceGC(): Promise<Record<string, unknown>> {
   const escalatedIds: string[] = [];
   const reassignedIds: string[] = [];
   const escalationTargets: string[] = [];
+  const reconciledLandedIds: string[] = [];
   const escalationMs = stewardEscalationMs();
   const fallbackTarget = stewardFallbackTarget();
   for (const ws of all) {
@@ -159,6 +186,20 @@ export async function workspaceGC(): Promise<Record<string, unknown>> {
     const stewardOnline = Boolean(steward && getAgent(steward) && getAgent(steward)!.status !== "offline");
     const strandedAt = typeof meta.strandedAt === "number" ? meta.strandedAt : undefined;
 
+    if (!stewardOnline) {
+      const orch = workspaceOwnerOrchestrator(fresh, listOrchestrators().filter((o) => o.status === "online" && o.apiUrl), { requireApiUrl: true });
+      const preview = orch?.apiUrl ? await fetchHostMergePreview(orch.apiUrl, fresh, { checkPr: true }) : null;
+      if (preview && !("available" in preview) && !preview.error && !preview.missing) {
+        const landed = previewProvesLanded(preview);
+        if (landed) {
+          reconcileLandedWorkspace(fresh, preview);
+          patchWorkspaceMetadata(fresh.id, { strandedAt: undefined, escalatedAt: undefined, strandedNotifiedSteward: undefined });
+          reconciledLandedIds.push(fresh.id);
+          continue;
+        }
+      }
+    }
+
     if (stewardOnline) {
       if (strandedAt !== undefined && meta.strandedNotifiedSteward !== steward) {
         const sent = notifyTarget(
@@ -206,30 +247,45 @@ export async function workspaceGC(): Promise<Record<string, unknown>> {
   }
 
   const abandonedIds: string[] = [];
+  const autoAbandonDeferred: string[] = [];
   const notifiedStewards: string[] = [];
+  const reviewOrchestrators = listOrchestrators();
   for (const ws of all) {
     if (ws.status === "review_requested" && ws.updatedAt < reviewCutoff) {
-      updateWorkspaceStatus(ws.id, "abandoned", { autoAbandoned: true, abandonedReason: "review_requested TTL exceeded", abandonedAt: now });
-      abandonedIds.push(ws.id);
-      const target = ws.stewardAgentId ?? fallbackTarget;
+      const fresh = getWorkspace(ws.id);
+      if (!fresh || fresh.status !== "review_requested") continue;
+      const decision = await reviewAutoAbandonDecision(fresh, reviewOrchestrators);
+      if (decision.kind === "defer") {
+        autoAbandonDeferred.push(`${fresh.id}:${decision.reason}`);
+        continue;
+      }
+      if (decision.kind === "landed") {
+        reconcileLandedWorkspace(fresh, decision.preview);
+        reconciledLandedIds.push(fresh.id);
+        continue;
+      }
+
+      updateWorkspaceStatus(fresh.id, "abandoned", { autoAbandoned: true, abandonedReason: "review_requested TTL exceeded", abandonedAt: now });
+      abandonedIds.push(fresh.id);
+      const target = fresh.stewardAgentId ?? fallbackTarget;
       const sent = notifyTarget(
         "workspace.auto_abandoned",
-        { workspaceId: ws.id, repoRoot: ws.repoRoot },
+        { workspaceId: fresh.id, repoRoot: fresh.repoRoot },
         target,
         "Workspace auto-abandoned",
-        `Workspace \`${ws.branch ?? ws.id}\` in ${ws.repoRoot} was auto-abandoned after ${Math.round(WORKSPACE_REVIEW_TTL_MS / DAY_MS)}d without steward action. Run workspace cleanup to reclaim the worktree.`,
-        { kind: "workspace.auto-abandoned", workspaceId: ws.id, repoRoot: ws.repoRoot, branch: ws.branch },
+        `Workspace \`${fresh.branch ?? fresh.id}\` in ${fresh.repoRoot} was auto-abandoned after ${Math.round(WORKSPACE_REVIEW_TTL_MS / DAY_MS)}d without steward action. Run workspace cleanup to reclaim the worktree.`,
+        { kind: "workspace.auto-abandoned", workspaceId: fresh.id, repoRoot: fresh.repoRoot, branch: fresh.branch },
       );
       if (sent) notifiedStewards.push(sent);
       createActivityEvent({
-        clientId: `workspace-gc-abandon-${ws.id}-${now}`,
+        clientId: `workspace-gc-abandon-${fresh.id}-${now}`,
         kind: "state",
         title: "Workspace auto-abandoned",
-        body: `${ws.branch ?? ws.id} in ${ws.repoRoot} - review_requested for ${Math.round((now - ws.updatedAt) / DAY_MS)}d`,
-        meta: ws.branch ?? ws.id,
+        body: `${fresh.branch ?? fresh.id} in ${fresh.repoRoot} - review_requested for ${Math.round((now - fresh.updatedAt) / DAY_MS)}d`,
+        meta: fresh.branch ?? fresh.id,
         icon: "ti-clock-x",
         view: "orchestrators",
-        metadata: { source: "server", maintenanceJobId: "workspace-gc", workspaceId: ws.id },
+        metadata: { source: "server", maintenanceJobId: "workspace-gc", workspaceId: fresh.id },
       });
     }
   }
@@ -255,12 +311,14 @@ export async function workspaceGC(): Promise<Record<string, unknown>> {
   return {
     prunedTerminal: terminalIds,
     autoAbandoned: abandonedIds,
+    autoAbandonDeferred,
     notifiedStewards,
     pruneCommands,
     releasedLeaseRepos,
     escalated: escalatedIds,
     reassigned: reassignedIds,
     escalationTargets,
+    reconciledLanded: reconciledLandedIds,
   };
 }
 
@@ -288,7 +346,7 @@ export async function refreshIdleWorkspaces(): Promise<Record<string, unknown>>
   const now = Date.now();
 
   for (const ws of candidates) {
-    const orch = orchestrators.find((candidate) => workspacePathWithinBase(ws.sourceCwd, candidate.baseDir));
+    const orch = workspaceOwnerOrchestrator(ws, orchestrators);
     if (!orch?.agentId) { skipped.push(`${ws.id}:no-orchestrator`); continue; }
 
     // Gate: owner must exist and not be busy.

package/src/routes/commands.ts

@@ -22,6 +22,7 @@ import { handleReviewerMergeResult } from "../reviewer-pipeline";
 import { CLEAR_MERGE_NO_PROGRESS, noteMergeNoProgress, scheduleRepoMerge } from "../workspace-auto-merge";
 import { enqueueContinuationInjectionAfterSelfResume } from "../self-resume";
 import { type Command, type CommandStatus, type CreateCommandInput, type WorkspaceStatus } from "../types";
+import { commandTargetsWorkspaceOwner } from "../workspace-host";
 
 const VALID_COMMAND_STATUSES = ["pending", "accepted", "running", "succeeded", "failed", "timed_out", "rejected", "canceled"] as const;
 
@@ -227,10 +228,13 @@ export const patchCommand: Handler = async (req, params) => {
     if (command.type === "workspace.cleanup" && command.status === "succeeded" && isRecord(command.result)) {
       const workspaceId = cleanString(command.result.workspaceId, "result.workspaceId", { max: 160 });
       if (workspaceId) {
-        updateWorkspaceStatus(workspaceId, "cleaned", {
-          cleanupResult: command.result,
-          cleanupCommandId: command.id,
-        });
+        const workspace = getWorkspace(workspaceId);
+        if (workspace && commandTargetsWorkspaceOwner(command, workspace)) {
+          updateWorkspaceStatus(workspaceId, "cleaned", {
+            cleanupResult: command.result,
+            cleanupCommandId: command.id,
+          });
+        }
       }
     }
     if (command.type === "workspace.idle-refresh" && command.status === "succeeded" && isRecord(command.result)) {
@@ -261,6 +265,10 @@ export const patchCommand: Handler = async (req, params) => {
           // Snapshot the row BEFORE the recycle repoints `branch` (#206) — the landed
           // branch name + author (#239 branch.landed push) come from this pre-mutation state.
           const landedWorkspace = getWorkspace(workspaceId);
+          if (landedWorkspace && !commandTargetsWorkspaceOwner(command, landedWorkspace)) {
+            auditCommandOutcome(command);
+            return json(command);
+          }
           const newBranch = cleanString(command.result.newBranch, "result.newBranch", { max: 240 });
           const normalizedStatus = command.result.merged === true
             && !newBranch
@@ -361,6 +369,10 @@ export const patchCommand: Handler = async (req, params) => {
         // auto-merge job backs off after N instead of busy-looping (#638).
         const current = getWorkspace(command.correlationId);
         if (current && current.status === "merge_planned") {
+          if (!commandTargetsWorkspaceOwner(command, current)) {
+            auditCommandOutcome(command);
+            return json(command);
+          }
           const failedResultStatus = isRecord(command.result)
             ? optionalEnum(command.result.status, "result.status", VALID_WORKSPACE_STATUSES) as WorkspaceStatus | undefined
             : undefined;
@@ -420,6 +432,10 @@ export const patchCommand: Handler = async (req, params) => {
         // a status a human/agent has since moved on (merge_planned, abandoned, …).
         const current = getWorkspace(workspaceId);
         if (current && (current.status === "active" || current.status === "ready")) {
+          if (!commandTargetsWorkspaceOwner(command, current)) {
+            auditCommandOutcome(command);
+            return json(command);
+          }
           if (removed) {
             // The owner exited and the worktree had no work — the orchestrator
             // already deleted it on disk. Drop the DB row immediately instead of