Skip to content
Python

Coworker picker: Engineering and Security groups under small labels

Rohit C Prasad628868c03aeb
diff --git a/coworker/personas/builtin/design-worker/manifest.md b/coworker/personas/builtin/design-worker/manifest.md
index ded3a1ff..d3f5ab82 100644
--- a/coworker/personas/builtin/design-worker/manifest.md
+++ b/coworker/personas/builtin/design-worker/manifest.md
@@ -1,6 +1,7 @@
---
ships: false
id: design-worker
+group: engineering
name: Design Worker
icon: layout
tagline: UI/UX implementation under a team lead
diff --git a/coworker/personas/builtin/reviewer/manifest.md b/coworker/personas/builtin/reviewer/manifest.md
index 4088c4fe..7997ae0a 100644
--- a/coworker/personas/builtin/reviewer/manifest.md
+++ b/coworker/personas/builtin/reviewer/manifest.md
@@ -1,5 +1,6 @@
---
id: reviewer
+group: engineering
name: Reviewer
icon: shield
tagline: Reviews a pull request — one summary comment, changes only for real defects
diff --git a/coworker/personas/builtin/swe-lead/manifest.md b/coworker/personas/builtin/swe-lead/manifest.md
index 7c0931a3..2af4a438 100644
--- a/coworker/personas/builtin/swe-lead/manifest.md
+++ b/coworker/personas/builtin/swe-lead/manifest.md
@@ -1,6 +1,7 @@
---
ships: false
id: swe-lead
+group: engineering
name: SWE Lead
icon: users
tagline: Leads a software team — plans, staffs, assigns, verifies
diff --git a/coworker/personas/builtin/swe-worker/manifest.md b/coworker/personas/builtin/swe-worker/manifest.md
index 5e4a68d8..5aa2b85e 100644
--- a/coworker/personas/builtin/swe-worker/manifest.md
+++ b/coworker/personas/builtin/swe-worker/manifest.md
@@ -1,6 +1,7 @@
---
ships: false
id: swe-worker
+group: engineering
name: SWE Worker
icon: code
tagline: Implements work items under a team lead
diff --git a/coworker/personas/builtin/test-worker/manifest.md b/coworker/personas/builtin/test-worker/manifest.md
index 6e76fddc..bed089c5 100644
--- a/coworker/personas/builtin/test-worker/manifest.md
+++ b/coworker/personas/builtin/test-worker/manifest.md
@@ -1,6 +1,7 @@
---
ships: false
id: test-worker
+group: engineering
name: Test Worker
icon: check
tagline: Verifies teammates' work against acceptance criteria
diff --git a/coworker/personas/manifest.py b/coworker/personas/manifest.py
index 6a93f67f..61dc02be 100644
--- a/coworker/personas/manifest.py
+++ b/coworker/personas/manifest.py
@@ -27,7 +27,7 @@ VALID_TEAM = {"lead", "worker"}
VALID_MODES = {"discuss", "plan", "interactive", "custom", "auto", "bypass-approvals", "auto-approve"}
VALID_REC_KINDS = {"connector", "mcp"}
VALID_REC_TIERS = {"core", "optional"}
-VALID_GROUPS = {"general", "security"}
+VALID_GROUPS = {"general", "engineering", "security"}
class ManifestError(ValueError):
diff --git a/surfaces/gui/src/components/PersonasTab.tsx b/surfaces/gui/src/components/PersonasTab.tsx
index 6ac69022..27983dc2 100644
--- a/surfaces/gui/src/components/PersonasTab.tsx
+++ b/surfaces/gui/src/components/PersonasTab.tsx
@@ -251,7 +251,8 @@ export function PersonasTab({
) : null}
{/* One toggle per row (enable implies picker); ★ marks the default. Everything
else — in-picker nuance, default, export, delete — lives on the detail page. */}
- {group(t("personas.group_general"), personas.filter((p) => p.ships !== false && p.group !== "security"))}
+ {group(t("personas.group_general"), personas.filter((p) => p.ships !== false && !["engineering", "security"].includes(p.group || "")))}
+ {group(t("personas.group_engineering"), personas.filter((p) => p.ships !== false && p.group === "engineering"))}
{group(t("personas.group_security"), personas.filter((p) => p.ships !== false && p.group === "security"))}
{unshipped.length > 0 && (
diff --git a/surfaces/gui/src/components/SessionSetupRow.groups.test.tsx b/surfaces/gui/src/components/SessionSetupRow.groups.test.tsx
new file mode 100644
index 00000000..0e0c8cda
--- /dev/null
+++ b/surfaces/gui/src/components/SessionSetupRow.groups.test.tsx
@@ -0,0 +1,50 @@
+// The coworker picker shows groups (UX ruling 2026-09-29, variant C): the general
+// coworkers first with no label, then Engineering and Security, each under a small label.
+import { afterEach, describe, expect, it, vi } from "vitest";
+import { cleanup, fireEvent, render, screen } from "@testing-library/react";
+import { SessionSetupRow, personaGroups } from "./SessionSetupRow";
+import type { Persona } from "../api";
+
+const persona = (id: string, group?: string, extra: Partial<Persona> = {}): Persona => ({
+ id, name: id, icon: "bot", tagline: `${id} tagline`, requires_folder: false, builtin: true,
+ tools: [], enabled: true, surfaced: true, default: id === "cowork", group, ...extra,
+});
+
+const PERSONAS = [
+ persona("security", "security"),
+ persona("cowork", "general"),
+ persona("reviewer", "engineering"),
+ persona("dep-audit", "security"),
+ persona("imported"),
+];
+
+afterEach(cleanup);
+
+describe("coworker picker groups", () => {
+ it("orders general first, then Engineering, then Security; empty groups vanish", () => {
+ expect(personaGroups(PERSONAS).map((g) => [g.group, g.items.map((p) => p.id)])).toEqual([
+ ["", ["cowork", "imported"]],
+ ["engineering", ["reviewer"]],
+ ["security", ["security", "dep-audit"]],
+ ]);
+ expect(personaGroups([persona("cowork", "general")]).map((g) => g.group)).toEqual([""]);
+ });
+
+ it("draws a label for each group but none for the general coworkers", () => {
+ vi.stubGlobal("fetch", vi.fn(async () => ({ ok: true, json: async () => ({ workspaces: [] }) }) as unknown as Response));
+ render(
+ <SessionSetupRow
+ personas={PERSONAS} agent="cowork" showFolder={false} folderName={null}
+ onPickCoworker={() => {}} onPickFolder={() => {}} onManage={() => {}} onImport={() => {}}
+ />,
+ );
+ fireEvent.click(screen.getByTestId("coworker-chip"));
+ const menu = screen.getByTestId("coworker-group-engineering").parentElement!;
+ const text = menu.textContent || "";
+ expect(text.indexOf("cowork")).toBeLessThan(text.indexOf("Engineering"));
+ expect(text.indexOf("Engineering")).toBeLessThan(text.indexOf("reviewer"));
+ expect(text.indexOf("reviewer")).toBeLessThan(text.indexOf("Security"));
+ expect(screen.queryByText("General")).toBeNull();
+ expect(screen.getByTestId("coworker-group-security").textContent).toContain("dep-audit");
+ });
+});
diff --git a/surfaces/gui/src/components/SessionSetupRow.tsx b/surfaces/gui/src/components/SessionSetupRow.tsx
index 10343d6e..a082709b 100644
--- a/surfaces/gui/src/components/SessionSetupRow.tsx
+++ b/surfaces/gui/src/components/SessionSetupRow.tsx
@@ -41,6 +41,23 @@ interface Props {
onImport: () => void;
}
+// Picker order (UX ruling 2026-09-29): the general coworkers first, with no label; then
+// Engineering and Security, each under a hairline and a small label; any other group after,
+// by name. A group is left out when it has nothing to show.
+const PICKER_GROUP_ORDER = ["engineering", "security"];
+
+export function personaGroups(personas: Persona[]): { group: string; items: Persona[] }[] {
+ const by = new Map<string, Persona[]>();
+ for (const p of personas) {
+ const g = p.group && p.group !== "general" ? p.group : "";
+ by.set(g, [...(by.get(g) || []), p]);
+ }
+ const rest = [...by.keys()].filter((g) => g && !PICKER_GROUP_ORDER.includes(g)).sort();
+ return ["", ...PICKER_GROUP_ORDER, ...rest]
+ .filter((g) => (by.get(g) || []).length > 0)
+ .map((g) => ({ group: g, items: by.get(g) || [] }));
+}
+
export function SessionSetupRow(props: Props) {
const { t } = useTranslation();
const [openMenu, setOpenMenu] = useState<"coworker" | "folder" | "machine" | null>(null);
@@ -89,25 +106,36 @@ export function SessionSetupRow(props: Props) {
</button>
{openMenu === "coworker" && (
<div className="setup-menu absolute bottom-full mb-1.5 left-0 z-30 w-[320px] bg-panel border border-line rounded-xl2 shadow-xl p-1">
- {personas.map((p) => (
- <button
- key={p.id}
- className={
- "w-full text-left px-2.5 py-2 rounded-lg hover:bg-paper " +
- (p.id === props.agent ? "bg-accentSoft/50" : "")
- }
- onClick={() => {
- setOpenMenu(null);
- props.onPickCoworker(p.id);
- }}
- >
- <span className="block text-ui font-medium text-ink">
- {fullPersonaName(p.name, p.id)}
- </span>
- {p.tagline && (
- <span className="block text-meta text-muted truncate">{p.tagline}</span>
+ {personaGroups(personas).map(({ group, items }) => (
+ <div key={group || "general"} data-testid={group ? `coworker-group-${group}` : undefined}>
+ {group && (
+ <div className="border-t border-line mt-1 pt-1">
+ <div className="px-2.5 pt-1.5 pb-0.5 text-meta text-faint">
+ {t(`setup.group_${group}`, { defaultValue: group })}
+ </div>
+ </div>
)}
- </button>
+ {items.map((p) => (
+ <button
+ key={p.id}
+ className={
+ "w-full text-left px-2.5 py-2 rounded-lg hover:bg-paper " +
+ (p.id === props.agent ? "bg-accentSoft/50" : "")
+ }
+ onClick={() => {
+ setOpenMenu(null);
+ props.onPickCoworker(p.id);
+ }}
+ >
+ <span className="block text-ui font-medium text-ink">
+ {fullPersonaName(p.name, p.id)}
+ </span>
+ {p.tagline && (
+ <span className="block text-meta text-muted truncate">{p.tagline}</span>
+ )}
+ </button>
+ ))}
+ </div>
))}
<div className="border-t border-line mt-1 pt-1">
<button
diff --git a/surfaces/gui/src/locales/en.json b/surfaces/gui/src/locales/en.json
index 367678f3..029a57ac 100644
--- a/surfaces/gui/src/locales/en.json
+++ b/surfaces/gui/src/locales/en.json
@@ -1451,7 +1451,8 @@
"consent_recommended_tag": "(recommended)",
"consent_optional_tag": "(optional)",
"consent_enabled_note": "✓ Enabled — it's in your coworker picker.",
- "consent_recommended_mode": "Recommended mode: {{mode}}."
+ "consent_recommended_mode": "Recommended mode: {{mode}}.",
+ "group_engineering": "Engineering"
},
"provider": {
"all_providers": "‹ All providers",
@@ -1695,7 +1696,9 @@
"manage_coworkers": "Manage coworkers…",
"choose_folder": "Choose folder",
"choose_another_folder": "Choose another folder…",
- "choose_a_folder": "Choose a folder…"
+ "choose_a_folder": "Choose a folder…",
+ "group_engineering": "Engineering",
+ "group_security": "Security"
},
"mcp": {
"preset_granola_blurb": "Meeting notes & transcripts — sign in with your Granola account.",
diff --git a/surfaces/gui/src/locales/zh.json b/surfaces/gui/src/locales/zh.json
index dc3b6532..d675053c 100644
--- a/surfaces/gui/src/locales/zh.json
+++ b/surfaces/gui/src/locales/zh.json
@@ -1431,7 +1431,8 @@
"consent_recommended_tag": "(推荐)",
"consent_optional_tag": "(可选)",
"consent_enabled_note": "✓ 已启用 —— 已在你的同事选择器中。",
- "consent_recommended_mode": "推荐模式:{{mode}}。"
+ "consent_recommended_mode": "推荐模式:{{mode}}。",
+ "group_engineering": "工程"
},
"provider": {
"all_providers": "‹ 全部 provider",
@@ -1661,7 +1662,9 @@
"manage_coworkers": "管理同事…",
"choose_folder": "选择文件夹",
"choose_another_folder": "选择其他文件夹…",
- "choose_a_folder": "选择一个文件夹…"
+ "choose_a_folder": "选择一个文件夹…",
+ "group_engineering": "工程",
+ "group_security": "安全"
},
"mcp": {
"preset_granola_blurb": "会议笔记与转录——用你的 Granola 账户登录。",