+
+
+
+
+ {badge.label}
- )}
-
- {agentLabel(session.provider)}
-
+ {issueId && (
+
+ {issueId}
+
+ )}
+
+ {agentLabel(session.provider)}
+
+
+
+ {session.title}
+
+ {showBranch &&
{branch}
}
event.stopPropagation()}
>
- {session.title}
-
- {showBranch &&
{branch}
}
-
- {prSummaries.length > 0 ? (
-
- {prSummaries.map((prSummary, index) => (
-
0 && "border-t border-border pt-2")}
- key={prSummary.number}
- pr={prSummary}
- />
+ {prSummaries.length === 0 ? (
+ "no PR yet"
+ ) : (
+
+ {groupPRsByLifecycle(prSummaries).map((group) => (
+
))}
- ) : (
- "no PR yet"
)}
);
}
-function BoardPRSummary({ className, pr }: { className?: string; pr: SessionPRSummary }) {
- const diffSummary = prDiffSummary(pr);
+type BoardPRLifecycleStatus = { label: "closed" | "open" | "draft" | "merged"; className: string };
+type BoardPRGroup = { status: BoardPRLifecycleStatus; prs: SessionPRSummary[] };
+
+function BoardPRGroup({ group }: { group: BoardPRGroup }) {
return (
-
-
- PR #{pr.number} · {pr.state}
-
- {diffSummary ?
{diffSummary} : null}
-
-
-
+
`#${pr.number}`).join(", ")} ${group.status.label}`}
+ className="inline-flex min-w-0 flex-wrap items-center gap-x-1.5 gap-y-1"
+ >
+ PR
+ {group.prs.map((pr, index) => (
+
+
+ #{pr.number}
+
+ {index < group.prs.length - 1 ? "," : null}
+
+ ))}
+ {group.status.label}
+
);
}
+function groupPRsByLifecycle(prs: SessionPRSummary[]): BoardPRGroup[] {
+ const groups = new Map
();
+ for (const pr of prs) {
+ const status = prLifecycleStatus(pr);
+ const group = groups.get(status.label);
+ if (group) {
+ group.prs.push(pr);
+ } else {
+ groups.set(status.label, { status, prs: [pr] });
+ }
+ }
+ return Array.from(groups.values());
+}
+
+function prLifecycleStatus(pr: SessionPRSummary): BoardPRLifecycleStatus {
+ if (pr.state === "draft") return { label: "draft", className: "text-passive" };
+ if (pr.state === "merged") return { label: "merged", className: "text-accent" };
+ if (pr.state === "closed") return { label: "closed", className: "text-error" };
+ return { label: "open", className: "text-success" };
+}
+
function sameLabel(a: string, b: string): boolean {
const normalize = (value: string) =>
value
diff --git a/frontend/src/renderer/components/Sidebar.tsx b/frontend/src/renderer/components/Sidebar.tsx
index 09923768c..d405fa7c3 100644
--- a/frontend/src/renderer/components/Sidebar.tsx
+++ b/frontend/src/renderer/components/Sidebar.tsx
@@ -557,7 +557,13 @@ function ProjectItem({
- {isProjectRestarting ? "Restarting…" : isSpawning ? "Spawning…" : orchestrator ? "Orchestrator" : "Spawn orchestrator"}
+ {isProjectRestarting
+ ? "Restarting…"
+ : isSpawning
+ ? "Spawning…"
+ : orchestrator
+ ? "Orchestrator"
+ : "Spawn orchestrator"}
diff --git a/frontend/src/renderer/hooks/useWorkspaceQuery.test.tsx b/frontend/src/renderer/hooks/useWorkspaceQuery.test.tsx
index 60fc3c4e8..9e21bfa96 100644
--- a/frontend/src/renderer/hooks/useWorkspaceQuery.test.tsx
+++ b/frontend/src/renderer/hooks/useWorkspaceQuery.test.tsx
@@ -101,7 +101,12 @@ describe("useWorkspaceQuery", () => {
await waitFor(() => expect(result.current.isSuccess).toBe(true));
const [workspace] = result.current.data ?? [];
- expect(workspace).toMatchObject({ id: "proj-1", name: "my-app", path: "/home/me/my-app", orchestratorAgent: "codex" });
+ expect(workspace).toMatchObject({
+ id: "proj-1",
+ name: "my-app",
+ path: "/home/me/my-app",
+ orchestratorAgent: "codex",
+ });
expect(workspace.sessions).toHaveLength(2);
expect(workspace.sessions[0]).toMatchObject({
id: "sess-1",
diff --git a/frontend/src/renderer/lib/restart-orchestrator.ts b/frontend/src/renderer/lib/restart-orchestrator.ts
index 0d41f7981..d921a4c80 100644
--- a/frontend/src/renderer/lib/restart-orchestrator.ts
+++ b/frontend/src/renderer/lib/restart-orchestrator.ts
@@ -44,7 +44,10 @@ export async function restartProjectOrchestrator({
});
} catch (error) {
await refreshWorkspaceState(queryClient);
- setOrchestratorReplacementError(projectId, error instanceof Error ? error.message : "Could not replace orchestrator");
+ setOrchestratorReplacementError(
+ projectId,
+ error instanceof Error ? error.message : "Could not replace orchestrator",
+ );
onError?.(error);
} finally {
setProjectRestarting(projectId, false);
diff --git a/frontend/src/renderer/types/workspace.test.ts b/frontend/src/renderer/types/workspace.test.ts
index 1f9021da6..236f4fa47 100644
--- a/frontend/src/renderer/types/workspace.test.ts
+++ b/frontend/src/renderer/types/workspace.test.ts
@@ -239,7 +239,8 @@ describe("orchestratorHealth", () => {
}),
).toEqual({
state: "duplicates",
- message: "Multiple orchestrators are active. The newest one is used; stale ones will be cleaned up on daemon reconcile.",
+ message:
+ "Multiple orchestrators are active. The newest one is used; stale ones will be cleaned up on daemon reconcile.",
});
expect(
diff --git a/frontend/src/renderer/types/workspace.ts b/frontend/src/renderer/types/workspace.ts
index 9d0ad4587..683478286 100644
--- a/frontend/src/renderer/types/workspace.ts
+++ b/frontend/src/renderer/types/workspace.ts
@@ -386,7 +386,8 @@ export function orchestratorHealth(workspace: WorkspaceSummary, restarting = fal
if (active.length > 1) {
return {
state: "duplicates",
- message: "Multiple orchestrators are active. The newest one is used; stale ones will be cleaned up on daemon reconcile.",
+ message:
+ "Multiple orchestrators are active. The newest one is used; stale ones will be cleaned up on daemon reconcile.",
};
}
const orchestrator = newestActiveOrchestrator(workspace.sessions);