Skip to content
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
16 commits
Select commit Hold shift + click to select a range
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Next Next commit
feat(desktop): add Team management and durable group chat
  • Loading branch information
SivanCola committed Nov 3, 2026
commit 73058cec26762f5f3b0f8bcc850ccadb5e119f93
8 changes: 8 additions & 0 deletions desktop/app.go
Original file line number Diff line number Diff line change
Expand Up @@ -1289,6 +1289,11 @@ func applyTabToolApprovalModeToController(ctrl control.SessionAPI, mode string)
return nil
}
mode = normalizeToolApprovalMode(mode)
if teamMode, err := teamPermissionForController(ctrl, mode); err != nil {
mode = control.ToolApprovalReadOnly
} else {
mode = teamMode
}
if applier, ok := ctrl.(toolApprovalApplier); ok {
return applier.ApplyToolApprovalMode(mode)
}
Expand Down Expand Up @@ -3516,6 +3521,9 @@ func (a *App) SetPermissionPresetForTab(tabID, expectedSessionID, preset string,
if err := requirePermissionSession(live, expectedSessionID); err != nil {
return live, err
}
if ctrl.BoundTeamSeat() != nil && preset != live.Preset {
return live, fmt.Errorf("change persistent Team permissions in Team settings")
}
snapshot, _, err := ctrl.SetPermissionPreset(preset, expectedRevision)
if err != nil {
return snapshot, err
Expand Down
23 changes: 21 additions & 2 deletions desktop/frontend/bench/settings-pages.mjs
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@ let cases = 0;
const pages = [
["general", ".settings-field"], ["models", ".model-assignment-row"], ["providers", ".provider-connections"],
["model-stats", ".usage-stats__cards"], ["mcp", ".cap-mcp-add-btn:enabled"], ["agent-presets", ".agent-preset-row"],
["team", ".settings-section__actions button:enabled"],
["skills", ".settings-toolbar"], ["subagents", ".subagents-profile-group"], ["plugins", ".settings-toolbar button:enabled"],
["memory", ".memory-tabs-row"], ["hooks", ".hooks-json-panel__textarea"], ["diagnostics", ".diag-page"],
["permissions", ".set-rules"], ["sandbox", ".sandbox-settings"], ["network", ".settings-save-bar"],
Expand Down Expand Up @@ -113,7 +114,7 @@ async function openSettings(page, locale) {
await page.locator(".settings-page--general").waitFor();
const nav = page.locator(".settings-center__navgroups");
const labels = await nav.locator(".settings-center__navitem").allTextContents();
assert.equal(labels.length, 20, "every settings entry is covered");
assert.equal(labels.length, 21, "every settings entry is covered");
for (const [index, label] of labels.entries()) {
await nav.getByRole("button", { name: label.trim(), exact: true }).click();
const [id, ready] = pages[index];
Expand Down Expand Up @@ -163,6 +164,24 @@ try {
assert.equal(await page.locator(".agent-preset-editor").getByRole("button", { name: "Save", exact: true }).isEnabled(), false);
await page.locator(".agent-preset-editor .settings-back-button").click();

await go("Team");
for(const name of ["Chief","Ada With Spaces"]) {
await page.getByRole("button",{name:"New member",exact:true}).click();
await page.getByRole("textbox",{name:"Name",exact:true}).waitFor();
await verify(page,`team-member-${name.split(" ")[0]}`,true);
await page.getByRole("textbox",{name:"Name",exact:true}).fill(name);
await page.locator(".settings-page--team button[type=submit]").click();
await page.getByRole("heading",{name,exact:true}).waitFor();
}
await page.getByRole("button",{name:"New group",exact:true}).click();
await verify(page,"team-group-editor",true);
await page.getByRole("textbox",{name:"Name",exact:true}).fill("Project group");
await page.getByRole("checkbox",{name:"Chief",exact:true}).check();
await page.getByRole("checkbox",{name:"Ada With Spaces",exact:true}).check();
await page.locator(".settings-page--team button[type=submit]").click();
await page.getByRole("heading",{name:"Project group",exact:true}).waitFor();
await verify(page,"team-saved-list",true);

await go("MCP & Tools");
await page.locator(".cap-mcp-add-btn").click();
await page.locator(".cap-mcp-editor").waitFor();
Expand Down Expand Up @@ -331,7 +350,7 @@ try {
const selector = page.locator(".settings-center__compact-navigation button");
await selector.click();
const list = page.getByRole("listbox", { name: "Settings", exact: true });
assert.equal(await list.getByRole("option").count(), 20);
assert.equal(await list.getByRole("option").count(), 21);
await page.getByRole("combobox", { name: "Search settings", exact: true }).fill("network");
await list.getByRole("option", { name: "Network", exact: true }).click();
await page.locator(".settings-page--network").waitFor();
Expand Down
65 changes: 65 additions & 0 deletions desktop/frontend/bench/team-desktop.mjs
Original file line number Diff line number Diff line change
@@ -0,0 +1,65 @@
// Real Desktop frontend with the existing preview bridge. This gate verifies
// UI ownership and navigation; it does not claim real model or native-host QA.
import assert from "node:assert/strict";
import { mkdir } from "node:fs/promises";
import os from "node:os";
import path from "node:path";
import { fileURLToPath } from "node:url";
import { chromium } from "playwright";
import { startPreviewServer } from "./vite-preview-server.mjs";

const root=path.resolve(path.dirname(fileURLToPath(import.meta.url)),"..");
const port=Number(process.env.DEEPZORA_TEAM_BROWSER_PORT??4689);
const external=process.env.DEEPZORA_TEAM_BASE_URL;
const preview=external?null:await startPreviewServer(root,port);
const browser=await chromium.launch({headless:true});
const output=path.join(os.tmpdir(),"deepzora-team-browser");await mkdir(output,{recursive:true});
const errors=[];
const page=await browser.newPage({locale:"en-US",viewport:{width:1440,height:1000}});
page.on("pageerror",error=>errors.push(error.message));
try {
await page.goto(`${external??`http://127.0.0.1:${port}`}/?mock=deepseek_upgrade&bench=1&platform=windows`,{waitUntil:"domcontentloaded"});
await page.locator(".team-sidebar").waitFor();
await page.locator(".team-sidebar").getByRole("button",{name:"Manage team",exact:true}).click();
const settings=page.locator(".settings-page--team");await settings.waitFor();
for(const name of ["Chief","Ada With Spaces"]) {
await settings.getByRole("button",{name:"New member",exact:true}).click();
await settings.getByRole("textbox",{name:"Name",exact:true}).fill(name);
await settings.locator("button[type=submit]").click();
await settings.getByRole("heading",{name,exact:true}).waitFor();
}
await settings.getByRole("button",{name:"Move Ada With Spaces up",exact:true}).click();
await page.waitForFunction(()=>document.querySelector('.settings-page--team .agent-preset-row h3')?.textContent==='Ada With Spaces');
await settings.getByRole("button",{name:"New group",exact:true}).click();
await settings.getByRole("textbox",{name:"Name",exact:true}).fill("Project group");
for(const name of ["Chief","Ada With Spaces"])await settings.getByRole("checkbox",{name,exact:true}).check();
await settings.locator("button[type=submit]").click();
await settings.getByRole("heading",{name:"Project group",exact:true}).waitFor();
await page.getByRole("button",{name:"Back to workspace",exact:true}).click();
const sidebar=page.locator(".team-sidebar");
await sidebar.getByRole("button",{name:/Project group/}).click();
const chat=page.locator(".team-chat");await chat.waitFor();
const input=chat.getByRole("textbox",{name:"Message the group…",exact:true});
await input.fill("Retain this group draft");
await chat.getByRole("checkbox",{name:"Ada With Spaces",exact:true}).check();
await sidebar.getByRole("button",{name:/^Chief/}).click();
await chat.waitFor({state:"detached"});
await sidebar.getByRole("button",{name:/Project group/}).click();
await input.waitFor();assert.equal(await input.inputValue(),"Retain this group draft");
assert.equal(await chat.getByRole("checkbox",{name:"Ada With Spaces",exact:true}).isChecked(),true);
await chat.getByRole("button",{name:"Send to group",exact:true}).click();
await chat.getByText("Retain this group draft",{exact:true}).waitFor();
await page.waitForFunction(()=>document.querySelector('.team-chat textarea')?.value==='');
assert.equal(await chat.locator('[data-chat-kind="user"]').count(),1,"one accepted submission is rendered once");
assert.equal(await chat.locator('[data-chat-kind="assistant"]').count(),0,"preview does not fabricate model replies");
for(const width of [1440,900,400]) {
await page.setViewportSize({width,height:1000});
const overflow=await chat.evaluate(el=>el.scrollWidth-el.clientWidth);
assert.ok(overflow<=1,`group chat fits ${width}px`);
await page.screenshot({path:path.join(output,`team-group-${width}.png`)});
}
assert.deepEqual(errors,[],"no browser runtime errors");
console.log("PASS Team creation, ordering, structured mentions, canonical switching, retained drafts, at-most-once display and responsive group chat");
} finally {
await page.close();await browser.close();if(preview)await preview.httpServer.close();
}
2 changes: 2 additions & 0 deletions desktop/frontend/scripts/test-manifest.json
Original file line number Diff line number Diff line change
Expand Up @@ -208,6 +208,8 @@
]
],
"transcript": [
["tsx", "src/__tests__/team-history-window.test.ts"],
["tsx", "src/__tests__/team-composer-persistence.test.ts"],
[
"tsx",
"src/__tests__/canonical-user-display.test.ts"
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,61 @@
import assert from "node:assert/strict";
import { JSDOM } from "jsdom";
import { installDesktopHostStub } from "./desktopHostStub";
import type { SaveTeamGroupDraftRequest, TeamGroupDraftView } from "../generated/desktopContract.generated";
import { clearSubmittedTeamDraft, emptyTeamDraft, flushAllTeamDrafts, flushTeamDraft, loadTeamDraft, resumeTeamDraftEditing, trackTeamSubmission, useTeamComposerStore } from "../store/teamComposer";

const dom=new JSDOM("<div></div>",{url:"http://localhost"});
Object.assign(globalThis,{window:dom.window,document:dom.window.document});
const saved=new Map<string,TeamGroupDraftView>();
let pause:Promise<void>|undefined;
let entered:(()=>void)|undefined;
let loseResponse=false;
const requests:SaveTeamGroupDraftRequest[]=[];
installDesktopHostStub({
ReadTeamGroupDraft:async group=>structuredClone(saved.get(group)??{revision:0,draft:emptyTeamDraft}),
SaveTeamGroupDraft:async request=>{
requests.push(structuredClone(request));
entered?.();if(pause)await pause;
const previous=saved.get(request.groupId);
if(previous?.revision!==undefined&&previous.revision!==request.expectedRevision){
if(previous.revision===request.expectedRevision+1&&JSON.stringify(previous.draft)===JSON.stringify(request.draft))return {outcome:"applied",view:structuredClone(previous)};
return {outcome:"rejected",reason:"conflict",view:structuredClone(previous)};
}
const next={revision:request.expectedRevision+1,draft:structuredClone(request.draft)};saved.set(request.groupId,next);
if(loseResponse){loseResponse=false;throw new Error("lost response");}
return {outcome:"applied",view:structuredClone(next)};
},
});
const edit=(group:string,text:string)=>useTeamComposerStore.getState().set(group,{...emptyTeamDraft,text});
try {
await loadTeamDraft("group-a");
edit("group-a","first");const first=useTeamComposerStore.getState().drafts["group-a"];
let release!:()=>void;
pause=new Promise<void>(resolve=>{release=resolve;});
const admitted=new Promise<void>(resolve=>{entered=resolve;});
const writing=flushTeamDraft("group-a");await admitted;
edit("group-a","edited during save");const second=useTeamComposerStore.getState().drafts["group-a"];
assert.notEqual(first.requestId,second.requestId,"an actual edit gets a new submission identity");
pause=undefined;entered=undefined;release();await writing;
assert.equal(saved.get("group-a")?.draft.text,"edited during save");
assert.deepEqual(requests.map(request=>request.expectedRevision),[0,1],"a delayed save cannot overwrite the later input or reuse its old revision");
clearSubmittedTeamDraft("group-a",first);
assert.equal(useTeamComposerStore.getState().drafts["group-a"],second,"a late accepted submission cannot erase the newer input");

await loadTeamDraft("group-b");edit("group-b","do not duplicate");loseResponse=true;
await assert.rejects(flushTeamDraft("group-b"),/lost response/);
assert.equal(useTeamComposerStore.getState().drafts["group-b"].text,"do not duplicate");
// Explicit reload represents the same persisted snapshot after a restart.
await loadTeamDraft("group-b",true);
assert.equal(useTeamComposerStore.getState().drafts["group-b"].requestId,saved.get("group-b")?.draft.requestId);

let finish!:()=>void;
const admittedSend=new Promise<void>(resolve=>{finish=resolve;});
const submission=trackTeamSubmission("group-a",async()=>{await admittedSend;clearSubmittedTeamDraft("group-a",second);});
let exited=false;const quitting=flushAllTeamDrafts().then(()=>{exited=true;});
await Promise.resolve();assert.equal(exited,false,"quit joins admitted Team submissions");
finish();await submission;await quitting;
assert.equal(saved.get("group-a")?.draft.text,"","quit persists the accepted submission's cleared input");
resumeTeamDraftEditing();
console.log("PASS Team draft concurrent saves, stale clears, durable submission identity and quit join");
} finally {resumeTeamDraftEditing();dom.window.close();}
47 changes: 47 additions & 0 deletions desktop/frontend/src/__tests__/team-history-window.test.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,47 @@
import assert from "node:assert/strict";
import { TeamHistoryWindow } from "../lib/teamHistoryWindow";
import { TeamGroupProjection } from "../lib/teamGroupProjection";
import type { GroupLine, TeamAgentView, TeamGroupHistoryPage } from "../generated/desktopContract.generated";
import { t } from "../lib/i18n";

function page(start:number):TeamGroupHistoryPage {
const lines:GroupLine[]=Array.from({length:32},(_,offset)=>({seq:start+offset,from:"a-0000000000000001",kind:"post",at:"2026-11-03T00:00:00Z",text:`message ${start+offset}`}));
return {status:"ready",snapshot:"fixed",maxSequence:320,lines,olderCursor:start>1?`older:${start}`:"",newerCursor:start+31<320?`newer:${start+31}`:""};
}
const window=new TeamHistoryWindow();
assert.ok(window.accept(page(289),"latest"));
const lastLine=window.lines[0];
for(const start of [257,225,193,161,129,97,65,33,1]) {
assert.ok(window.accept(page(start),"older"));
assert.ok(window.lines.length<=96,"paging must release bodies from the opposite end");
assert.equal(window.lines[0].seq,start);
if(start<=193)assert.ok(window.newerCursor,"reclaimed messages remain reachable");
}
for(const start of [97,129,161,193,225,257,289])assert.ok(window.accept(page(start),"newer"));
assert.equal(window.lines[window.lines.length-1].seq,320);
assert.equal(window.newerCursor,"");
assert.ok(!window.accept({...page(289),snapshot:"replaced"},"older"));
assert.ok(!window.accept({...page(289),status:"stale_cursor"},"latest"));
assert.equal(window.lines[window.lines.length-1].seq,320,"a stale result preserves the reader's current page");
assert.ok(window.accept(page(289),"latest"));
const resident=window.lines[0];
assert.ok(window.accept(page(289),"latest"));
assert.equal(window.lines[0],resident,"unchanged event identities preserve their objects");
assert.notEqual(resident,lastLine,"reclaimed data was released and refetched");

const member:TeamAgentView={id:"a-0000000000000001",name:"Ada With Spaces",role:"",instructions:"",avatar:{glyph:"bot"},folder:"",initialModel:"",permission:"read-only",main:true,pinned:false,hidden:false,sessionPath:"",createdBy:"user",createdAt:"2026-11-03T00:00:00Z"};
const projection=new TeamGroupProjection();
const first=projection.update("group",window.lines,[member],t);
const second=projection.update("group",window.lines,[{...member}],t);
assert.equal(first,second,"unchanged projections preserve node and order references");
assert.equal(first[0].speaker?.id,member.id);
assert.equal(first[0].speaker?.name,"Ada With Spaces");
const renamed=projection.update("group",window.lines,[{...member,name:"New Name"}],t);
assert.equal(renamed[0].id,first[0].id,"renaming does not remount the message host");
assert.equal(renamed[0].speaker?.name,"New Name");
const human:GroupLine={seq:321,from:"user",kind:"post",at:"2026-11-03T00:00:00Z",text:"hello"};
const userNamedAgent={...member,name:"user"};
const identities=projection.update("group",[human,window.lines[0]],[userNamedAgent],t);
assert.equal(identities[0].kind,"user");
assert.equal(identities[1].kind,"assistant","display name cannot impersonate the human role");
console.log("PASS Team bounded history and speaker projection");
1 change: 1 addition & 0 deletions desktop/frontend/src/app-runtime/desktopBridgeAdapter.ts
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ import { app } from "../lib/bridge";

/** Runtime-only bridge ports used by App owners; presentation never imports the desktop bridge directly. */
export const desktopBridge = {
prepareTeamAgent: app.PrepareTeamAgentSession,
getSessionSummary: (ref: Parameters<typeof app.GetSessionSummary>[0]) => app.GetSessionSummary(ref),
cancelJobForTab: (tabId: string, jobId: string) => app.CancelJobForTab(tabId, jobId),
terminalOutputForTab: (tabId: string, sessionId: string) => app.TerminalOutputForTab(tabId, sessionId),
Expand Down
11 changes: 10 additions & 1 deletion desktop/frontend/src/app-runtime/desktopNavigationOwner.ts
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ import type { useAppRuntimeAdapter } from "./useAppRuntimeAdapter";
import type { SessionOperationAuthority } from "./useResourceOperations";

export type DesktopNavigationIntent =
| { kind:"team-agent"; agentID:string }
| { kind: "canonical-session"; ref: SessionRef }
| { kind: "topic"; scope: string; workspaceRoot: string; topicId: string; sessionPath?: string }
| { kind: "blank"; scope: string; workspaceRoot: string }
Expand All @@ -17,6 +18,7 @@ export type DesktopNavigationPorts = Pick<Runtime["navigation"],
| "ensureBlankSurface" | "createIsolatedWorktree" | "registeredNavigationIntent"> &
Pick<Runtime["sessionActions"], "openChannelSession" | "resumeSession"> & {
listTabs(): Promise<TabMeta[]>;
prepareTeamAgent?(agentID:string):Promise<SessionRef>;
applyTabs(tabs: TabMeta[]): void;
seedTab(tab: TabMeta): void;
topicAccepted?(intent: number): void;
Expand Down Expand Up @@ -62,6 +64,13 @@ export async function executeDesktopNavigation(input: DesktopNavigationCapture,
ports.ensureBlankSurface(scope, scope === "project" ? workspace : "", seq);
checkpoint();
try {
if(request.kind==="team-agent") {
if(!ports.prepareTeamAgent)throw new Error("Team execution requires the local Desktop host");
const ref=await ports.prepareTeamAgent(request.agentID);
checkpoint();
await ports.openCanonicalSession(ref,seq);
checkpoint();ports.closeHistory();await refresh();checkpoint();ports.reveal();return;
}
if (request.kind === "canonical-session") {
await ports.openCanonicalSession(request.ref, seq);
checkpoint(); ports.closeHistory();
Expand Down Expand Up @@ -102,7 +111,7 @@ export async function executeDesktopNavigation(input: DesktopNavigationCapture,
ports.reveal(); await refresh();
} catch (error) {
checkpoint();
if (request.kind === "canonical-session") {
if (request.kind === "canonical-session" || request.kind === "team-agent") {
ports.notice({ message: error instanceof Error ? error.message : String(error), tone: "error" });
return;
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -69,6 +69,7 @@ export function useAppNavigationComposition(input: AppNavigationCompositionInput
setSettingsTarget, setSettingsFocus, setSidebarSearchOpen, setSidebarSearchFocusSignal, setProviderSetupNeeded,
} = shell;
const { reload: reloadDesktopPreferences } = shell.preferences;
const teamGroupVisible=shell.page.kind==="workspace"&&!!shell.page.teamGroupID;
const {
closeTransientOverlays, refreshProviderSetupState,
tabBarCommands, terminalPanelCommands, runtimeEventCommands,
Expand Down Expand Up @@ -125,7 +126,8 @@ export function useAppNavigationComposition(input: AppNavigationCompositionInput
// while the palette is up; extension actions follow the same snapshot rule.
const { openPalette, paletteItems } = usePaletteCommands({
managementActive,
activeTabId,
activeTabId:teamGroupVisible?undefined:activeTabId,
closeSurface:teamGroupVisible?enterConversation:undefined,
t,
notice,
showToast,
Expand Down
Loading