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
Prev Previous commit
Next Next commit
feat(team): archive and restore member identities
  • Loading branch information
SivanCola committed Nov 3, 2026
commit ba72949b486a4d393a0cd316f68ab0125a255a9e
5 changes: 5 additions & 0 deletions desktop/frontend/bench/team-desktop.mjs
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,11 @@ try {
}
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');
const ada=settings.locator('.agent-preset-row').filter({has:page.getByRole('heading',{name:'Ada With Spaces',exact:true})});
await ada.getByRole('button',{name:'Archive member',exact:true}).click();
const archived=settings.locator('.settings-section').filter({has:page.getByRole('heading',{name:'Archived members',exact:true})});
await archived.getByRole('button',{name:'Restore member',exact:true}).click();
await ada.getByRole('button',{name:'Edit',exact:true}).waitFor();
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();
Expand Down
4 changes: 4 additions & 0 deletions desktop/frontend/src/components/TeamSettingsPage.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -79,12 +79,16 @@ export function TeamSettingsPage({tabId,workspaceKey}:{tabId:string;workspaceKey
<p className="cap-skill-card__desc">{member.role}</p>
{team.view?.seats.some(seat=>seat.agentId===member.id&&seat.settingsPending)&&<p role="status">{t("team.pendingConfig")}</p>}
<div className="agent-preset-row__actions"><button className="btn btn--small" type="button" disabled={!team.view?.writable||operation.busy} onClick={()=>{setNotice("");setEditor({kind:"agent",member,revision});}}>{t("common.edit")}</button>
<button className="btn btn--small" type="button" disabled={!team.view?.writable||operation.busy} onClick={()=>{setFailedTarget({agentId:member.id,groupId:""});void operation.save({agentId:member.id,revision,action:"archive"},requestId=>app.ArchiveTeamAgent({agentId:member.id,groupId:"",expectedRevision:revision,requestId}));}}>{t("team.archiveMember")}</button>
<button className="btn btn--small" type="button" aria-label={t("team.moveUp",{name:member.name})} disabled={!team.view?.writable||operation.busy||index===0} onClick={()=>reorder("agents",member.id,-1)}><ArrowUp size={14}/></button>
<button className="btn btn--small" type="button" aria-label={t("team.moveDown",{name:member.name})} disabled={!team.view?.writable||operation.busy||index===(team.view?.roster.agents.length??0)-1} onClick={()=>reorder("agents",member.id,1)}><ArrowDown size={14}/></button>
<InlineConfirmButton label={t("common.delete")} confirmLabel={t("team.confirmDelete",{name:member.name})} cancelLabel={t("common.cancel")} disabled={!team.view?.writable||operation.busy} danger onConfirm={async()=>{await remove(member.id,"");}}/>
</div>
</article>)}</div>
</SettingsSection>
{team.view.roster.retiredAgents.some(member=>member.archived)&&<SettingsSection title={t("team.archivedMembers")} description={t("team.restoreMemberHint")}>
{team.view.roster.retiredAgents.filter(member=>member.archived).map(member=><article className="cap-skill-card" key={member.id}><h3>{member.name}</h3><button className="btn btn--small" type="button" disabled={!team.view?.writable||operation.busy} onClick={()=>void operation.save({agentId:member.id,revision,action:"restore"},requestId=>app.RestoreTeamAgent({agentId:member.id,groupId:"",expectedRevision:revision,requestId}))}>{t("team.restoreMember")}</button></article>)}
</SettingsSection>}
<SettingsSection title={t("team.groups")} actions={<button className="btn btn--small" type="button" disabled={!team.view.writable||team.view.roster.agents.length<2} onClick={()=>{setNotice("");setEditor({kind:"group",revision});}}><Plus size={14}/>{t("team.newGroup")}</button>}>
<div className="cap-skills">{team.view.roster.groups.map((group,index)=><article className="cap-skill-card" key={group.id}><h3>{group.name}</h3><p>{group.notice}</p><p>{group.members.map(id=>team.view?.roster.agents.find(a=>a.id===id)?.name??id).join(", ")}</p>
{group.archived&&<span>{t("team.archived")}</span>}<div className="agent-preset-row__actions"><button className="btn btn--small" type="button" disabled={!team.view?.writable||operation.busy} onClick={()=>setEditor({kind:"group",group,revision})}>{t("common.edit")}</button>
Expand Down
61 changes: 61 additions & 0 deletions desktop/frontend/src/generated/desktopContract.generated.json
Original file line number Diff line number Diff line change
Expand Up @@ -649,6 +649,33 @@
"desktop/session_operations.go"
]
},
{
"cancellation": "before-dispatch",
"domain": "desktop/team_organization.go",
"name": "ArchiveTeamAgent",
"owner": "App.ArchiveTeamAgent",
"params": [
{
"kind": "object",
"ref": "main.TeamTargetMutationRequest"
}
],
"result": {
"kind": "object",
"ref": "main.TeamMutationResult"
},
"returnsError": true,
"scope": {
"inputs": [
"req"
],
"kind": "owner-inputs",
"resolver": "App.ArchiveTeamAgent"
},
"sources": [
"desktop/team_organization.go"
]
},
{
"cancellation": "before-dispatch",
"domain": "desktop/attachments_app.go",
Expand Down Expand Up @@ -9101,6 +9128,33 @@
"desktop/session_operations.go"
]
},
{
"cancellation": "before-dispatch",
"domain": "desktop/team_organization.go",
"name": "RestoreTeamAgent",
"owner": "App.RestoreTeamAgent",
"params": [
{
"kind": "object",
"ref": "main.TeamTargetMutationRequest"
}
],
"result": {
"kind": "object",
"ref": "main.TeamMutationResult"
},
"returnsError": true,
"scope": {
"inputs": [
"req"
],
"kind": "owner-inputs",
"resolver": "App.RestoreTeamAgent"
},
"sources": [
"desktop/team_organization.go"
]
},
{
"cancellation": "before-dispatch",
"domain": "desktop/goal_app.go",
Expand Down Expand Up @@ -31194,6 +31248,13 @@
"type": {
"kind": "string"
}
},
{
"name": "archived",
"optional": true,
"type": {
"kind": "boolean"
}
}
]
},
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@

