agent-relay-server 0.57.2 → 0.59.0

package/src/project-instructions.ts

@@ -0,0 +1,176 @@
+// Project instruction projection (#409) — the relay-owned replacement for host
+// CLAUDE.md bleed-in. Given a resolved project, render its `rule`/`fact` entries
+// (own + inherited `contains`-ancestor entries from #406's cascade) into a compact,
+// DETERMINISTIC, size-bounded instruction block that can be prepended to a spawned
+// agent's systemPromptAppend.
+//
+// ADDITIVE-FROM-EMPTY (#403 decision 4): this composer builds the instruction world
+// from NOTHING and ADDS project knowledge. It NEVER reads host CLAUDE.md or subtracts
+// from it. Going fully vanilla later = simply not including host-derived (`ingested`)
+// content — a policy switch here, zero schema/composer change. `project_entries.source`
+// is that lever: the included-source set is a policy PARAMETER, and the `vanilla`
+// policy includes `manual`+`promoted` while excluding `ingested`.
+import { resolveProjectEntries } from "./db";
+import { PROJECT_ENTRY_SOURCES, type Project, type ProjectEntryKind, type ProjectEntrySource, type ResolvedProjectEntry } from "./types";
+
+/** Named source policies — THE additive-from-empty lever (#403 decision 4).
+ *   `all`     — every source (manual + promoted + ingested host-CLAUDE.md content).
+ *   `vanilla` — manual + promoted only; EXCLUDES `ingested`, so a vanilla agent gets
+ *               zero host-CLAUDE.md bleed-in while still receiving relay-native knowledge. */
+export const PROJECT_INSTRUCTION_SOURCE_SETS = {
+  all: PROJECT_ENTRY_SOURCES,
+  vanilla: ["manual", "promoted"],
+} as const satisfies Record<string, readonly ProjectEntrySource[]>;
+
+export const PROJECT_INSTRUCTION_POLICY_NAMES = ["all", "vanilla"] as const;
+export type ProjectInstructionPolicyName = (typeof PROJECT_INSTRUCTION_POLICY_NAMES)[number];
+
+/** Per-spawn projection request. Presence (a non-undefined value on the spawn input)
+ * means "project the preamble"; absence means OFF. `policy` selects the source set. */
+export interface ProjectInstructionPolicy {
+  policy?: ProjectInstructionPolicyName;
+}
+
+export interface ComposeProjectInstructionsOptions {
+  /** Named policy selecting the included source set. Default `all`. */
+  policy?: ProjectInstructionPolicyName;
+  /** Explicit source set; overrides `policy` when given (the low-level lever). */
+  includeSources?: readonly ProjectEntrySource[];
+  /** Entry kinds rendered, in this order. Default `["rule", "fact"]` (the directive +
+   * truth kinds; `decision`/`memory` are log/scratch, not preamble material). */
+  includeKinds?: readonly ProjectEntryKind[];
+  /** Merge transitive `contains`-ancestor entries (#406 cascade). Default true. */
+  includeInherited?: boolean;
+  /** Hard byte cap on the rendered block (UTF-8). Default 8192. The block is truncated
+   * deterministically (lowest-priority entries dropped first) to stay within it. */
+  maxBytes?: number;
+}
+
+const DEFAULT_KINDS: readonly ProjectEntryKind[] = ["rule", "fact"];
+const DEFAULT_MAX_BYTES = 8192;
+const TRUNCATION_NOTICE = "_(… additional project entries omitted to fit the instruction budget.)_";
+
+const KIND_HEADINGS: Record<ProjectEntryKind, string> = {
+  rule: "Rules",
+  fact: "Facts",
+  decision: "Decisions",
+  memory: "Memory",
+};
+
+function byteLen(value: string): number {
+  return Buffer.byteLength(value, "utf8");
+}
+
+/** Stable dedup key — same kind + same (trimmed) title + body collapses to one entry.
+ * Uses NUL separators so distinct fields can't collide by concatenation. */
+function dedupKey(entry: ResolvedProjectEntry): string {
+  return `${entry.kind}\u0000${entry.title.trim()}\u0000${(entry.body ?? "").trim()}`;
+}
+
+function entryLine(entry: ResolvedProjectEntry): string {
+  const body = entry.body?.trim();
+  const tag = entry.inherited ? " _(inherited)_" : "";
+  return body ? `- ${entry.title.trim()}: ${body}${tag}` : `- ${entry.title.trim()}${tag}`;
+}
+
+/**
+ * Render a project's instruction block. Deterministic: ordering is by kind (in
+ * `includeKinds` order), then own-before-inherited, then title (code-point), then id —
+ * fully independent of DB row timestamps. Output is deduped and hard-bounded to
+ * `maxBytes`. Returns "" when no entry survives the source/kind filter (the caller then
+ * leaves systemPromptAppend untouched, so the spawn stays byte-identical).
+ */
+export function composeProjectInstructions(
+  project: Pick<Project, "id" | "slug" | "title">,
+  opts: ComposeProjectInstructionsOptions = {},
+): string {
+  const kinds = opts.includeKinds ?? DEFAULT_KINDS;
+  const kindRank = new Map<ProjectEntryKind, number>(kinds.map((kind, index) => [kind, index]));
+  const sources = new Set<ProjectEntrySource>(
+    opts.includeSources ?? PROJECT_INSTRUCTION_SOURCE_SETS[opts.policy ?? "all"],
+  );
+  const includeInherited = opts.includeInherited !== false;
+  const maxBytes = opts.maxBytes ?? DEFAULT_MAX_BYTES;
+
+  const resolved = resolveProjectEntries(project.id, { includeInherited });
+  const filtered = resolved.filter((entry) => kindRank.has(entry.kind) && sources.has(entry.source));
+
+  // Deterministic ordering, independent of DB row order/timestamps.
+  filtered.sort((a, b) => {
+    const byKind = (kindRank.get(a.kind) ?? 0) - (kindRank.get(b.kind) ?? 0);
+    if (byKind !== 0) return byKind;
+    const byInherited = Number(a.inherited) - Number(b.inherited); // own (false) first
+    if (byInherited !== 0) return byInherited;
+    const ta = a.title.trim();
+    const tb = b.title.trim();
+    if (ta !== tb) return ta < tb ? -1 : 1;
+    return a.id < b.id ? -1 : a.id > b.id ? 1 : 0;
+  });
+
+  // Dedup, own-wins (own sorts before inherited above).
+  const seen = new Set<string>();
+  const deduped: ResolvedProjectEntry[] = [];
+  for (const entry of filtered) {
+    const key = dedupKey(entry);
+    if (seen.has(key)) continue;
+    seen.add(key);
+    deduped.push(entry);
+  }
+  if (deduped.length === 0) return "";
+
+  // Greedy size-bounded render. Entries are contiguous by kind (primary sort key), so a
+  // per-kind `## heading` is emitted once when the first entry of that kind is included.
+  const header = `# Project knowledge: ${project.title?.trim() || project.slug}`;
+  const budget = maxBytes - byteLen(`\n\n${TRUNCATION_NOTICE}`);
+  const lines: string[] = [header];
+  let bytes = byteLen(header);
+  let lastKind: ProjectEntryKind | null = null;
+  let truncated = false;
+
+  for (const entry of deduped) {
+    const segments: string[] = [];
+    if (entry.kind !== lastKind) segments.push("", `## ${KIND_HEADINGS[entry.kind]}`);
+    segments.push(entryLine(entry));
+    const addition = `\n${segments.join("\n")}`;
+    if (bytes + byteLen(addition) > budget) {
+      truncated = true;
+      break;
+    }
+    lines.push(...segments);
+    bytes += byteLen(addition);
+    lastKind = entry.kind;
+  }
+
+  if (truncated) lines.push("", TRUNCATION_NOTICE);
+  let out = lines.join("\n");
+  // Safety net: guarantee the hard byte cap even if the header + first entry overshoot.
+  if (byteLen(out) > maxBytes) {
+    out = Buffer.from(out, "utf8").subarray(0, maxBytes).toString("utf8");
+  }
+  return out;
+}
+
+/**
+ * Parse a spawn-transport's `projectInstructions` wire value into the normalized policy
+ * (or undefined = OFF). Shared by the MCP and HTTP spawn paths so they cannot drift.
+ *   - undefined / null / false → undefined (OFF)
+ *   - true                     → {} (ON, default policy)
+ *   - { policy }               → validated policy
+ * Throws `onInvalid(message)` for a malformed shape or unknown policy name.
+ */
+export function parseProjectInstructions(
+  value: unknown,
+  onInvalid: (message: string) => Error,
+): ProjectInstructionPolicy | undefined {
+  if (value === undefined || value === null || value === false) return undefined;
+  if (value === true) return {};
+  if (typeof value !== "object") {
+    throw onInvalid("projectInstructions must be a boolean or { policy } object");
+  }
+  const policy = (value as Record<string, unknown>).policy;
+  if (policy === undefined) return {};
+  if (typeof policy !== "string" || !PROJECT_INSTRUCTION_POLICY_NAMES.includes(policy as ProjectInstructionPolicyName)) {
+    throw onInvalid(`projectInstructions.policy must be one of: ${PROJECT_INSTRUCTION_POLICY_NAMES.join(", ")}`);
+  }
+  return { policy: policy as ProjectInstructionPolicyName };
+}

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/routes/index.ts

