agent-relay-server 0.58.0 → 0.60.0

package/src/routes/agents-spawn.ts

@@ -6,6 +6,7 @@ import { ValidationError, listAgents } from "../db";
 import { cleanMeta, cleanNullableString, cleanString, cleanStringArray, optionalEnum } from "../validation";
 import { registerAgent } from "../services/register-agent";
 import { spawnAgent, type SpawnAgentInput } from "../services/spawn-agent";
+import { parseProjectInstructions } from "../project-instructions";
 import { authContextFromRequest } from "../services/auth-context";
 import { listHostDirectories } from "../agent-spawn";
 import { rankRouteCandidates, type RouteAdvisorInput } from "../context-router";
@@ -116,6 +117,7 @@ export const postAgentSpawn: Handler = async (req) => {
       profile: cleanString(parsed.body.profile, "profile", { max: 120 }),
       prompt: cleanString(parsed.body.prompt, "prompt", { max: 16000 }),
       systemPromptAppend: cleanString(parsed.body.systemPromptAppend, "systemPromptAppend", { max: 64_000 }),
+      projectInstructions: parseProjectInstructions(parsed.body.projectInstructions, (m) => new ValidationError(m)),
       tags: cleanStringArray(parsed.body.tags, "tags", { itemMax: 80, maxItems: 50 }),
       capabilities: cleanStringArray(parsed.body.capabilities, "capabilities", { itemMax: 80, maxItems: 50 }),
       providerArgs: cleanStringArray(parsed.body.providerArgs, "providerArgs", { itemMax: 80, maxItems: 50 }),

package/src/routes/commands.ts

@@ -229,15 +229,21 @@ export const patchCommand: Handler = async (req, params) => {
           if (newBranch) {
             setWorkspaceBranch(workspaceId, newBranch, baseSha ?? mergedSha);
           }
-          // #239 — push the author a "your branch landed" notice (no polling). Only on a
+          // #239 — push the author a "your branch landed" notice (no polling). Fires on a
           // real land; a no-op resolution (#230) merged nothing, so it earns no notice.
-          if (command.result.merged === true && landedWorkspace) {
+          // #423 — a PR-land RECYCLE is a no-op merge (`merged:false`) but a land DID happen
+          // on the remote: the relay carries that ground truth in `params.prLanded`, so the
+          // notice fires from it with the recycled `newBranch` — full rebase-ff parity.
+          const prLanded = isRecord(command.params.prLanded) ? command.params.prLanded : undefined;
+          if ((command.result.merged === true || prLanded) && landedWorkspace) {
             notifyBranchLanded({
               workspace: landedWorkspace,
-              mergedSha,
-              subject: cleanString(command.result.subject, "result.subject", { max: 200 }),
+              mergedSha: prLanded ? cleanString(prLanded.sha, "params.prLanded.sha", { max: 64 }) ?? mergedSha : mergedSha,
+              subject: prLanded
+                ? cleanString(prLanded.subject, "params.prLanded.subject", { max: 200 })
+                : cleanString(command.result.subject, "result.subject", { max: 200 }),
               newBranch,
-              pushed: typeof command.result.pushed === "boolean" ? command.result.pushed : undefined,
+              pushed: prLanded ? true : typeof command.result.pushed === "boolean" ? command.result.pushed : undefined,
             });
           }
         }

package/src/self-resume.ts

@@ -11,7 +11,7 @@ import {
   ValidationError,
 } from "./db";
 import { emitRelayEvent } from "./events";
-import { notifySystemMessage } from "./notify";
+import { routeNotification } from "./notification-router";
 import type { AgentCard, Command, ContinuationEnvelope, ContinuationLedgerEntry, SelfResumeMode } from "./types";
 
 export interface CompactAndResumeInput {
@@ -200,11 +200,16 @@ function notifySelfResumeBudgetExhausted(agent: AgentCard, envelope: Continuatio
   };
   emitRelayEvent({ type: "agent.resume_budget_exhausted", source: "server", subject: agent.id, data: payload });
   if (!agent.spawnedBy) return;
-  notifySystemMessage(agent.spawnedBy, {
-    subject: "Self-resume budget exhausted",
-    body: `Spawned agent \`${agent.id}\` stopped cleanly: ${reason}.`,
-    payload,
-    replyExpected: false,
+  routeNotification({
+    type: "agent.resume_budget_exhausted",
+    scope: { agentId: agent.id, parent: agent.spawnedBy },
+    recipients: [agent.spawnedBy],
+    message: {
+      subject: "Self-resume budget exhausted",
+      body: `Spawned agent \`${agent.id}\` stopped cleanly: ${reason}.`,
+      payload,
+      replyExpected: false,
+    },
   });
 }
 

package/src/services/plan-live-bindings.ts

@@ -1,6 +1,6 @@
 import { getTeam } from "../db";
 import { subscribeRelayEvents, type RelayEvent } from "../events";
-import { notifySystemMessage } from "../notify";
+import { routeNotification } from "../notification-router";
 import { updateBoundPlanNodesForAgent, updateBoundPlanNodesFromAgent } from "./plan-graph";
 
 let unsubscribe: (() => void) | undefined;
@@ -48,11 +48,16 @@ function notifyBoundExit(event: RelayEvent, updatedPlans: ReturnType<typeof upda
     const target = team?.coordinatorId ?? `team:${plan.teamId}`;
     const blockedNodes = plan.nodes.filter((node) => node.statusSource === "bound" && node.ownerRef?.agentId === agentId && node.status === "blocked");
     if (blockedNodes.length === 0) continue;
-    notifySystemMessage(target, {
-      subject: "Bound plan node blocked",
-      body: `Agent \`${agentId}\` exited${reason ? ` (${reason})` : ""}; blocked plan node(s) ${blockedNodes.map((node) => `\`${node.id}\``).join(", ")} in \`${plan.id}\`.`,
-      payload: { kind: "plan.bound_agent_exited", planId: plan.id, agentId, nodeIds: blockedNodes.map((node) => node.id), reason },
-      replyExpected: false,
+    routeNotification({
+      type: "plan.bound_agent_exited",
+      scope: { agentId, planId: plan.id, teamId: plan.teamId },
+      recipients: [target],
+      message: {
+        subject: "Bound plan node blocked",
+        body: `Agent \`${agentId}\` exited${reason ? ` (${reason})` : ""}; blocked plan node(s) ${blockedNodes.map((node) => `\`${node.id}\``).join(", ")} in \`${plan.id}\`.`,
+        payload: { kind: "plan.bound_agent_exited", planId: plan.id, agentId, nodeIds: blockedNodes.map((node) => node.id), reason },
+        replyExpected: false,
+      },
     });
   }
 }

package/src/services/rate-limit-resume.ts

@@ -1,5 +1,5 @@
 import { createActivityEvent, listAgents } from "../db";
-import { notifySystemMessage } from "../notify";
+import { routeNotification } from "../notification-router";
 import { agentProviderState, isRateLimitHold, rateLimitResumeAt } from "../provider-state";
 
 // #286 Phase 2: auto-resume agents held on a usage/rate-limit stall once their
@@ -52,16 +52,23 @@ export function resumeRateLimitedAgents(): Record<string, unknown> {
     resumeTracker.set(agent.id, now);
 
     try {
-      notifySystemMessage(agent.id, {
-        subject: "Usage limit reset — resume",
-        body: RESUME_BODY,
-        payload: {
-          kind: "agent.rate_limit_resume",
-          agentId: agent.id,
-          resetAt: state?.resetAt,
-          errorType: state?.errorType,
+      // Short default TTL (per-type): a "limit reset, resume" push is pointless once stale — the
+      // window has moved on. One recipient per iteration keeps the per-agent rollback below intact.
+      routeNotification({
+        type: "agent.rate_limit_resume",
+        scope: { agentId: agent.id },
+        recipients: [agent.id],
+        message: {
+          subject: "Usage limit reset — resume",
+          body: RESUME_BODY,
+          payload: {
+            kind: "agent.rate_limit_resume",
+            agentId: agent.id,
+            resetAt: state?.resetAt,
+            errorType: state?.errorType,
+          },
+          replyExpected: false,
         },
-        replyExpected: false,
       });
     } catch {
       // A stale/unreachable target must never break the sweep; it store-aheads

package/src/services/spawn-agent.ts

@@ -32,6 +32,7 @@ import { buildSpawnCommand, generateSpawnRequestId, resolveSpawnModelParams } fr
 import { runnerRuntimeTokenEnv } from "../runtime-tokens";
 import { selectSpawnOrchestrator } from "../spawn-targets";
 import { getAgentProfile } from "../config-store";
+import { composeProjectInstructions, type ProjectInstructionPolicy } from "../project-instructions";
 import { hasComponentScope, isComponentAuthorizedFor } from "../security";
 import { isPathWithinBase } from "../utils";
 import { McpAuthError, McpNotFoundError } from "../mcp-errors";
@@ -62,6 +63,16 @@ export interface SpawnAgentInput {
   profile?: string;
   prompt?: string;
   systemPromptAppend?: string;
+  /**
+   * #409 — project instruction projection. When set, relay composes an instruction
+   * preamble from the spawn's resolved project (own entries + inherited `contains`-
+   * ancestors) and PREPENDS it to systemPromptAppend. Additive-from-empty (#403
+   * decision 4): the block is built only from `project_entries`, never from host
+   * CLAUDE.md. Absent (undefined) = OFF → the spawn command is byte-identical to today.
+   * `policy` selects the included source set: `all` (manual+promoted+ingested) or
+   * `vanilla` (manual+promoted; excludes `ingested` host-CLAUDE.md content).
+   */
+  projectInstructions?: ProjectInstructionPolicy;
   /**
    * #413 — does this spawn carry a report-back contract? When true, relay seeds a pending
    * reply obligation from the spawner to the child at registration, so the child can't go
@@ -197,6 +208,20 @@ export async function spawnAgent(input: SpawnAgentInput, ctx: AuthContext): Prom
   // resolves it. Absent (graceful) when the cwd is inside no registered root.
   const callerProject = resolveProjectForCwd(resolvedCwd);
 
+  // #409 — instruction projection (default OFF). Only when the caller opts in AND the
+  // spawn cwd resolves to a project do we compose a knowledge preamble and PREPEND it to
+  // systemPromptAppend. Absent flag / no project / empty block ⇒ systemPromptAppend is
+  // left exactly as the caller passed it, so the spawn command stays byte-identical.
+  let systemPromptAppend = input.systemPromptAppend;
+  if (input.projectInstructions && callerProject) {
+    const block = composeProjectInstructions(callerProject, {
+      ...(input.projectInstructions.policy ? { policy: input.projectInstructions.policy } : {}),
+    });
+    if (block) {
+      systemPromptAppend = systemPromptAppend ? `${block}\n\n${systemPromptAppend}` : block;
+    }
+  }
+
   // Child runner token. `agentInitiated` (set whenever an agent is the caller) forces a
   // non-spawn-capable child (no grandchildren); `spawnedBy` stamps authoritative lineage the
   // child can't forge (it registers with spawnedBy = caller, read from the signed token).
@@ -244,7 +269,7 @@ export async function spawnAgent(input: SpawnAgentInput, ctx: AuthContext): Prom
       permissionMode: approvalMode,
       providerArgs: input.providerArgs ?? [],
       prompt: input.prompt,
-      systemPromptAppend: input.systemPromptAppend,
+      systemPromptAppend,
       ...(expectReply ? { expectReply } : {}),
       policyName: input.policyName,
       spawnRequestId,

package/src/services/transient-agent-reaper.ts

@@ -1,7 +1,7 @@
 import { createCommand } from "../commands-db";
 import { emitRelayEvent } from "../events";
 import { createActivityEvent, getAgent, listAgents, listWorkspaces } from "../db";
-import { notifySystemMessage } from "../notify";
+import { routeNotification } from "../notification-router";
 import { isProviderBlocked } from "../provider-state";
 import { TERMINAL_WORKSPACE_STATUSES } from "../workspace-phase";
 
@@ -47,11 +47,16 @@ function notifyTransientHeld(agentId: string, workspaceId: string | undefined, s
     metadata: { source: "server", maintenanceJobId: "transient-agent-reaper", ...payload },
   });
   if (parent) {
-    notifySystemMessage(parent, {
-      subject: "Transient worker held pending land",
-      body: `Transient agent \`${agentId}\` is idle but still unreaped because workspace \`${workspaceId ?? "unknown"}\` is \`${status ?? "unknown"}\` after ${Math.round(waitMs / 60_000)} min. Its work is being preserved; resolve the land before cleanup.`,
-      payload,
-      replyExpected: false,
+    routeNotification({
+      type: "agent.transient_land_hold",
+      scope: { agentId, parent, workspaceId },
+      recipients: [parent],
+      message: {
+        subject: "Transient worker held pending land",
+        body: `Transient agent \`${agentId}\` is idle but still unreaped because workspace \`${workspaceId ?? "unknown"}\` is \`${status ?? "unknown"}\` after ${Math.round(waitMs / 60_000)} min. Its work is being preserved; resolve the land before cleanup.`,
+        payload,
+        replyExpected: false,
+      },
     });
   }
 }

package/src/token-db.ts

@@ -57,7 +57,7 @@ const BUILT_IN_PROFILES: Array<Omit<TokenProfile, "createdAt" | "updatedAt">> =
     name: "Provider Agent",
     description: "Coding-agent runtime access for messages, commands, tasks, and scoped memory reads.",
     role: "provider",
-    scope: ["agent:read", "agent:write", "message:read", "message:send", "command:read", "command:write", "task:read", "task:write", "memory:read", "artifact:read", "artifact:write", "mcp:use", "plans:read", "plans:write", "teams:read", "teams:write", "blackboard:read", "blackboard:write", "project:read", "project:write", "insights:write"],
+    scope: ["agent:read", "agent:write", "message:read", "message:send", "command:read", "command:write", "task:read", "task:write", "memory:read", "artifact:read", "artifact:write", "mcp:use", "plans:read", "plans:write", "teams:read", "teams:write", "blackboard:read", "blackboard:write", "project:read", "project:write", "notifications:read", "notifications:write", "insights:write"],
     ttlSeconds: 24 * 60 * 60,
     builtIn: true,
     createdBy: "system",
@@ -67,7 +67,7 @@ const BUILT_IN_PROFILES: Array<Omit<TokenProfile, "createdAt" | "updatedAt">> =
     name: "Provider Child Agent",
     description: "Delegated child-agent runtime access, constrained to its parent and spawn request.",
     role: "provider",
-    scope: ["agent:read", "agent:write", "message:read", "message:send", "command:read", "command:write", "task:read", "task:write", "memory:read", "artifact:read", "artifact:write", "mcp:use", "teams:read", "blackboard:read", "blackboard:write", "project:read", "project:write", "insights:write"],
+    scope: ["agent:read", "agent:write", "message:read", "message:send", "command:read", "command:write", "task:read", "task:write", "memory:read", "artifact:read", "artifact:write", "mcp:use", "teams:read", "blackboard:read", "blackboard:write", "project:read", "project:write", "notifications:read", "notifications:write", "insights:write"],
     constraints: { canDelegate: false },
     ttlSeconds: 2 * 60 * 60,
     builtIn: true,
@@ -78,7 +78,7 @@ const BUILT_IN_PROFILES: Array<Omit<TokenProfile, "createdAt" | "updatedAt">> =
     name: "Provider Interactive Agent",
     description: "User-launched provider runtime access constrained to its own agent and cwd for long interactive sessions.",
     role: "provider",
-    scope: ["agent:read", "agent:write", "message:read", "message:send", "command:read", "command:write", "task:read", "task:write", "memory:read", "artifact:read", "artifact:write", "mcp:use", "teams:read", "blackboard:read", "blackboard:write", "project:read", "project:write", "insights:write"],
+    scope: ["agent:read", "agent:write", "message:read", "message:send", "command:read", "command:write", "task:read", "task:write", "memory:read", "artifact:read", "artifact:write", "mcp:use", "teams:read", "blackboard:read", "blackboard:write", "project:read", "project:write", "notifications:read", "notifications:write", "insights:write"],
     constraints: { terminalAttach: false, logsRead: false, canDelegate: false },
     ttlSeconds: 30 * 24 * 60 * 60,
     builtIn: true,

package/src/workspace-merge.ts

@@ -113,6 +113,16 @@ interface RequestWorkspaceMergeOptions {
   reviewer?: string;
   /** Extra metadata merged onto the workspace row when moving to merge_planned. */
   metadata?: Record<string, unknown>;
+  /**
+   * Set when this "merge" is really a land-and-continue RECYCLE of a workspace whose PR
+   * already merged on the remote out-of-band (#423). The host preview is then a no-op
+   * (work is already in base) so `mergeWorkspace` recycles the live owner onto a fresh
+   * branch without merging anything — `result.merged` is false. The relay still owns the
+   * ground truth that a land happened (it observed `prMerged`), so it carries the merge
+   * SHA/subject here; the merge-result handler fires the `branch.landed` notice from it,
+   * giving full parity with a rebase-ff land-and-continue.
+   */
+  prLanded?: { sha?: string; subject?: string };
 }
 
 type RequestWorkspaceMergeResult =
@@ -253,6 +263,7 @@ export function requestWorkspaceMerge(workspace: WorkspaceRecord, opts: RequestW
         prBody,
         ...(autoMerge !== undefined ? { autoMerge } : {}),
         ...(opts.reviewer !== undefined ? { reviewer: opts.reviewer } : {}),
+        ...(opts.prLanded !== undefined ? { prLanded: opts.prLanded } : {}),
         requestedBy: opts.requestedBy,
         requestedAt: Date.now(),
       },

package/src/workspace-pr-completion.ts

@@ -1,22 +1,85 @@
 import { isRecord } from "agent-relay-sdk";
 import { createCommand, getCommand } from "./commands-db";
-import { patchWorkspaceMetadata } from "./db";
+import { createActivityEvent, patchWorkspaceMetadata } from "./db";
 import { handleReviewerPipelineScan, isAwaitingReviewerApproval } from "./reviewer-pipeline";
+import { isOwnerAlive, requestWorkspaceMerge } from "./workspace-merge";
 import type { Command, WorkspaceAutoMergePolicy, WorkspaceMergePreview, WorkspaceRecord } from "./types";
 
+/**
+ * Decide what to do when a workspace's PR has merged on the remote (`prMerged`/`landed`),
+ * out-of-band of the relay's land path. Splits on owner liveness:
+ *
+ *  - LIVE owner → land-and-continue RECYCLE (#423). The rebase-ff land path recycles a live
+ *    owner onto a fresh `agent/...-N` branch off the advanced base; a PR land never ran through
+ *    it, stranding the owner on its merged branch at terminal `merged` (`relay_workspace_status`
+ *    then reports "you don't own an isolated workspace"). Dispatch a `rebase-ff` merge carrying
+ *    `prLanded` (the merge SHA/subject — our ground truth). The host honors prLanded and recycles
+ *    the live owner onto a fresh branch cut off the UPDATED upstream base, returning it to
+ *    `active` in the same CWD. (A bare no-op assumption would NOT hold for a squash merge onto an
+ *    advanced base — local cherry/tree detection can't see the squash commit, so the host's own
+ *    no-op derivation reports ahead>0 and would soft-loop via review_requested; prLanded is what
+ *    short-circuits that, see `mergeWorkspace`.) Explicit `rebase-ff` so a (prMerged-gated,
+ *    near-impossible) non-recycle never opens a duplicate PR; the merge-result handler fires the
+ *    `branch.landed` notice from `prLanded` (SHA + subject) since the recycle reports no land.
+ *  - GONE owner (offline/absent) → finalize terminal `merged` + store-ahead `branch.landed` for
+ *    its next poll (#304). Signalled by `kind: "finalize"`; the caller invokes the finalizer.
+ *
+ * `kind: "wait"` means the per-repo merge lease is held this tick (a concurrent merge) — retry
+ * next sweep; the caller must NOT finalize, or it re-strands the live owner.
+ */
+export function reconcileLandedPr(workspace: WorkspaceRecord, preview: WorkspaceMergePreview):
+  | { kind: "recycle"; command: Command }
+  | { kind: "wait"; reason: string }
+  | { kind: "finalize" } {
+  if (!isOwnerAlive(workspace.ownerAgentId)) return { kind: "finalize" };
+  const recycle = requestWorkspaceMerge(workspace, {
+    strategy: "rebase-ff",
+    requestedBy: "pr-land-recycle",
+    prLanded: {
+      sha: typeof preview.prMergeSha === "string" ? preview.prMergeSha : undefined,
+      subject: typeof preview.prMergeSubject === "string" ? preview.prMergeSubject : undefined,
+    },
+  });
+  if (recycle.ok) {
+    createActivityEvent({
+      clientId: `workspace-pr-recycle-${workspace.id}-${Date.now()}`,
+      kind: "state",
+      title: "Workspace recycling after PR land",
+      body: `${workspace.branch ?? workspace.id}'s PR merged into ${preview.baseRef ?? "base"} — recycling the live owner onto a fresh branch (land-and-continue)`,
+      meta: workspace.branch ?? workspace.id,
+      icon: "ti-git-merge",
+      view: "orchestrators",
+      metadata: { source: "server", maintenanceJobId: "workspace-conflict-scan", workspaceId: workspace.id, commandId: recycle.command.id, landedVia: "pr" },
+    });
+    return { kind: "recycle", command: recycle.command };
+  }
+  // 409 = lease held by an in-flight merge — retry next sweep, don't finalize (re-strands a
+  // live owner). Any other failure (e.g. lost worktree) falls through to finalize so the row
+  // doesn't loop forever in a reconcilable status.
+  if (recycle.status === 409) return { kind: "wait", reason: "recycle-lease-held" };
+  return { kind: "finalize" };
+}
+
 const ACTIVE_COMMAND_STATUSES = new Set(["pending", "accepted", "running"]);
 const PASSING_CONCLUSIONS = new Set(["SUCCESS", "NEUTRAL", "SKIPPED"]);
 const PASSING_STATES = new Set(["SUCCESS"]);
 const READY_MERGE_STATES = new Set(["CLEAN", "HAS_HOOKS"]);
 
-function relayPrMergeAlreadyHandled(workspace: WorkspaceRecord): boolean {
+function relayPrMergeAlreadyHandled(workspace: WorkspaceRecord, preview: WorkspaceMergePreview): boolean {
   const commandId = text(workspace.metadata.relayMergeCommandId);
-  if (commandId) {
-    const command = getCommand(commandId);
-    if (command && ACTIVE_COMMAND_STATUSES.has(command.status)) return true;
-    if (command?.status === "succeeded" && command.result?.relayMerged === true) return true;
-  }
-  return workspace.metadata.relayMerged === true && !commandId;
+  if (!commandId) return false;
+  const command = getCommand(commandId);
+  if (!command) return false;
+  // PR-scope the idempotency guard (#453). A land-and-continue recycle (#423) repoints the
+  // workspace onto a fresh branch but leaves the PRIOR cycle's relayMerge* metadata on the row,
+  // so without this a succeeded merge for an already-closed PR would block every SUBSEQUENT PR
+  // on the recycled workspace forever (green PR, never merged, no steward). Only treat the merge
+  // as already-handled when the recorded command targets the SAME PR we're now considering.
+  const recordedPr = isRecord(command.params) && typeof command.params.prNumber === "number" ? command.params.prNumber : undefined;
+  const currentPr = preview.prNumber ?? (typeof workspace.metadata.prNumber === "number" ? workspace.metadata.prNumber : undefined);
+  if (typeof recordedPr === "number" && typeof currentPr === "number" && recordedPr !== currentPr) return false;
+  if (ACTIVE_COMMAND_STATUSES.has(command.status)) return true;
+  return command.status === "succeeded" && command.result?.relayMerged === true;
 }
 
 function nativeAutoMergeArmed(workspace: WorkspaceRecord): boolean {
@@ -43,7 +106,7 @@ function prReadyForRelayMerge(workspace: WorkspaceRecord, preview: WorkspaceMerg
   if (preview.prMerged === true || preview.prState === "merged") return { ok: false, reason: "already-merged" };
   if (!preview.prNumber && !preview.prUrl) return { ok: false, reason: "missing-pr" };
   if (nativeAutoMergeArmed(workspace)) return { ok: false, reason: "native-auto-merge-armed" };
-  if (relayPrMergeAlreadyHandled(workspace)) return { ok: false, reason: "relay-merge-already-dispatched" };
+  if (relayPrMergeAlreadyHandled(workspace, preview)) return { ok: false, reason: "relay-merge-already-dispatched" };
 
   const policy = prAutoMergePolicy(workspace, preview);
   if (policy === "manual") return { ok: false, reason: "manual", policy };

package/public/assets/agents-DZBM5dp_.js

@@ -1,2 +0,0 @@
-import{r as e}from"./chunk-CilyBKbf.js";import{At as t,B as n,Cn as r,G as i,I as a,J as o,Kn as s,Mn as c,On as l,P as u,Pn as d,Rt as f,g as p,i as m,l as h,m as g,st as _}from"./lucide-react-CMhBract.js";import{o as ee,t as v}from"./store-BgJq_lN9.js";import{G as y,K as b,U as x,V as S,a as C,d as w,i as te,n as ne}from"./display-CketawEF.js";import{o as T,r as E}from"./dist-DV2tZ2fq.js";import{t as D}from"./dist-CoUvwLTy.js";import{i as O,n as k}from"./dist-CV3sgFiv.js";import{t as A}from"./dist-C5t_OxI0.js";import{t as j}from"./dist-1x-LE9Uk.js";import{a as M,i as N,n as re,o as ie,r as ae,s as oe,t as P}from"./es2015-DcavLcQ0.js";import{a as F,i as se,n as I,r as L,t as R}from"./dist-Ca3ujqG_.js";import{t as z}from"./badge-Dj6PREuI.js";import{t as B}from"./button-Cqpufqam.js";import{t as ce}from"./copy-button-DI7b8A7_.js";import{B as le,H as V,P as ue,S as H,U,V as W,d as de,g as fe,h as pe,l as me,m as he,p as ge,u as _e,x as G}from"./index-Ba2RDJaA.js";import{n as ve,t as ye}from"./card-OmDF73CE.js";import{n as be,t as xe}from"./branch-state-badge-CdYg2HYc.js";var K=e(s(),1),q=d(),J=`Popover`,[Se,Ce]=O(J,[F]),Y=F(),[we,X]=Se(J),Te=e=>{let{__scopePopover:t,children:n,open:r,defaultOpen:i,onOpenChange:a,modal:o=!1}=e,s=Y(t),c=K.useRef(null),[l,u]=K.useState(!1),[d,f]=A({prop:r,defaultProp:i??!1,onChange:a,caller:J});return(0,q.jsx)(se,{...s,children:(0,q.jsx)(we,{scope:t,contentId:oe(),triggerRef:c,open:d,onOpenChange:f,onOpenToggle:K.useCallback(()=>f(e=>!e),[f]),hasCustomAnchor:l,onCustomAnchorAdd:K.useCallback(()=>u(!0),[]),onCustomAnchorRemove:K.useCallback(()=>u(!1),[]),modal:o,children:n})})};Te.displayName=J;var Ee=`PopoverAnchor`,De=K.forwardRef((e,t)=>{let{__scopePopover:n,...r}=e,i=X(Ee,n),a=Y(n),{onCustomAnchorAdd:o,onCustomAnchorRemove:s}=i;return K.useEffect(()=>(o(),()=>s()),[o,s]),(0,q.jsx)(R,{...a,...r,ref:t})});De.displayName=Ee;var Oe=`PopoverTrigger`,ke=K.forwardRef((e,t)=>{let{__scopePopover:n,...r}=e,i=X(Oe,n),a=Y(n),o=T(t,i.triggerRef),s=(0,q.jsx)(D.button,{type:`button`,"aria-haspopup":`dialog`,"aria-expanded":i.open,"aria-controls":i.contentId,"data-state":Ve(i.open),...r,ref:o,onClick:k(e.onClick,i.onOpenToggle)});return i.hasCustomAnchor?s:(0,q.jsx)(R,{asChild:!0,...a,children:s})});ke.displayName=Oe;var Z=`PopoverPortal`,[Ae,je]=Se(Z,{forceMount:void 0}),Me=e=>{let{__scopePopover:t,forceMount:n,children:r,container:i}=e,a=X(Z,t);return(0,q.jsx)(Ae,{scope:t,forceMount:n,children:(0,q.jsx)(j,{present:n||a.open,children:(0,q.jsx)(N,{asChild:!0,container:i,children:r})})})};Me.displayName=Z;var Q=`PopoverContent`,Ne=K.forwardRef((e,t)=>{let n=je(Q,e.__scopePopover),{forceMount:r=n.forceMount,...i}=e,a=X(Q,e.__scopePopover);return(0,q.jsx)(j,{present:r||a.open,children:a.modal?(0,q.jsx)(Fe,{...i,ref:t}):(0,q.jsx)(Ie,{...i,ref:t})})});Ne.displayName=Q;var Pe=E(`PopoverContent.RemoveScroll`),Fe=K.forwardRef((e,t)=>{let n=X(Q,e.__scopePopover),r=K.useRef(null),i=T(t,r),a=K.useRef(!1);return K.useEffect(()=>{let e=r.current;if(e)return P(e)},[]),(0,q.jsx)(re,{as:Pe,allowPinchZoom:!0,children:(0,q.jsx)(Le,{...e,ref:i,trapFocus:n.open,disableOutsidePointerEvents:!0,onCloseAutoFocus:k(e.onCloseAutoFocus,e=>{e.preventDefault(),a.current||n.triggerRef.current?.focus()}),onPointerDownOutside:k(e.onPointerDownOutside,e=>{let t=e.detail.originalEvent,n=t.button===0&&t.ctrlKey===!0;a.current=t.button===2||n},{checkForDefaultPrevented:!1}),onFocusOutside:k(e.onFocusOutside,e=>e.preventDefault(),{checkForDefaultPrevented:!1})})})}),Ie=K.forwardRef((e,t)=>{let n=X(Q,e.__scopePopover),r=K.useRef(!1),i=K.useRef(!1);return(0,q.jsx)(Le,{...e,ref:t,trapFocus:!1,disableOutsidePointerEvents:!1,onCloseAutoFocus:t=>{e.onCloseAutoFocus?.(t),t.defaultPrevented||(r.current||n.triggerRef.current?.focus(),t.preventDefault()),r.current=!1,i.current=!1},onInteractOutside:t=>{e.onInteractOutside?.(t),t.defaultPrevented||(r.current=!0,t.detail.originalEvent.type===`pointerdown`&&(i.current=!0));let a=t.target;n.triggerRef.current?.contains(a)&&t.preventDefault(),t.detail.originalEvent.type===`focusin`&&i.current&&t.preventDefault()}})}),Le=K.forwardRef((e,t)=>{let{__scopePopover:n,trapFocus:r,onOpenAutoFocus:i,onCloseAutoFocus:a,disableOutsidePointerEvents:o,onEscapeKeyDown:s,onPointerDownOutside:c,onFocusOutside:l,onInteractOutside:u,...d}=e,f=X(Q,n),p=Y(n);return ae(),(0,q.jsx)(M,{asChild:!0,loop:!0,trapped:r,onMountAutoFocus:i,onUnmountAutoFocus:a,children:(0,q.jsx)(ie,{asChild:!0,disableOutsidePointerEvents:o,onInteractOutside:u,onEscapeKeyDown:s,onPointerDownOutside:c,onFocusOutside:l,onDismiss:()=>f.onOpenChange(!1),children:(0,q.jsx)(L,{"data-state":Ve(f.open),role:`dialog`,id:f.contentId,...p,...d,ref:t,style:{...d.style,"--radix-popover-content-transform-origin":`var(--radix-popper-transform-origin)`,"--radix-popover-content-available-width":`var(--radix-popper-available-width)`,"--radix-popover-content-available-height":`var(--radix-popper-available-height)`,"--radix-popover-trigger-width":`var(--radix-popper-anchor-width)`,"--radix-popover-trigger-height":`var(--radix-popper-anchor-height)`}})})})}),$=`PopoverClose`,Re=K.forwardRef((e,t)=>{let{__scopePopover:n,...r}=e,i=X($,n);return(0,q.jsx)(D.button,{type:`button`,...r,ref:t,onClick:k(e.onClick,()=>i.onOpenChange(!1))})});Re.displayName=$;var ze=`PopoverArrow`,Be=K.forwardRef((e,t)=>{let{__scopePopover:n,...r}=e,i=Y(n);return(0,q.jsx)(I,{...i,...r,ref:t})});Be.displayName=ze;function Ve(e){return e?`open`:`closed`}var He=Te,Ue=ke,We=Me,Ge=Ne;function Ke({...e}){return(0,q.jsx)(He,{"data-slot":`popover`,...e})}function qe({...e}){return(0,q.jsx)(Ue,{"data-slot":`popover-trigger`,...e})}function Je({className:e,align:t=`center`,sideOffset:n=4,...r}){return(0,q.jsx)(We,{children:(0,q.jsx)(Ge,{"data-slot":`popover-content`,align:t,sideOffset:n,className:c(`z-50 flex w-72 origin-(--radix-popover-content-transform-origin) flex-col gap-2.5 rounded-lg bg-popover p-2.5 text-sm text-popover-foreground shadow-md ring-1 ring-foreground/10 outline-hidden duration-100 data-[side=bottom]:slide-in-from-top-2 data-[side=left]:slide-in-from-right-2 data-[side=right]:slide-in-from-left-2 data-[side=top]:slide-in-from-bottom-2 data-open:animate-in data-open:fade-in-0 data-open:zoom-in-95 data-closed:animate-out data-closed:fade-out-0 data-closed:zoom-out-95`,e),...r})})}function Ye({className:e,...t}){return(0,q.jsx)(`div`,{"data-slot":`popover-header`,className:c(`flex flex-col gap-0.5 text-sm`,e),...t})}function Xe({className:e,...t}){return(0,q.jsx)(`div`,{"data-slot":`popover-title`,className:c(`font-medium`,e),...t})}function Ze({agent:e,childAgents:r=[],parentAgent:a}){let s=ee();v(e=>e.set);let c=v(e=>e.switchView),l=v(e=>e.openInboxThread),d=v(e=>e.openAgentDetail),m=v(e=>e.openPairInvite),T=v(e=>e.openRename),E=v(e=>e.openConfirm),D=v(e=>e.doAgentAction),O=v(e=>e.doDeleteAgent),k=v(e=>e.openFilesForAgent),A=v(e=>e.workspaceAction),j=v(e=>e.openWorkspaceFocus),{terminalOpen:M,terminalTarget:N,terminalOpening:re,openTerminal:ie,closeTerminal:ae}=be(e.id),oe=le(),P=te(s,e,ue(e),oe[e.id]||null),F=C(e,`shutdown`),se=C(e,`compact`),I=C(e,`clearContext`),L=!!(e.providerCapabilities?.terminal?.live?.read||e.providerCapabilities?.terminal?.attach?.create),R=!!(e.providerCapabilities?.terminal?.live?.write||e.providerCapabilities?.model?.provider===`claude`),V=ne(e),U=a?w(a):e.spawnedBy,W=r.length>0;return(0,q.jsxs)(q.Fragment,{children:[(0,q.jsx)(ye,{className:`group hover:border-zinc-600 transition-colors cursor-pointer`,onClick:()=>d(e),children:(0,q.jsxs)(ve,{className:`p-4`,children:[(0,q.jsxs)(`div`,{className:`flex items-start gap-2.5 mb-2.5`,children:[(0,q.jsx)(H,{agent:e,now:s,className:`mt-0.5`}),(0,q.jsx)(G,{agent:e}),(0,q.jsxs)(`div`,{className:`flex-1 min-w-0`,children:[(0,q.jsx)(`div`,{className:`text-sm font-medium truncate`,children:w(e)}),(0,q.jsx)(`div`,{className:`text-xs mt-0.5 ${y(P.tone)}`,children:P.label}),typeof e.meta?.cwd==`string`&&e.meta.cwd&&(0,q.jsx)(`button`,{type:`button`,className:`mt-0.5 block max-w-full truncate font-mono text-[10px] text-muted-foreground hover:text-foreground`,title:`Open ${e.meta.cwd} in Files`,onClick:t=>{t.stopPropagation(),k(e)},children:S(e.meta.cwd)})]}),e.branchState&&e.branchWorkspaceId&&(0,q.jsx)(xe,{state:e.branchState,className:`mt-0.5 shrink-0`,onClick:t=>{t.stopPropagation(),j(e.branchWorkspaceId)}})]}),P.badges.length>0&&(0,q.jsx)(`div`,{className:`flex flex-wrap gap-1 mb-2`,children:P.badges.map(e=>(0,q.jsx)(`span`,{className:`text-[10px] px-1.5 py-0.5 rounded-full font-medium ${e.className}`,children:e.label},e.label))}),(W||e.spawnedBy&&U)&&(0,q.jsxs)(`div`,{className:`mb-2 flex flex-wrap gap-1.5`,onClick:e=>e.stopPropagation(),children:[W&&(0,q.jsxs)(Ke,{children:[(0,q.jsx)(qe,{asChild:!0,children:(0,q.jsxs)(`button`,{type:`button`,className:`inline-flex h-6 max-w-full items-center gap-1.5 rounded-full border border-sky-500/30 bg-sky-500/10 px-2 text-[10px] font-medium text-sky-300 transition-colors hover:bg-sky-500/15`,title:`${r.length} live child ${r.length===1?`agent`:`agents`}`,children:[(0,q.jsx)(h,{className:`h-3 w-3`}),(0,q.jsx)(`span`,{children:r.length}),(0,q.jsx)(`span`,{className:`flex -space-x-1`,children:r.slice(0,4).map(e=>(0,q.jsx)(H,{agent:e,now:s,className:`h-2 w-2 ring-1 ring-background`},e.id))})]})}),(0,q.jsxs)(Je,{align:`start`,className:`w-80`,onClick:e=>e.stopPropagation(),children:[(0,q.jsx)(Ye,{children:(0,q.jsx)(Xe,{children:`Team`})}),(0,q.jsx)(`div`,{className:`space-y-1.5`,children:r.map(e=>(0,q.jsxs)(`div`,{className:`rounded-md border border-border bg-card/60 p-2`,children:[(0,q.jsxs)(`div`,{className:`flex items-start gap-2`,children:[(0,q.jsx)(H,{agent:e,now:s,className:`mt-1`}),(0,q.jsx)(G,{agent:e}),(0,q.jsxs)(`div`,{className:`min-w-0 flex-1`,children:[(0,q.jsx)(`div`,{className:`truncate text-xs font-medium`,children:w(e)}),(0,q.jsx)(`div`,{className:`truncate text-[10px] text-muted-foreground`,children:e.providerCapabilities?.model?.alias||e.providerCapabilities?.model?.id||e.providerCapabilities?.model?.provider||e.status})]}),(0,q.jsx)(z,{variant:`outline`,className:`h-4 px-1.5 text-[9px]`,children:e.status})]}),(0,q.jsxs)(`div`,{className:`mt-2 flex gap-1`,children:[(0,q.jsx)(B,{size:`xs`,variant:`outline`,onClick:()=>d(e),children:`Open`}),(0,q.jsxs)(B,{size:`xs`,variant:`ghost`,onClick:()=>{l(e.id),c(`chat`)},children:[(0,q.jsx)(o,{className:`h-3 w-3`}),`Chat`]})]})]},e.id))})]})]}),e.spawnedBy&&U&&(0,q.jsx)(z,{variant:`outline`,className:`max-w-full text-[10px] text-muted-foreground`,children:(0,q.jsxs)(`span`,{className:`truncate`,children:[`spawned by `,U]})})]}),(e.tags.length>0||b(e.capabilities).length>0)&&(0,q.jsxs)(`div`,{className:`flex flex-wrap gap-1 mb-2`,children:[e.tags.slice(0,3).map(e=>(0,q.jsx)(z,{variant:`outline`,className:`text-[9px] px-1 py-0 h-4`,children:e},e)),b(e.capabilities).slice(0,2).map(e=>(0,q.jsx)(z,{variant:`secondary`,className:`text-[9px] px-1 py-0 h-4`,children:e},e))]}),(0,q.jsxs)(`div`,{className:`space-y-2 mb-2`,children:[(0,q.jsx)(pe,{agent:e}),(0,q.jsx)(he,{agent:e,compact:!0}),(0,q.jsx)(fe,{agent:e})]}),(0,q.jsx)(`div`,{className:`text-xs text-muted-foreground`,children:e.id!==`user`&&e.id!==`system`&&x(s,e.lastSeen)}),(0,q.jsxs)(`div`,{className:`flex gap-1 mt-2.5 opacity-100 sm:opacity-0 sm:group-hover:opacity-100 transition-opacity`,onClick:e=>e.stopPropagation(),children:[(0,q.jsx)(ce,{value:e.id,label:`Copy agent ID`,size:`icon`,className:`h-7 w-7`,iconClassName:`w-3 h-3`}),(0,q.jsx)(B,{size:`icon`,variant:`ghost`,className:`h-7 w-7`,title:`Chat`,onClick:()=>{l(e.id),c(`chat`)},children:(0,q.jsx)(o,{className:`w-3 h-3`})}),(0,q.jsx)(B,{size:`icon`,variant:`ghost`,className:`h-7 w-7`,title:`Pair`,onClick:()=>m(e.id),children:(0,q.jsx)(_,{className:`w-3 h-3`})}),(0,q.jsx)(B,{size:`icon`,variant:`ghost`,className:`h-7 w-7`,title:`Rename`,onClick:()=>T(e),children:(0,q.jsx)(n,{className:`w-3 h-3`})}),L&&(0,q.jsx)(B,{size:`icon`,variant:`ghost`,className:`h-7 w-7`,title:`Terminal`,disabled:re,onClick:()=>void ie(),children:(0,q.jsx)(p,{className:`w-3 h-3`})}),(e.branchState===`changes`||e.branchState===`idle`)&&e.branchWorkspaceId&&(0,q.jsx)(B,{size:`icon`,variant:`ghost`,className:`h-7 w-7 text-amber-400 hover:text-amber-300`,title:`Mark workspace ready — hand off to the auto-merge`,onClick:()=>E(`Mark Workspace Ready`,`Mark ${w(e)}'s branch ready to land? The relay auto-merge will rebase and land it.`,()=>A(e.branchWorkspaceId,`ready`)),children:(0,q.jsx)(t,{className:`w-3 h-3`})}),se&&(0,q.jsx)(B,{size:`icon`,variant:`ghost`,className:`h-7 w-7`,title:`Compact`,onClick:()=>E(`Compact Agent`,`Compact context for ${w(e)}?`,()=>D(e,`compact`,`agents-grid`)),children:(0,q.jsx)(i,{className:`w-3 h-3`})}),I&&(0,q.jsx)(B,{size:`icon`,variant:`ghost`,className:`h-7 w-7`,title:`Clear Context`,onClick:()=>E(`Clear Context`,`Clear context for ${w(e)}?`,()=>D(e,`clearContext`,`agents-grid`)),children:(0,q.jsx)(f,{className:`w-3 h-3`})}),F&&(0,q.jsx)(B,{size:`icon`,variant:`ghost`,className:`h-7 w-7 text-red-400 hover:text-red-300`,title:`Shutdown`,onClick:()=>E(`Shutdown Agent`,`Shutdown ${w(e)}?`,()=>D(e,`shutdown`,`agents-grid`)),children:(0,q.jsx)(u,{className:`w-3 h-3`})}),V&&(0,q.jsx)(B,{size:`icon`,variant:`ghost`,className:`h-7 w-7 text-red-400 hover:text-red-300`,title:`Forget stale agent`,onClick:()=>E(`Forget Agent`,`Forget ${w(e)}?`,()=>O(e.id)),children:(0,q.jsx)(g,{className:`w-3 h-3`})})]})]})}),N&&(0,q.jsx)(ge,{open:M,onOpenChange:ae,orchestratorId:N.orchestratorId,session:N.session,interactive:N.interactive||R})]})}function Qe(){let e=v(e=>e.agentPresetFilter),t=v(e=>e.agentStatusFilter),n=v(e=>e.agentTagFilter),i=v(e=>e.agentHostFilter),o=v(e=>e.agentSort),s=v(e=>e.agentSortDir),c=v(e=>e.showOffline),u=v(e=>e.set),d=v(e=>e.openAgentSpawn),f=v(e=>e.agentsById),p=ee(),h=W(),g=U(),_=V(),y=me(h,p),b=de(h,p),x=e||t||n||i;function S(){u({agentPresetFilter:``,agentStatusFilter:``,agentTagFilter:``,agentHostFilter:``})}function C(){u({agentSortDir:s===`asc`?`desc`:`asc`})}return(0,q.jsxs)(`div`,{className:`space-y-4`,children:[(0,q.jsxs)(`div`,{className:`flex flex-wrap items-center gap-2`,children:[(0,q.jsxs)(`select`,{value:e,onChange:e=>u({agentPresetFilter:e.target.value}),className:`h-8 rounded-md border border-border bg-card text-sm px-2 text-foreground`,children:[(0,q.jsx)(`option`,{value:``,children:`All agents`}),(0,q.jsx)(`option`,{value:`active`,children:`Active`}),(0,q.jsx)(`option`,{value:`claude`,children:`Claude`}),(0,q.jsx)(`option`,{value:`codex`,children:`Codex`}),(0,q.jsx)(`option`,{value:`paired`,children:`Paired`}),(0,q.jsx)(`option`,{value:`unpaired`,children:`Unpaired`}),(0,q.jsx)(`option`,{value:`offline_stale`,children:`Offline / Stale`})]}),(0,q.jsxs)(`select`,{value:t,onChange:e=>u({agentStatusFilter:e.target.value}),className:`h-8 rounded-md border border-border bg-card text-sm px-2 text-foreground`,children:[(0,q.jsx)(`option`,{value:``,children:`Any status`}),(0,q.jsx)(`option`,{value:`online`,children:`Online`}),(0,q.jsx)(`option`,{value:`idle`,children:`Idle`}),(0,q.jsx)(`option`,{value:`busy`,children:`Busy`}),(0,q.jsx)(`option`,{value:`offline`,children:`Offline`}),(0,q.jsx)(`option`,{value:`starting`,children:`Starting`})]}),g.length>0&&(0,q.jsxs)(`select`,{value:n,onChange:e=>u({agentTagFilter:e.target.value}),className:`h-8 rounded-md border border-border bg-card text-sm px-2 text-foreground`,children:[(0,q.jsx)(`option`,{value:``,children:`Any tag`}),g.map(e=>(0,q.jsx)(`option`,{value:e,children:e},e))]}),_.length>1&&(0,q.jsxs)(`select`,{value:i,onChange:e=>u({agentHostFilter:e.target.value}),className:`h-8 rounded-md border border-border bg-card text-sm px-2 text-foreground`,children:[(0,q.jsx)(`option`,{value:``,children:`Any host`}),_.map(e=>(0,q.jsx)(`option`,{value:e,children:e},e))]}),(0,q.jsxs)(`select`,{value:o,onChange:e=>u({agentSort:e.target.value}),className:`h-8 rounded-md border border-border bg-card text-sm px-2 text-foreground`,children:[(0,q.jsx)(`option`,{value:`status`,children:`Sort: Status`}),(0,q.jsx)(`option`,{value:`name`,children:`Sort: Name`}),(0,q.jsx)(`option`,{value:`lastSeen`,children:`Sort: Last seen`}),(0,q.jsx)(`option`,{value:`created`,children:`Sort: Created`})]}),(0,q.jsx)(B,{size:`icon`,variant:`outline`,className:`h-8 w-8`,title:`Toggle sort direction`,onClick:C,children:s===`asc`?(0,q.jsx)(r,{className:`w-3.5 h-3.5`}):(0,q.jsx)(l,{className:`w-3.5 h-3.5`})}),(0,q.jsxs)(`label`,{className:`flex items-center gap-1.5 text-sm text-muted-foreground cursor-pointer select-none`,children:[(0,q.jsx)(`input`,{type:`checkbox`,checked:c,onChange:e=>u({showOffline:e.target.checked}),className:`rounded`}),`Show offline`]}),x&&(0,q.jsxs)(B,{size:`sm`,variant:`ghost`,className:`h-8 text-muted-foreground hover:text-foreground gap-1`,onClick:S,children:[(0,q.jsx)(m,{className:`w-3 h-3`}),`Clear filters`]}),(0,q.jsx)(`div`,{className:`ml-auto`,children:(0,q.jsxs)(B,{size:`sm`,onClick:d,className:`gap-1`,children:[(0,q.jsx)(a,{className:`w-3.5 h-3.5`}),`Spawn`]})})]}),b.length===0?(0,q.jsx)(`div`,{className:`text-center py-16 text-muted-foreground text-sm`,children:`No agents match the current filters.`}):(0,q.jsx)(`div`,{className:`grid grid-cols-1 sm:grid-cols-2 md:grid-cols-3 xl:grid-cols-4 gap-3`,children:b.map(e=>(0,q.jsx)(Ze,{agent:e,parentAgent:e.spawnedBy?f[e.spawnedBy]??null:null,childAgents:_e(y.get(e.id)??[])},e.id))})]})}export{Qe as AgentsView};
-//# sourceMappingURL=agents-DZBM5dp_.js.map