From ef3ecc3796213809906fdbe65f18996e06c270ba Mon Sep 17 00:00:00 2001 From: Bryant Derosier Date: Tue, 27 Oct 2026 10:57:33 -0400 Subject: [PATCH 01/13] feat(web): edit Crew proposal members in place --- apps/web/src/j5/crew/CrewNoticeRenderer.tsx | 17 +- .../web/src/j5/crew/CrewProposalCard.test.tsx | 607 ++++++++++++++++++ apps/web/src/j5/crew/CrewProposalCard.tsx | 382 +++++------ .../web/src/j5/crew/CrewProposalMemberRow.tsx | 279 ++++++++ apps/web/src/j5/crew/CrewSeatDialog.test.tsx | 316 --------- apps/web/src/j5/crew/CrewSeatDialog.tsx | 161 ----- apps/web/src/j5/crew/CrewSeatEditor.tsx | 204 +++--- .../web/src/j5/crew/crewNotices.logic.test.ts | 29 +- apps/web/src/j5/crew/crewNotices.logic.ts | 12 +- .../web/src/j5/crew/crewProposalDraft.test.ts | 64 +- apps/web/src/j5/crew/crewProposalDraft.ts | 78 ++- .../j5/crew/useCrewProposalPreview.test.tsx | 47 +- .../web/src/j5/crew/useCrewProposalPreview.ts | 123 ++-- docs/j5/product/features/crews.md | 10 +- 14 files changed, 1484 insertions(+), 845 deletions(-) create mode 100644 apps/web/src/j5/crew/CrewProposalCard.test.tsx create mode 100644 apps/web/src/j5/crew/CrewProposalMemberRow.tsx delete mode 100644 apps/web/src/j5/crew/CrewSeatDialog.test.tsx delete mode 100644 apps/web/src/j5/crew/CrewSeatDialog.tsx diff --git a/apps/web/src/j5/crew/CrewNoticeRenderer.tsx b/apps/web/src/j5/crew/CrewNoticeRenderer.tsx index 666cedb98a602..694bf74535be7 100644 --- a/apps/web/src/j5/crew/CrewNoticeRenderer.tsx +++ b/apps/web/src/j5/crew/CrewNoticeRenderer.tsx @@ -7,6 +7,7 @@ import type { ReactNode } from "react"; import { cn } from "../../lib/utils"; import { buildThreadRouteParams } from "../../threadRoutes"; import { + crewApprovalSummary, crewGateTitle, crewNoticeLines, presentCrewNotice, @@ -139,12 +140,24 @@ function CrewNoticeLines(props: { /** * Null for anything that is not a Crew notice; the caller then falls through to its own rendering. - * A notice with no lines never reaches here: the timeline's entries leave it out. + * Approval summaries remain visible; completed finishes without a warning take no timeline row. */ export function renderCrewNotice(input: CrewNoticeRenderInput): ReactNode { const notice = presentCrewNotice(input.message); if (notice === null) return null; if (notice.kind === "gate" && notice.decision === "declined") return ; - return ; + const summary = crewApprovalSummary(notice); + return ( + <> + {summary === null ? null : ( +

+ {summary} +

+ )} + {crewNoticeLines(notice).length === 0 ? null : ( + + )} + + ); } diff --git a/apps/web/src/j5/crew/CrewProposalCard.test.tsx b/apps/web/src/j5/crew/CrewProposalCard.test.tsx new file mode 100644 index 0000000000000..f88d97e055e35 --- /dev/null +++ b/apps/web/src/j5/crew/CrewProposalCard.test.tsx @@ -0,0 +1,607 @@ +// @vitest-environment jsdom + +import { + EnvironmentId, + ProviderDriverKind, + ProviderInstanceId, + type ServerProvider, +} from "@t3tools/contracts"; +import type { + CrewProposal, + CrewProposalPreviewRequest, + CrewProposalPreviewResponse, +} from "@t3tools/contracts/j5"; +import { act, useState } from "react"; +import { createPortal } from "react-dom"; +import { createRoot, type Root } from "react-dom/client"; +import { afterEach, beforeEach, expect, it, vi } from "vite-plus/test"; + +const state = vi.hoisted(() => ({ permitted: true, preview: vi.fn() })); +vi.mock("@effect/atom-react", () => ({ useAtomValue: (atom: unknown) => atom })); +vi.mock("../state", () => ({ + j5Environment: { resolveCrewProposal: { permissionAtom: () => state.permitted } }, +})); +vi.mock("../a2a/ParticipantIdentitiesClient", () => ({ + useParticipantLabels: () => new Map([["captain", "Release Captain"]]), +})); +vi.mock("../sharing/access", () => ({ useCanOperateThread: () => state.permitted })); +vi.mock("../../state/query", () => ({ useEnvironmentQuery: () => ({ data: {} }) })); +vi.mock("@t3tools/client-runtime/j5/agent-personas", () => ({ + presentAgentPersonaCatalog: () => [ + { personaId: "sentry", displayName: "Sentry", availability: "available" }, + { personaId: "critic", displayName: "Critic", availability: "available" }, + ], +})); +vi.mock("../agents/agentPersonaAtoms", () => ({ + agentPersonaEnvironment: { catalog: () => null }, +})); +vi.mock("./crewProposalsClient", () => ({ + previewCrewProposal: (...args: unknown[]) => state.preview(...args), +})); +vi.mock("../../state/server", () => ({ + serverEnvironment: { providersValueAtom: () => providers }, +})); +vi.mock("../../components/WorktreeBaseBranchPicker", () => ({ + WorktreeBaseBranchPicker: () => null, +})); +vi.mock("../../components/chat/ProviderModelPicker", () => ({ + ProviderModelPicker: (props: { + onOpenChange: (open: boolean) => void; + onInstanceModelChange: (instanceId: ProviderInstanceId, model: string) => void; + }) => { + const [open, setOpen] = useState(false); + return ( + <> + + {open + ? createPortal( + , + document.body, + ) + : null} + + ); + }, +})); + +import { CrewProposalCard } from "./CrewProposalCard"; + +const providers: ReadonlyArray = [ + { + instanceId: ProviderInstanceId.make("codex"), + driver: ProviderDriverKind.make("codex"), + enabled: true, + installed: true, + version: null, + status: "ready", + auth: { status: "authenticated" }, + checkedAt: "2026-10-27T00:00:00Z", + slashCommands: [], + skills: [], + models: [ + { slug: "gpt-6", name: "GPT-6", isCustom: false, capabilities: null }, + { slug: "other-model", name: "Other model", isCustom: false, capabilities: null }, + ], + }, +]; +const proposal: CrewProposal = { + id: "proposal:1", + projectId: "project:1", + captainParticipantId: "captain", + captainThreadId: "captain-thread", + crewInstanceId: null, + kind: "roster", + status: "open", + displayName: "Ship a fix", + brief: "Implement and review the fix.", + requestedSeats: [ + { seat: "builder", agentId: null, instructions: "Implement", reason: "Build the fix" }, + { seat: "reviewer", agentId: "sentry", reason: "Review independently" }, + ], + approvedSeats: null, + createdAt: "2026-10-27T00:00:00Z", + resolvedAt: null, +}; +const preview = ( + _environment: EnvironmentId, + input: CrewProposalPreviewRequest, +): Promise => + Promise.resolve({ + proposalId: input.proposalId, + workspaceOptions: { cwd: "/repo", currentBranch: "main", worktrees: [] }, + approvalToken: "token:" + JSON.stringify(input.seats), + seats: (input.seats ?? proposal.requestedSeats).map((seat) => ({ + seat: seat.seat, + provider: "OpenAI", + harness: "Codex", + model: seat.modelSelection?.model ?? "GPT-6", + reasoning: "High", + access: seat.runtimeMode === "approval-required" ? "Supervised" : "Full access", + runtimeMode: seat.runtimeMode ?? "full-access", + modelSelection: seat.modelSelection ?? { + instanceId: ProviderInstanceId.make("codex"), + model: "gpt-6", + }, + workspace: seat.workspace ?? { type: "shared" }, + })), + }); +let container: HTMLDivElement; +let root: Root; +const resolve = vi.fn(); +beforeEach(() => { + vi.stubGlobal("IS_REACT_ACT_ENVIRONMENT", true); + Object.defineProperty(Element.prototype, "getAnimations", { + configurable: true, + value: () => [], + }); + vi.stubGlobal( + "ResizeObserver", + class { + observe() {} + unobserve() {} + disconnect() {} + }, + ); + state.permitted = true; + state.preview.mockReset().mockImplementation(preview); + resolve.mockReset(); + container = document.createElement("div"); + document.body.append(container); + root = createRoot(container); +}); +afterEach(async () => { + await act(() => root.unmount()); + container.remove(); + Reflect.deleteProperty(Element.prototype, "getAnimations"); + vi.useRealTimers(); + vi.unstubAllGlobals(); +}); +async function render(overrides: Partial> = {}) { + await act(async () => + root.render( +
    + +
, + ), + ); +} +const button = (label: string) => + [...container.querySelectorAll("button")].find( + (item) => item.getAttribute("aria-label") === label || item.textContent === label, + )!; +const option = (trigger: string, text: string) => { + const popup = document.getElementById(button(trigger).getAttribute("aria-controls")!)!; + return [...popup.querySelectorAll('[role="option"]')].find((item) => + item.textContent?.startsWith(text), + )!; +}; +const approve = () => + [...container.querySelectorAll("button")].find((item) => + item.textContent?.startsWith("Approve "), + )!; +async function click(element: HTMLElement) { + await act(async () => { + element.dispatchEvent(new MouseEvent("pointerdown", { bubbles: true, button: 0 })); + element.dispatchEvent(new MouseEvent("pointerup", { bubbles: true, button: 0 })); + element.click(); + }); +} +async function input(label: string, value: string) { + const element = container.querySelector( + `[aria-label="${label}"]`, + )!; + await act(async () => { + const prototype = + element instanceof HTMLTextAreaElement + ? HTMLTextAreaElement.prototype + : HTMLInputElement.prototype; + Object.getOwnPropertyDescriptor(prototype, "value")!.set!.call(element, value); + element.dispatchEvent(new Event("input", { bubbles: true })); + }); +} + +it("applies edits immediately, retains them across rows, and approves only after closing", async () => { + await render(); + expect(approve().disabled).toBe(false); + await click(button("Edit seat builder")); + expect(approve().disabled).toBe(true); + await input("builder instructions", "Implement carefully"); + expect(container.textContent).toContain("Edited"); + await click(button("Edit seat reviewer")); + expect(container.querySelector('[aria-label="builder instructions"]')).toBeNull(); + await click(button("Done")); + expect(state.preview).toHaveBeenLastCalledWith( + "test", + expect.objectContaining({ + seats: [ + expect.objectContaining({ instructions: "Implement carefully" }), + proposal.requestedSeats[1], + ], + }), + ); + expect(approve().disabled).toBe(false); + await click(approve()); + expect(resolve).toHaveBeenCalledWith( + "approve", + [ + expect.objectContaining({ instructions: "Implement carefully", reason: "Build the fix" }), + proposal.requestedSeats[1], + ], + expect.stringContaining("token:"), + ); +}); + +it("retains invalid instructions on outside click and clears Edited after restoration", async () => { + await render(); + await click(button("Edit seat builder")); + await input("builder instructions", ""); + await act(async () => document.body.dispatchEvent(new Event("pointerdown", { bubbles: true }))); + expect(button("Done")).toBeUndefined(); + expect(container.textContent).toContain("Give the custom crew member its instructions"); + expect(approve().disabled).toBe(true); + await click(button("Edit seat builder")); + await input("builder instructions", "Implement"); + expect(container.textContent).not.toContain("Edited"); + await click(button("Done")); + expect(approve().disabled).toBe(false); +}); + +it("focuses a custom addition, blocks approval until complete, and can remove it", async () => { + await render(); + await click(button("Add crew member")); + expect(document.activeElement?.getAttribute("aria-label")).toBe("New seat name"); + expect(container.querySelector('[aria-label="New seat instructions"]')).not.toBeNull(); + expect(approve().textContent).toBe("Approve 3 members"); + await input("New seat name", "tester"); + await click(button("Done")); + expect(approve().disabled).toBe(true); + await click(button("Edit seat tester")); + await input("tester instructions", "Test the change"); + await click(button("Done")); + expect(approve().disabled).toBe(false); + await click(button("Remove seat tester")); + expect(approve().textContent).toBe("Approve 2 members"); + await click(button("Remove seat reviewer")); + expect(button("Remove seat builder").disabled).toBe(true); +}); + +it("keeps a row open when picking through a portal and closes on Escape", async () => { + await render(); + await click(button("Edit seat builder")); + await click(button("Pick model")); + const option = document.querySelector('[data-testid="portalled-model"]')!; + await act(async () => option.dispatchEvent(new Event("pointerdown", { bubbles: true }))); + await click(option); + expect(button("Done")).toBeDefined(); + expect(approve().disabled).toBe(true); + await act(async () => + button("Done").dispatchEvent(new KeyboardEvent("keydown", { key: "Escape", bubbles: true })), + ); + expect(button("Done")).toBeUndefined(); + expect(document.activeElement).toBe(button("Edit seat builder")); + await click(approve()); + expect(resolve.mock.calls[0]?.[1][0].modelSelection.model).toBe("other-model"); +}); + +it("opening and closing a saved persona does not pin runtime defaults", async () => { + await render(); + await click(button("Edit seat reviewer")); + await click(button("Instructions")); + await input("reviewer instructions", "Review authentication"); + await click(button("Done")); + await click(approve()); + expect(resolve.mock.calls[0]?.[1][1]).toEqual({ + ...proposal.requestedSeats[1], + instructions: "Review authentication", + }); +}); + +it("keeps editing and approval unavailable without permission", async () => { + state.permitted = false; + await render(); + expect(approve().disabled).toBe(true); + expect(button("Edit seat builder").disabled).toBe(true); + expect(button("Add crew member").disabled).toBe(true); +}); + +it("opens persona selection from its label and resets only runtime overrides on a switch", async () => { + await render(); + await click(button("Change persona for builder")); + const sentry = option("builder member", "Sentry"); + expect(sentry).toBeDefined(); + await click(sentry); + await click(button("Done")); + await click(approve()); + expect(resolve.mock.calls[0]?.[1][0]).toEqual({ + ...proposal.requestedSeats[0], + agentId: "sentry", + }); +}); + +it("allows clearing an access override back to Persona default", async () => { + await render(); + await click(button("Edit seat reviewer")); + await click(button("reviewer access")); + const supervised = [...document.querySelectorAll('[role="option"]')].find((item) => + item.textContent?.startsWith("Supervised"), + )!; + await click(supervised); + await click(button("Done")); + expect(container.textContent).toContain("Asks for approvals"); + await click(button("Edit seat reviewer")); + await click(button("reviewer access")); + const inherited = option("reviewer access", "Persona default"); + await click(inherited); + await click(button("Done")); + expect(container.textContent).not.toContain("Edited"); + expect(container.textContent).not.toContain("Asks for approvals"); + await click(approve()); + expect(resolve.mock.calls[0]?.[1][1]).toEqual(proposal.requestedSeats[1]); +}); + +it("clears an original playbook swap once a fresh preview resolves the matching persona", async () => { + const swap = { stepId: "review", wanted: "critic", seatPersona: "sentry", wantedProblem: null }; + state.preview.mockImplementation( + async (environment: EnvironmentId, request: CrewProposalPreviewRequest) => { + const result = await preview(environment, request); + return { + ...result, + seats: result.seats.map((runtime) => + runtime.seat === "reviewer" && + request.seats?.find((seat) => seat.seat === "reviewer")?.agentId !== "critic" + ? { ...runtime, personaSwaps: [swap] } + : runtime, + ), + }; + }, + ); + await render({ + proposal: { + ...proposal, + requestedSeats: [ + proposal.requestedSeats[0]!, + { ...proposal.requestedSeats[1]!, steps: ["review"], personaSwaps: [swap] }, + ], + }, + }); + expect(container.textContent).toContain("wants critic; reviewer is sentry"); + await click(button("Change persona for reviewer")); + const critic = option("reviewer member", "Critic"); + await click(critic); + expect(container.textContent).not.toContain("wants critic"); + await click(button("Done")); + expect(container.textContent).not.toContain("wants critic"); +}); + +it("coalesces typing previews, applies runtime picks immediately, and flushes text on Done", async () => { + vi.useFakeTimers(); + await render(); + await click(button("Edit seat builder")); + const calls = state.preview.mock.calls.length; + await input("builder instructions", "One"); + await input("builder instructions", "Two"); + expect(state.preview).toHaveBeenCalledTimes(calls); + expect(container.textContent).toContain("Edited"); + await act(async () => vi.advanceTimersByTime(299)); + expect(state.preview).toHaveBeenCalledTimes(calls); + await act(async () => vi.advanceTimersByTime(1)); + expect(state.preview).toHaveBeenCalledTimes(calls + 1); + await click(button("Pick model")); + await click(document.querySelector('[data-testid="portalled-model"]')!); + expect(state.preview).toHaveBeenCalledTimes(calls + 2); + await input("builder instructions", "Final instructions"); + await click(button("Done")); + expect(state.preview).toHaveBeenCalledTimes(calls + 3); + await act(async () => vi.advanceTimersByTime(300)); + expect(state.preview).toHaveBeenCalledTimes(calls + 3); + await click(approve()); + expect(resolve.mock.calls[0]?.[1][0].instructions).toBe("Final instructions"); +}); + +it("keeps approval disabled after Done until the edited roster preview resolves", async () => { + await render(); + let finish!: (result: CrewProposalPreviewResponse) => void; + state.preview.mockImplementation( + () => + new Promise((resolve) => { + finish = resolve; + }), + ); + await click(button("Edit seat builder")); + await input("builder instructions", "Updated"); + await click(button("Done")); + expect(approve().disabled).toBe(true); + const request = state.preview.mock.lastCall![1] as CrewProposalPreviewRequest; + await act(async () => finish(await preview(EnvironmentId.make("test"), request))); + expect(approve().disabled).toBe(false); +}); + +it("shows unavailable runtime after a failed preview rather than an endless resolving label", async () => { + state.preview.mockRejectedValue(new Error("Provider unavailable")); + await render(); + expect(container.textContent).toContain("Runtime unavailable"); + expect(container.textContent).not.toContain("Resolving runtime"); + expect(approve().disabled).toBe(true); +}); + +it("uses the resolved existing-worktree branch instead of its path", async () => { + state.preview.mockImplementation( + async (environment: EnvironmentId, request: CrewProposalPreviewRequest) => { + const result = await preview(environment, request); + return { + ...result, + seats: result.seats.map((runtime) => + runtime.workspace?.type === "existing_worktree" + ? { ...runtime, workspace: { ...runtime.workspace, branch: "fix/payments" } } + : runtime, + ), + }; + }, + ); + await render({ + proposal: { + ...proposal, + requestedSeats: [ + { + ...proposal.requestedSeats[0]!, + workspace: { type: "existing_worktree", worktreePath: "/repo/worktrees/payments" }, + }, + proposal.requestedSeats[1]!, + ], + }, + }); + expect(container.textContent).toContain("Existing worktree on fix/payments"); + expect(container.textContent).not.toContain("/repo/worktrees/payments"); +}); + +it("retains the Captain label in the Inbox while omitting it from the Captain's own gate", async () => { + await render(); + expect(container.textContent).not.toContain("Release Captain"); + await render({ onOpenCaptain: () => {} }); + expect(container.textContent).toContain("Captain: Release Captain"); +}); + +it("prevents changes and approval while busy", async () => { + await render({ busy: true }); + expect(button("Working…").disabled).toBe(true); + expect(button("Edit seat builder").disabled).toBe(true); + expect(button("Add crew member").disabled).toBe(true); +}); + +it("ignores an old row-default preview and approves only with the eventual full-roster token", async () => { + await render(); + const pending: Array<{ + request: CrewProposalPreviewRequest; + resolve: (value: CrewProposalPreviewResponse) => void; + }> = []; + state.preview.mockImplementation( + (_environment: EnvironmentId, request: CrewProposalPreviewRequest) => + new Promise((resolve) => pending.push({ request, resolve })), + ); + await click(button("Add crew member")); + await click(button("New seat member")); + const sentry = option("New seat member", "Sentry"); + await click(sentry); + expect(pending).toHaveLength(2); + const old = await preview(EnvironmentId.make("test"), pending[0]!.request); + await act(async () => + pending[0]!.resolve({ + ...old, + seats: old.seats.map((runtime) => ({ ...runtime, reasoning: "Old custom reasoning" })), + }), + ); + expect(container.textContent).not.toContain("Old custom reasoning"); + const latest = await preview(EnvironmentId.make("test"), pending[1]!.request); + await act(async () => + pending[1]!.resolve({ + ...latest, + approvalToken: "row-only-token", + seats: latest.seats.map((runtime) => ({ ...runtime, reasoning: "New persona reasoning" })), + }), + ); + expect(container.textContent).toContain("New persona reasoning"); + await input("New seat name", "manual"); + await click(button("Done")); + expect(approve().disabled).toBe(true); + expect(resolve).not.toHaveBeenCalled(); + const full = pending.at(-1)!; + expect(full.request.seats).toHaveLength(3); + await act(async () => + full.resolve({ + ...(await preview(EnvironmentId.make("test"), full.request)), + approvalToken: "full-roster-token", + }), + ); + await click(approve()); + expect(resolve).toHaveBeenCalledWith( + "approve", + expect.arrayContaining([expect.objectContaining({ seat: "manual", agentId: "sentry" })]), + "full-roster-token", + ); +}); + +it.each([ + { type: "worktree" as const, baseRef: "" }, + { type: "existing_worktree" as const, worktreePath: "/repo/deleted-worktree" }, +])( + "keeps the last member's workspace repairable after the first preview rejects $type", + async (workspace) => { + state.preview.mockImplementation( + async (environment: EnvironmentId, request: CrewProposalPreviewRequest) => { + if (request.seats?.some((seat) => seat.workspace?.type !== "shared")) + throw new Error("Workspace no longer available"); + return { + ...(await preview(environment, request)), + workspaceOptions: { cwd: "/repo", currentBranch: null, worktrees: [] }, + }; + }, + ); + await render({ + proposal: { ...proposal, requestedSeats: [{ ...proposal.requestedSeats[0]!, workspace }] }, + }); + expect(approve().disabled).toBe(true); + expect(button("Remove seat builder").disabled).toBe(true); + await click(button("Edit seat builder")); + expect(button("builder workspace")).toBeDefined(); + await click(button("builder workspace")); + await click(option("builder workspace", "Captain's checkout")); + await click(button("Done")); + expect(approve().disabled).toBe(false); + await click(approve()); + expect(resolve).toHaveBeenCalledWith( + "approve", + [expect.objectContaining({ seat: "builder", workspace: { type: "shared" } })], + expect.stringContaining("token:"), + ); + }, +); + +it("keeps the workspace controls mounted when a loaded selection fails its next preview", async () => { + state.preview.mockImplementation( + async (environment: EnvironmentId, request: CrewProposalPreviewRequest) => { + if (request.seats?.some((seat) => seat.workspace?.type === "worktree")) + throw new Error("Invalid base branch"); + return { + ...(await preview(environment, request)), + workspaceOptions: { cwd: "/repo", currentBranch: null, worktrees: [] }, + }; + }, + ); + await render(); + await click(button("Edit seat builder")); + const trigger = button("builder workspace"); + await click(trigger); + await click(option("builder workspace", "New worktree")); + expect(container.textContent).toContain("Invalid base branch"); + expect(button("builder workspace")).toBe(trigger); + expect(trigger.isConnected).toBe(true); + expect(state.preview).toHaveBeenCalledTimes(2); + await click(button("builder workspace")); + await click(option("builder workspace", "Captain's checkout")); + await click(button("Done")); + expect(approve().disabled).toBe(false); +}); diff --git a/apps/web/src/j5/crew/CrewProposalCard.tsx b/apps/web/src/j5/crew/CrewProposalCard.tsx index 5b6a5c7ef55f9..5af9c299dcc02 100644 --- a/apps/web/src/j5/crew/CrewProposalCard.tsx +++ b/apps/web/src/j5/crew/CrewProposalCard.tsx @@ -1,45 +1,34 @@ import { useAtomValue } from "@effect/atom-react"; import { presentAgentPersonaCatalog } from "@t3tools/client-runtime/j5/agent-personas"; import type { EnvironmentId, ThreadId } from "@t3tools/contracts"; -import { PencilIcon, PlusIcon, XIcon } from "lucide-react"; -import { useMemo, useState } from "react"; +import { PlusIcon } from "lucide-react"; +import { useMemo, useRef, useState } from "react"; -import { Badge } from "../../components/ui/badge"; import { Tooltip, TooltipTrigger, TooltipPopup } from "../../components/ui/tooltip"; +import { useParticipantLabels } from "../a2a/ParticipantIdentitiesClient"; import { Button } from "../../components/ui/button"; import { j5Environment } from "../state"; import { useEnvironmentQuery } from "../../state/query"; import { agentPersonaEnvironment } from "../agents/agentPersonaAtoms"; import type { CrewProposal, CrewProposalSeat } from "./crewProposalsClient"; -import { addSeat, describeSeatAgent, removeSeat, saveSeat } from "./crewProposalDraft"; +import { crewProposalRows, crewProposalRoster, newCrewProposalRow } from "./crewProposalDraft"; import { describePersonaSwap, removedSeatSteps, stepTitle, unownedSteps } from "./crewPlaybookPlan"; -import { CrewSeatDialog } from "./CrewSeatDialog"; -import { crewSeatStopsForApprovals, describeCrewSeatWorkspace } from "./crewSeatRuntime"; -import type { CrewProposalSeatRuntime } from "@t3tools/contracts/j5"; -import { useParticipantLabels } from "../a2a/ParticipantIdentitiesClient"; +import { CrewProposalMemberRow } from "./CrewProposalMemberRow"; import { useCrewProposalPreview } from "./useCrewProposalPreview"; import { useCanOperateThread } from "../sharing/access"; -function CaptainLabel(props: { - readonly environmentId: EnvironmentId; - readonly participantId: string; -}) { +function CaptainLabel(props: { environmentId: EnvironmentId; participantId: string }) { const labels = useParticipantLabels(props.environmentId, [props.participantId]); return ( - }> - {labels.get(props.participantId) ?? "Captain"} + }> + Captain: {labels.get(props.participantId) ?? props.participantId} {props.participantId} ); } -/** - * The human gate for one Crew request. The Captain's seats arrive with reasons; the user may drop - * seats, add personas from the library or a custom seat with its own instructions, then approve the - * final roster or decline the whole request. - */ export function CrewProposalCard(props: { readonly proposal: CrewProposal; readonly environmentId: EnvironmentId | null; @@ -49,12 +38,9 @@ export function CrewProposalCard(props: { seats: ReadonlyArray, approvalToken?: string, ) => void; - /** Omitted when the card already sits in the Captain's thread. */ readonly onOpenCaptain?: (() => void) | undefined; }) { const { proposal } = props; - // Resolving a roster launches or refuses agents; the command says whether this session may, - // and anyone who can write to the Captain's thread may (Shared conversations AC9). const permitted = useAtomValue( j5Environment.resolveCrewProposal.permissionAtom(props.environmentId), ); @@ -63,82 +49,97 @@ export function CrewProposalCard(props: { proposal.captainThreadId as ThreadId, ); const canResolve = permitted && writesToCaptain; - const [seats, setSeats] = useState>(proposal.requestedSeats); - const [editor, setEditor] = useState<{ - readonly seat: CrewProposalSeat | null; - readonly runtime?: CrewProposalSeatRuntime | undefined; - } | null>(null); + const [rows, setRows] = useState(() => crewProposalRows(proposal.requestedSeats)); + const [editingText, setEditingText] = useState(false); + const [openRow, setOpenRow] = useState(null); + const nextRow = useRef(0); + const addButton = useRef(null); + const [fullBrief, setFullBrief] = useState(false); const catalog = useEnvironmentQuery( props.environmentId === null ? null : agentPersonaEnvironment.catalog({ environmentId: props.environmentId, input: {} }), ); - const rows = useMemo( + const agents = useMemo( () => - catalog.data === null || catalog.data === undefined + catalog.data == null ? [] - : presentAgentPersonaCatalog(catalog.data), + : presentAgentPersonaCatalog(catalog.data).filter( + (agent) => agent.availability === "available", + ), [catalog.data], ); - const agents = useMemo(() => rows.filter((agent) => agent.availability === "available"), [rows]); - const preview = useCrewProposalPreview(props.environmentId, proposal.id, seats, props.busy); - const runtimeFor = (seat: CrewProposalSeat) => - preview.runtimeSeats?.find((row) => row.seat === seat.seat); - const stopping = seats.filter((seat) => crewSeatStopsForApprovals(seat, runtimeFor(seat))).length; - // The preview carries the plan the approval token binds; the list's copy is only a first paint. + const roster = useMemo(() => crewProposalRoster(rows), [rows]); + const { seats, errors } = roster; + const preview = useCrewProposalPreview( + props.environmentId, + proposal.id, + seats, + props.busy, + errors.size === 0, + openRow !== null && editingText ? 300 : 0, + ); const playbook = preview.data?.playbook ?? proposal.playbook ?? null; const unowned = - preview.data?.unownedSteps ?? - // An addition's other steps belong to live members only the server knows about. - (proposal.kind === "roster" ? unownedSteps(playbook, seats) : []); + preview.data?.unownedSteps ?? (proposal.kind === "roster" ? unownedSteps(playbook, seats) : []); const titles = (ids: ReadonlyArray) => ids.map((id) => stepTitle(playbook, id)).join(", "); + const canApprove = + !props.busy && + canResolve && + openRow === null && + rows.length > 0 && + errors.size === 0 && + preview.data !== null; return (
  • -
    +
    -
    - - - {proposal.kind === "roster" ? "New crew" : "Add a seat"} - - - {props.environmentId === null ? ( - Captain - ) : ( +

    + {proposal.kind === "roster" + ? "Crew proposal · waiting for you" + : "Add member · waiting for you"} +

    +

    {proposal.displayName}

    + {props.onOpenCaptain && props.environmentId !== null ? ( +
    - )} -
    -

    {proposal.displayName}

    +
    + ) : null}
    - {props.onOpenCaptain === undefined ? null : ( + {props.onOpenCaptain ? ( - )} + ) : null} +
    +
    +

    + {proposal.brief} +

    +
    - {/* The brief is context, not the decision: a clamped excerpt sits in the summary so the - seats and Approve stay in view, and the full text opens in place before approving. */} -
    - - Brief - - -

    {proposal.brief}

    -
    {playbook === null ? null : (

    @@ -151,149 +152,85 @@ export function CrewProposalCard(props: { )}

    )} -
      - {seats.map((seat) => { - const runtime = runtimeFor(seat); +
        + {rows.map((row, index) => { + const seat = seats[index]!; + const runtime = preview.runtimeSeats?.find((candidate) => candidate.seat === seat.seat); return ( -
      • 1} + needsRuntimePreview={errors.size > 0} + runtimeLoading={preview.loading} + error={errors.get(row.id)} + onOpen={() => setOpenRow(row.id)} + onClose={() => setOpenRow((current) => (current === row.id ? null : current))} + onRemove={() => { + addButton.current?.focus(); + setRows((current) => current.filter((candidate) => candidate.id !== row.id)); + setOpenRow((current) => (current === row.id ? null : current)); + }} + onChange={(value) => { + setEditingText( + value.agentId === row.value.agentId && + value.modelSelection === row.value.modelSelection && + value.runtimeMode === row.value.runtimeMode && + value.workspace === row.value.workspace, + ); + setRows((current) => + current.map((candidate) => + candidate.id === row.id ? { ...candidate, value } : candidate, + ), + ); + }} > -
        -
        -
        -

        {seat.seat}

        - - {seat.agentId === null - ? "Custom crew member" - : describeSeatAgent(rows, seat.agentId)} - - {crewSeatStopsForApprovals(seat, runtime) ? ( - - Stops for approvals - - ) : null} -
        - {runtime ? ( -

        - {[ - runtime.provider, - runtime.model, - runtime.reasoning, - runtime.access, - ...(runtime.workspace === undefined - ? [] - : [describeCrewSeatWorkspace(runtime.workspace)]), - ].join(" · ")} - Harness: {runtime.harness} -

        - ) : ( -

        - {preview.loading ? "Checking runtime…" : "Runtime unavailable"} -

        - )} - {seat.instructions ? ( -
        - Instructions -

        - {seat.instructions} -

        -
        - ) : null} - {seat.steps !== undefined && seat.steps.length > 0 ? ( -

        Steps: {titles(seat.steps)}

        - ) : null} - {(runtime === undefined - ? (seat.personaSwaps ?? []) - : (runtime.personaSwaps ?? []) - ).map((swap) => ( -

        - {stepTitle(playbook, swap.stepId)} {describePersonaSwap(swap, seat.seat)} -

        - ))} -
        -
        - - -
        -
        -
      • + {seat.steps?.length ? ( +

        + Steps: {titles(seat.steps)} +

        + ) : null} + {(runtime !== undefined + ? (runtime.personaSwaps ?? []) + : seat.agentId === row.original?.agentId + ? (seat.personaSwaps ?? []) + : [] + ).map((swap) => ( +

        + {stepTitle(playbook, swap.stepId)} {describePersonaSwap(swap, seat.seat)} +

        + ))} + ); })}
      {playbook === null ? null : ( -
      +
      {removedSeatSteps(proposal.requestedSeats, seats).map(({ seat, steps }) => (

      Removing {seat} leaves {titles(steps)} unowned.

      ))} - {unowned.length === 0 ? null : ( + {unowned.length ? (

      Unowned steps, done by the Captain: {titles(unowned)}

      - )} + ) : null}
      )} - - {/* Someone who cannot write to the Captain's thread, or no longer can, edits no seat. */} - {editor !== null && canResolve ? ( - setEditor(null)} - onSave={(draft) => { - const next = - editor.seat === null - ? addSeat(seats, draft) - : saveSeat(seats, editor.seat.seat, draft); - if (next.error === null) setSeats(next.seats); - return next.error; - }} - /> - ) : null} {preview.error ? (

      {preview.error}

      ) : null} - {stopping > 0 ? ( -

      - {stopping === 1 - ? "1 seat will stop for approvals in its own thread." - : `${stopping} seats will stop for approvals in their own threads.`} -

      - ) : null} -
      +
      - +
      + + +
      ); diff --git a/apps/web/src/j5/crew/CrewProposalMemberRow.tsx b/apps/web/src/j5/crew/CrewProposalMemberRow.tsx new file mode 100644 index 0000000000000..bba491965368d --- /dev/null +++ b/apps/web/src/j5/crew/CrewProposalMemberRow.tsx @@ -0,0 +1,279 @@ +import { useAtomValue } from "@effect/atom-react"; +import type { EnvironmentId } from "@t3tools/contracts"; +import type { CrewProposalSeatRuntime, CrewWorkspaceOptions } from "@t3tools/contracts/j5"; +import { PencilIcon, XIcon } from "lucide-react"; +import { useEffect, useMemo, useRef, useState, type ReactNode } from "react"; + +import { ProviderInstanceIcon } from "../../components/chat/ProviderInstanceIcon"; +import { Tooltip, TooltipTrigger, TooltipPopup } from "../../components/ui/tooltip"; +import { Button } from "../../components/ui/button"; +import { serverEnvironment } from "../../state/server"; +import { deriveProviderInstanceEntries } from "../../providerInstances"; +import { CrewSeatEditor } from "./CrewSeatEditor"; +import { + CUSTOM_AGENT, + crewProposalRowChange, + describeSeatAgent, + type CrewProposalRow, +} from "./crewProposalDraft"; +import { + crewSeatStopsForApprovals, + describeCrewSeatWorkspace, + type CrewSeatDraft, +} from "./crewSeatRuntime"; +import { useCrewProposalPreview } from "./useCrewProposalPreview"; + +function MemberProvider(props: { + environmentId: EnvironmentId; + runtime?: CrewProposalSeatRuntime | undefined; +}) { + const providers = useAtomValue(serverEnvironment.providersValueAtom(props.environmentId)) ?? []; + const entry = deriveProviderInstanceEntries(providers).find( + (provider) => provider.instanceId === props.runtime?.modelSelection.instanceId, + ); + return entry ? ( + + + } + > + + + {entry.displayName} + + ) : ( + + ); +} + +export function CrewProposalMemberRow(props: { + readonly row: CrewProposalRow; + readonly proposalId: string; + readonly previewSeatName: string; + readonly environmentId: EnvironmentId | null; + readonly runtime?: CrewProposalSeatRuntime | undefined; + readonly workspaceOptions?: CrewWorkspaceOptions | undefined; + readonly agents: ReadonlyArray<{ readonly personaId: string; readonly displayName: string }>; + readonly open: boolean; + readonly disabled: boolean; + readonly canRemove: boolean; + readonly needsRuntimePreview: boolean; + readonly runtimeLoading: boolean; + readonly error?: string | undefined; + readonly children?: ReactNode; + readonly onOpen: () => void; + readonly onClose: () => void; + readonly onRemove: () => void; + readonly onChange: (draft: CrewSeatDraft) => void; +}) { + const { row, open, onClose } = props; + const eventsInside = useRef(new WeakSet()); + const editButton = useRef(null); + const [menuOpen, setMenuOpen] = useState(false); + const [personaOpen, setPersonaOpen] = useState(false); + const previewSeats = useMemo( + () => [ + { + seat: props.previewSeatName, + agentId: row.value.agentId === CUSTOM_AGENT ? null : row.value.agentId, + reason: "Member runtime preview", + workspace: { type: "shared" as const }, + ...(row.value.modelSelection ? { modelSelection: row.value.modelSelection } : {}), + ...(row.value.runtimeMode ? { runtimeMode: row.value.runtimeMode } : {}), + ...(row.value.agentId === CUSTOM_AGENT ? { instructions: "Crew member" } : {}), + }, + ], + [props.previewSeatName, row.value.agentId, row.value.modelSelection, row.value.runtimeMode], + ); + // The shared checkout lets a member repair a bad workspace even when its roster preview fails. + // This token never authorizes the roster; only the card's complete, current preview can do that. + const defaults = useCrewProposalPreview( + props.environmentId, + props.proposalId, + previewSeats, + props.disabled || + !props.open || + ((!props.needsRuntimePreview || props.runtime !== undefined) && + props.workspaceOptions !== undefined), + ); + const runtime = props.runtime ?? defaults.runtimeSeats?.[0]; + const change = crewProposalRowChange(row); + const seat = { + agentId: row.value.agentId === CUSTOM_AGENT ? null : row.value.agentId, + runtimeMode: row.value.runtimeMode, + }; + + useEffect(() => { + if (!open) return; + const outside = (event: Event) => { + // React capture includes portalled pickers; DOM containment would close the row on a pick. + if (!eventsInside.current.has(event)) onClose(); + }; + document.addEventListener("pointerdown", outside); + document.addEventListener("focusin", outside); + return () => { + document.removeEventListener("pointerdown", outside); + document.removeEventListener("focusin", outside); + }; + }, [open, onClose]); + + return ( +
    • eventsInside.current.add(event.nativeEvent)} + onFocusCapture={(event) => eventsInside.current.add(event.nativeEvent)} + onKeyDown={(event) => { + if (event.key === "Escape" && !menuOpen && !event.defaultPrevented) { + event.preventDefault(); + props.onClose(); + editButton.current?.focus(); + } + }} + > +
      +
      + {props.environmentId === null ? null : ( + + )} +
      +
      + {props.open ? ( + { + setMenuOpen(open); + if (!open) setPersonaOpen(false); + }} + /> + ) : ( + <> +
      +

      + {props.open + ? row.value.seat || "New member" + : row.value.seat.trim().toLowerCase().replace(/\s+/g, "-") || "New member"} +

      + +
      +

      + {runtime + ? [ + runtime.model, + runtime.reasoning, + runtime.access, + describeCrewSeatWorkspace( + props.runtime?.workspace ?? + row.value.workspace ?? + runtime.workspace ?? { type: "shared" }, + ), + ].join(" · ") + : props.runtimeLoading || defaults.loading + ? "Resolving runtime…" + : "Runtime unavailable"} +

      + {row.value.instructions ? ( +
      + Instructions +

      {row.value.instructions}

      +
      + ) : null} + + )} + {change ? {change} : null} + {crewSeatStopsForApprovals(seat, runtime) ? ( +

      Asks for approvals

      + ) : null} +
      + Why this member +

      + {row.original?.reason ?? "Added by the user"} +

      +
      + {props.children} + {props.error ? ( +

      + {props.error} +

      + ) : null} + {props.open && defaults.error && props.runtime === undefined ? ( +

      + {defaults.error} +

      + ) : null} + {props.open ? ( +
      + +
      + ) : null} +
      +
      + + +
      +
      +
    • + ); +} diff --git a/apps/web/src/j5/crew/CrewSeatDialog.test.tsx b/apps/web/src/j5/crew/CrewSeatDialog.test.tsx deleted file mode 100644 index 26195ffd70a1f..0000000000000 --- a/apps/web/src/j5/crew/CrewSeatDialog.test.tsx +++ /dev/null @@ -1,316 +0,0 @@ -import { EnvironmentId, ProviderInstanceId } from "@t3tools/contracts"; -import type { CrewProposalSeatRuntime } from "@t3tools/contracts/j5"; -import { act, type PropsWithChildren } from "react"; -import { create, type ReactTestRenderer } from "react-test-renderer"; -import { afterEach, beforeEach, describe, expect, it, vi } from "vite-plus/test"; - -vi.mock("../../components/ui/dialog", () => { - const Part = ({ children }: PropsWithChildren) =>
      {children}
      ; - return { - Dialog: Part, - DialogDescription: Part, - DialogFooter: Part, - DialogHeader: Part, - DialogPanel: Part, - DialogPopup: Part, - DialogTitle: Part, - }; -}); -vi.mock("../../components/ui/button", () => ({ - Button: (props: React.ComponentProps<"button">) => -
      - ) : null} - {error ? ( -

      - {error} -

      - ) : null} - - - - - - - - - ); -} diff --git a/apps/web/src/j5/crew/CrewSeatEditor.tsx b/apps/web/src/j5/crew/CrewSeatEditor.tsx index 13aa20f2a659d..7f4e983811fd9 100644 --- a/apps/web/src/j5/crew/CrewSeatEditor.tsx +++ b/apps/web/src/j5/crew/CrewSeatEditor.tsx @@ -1,6 +1,7 @@ import { useAtomValue } from "@effect/atom-react"; import type { EnvironmentId } from "@t3tools/contracts"; import type { CrewProposalSeatRuntime, CrewWorkspaceOptions } from "@t3tools/contracts/j5"; +import { useMemo, useState } from "react"; import { getProviderOptionCurrentValue } from "@t3tools/shared/model"; import { Input } from "../../components/ui/input"; @@ -13,7 +14,9 @@ import { SelectValue, } from "../../components/ui/select"; import { Textarea } from "../../components/ui/textarea"; -import { formatProviderDriverKindLabel } from "../../providerModels"; +import { Button } from "../../components/ui/button"; +import { ProviderModelPicker } from "../../components/chat/ProviderModelPicker"; +import { deriveProviderInstanceEntries } from "../../providerInstances"; import { serverEnvironment } from "../../state/server"; import { CUSTOM_AGENT, describeSeatAgent } from "./crewProposalDraft"; import { @@ -25,7 +28,6 @@ import { setCrewSeatStartFromOrigin, setCrewSeatWorktree, chooseCrewHarness, - crewModelSelection, crewReasoningDescriptor, resolvedCrewSeatDraft, setCrewReasoning, @@ -41,6 +43,8 @@ interface CrewSeatEditorProps { readonly workspaceOptions?: CrewWorkspaceOptions | undefined; readonly disabled: boolean; readonly existing?: boolean; + readonly initialPersonaOpen?: boolean; + readonly onMenuOpenChange: (open: boolean) => void; readonly onChange: (value: CrewSeatDraft) => void; } @@ -48,31 +52,41 @@ interface CrewSeatEditorProps { export function CrewSeatEditor(props: CrewSeatEditorProps) { const { value, disabled } = props; const custom = value.agentId === CUSTOM_AGENT; + const [showInstructions, setShowInstructions] = useState(custom); const changeInstructions = (instructions: string) => props.onChange({ ...value, instructions, }); return ( -
      -
      - +
      +
      + {props.existing ? ( +

      {value.seat}

      + ) : ( + + )}
      - Member
      - {props.environmentId === null ? (

      Connect to the crew’s environment to choose its runtime. @@ -99,21 +112,33 @@ export function CrewSeatEditor(props: CrewSeatEditorProps) { ) : ( )} -