export const DESKTOP_PROTOCOL_VERSION = 11;

export const DESKTOP_CONTRACT_DIGEST = "sha256:467028cf98738470b14cda937d6d75cea37c44bbc3eaf4eebd6b5a30da6a9cb6";
export const DESKTOP_CONTRACT_DIGEST = "sha256:2d257ca2e9ef0b085e89eb423c7c09baf482814832eb5cea1e0193a69753bc61";

export const DESKTOP_COMMANDS = [
"AIRenameSessionTarget",
Expand All @@ -30,6 +30,7 @@ export const DESKTOP_COMMANDS = [
"ApplyUpdateRequest",
"ArchiveCanonicalSession",
"ArchiveSessionTarget",
"ArchiveTeamAgent",
"AttachDropped",
"AttachDroppedForComposerTarget",
"AttachDroppedForTab",
Expand Down Expand Up @@ -349,6 +350,7 @@ export const DESKTOP_COMMANDS = [
"RestoreMemoryRevision",
"RestoreMemoryRevisionForTab",
"RestoreSessionTarget",
"RestoreTeamAgent",
"ResumeGoalForTab",
"ResumeTranscriptSessionForTab",
"RetryAuthenticationForTab",
Expand Down Expand Up @@ -3672,6 +3674,7 @@ export interface TeamAgentView {
sessionPath: string;
createdBy: string;
createdAt: string;
archived?: boolean;
}

export interface TeamGroupDraft {
Expand Down Expand Up @@ -4971,6 +4974,7 @@ export interface GeneratedDesktopCommands {
ApplyUpdateRequest(arg0: string, arg1: string, arg2: string): Promise<void>;
ArchiveCanonicalSession(arg0: SessionRef): Promise<void>;
ArchiveSessionTarget(arg0: SessionSelector): Promise<SessionMutationResult>;
ArchiveTeamAgent(arg0: TeamTargetMutationRequest): Promise<TeamMutationResult>;
AttachDropped(arg0: string): Promise<DroppedItem>;
AttachDroppedForComposerTarget(arg0: ComposerTarget, arg1: string): Promise<DroppedItem>;
AttachDroppedForTab(arg0: string, arg1: string): Promise<DroppedItem>;
Expand Down Expand Up @@ -5290,6 +5294,7 @@ export interface GeneratedDesktopCommands {
RestoreMemoryRevision(arg0: string, arg1: number): Promise<MemoryFact>;
RestoreMemoryRevisionForTab(arg0: string, arg1: string, arg2: number): Promise<MemoryFact>;
RestoreSessionTarget(arg0: SessionSelector): Promise<SessionMutationResult>;
RestoreTeamAgent(arg0: TeamTargetMutationRequest): Promise<TeamMutationResult>;
ResumeGoalForTab(arg0: string): Promise<boolean>;
ResumeTranscriptSessionForTab(arg0: string, arg1: string): Promise<HistorySwitchPhases>;
RetryAuthenticationForTab(arg0: string): Promise<AuthenticationState>;
Expand Down
4 changes: 3 additions & 1 deletion desktop/frontend/src/lib/teamBindings.ts
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ import type { GeneratedDesktopCommands } from "../generated/desktopContract.gene
export type TeamHostBindings = Pick<GeneratedDesktopCommands,
"BrowserTeamAgentForTab" | "GetTeam" | "OpenTeamAgent" | "SaveTeamAgent" | "SaveTeamGroup"
| "ReadTeamGroupHistory" | "SendTeamGroupMessage" | "ContinueTeamGroup" | "StopTeamSeat" | "StopTeamGroup" | "PrepareTeamAgentSession" | "DeleteTeamTarget" | "ReorderTeam"
| "ReadTeamGroupDraft" | "SaveTeamGroupDraft" | "MarkTeamGroupRead">;
| "ReadTeamGroupDraft" | "SaveTeamGroupDraft" | "MarkTeamGroupRead" | "ArchiveTeamAgent" | "RestoreTeamAgent">;

// This increment has no browser-only Team engine. The production proxy forwards
// the generated contract to Go; the browser preview reports the absent host.
Expand All @@ -22,6 +22,8 @@ export function makeUnavailableTeamHostMock(): TeamHostBindings {
StopTeamGroup: unavailable,
PrepareTeamAgentSession: unavailable,
DeleteTeamTarget: unavailable,
ArchiveTeamAgent: unavailable,
RestoreTeamAgent: unavailable,
ReorderTeam: unavailable,
ReadTeamGroupDraft: unavailable,
SaveTeamGroupDraft: unavailable,
Expand Down
13 changes: 13 additions & 0 deletions desktop/frontend/src/lib/teamMock.ts
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,19 @@ export function makeMockTeamBindings(ports:Ports):TeamHostBindings {
return ref;
};
return {
ArchiveTeamAgent:async request=>{
const prior=check(request.requestId,request.expectedRevision,{...request,action:"archive"});if(prior)return prior;
const member=view.roster.agents.find(a=>a.id===request.agentId);if(!member)return result("rejected","","target_invalid");
if(member.main&&!view.roster.agents.some(a=>a.main&&a.id!==member.id))return result("rejected","","invalid");
view.roster.retiredAgents.push({...member,archived:true});view.roster.agents=view.roster.agents.filter(a=>a.id!==member.id);
view.roster.revision++;receipts.set(request.requestId,{request:JSON.stringify({...request,action:"archive"}),target:member.id});return result("applied",member.id);
},
RestoreTeamAgent:async request=>{
const prior=check(request.requestId,request.expectedRevision,{...request,action:"restore"});if(prior)return prior;
const member=view.roster.retiredAgents.find(a=>a.id===request.agentId&&a.archived);if(!member)return result("rejected","","target_invalid");
view.roster.agents.push({...member,archived:false});view.roster.retiredAgents=view.roster.retiredAgents.filter(a=>a.id!==member.id);
view.roster.revision++;receipts.set(request.requestId,{request:JSON.stringify({...request,action:"restore"}),target:member.id});return result("applied",member.id);
},
BrowserTeamAgentForTab:async()=>"",
GetTeam:async()=>{view.groupStatus=view.roster.groups.map(group=>({groupId:group.id,lastSequence:logs.get(group.id)?.length??0,readSequence:read.get(group.id)??0,unread:(logs.get(group.id)??[]).filter(line=>line.seq>(read.get(group.id)??0)&&line.from!=="user").length}));return clone();},
ReadTeamGroupDraft:async group=>structuredClone(drafts.get(group)??{revision:0,draft:{requestId:"",text:"",mentions:[],everyone:false}}),
Expand Down
4 changes: 4 additions & 0 deletions desktop/frontend/src/locales/en.ts
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,10 @@ export const en = {
"team.modeAdmin": "Administrator first",
"team.relayLimit": "Relay limit",
"team.archived": "Archived",
"team.archiveMember": "Archive member",
"team.archivedMembers": "Archived members",
"team.restoreMember": "Restore member",
"team.restoreMemberHint": "Restores the member's identity and private history. Add group memberships explicitly after reviewing the roster.",
"team.mention": "Mention members",
"team.everyone": "Everyone",
"team.send": "Send to group",
Expand Down
4 changes: 4 additions & 0 deletions desktop/frontend/src/locales/zh.ts
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,10 @@ export const zh: Record<DictKey, string> = {
"team.modeAdmin": "管理员优先",
"team.relayLimit": "接力上限",
"team.archived": "已归档",
"team.archiveMember": "归档成员",
"team.archivedMembers": "已归档成员",
"team.restoreMember": "恢复成员",
"team.restoreMemberHint": "恢复成员身份与私聊历史。请审阅名册后重新加入所需群组。",
"team.mention": "提及成员",
"team.everyone": "全体成员",
"team.send": "发送群消息",
Expand Down
28 changes: 28 additions & 0 deletions desktop/host_command_owners.generated.json
Original file line number Diff line number Diff line change
Expand Up @@ -351,6 +351,20 @@
]
}
},
"ArchiveTeamAgent": {
"domain": "desktop/team_organization.go",
"owner": "App.ArchiveTeamAgent",
"sources": [
"desktop/team_organization.go"
],
"scope": {
"kind": "owner-inputs",
"resolver": "App.ArchiveTeamAgent",
"inputs": [
"req"
]
}
},
"AttachDropped": {
"domain": "desktop/attachments_app.go",
"owner": "App.AttachDropped",
Expand Down Expand Up @@ -4884,6 +4898,20 @@
]
}
},
"RestoreTeamAgent": {
"domain": "desktop/team_organization.go",
"owner": "App.RestoreTeamAgent",
"sources": [
"desktop/team_organization.go"
],
"scope": {
"kind": "owner-inputs",
"resolver": "App.RestoreTeamAgent",
"inputs": [
"req"
]
}
},
"ResumeGoalForTab": {
"domain": "desktop/goal_app.go",
"owner": "App.ResumeGoalForTab",
Expand Down
60 changes: 60 additions & 0 deletions desktop/team_archive_test.go
Original file line number Diff line number Diff line change
@@ -0,0 +1,60 @@
package main

import "testing"

func TestDesktopTeamArchiveRestoresStableIdentityAndNeverRestoresDeletedMember(t *testing.T) {
isolateDesktopUserDirs(t)
a := NewApp()
a.ctx = t.Context()
installNoopRuntimeEvents(a)
t.Cleanup(func() {
if err := a.stopTeamHost(); err != nil {
t.Error(err)
}
})
create, err := a.SaveTeamAgent(SaveTeamAgentRequest{RequestID: "archive-member-create", Settings: TeamAgentSettings{Name: "Ada", Permission: "read-only"}})
if err != nil || create.Outcome != "applied" {
t.Fatalf("create: %+v %v", create, err)
}
view := create.View
// Keep the required main seat while Ada is archived.
_, err = a.SaveTeamAgent(SaveTeamAgentRequest{RequestID: "archive-other-create", ExpectedRevision: view.Roster.Revision, Settings: TeamAgentSettings{Name: "Ben", Main: true, Permission: "read-only"}})
if err != nil {
t.Fatal(err)
}
view, err = a.GetTeam()
if err != nil {
t.Fatal(err)
}
original := view.Roster.Agents[0]
req := TeamTargetMutationRequest{AgentID: original.ID, RequestID: "archive-existing-member", ExpectedRevision: view.Roster.Revision}
archived, err := a.ArchiveTeamAgent(req)
if err != nil || archived.Outcome != "applied" {
t.Fatalf("archive: %+v %v", archived, err)
}
if len(archived.View.Roster.Agents) != 1 || len(archived.View.Roster.RetiredAgents) != 1 || !archived.View.Roster.RetiredAgents[0].Archived {
t.Fatalf("archive did not retire execution identity: %+v", archived.View.Roster)
}
req.RequestID = "restore-existing-member"
req.ExpectedRevision = archived.View.Roster.Revision
restored, err := a.RestoreTeamAgent(req)
if err != nil || restored.Outcome != "applied" {
t.Fatalf("restore: %+v %v", restored, err)
}
got := restored.View.Roster.Agents[1]
if got.ID != original.ID || got.SessionPath != original.SessionPath || got.Permission != original.Permission {
t.Fatalf("restore changed canonical identity: %+v", got)
}
req.RequestID = "delete-existing-member"
req.ExpectedRevision = restored.View.Roster.Revision
deleted, err := a.DeleteTeamTarget(req)
if err != nil || deleted.Outcome != "applied" {
t.Fatalf("delete: %+v %v", deleted, err)
}
req.RequestID = "restore-deleted-member"
req.ExpectedRevision = deleted.View.Roster.Revision
refused, err := a.RestoreTeamAgent(req)
if err != nil || refused.Reason != "target_invalid" {
t.Fatalf("deleted member became restorable: %+v %v", refused, err)
}
}
42 changes: 40 additions & 2 deletions desktop/team_organization.go
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,43 @@ type TeamTargetMutationRequest struct {
// DeleteTeamTarget retires identities instead of destroying their history.
// A member's departure retires a group that could no longer have two members.
func (a *App) DeleteTeamTarget(req TeamTargetMutationRequest) (TeamMutationResult, error) {
return a.mutateTeam(req.ExpectedRevision, req.RequestID, req, func(_ context.Context, r *teamroster.Roster) (string, error) {
return a.retireTeamTarget(req, false, req)
}

func (a *App) ArchiveTeamAgent(req TeamTargetMutationRequest) (TeamMutationResult, error) {
if req.AgentID == "" || req.GroupID != "" {
return TeamMutationResult{}, teamroster.ErrInvalid
}
return a.retireTeamTarget(req, true, struct {
Request TeamTargetMutationRequest
Action string
}{req, "archive"})
}

// Restore retains the stable identity, private session and copied definition.
// Group memberships are added explicitly after reviewing the active roster.
func (a *App) RestoreTeamAgent(req TeamTargetMutationRequest) (TeamMutationResult, error) {
return a.mutateTeam(req.ExpectedRevision, req.RequestID, struct {
Request TeamTargetMutationRequest
Action string
}{req, "restore"}, func(_ context.Context, r *teamroster.Roster) (string, error) {
if req.AgentID == "" || req.GroupID != "" {
return "", teamroster.ErrInvalid
}
i := slices.IndexFunc(r.RetiredAgents, func(member teamroster.Agent) bool { return member.ID == req.AgentID && member.Archived })
if i < 0 {
return "", teamroster.ErrUnknownAgent
}
member := r.RetiredAgents[i]
member.Archived = false
r.Agents = append(r.Agents, member)
r.RetiredAgents = slices.Delete(r.RetiredAgents, i, i+1)
return member.ID, nil
})
}

func (a *App) retireTeamTarget(req TeamTargetMutationRequest, archive bool, request any) (TeamMutationResult, error) {
return a.mutateTeam(req.ExpectedRevision, req.RequestID, request, func(_ context.Context, r *teamroster.Roster) (string, error) {
if (req.AgentID == "") == (req.GroupID == "") {
return "", teamroster.ErrInvalid
}
Expand Down Expand Up @@ -46,7 +82,9 @@ func (a *App) DeleteTeamTarget(req TeamTargetMutationRequest) (TeamMutationResul
}
}
}
r.RetiredAgents = append(r.RetiredAgents, *member)
retiredMember := *member
retiredMember.Archived = archive
r.RetiredAgents = append(r.RetiredAgents, retiredMember)
for i := range r.Groups {
g := &r.Groups[i]
if !g.IsMember(req.AgentID) {
Expand Down
3 changes: 2 additions & 1 deletion desktop/team_preset_dto.go
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,7 @@ type TeamAgentView struct {
SessionPath string `json:"sessionPath"`
CreatedBy string `json:"createdBy"`
CreatedAt time.Time `json:"createdAt"`
Archived bool `json:"archived,omitempty"`
}

type TeamRosterView struct {
Expand All @@ -68,5 +69,5 @@ func teamRosterView(r teamroster.Roster) TeamRosterView {
}

func teamAgentView(a teamroster.Agent) TeamAgentView {
return TeamAgentView{ID: a.ID, SessionPath: a.SessionPath, CreatedBy: a.CreatedBy, CreatedAt: a.CreatedAt, TeamAgentSettings: TeamAgentSettings{Name: a.Name, Role: a.Role, Instructions: a.Instructions, Avatar: a.Avatar, InitialModel: a.InitialModel, Folder: a.Folder, Permission: a.Permission, Main: a.Main, Pinned: a.Pinned, Hidden: a.Hidden, Preset: teamPresetView(a.Preset)}}
return TeamAgentView{ID: a.ID, SessionPath: a.SessionPath, CreatedBy: a.CreatedBy, CreatedAt: a.CreatedAt, Archived: a.Archived, TeamAgentSettings: TeamAgentSettings{Name: a.Name, Role: a.Role, Instructions: a.Instructions, Avatar: a.Avatar, InitialModel: a.InitialModel, Folder: a.Folder, Permission: a.Permission, Main: a.Main, Pinned: a.Pinned, Hidden: a.Hidden, Preset: teamPresetView(a.Preset)}}
}
Loading
Loading