@@ -28,6 +28,7 @@ import { getOrchestratorDirectories, getOrchestratorFileRead, getOrchestratorFil
 import { getPairById, getPairs, postAcceptPair, postHangupPair, postPair, postPairMessage, postRejectPair } from "./pairs";
 import { getPlanByIdRoute, getPlansRoute } from "./plans";
 import { getBlackboardEntryRoute, getBlackboardRoute } from "./blackboard";
+import { getProjectEntriesRoute, getProjectEntryRoute, getProjectRoute, getProjectsRoute } from "./projects";
 import { getRecipeByName, getRecipeInstanceArtifacts, getRecipeInstanceById, getRecipeInstances, getRecipes, postRecipeInstanceArtifacts, postRecipeStart, postRecipeStop } from "./recipes";
 import { getStewardConfigRoute, getWorkspaceConfigRoute, putStewardConfigRoute, putWorkspaceConfigRoute } from "./steward";
 import { getTaskById, getTaskEvents, getTasks, patchTaskStatus, postClaimTask, postRenewTaskClaim } from "./tasks";
@@ -280,6 +281,10 @@ const routes: Route[] = [
   route("GET", "/api/plans/:id", getPlanByIdRoute),
   route("GET", "/api/blackboard", getBlackboardRoute),
   route("GET", "/api/blackboard/:id", getBlackboardEntryRoute),
+  route("GET", "/api/projects", getProjectsRoute),
+  route("GET", "/api/projects/:id", getProjectRoute),
+  route("GET", "/api/projects/:id/entries", getProjectEntriesRoute),
+  route("GET", "/api/projects/:id/entries/:entryId", getProjectEntryRoute),
 
   route("GET", "/api/spec", getApiSpec),
   route("GET", "/api/docs", getApiDocs),

package/src/routes/projects.ts

@@ -0,0 +1,55 @@
+import { getProjectEntry, getProjectEntryChain, listProjectEntries, listProjects, resolveProject, rootsForProject } from "../db";
+import { cleanString, optionalEnum } from "../validation";
+import { error, json, type Handler } from "./_shared";
+import { PROJECT_ENTRY_KINDS, type ProjectEntryKind } from "../types";
+
+// Read routes for the durable Projects scope (#405), templated on routes/blackboard.ts.
+// Writes go through MCP (relay_project_*), mirroring the blackboard precedent where the
+// HTTP surface is read-only. Scope-gated /api/projects → project:read in src/security.ts.
+
+function routeKind(req: Request): ProjectEntryKind | undefined {
+  return optionalEnum(new URL(req.url).searchParams.get("kind") ?? undefined, "kind", PROJECT_ENTRY_KINDS) as ProjectEntryKind | undefined;
+}
+
+export const getProjectsRoute: Handler = (req) => {
+  try {
+    const includeArchived = new URL(req.url).searchParams.get("includeArchived") === "true";
+    return json({ projects: listProjects({ includeArchived }) });
+  } catch (err) {
+    return error(err instanceof Error ? err.message : "projects route failed");
+  }
+};
+
+export const getProjectRoute: Handler = (req, params) => {
+  try {
+    const ref = cleanString(params.id, "id", { required: true, max: 200 })!;
+    const project = resolveProject(ref);
+    if (!project) return error("project not found", 404);
+    return json({ project, roots: rootsForProject(project.id) });
+  } catch (err) {
+    return error(err instanceof Error ? err.message : "projects route failed");
+  }
+};
+
+export const getProjectEntriesRoute: Handler = (req, params) => {
+  try {
+    const ref = cleanString(params.id, "id", { required: true, max: 200 })!;
+    const project = resolveProject(ref);
+    if (!project) return error("project not found", 404);
+    const includeInactive = new URL(req.url).searchParams.get("includeInactive") === "true";
+    return json({ entries: listProjectEntries(project.id, { kind: routeKind(req), includeInactive }) });
+  } catch (err) {
+    return error(err instanceof Error ? err.message : "projects route failed");
+  }
+};
+
+export const getProjectEntryRoute: Handler = (req, params) => {
+  try {
+    const id = cleanString(params.entryId, "entryId", { required: true, max: 120 })!;
+    const entry = getProjectEntry(id);
+    if (!entry) return error("project entry not found", 404);
+    return json({ entry, chain: getProjectEntryChain(id) });
+  } catch (err) {
+    return error(err instanceof Error ? err.message : "projects route failed");
+  }
+};

package/src/runtime-tokens.ts

@@ -104,6 +104,8 @@ export function issueRunnerRuntimeToken(input: {
   spawnedBy?: string;
   /** Durable team id — stamped so the child registers into the coordinator's team. */
   teamId?: string;
+  /** Durable project id resolved from the spawn cwd (#405) — stamped so callerProject(auth) resolves it. */
+  projectId?: string;
 }): RuntimeTokenResult {
   const grant = spawnGrantForProfile(input.profile, input.agentInitiated);
   const subject = input.policyName
@@ -124,6 +126,7 @@ export function issueRunnerRuntimeToken(input: {
       ...(grant.canSpawn && grant.maxSpawnedAgents ? { maxSpawnedAgents: grant.maxSpawnedAgents } : {}),
       ...(input.spawnedBy ? { spawnedBy: input.spawnedBy } : {}),
       ...(input.teamId ? { teamId: input.teamId } : {}),
+      ...(input.projectId ? { projectId: input.projectId } : {}),
     },
     createdBy: input.createdBy ?? "runtime",
   });
@@ -244,6 +247,9 @@ export function runnerRuntimeTokenEnv(input: {
   /** Agent-requested spawn → forces a non-spawn-capable child (no grandchildren). */
   agentInitiated?: boolean;
   spawnedBy?: string;
+  teamId?: string;
+  /** Durable project id resolved from the spawn cwd (#405). */
+  projectId?: string;
 }): Record<string, string> {
   const issued = issueRunnerRuntimeToken(input);
   return {

package/src/security.ts

@@ -206,6 +206,7 @@ export function requiredScopeFor(method: string, pathname: string): string | nul
   if (pathname.startsWith("/api/pairs")) return method === "GET" ? "pairs:read" : "pairs:write";
   if (pathname.startsWith("/api/teams")) return method === "GET" ? "teams:read" : "teams:write";
   if (pathname.startsWith("/api/blackboard")) return method === "GET" ? "blackboard:read" : "blackboard:write";
+  if (pathname.startsWith("/api/projects")) return method === "GET" ? "project:read" : "project:write";
   // Insights config (the feature toggle) stays admin-only via the default; only the
   // mechanical observation feed is writable by lower-privilege callers.
   if (pathname === "/api/insights/observations") return method === "GET" ? "insights:read" : "insights:write";
@@ -282,6 +283,9 @@ export function requiredComponentScopeFor(method: string, pathname: string): str
   if (pathname.startsWith("/api/plans")) return method === "GET" ? "plans:read" : "plans:write";
   if (pathname.startsWith("/api/teams")) return method === "GET" ? "teams:read" : "teams:write";
   if (pathname.startsWith("/api/blackboard")) return method === "GET" ? "blackboard:read" : "blackboard:write";
+  // Fail-closed default returns system:admin, so this case is load-bearing: without it
+  // every /api/projects call from a scoped component token would 403-blackhole (#405).
+  if (pathname.startsWith("/api/projects")) return method === "GET" ? "project:read" : "project:write";
   // The Runner posts the #184 context-gathering signal here (source:"server") via its
   // provider token. Without this case the path fell through to the system:admin default
   // below and every observation was 403-dropped — the whole Insights feed stayed empty.

package/src/services/spawn-agent.ts

@@ -25,13 +25,14 @@
 // deliberately out of scope here — this slice converges the two external TRANSPORTS.
 import type { SpawnProvider } from "agent-relay-sdk";
 import { stringValue } from "agent-relay-sdk";
-import { countLiveSpawnedAgents, createActivityEvent, ensureTeam, getAgent, listAgents, setAgentTeam, ValidationError } from "../db";
+import { countLiveSpawnedAgents, createActivityEvent, ensureTeam, getAgent, listAgents, resolveProjectForCwd, setAgentTeam, ValidationError } from "../db";
 import { createCommand } from "../commands-db";
 import { emitCommandEvent } from "../command-events";
 import { buildSpawnCommand, generateSpawnRequestId, resolveSpawnModelParams } from "../spawn-command";
 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
@@ -192,6 +203,25 @@ export async function spawnAgent(input: SpawnAgentInput, ctx: AuthContext): Prom
   const callerTeam = callerId ? (caller?.teamId ? { id: caller.teamId } : ensureTeam(callerId)) : undefined;
   if (callerId && callerTeam && !caller?.teamId) setAgentTeam(callerId, callerTeam.id);
 
+  // #405 — durable project binding: the project whose registered root contains the spawn cwd.
+  // Stamped on the child token's constraints (identity-only, like teamId) so callerProject(auth)
+  // 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).
@@ -211,6 +241,7 @@ export async function spawnAgent(input: SpawnAgentInput, ctx: AuthContext): Prom
     profile: input.profile || undefined,
     ...(callerId ? { agentInitiated: true, spawnedBy: callerId } : {}),
     ...(callerTeam ? { teamId: callerTeam.id } : {}),
+    ...(callerProject ? { projectId: callerProject.id } : {}),
   });
 
   // #413 — default the report-back obligation ON for an agent coordinator handing a worker a
@@ -238,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/team.ts

@@ -56,7 +56,7 @@ export function setCallerTeamBrief(ctx: AuthContext, input: TeamBriefInput): Tea
 }
 
 export function dissolveTeamById(teamId: string, input: TeamDissolveServiceInput = {}): Team {
-  const team = dissolveTeam(teamId, input);
+  const { team, unpromotedBlackboard } = dissolveTeam(teamId, input);
   emitRelayEvent({
     type: "team.dissolved",
     source: "system",
@@ -65,6 +65,10 @@ export function dissolveTeamById(teamId: string, input: TeamDissolveServiceInput
       teamId: team.id,
       outcomeStatus: team.outcomeStatus ?? null,
       reason: team.outcomeSummary ?? null,
+      // Surface (don't auto-promote) the lossy findings the team is leaving behind so a
+      // coordinator/operator can decide what to lift into durable project knowledge (#404).
+      unpromotedBlackboardCount: unpromotedBlackboard.count,
+      unpromotedBlackboard: unpromotedBlackboard.entries,
     },
   });
   return team;

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", "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", "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", "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", "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", "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", "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,9 +1,65 @@
 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"]);

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