From b05feff2261720cddddab3e15da8d155e0b16e57 Mon Sep 17 00:00:00 2001
From: cl <cailue@apache.org>
Date: Tue, 12 May 2026 17:56:23 +0800
Subject: [PATCH 1/5] Add project grouping to dashboard

---
 src/dashboard-html.ts              |  13 +++-
 src/dashboard-js-part1.ts          |  11 ++-
 src/dashboard-js-part2.ts          |  22 ++++--
 src/dashboard-js-part3.ts          |  10 ++-
 src/dashboard.ts                   |  75 ++++++++++++++++-----
 src/db.ts                          |   5 +-
 src/index.ts                       |   7 +-
 src/recovery.ts                    |  27 ++++----
 src/schema.ts                      | 104 +++++++++++++++++++++++++++++
 src/tools/team-cleanup.ts          |  17 +++--
 src/tools/team-create.ts           |  22 ++++--
 src/util.ts                        |  17 +++++
 test/dashboard-ui-contract.test.ts |  21 +++++-
 test/dashboard.test.ts             |  35 +++++++++-
 test/db.test.ts                    |  33 +++++++--
 test/helpers.ts                    |   8 ++-
 test/recovery.test.ts              |  73 +++++++++++++++++++-
 test/tools/team-create.test.ts     |  31 +++++++++
 test/tools/team-lifecycle.test.ts  |  16 +++++
 19 files changed, 474 insertions(+), 73 deletions(-)
diff --git a/src/dashboard-html.ts b/src/dashboard-html.ts
index 1b5d090..52fe0f2 100644
--- a/src/dashboard-html.ts
+++ b/src/dashboard-html.ts
@@ -27,6 +27,10 @@ export const DASHBOARD_HEAD = `<!DOCTYPE html>
 details summary::-webkit-details-marker{display:none}details summary{list-style:none}
 :focus-visible{outline:2px solid rgba(96,165,250,.85);outline-offset:2px}
 select{-webkit-appearance:none;appearance:none;background-image:url("data:image/svg+xml,%3Csvg xmlns='http://www.w3.org/2000/svg' width='10' height='10' viewBox='0 0 24 24' fill='none' stroke='%235e6a82' stroke-width='2.5'%3E%3Cpath d='M6 9l6 6 6-6'/%3E%3C/svg%3E");background-repeat:no-repeat;background-position:right 8px center;padding-right:22px}
+.project-link[aria-current="true"]{color:#e2e8f0}
+.team-link[aria-current="true"]{color:#e2e8f0;border-left-color:#22c55e;background:rgba(34,197,94,.06)}
+#content.nav-collapsed{grid-template-columns:minmax(0,1fr)}
+#content.nav-collapsed #projects{display:none}
 .xp{max-height:0;overflow:hidden;transition:max-height .3s ease-out}.xp-open{max-height:3000px;transition:max-height .5s ease-in}
 .card-sel{outline:2px solid rgba(59,130,246,.4);outline-offset:1px}
 .md pre{background:#1a1f2e;border:1px solid #1e2433;border-radius:6px;padding:8px 12px;overflow-x:auto;margin:6px 0;font-size:12px;line-height:1.5}
@@ -47,8 +51,8 @@ select{-webkit-appearance:none;appearance:none;background-image:url("data:image/
 <header class="fixed top-0 inset-x-0 h-11 bg-base-950/95 backdrop-blur border-b border-base-800 flex items-center justify-between px-3 sm:px-4 z-50">
 <div class="flex items-center gap-2 sm:gap-3 min-w-0 flex-1">
 <span class="font-mono font-semibold text-[13px] tracking-[.08em] text-txt-200">ensemble</span>
-<span class="text-base-700">|</span>
-<select id="sel" class="bg-base-900 border border-base-700 rounded-md px-2 py-[3px] text-[11px] text-txt-200 font-mono outline-none cursor-pointer hover:border-base-600 transition-colors max-w-[180px] sm:max-w-[320px] min-w-0"></select>
+<button id="nav-toggle" type="button" aria-label="Toggle project navigation" aria-expanded="true" class="text-[10px] text-txt-500 border border-base-800 rounded px-1.5 py-[2px] hover:text-txt-200 hover:border-base-700 transition-colors">projects</button>
+<span id="crumb" class="text-[11px] text-txt-500 font-mono truncate"></span>
 </div>
 <div class="flex items-center gap-2 sm:gap-4 shrink-0">
 <div id="hring" class="w-6 h-6 rounded-full" title="Team health"></div>
@@ -67,7 +71,9 @@ select{-webkit-appearance:none;appearance:none;background-image:url("data:image/
 <div class="text-txt-400 text-sm">Waiting for a team</div>
 <div class="text-txt-500 text-[11px]">Run <code class="px-1.5 py-0.5 bg-base-900 rounded text-txt-300 font-mono text-[11px]">team_create</code> in OpenCode to get started</div>
 </div>
-<div id="content" class="hidden max-w-[1600px] mx-auto">
+<div id="content" class="hidden max-w-[1720px] mx-auto grid grid-cols-1 lg:grid-cols-[260px_minmax(0,1fr)] gap-4 items-start">
+<aside id="projects" aria-label="Project navigation" class="bg-base-950/60 border-r border-base-800/70 pr-3 lg:sticky lg:top-[88px]"></aside>
+<div class="min-w-0">
 <section id="attention" aria-label="Team attention" class="mb-3"></section>
 <div class="grid grid-cols-1 xl:grid-cols-[minmax(360px,1.35fr)_minmax(320px,.8fr)] gap-4 items-start">
 <section aria-label="Agent roster"><div id="agents" class="grid gap-2" style="grid-template-columns:repeat(auto-fill,minmax(300px,1fr))"></div></section>
@@ -77,6 +83,7 @@ select{-webkit-appearance:none;appearance:none;background-image:url("data:image/
 </div>
 </div>
 </div>
+</div>
 </main>
 <div id="tl" aria-label="Event timeline" class="fixed bottom-0 inset-x-0 h-10 bg-base-900/90 backdrop-blur border-t border-base-800 px-4 flex items-center z-40 overflow-x-auto scroll hidden"></div>
 <div id="sco" role="dialog" aria-modal="true" aria-hidden="true" aria-labelledby="shortcuts-title" tabindex="-1" onclick="closeShortcuts()">
diff --git a/src/dashboard-js-part1.ts b/src/dashboard-js-part1.ts
index de5ec2e..7f7fac1 100644
--- a/src/dashboard-js-part1.ts
+++ b/src/dashboard-js-part1.ts
@@ -1,6 +1,6 @@
 /** Dashboard JS — utilities, data helpers, and state management. */
 export const DASHBOARD_JS_PART1 = `
-let S=null,selId=null,fails=0,pollT=Date.now(),prevMC=0,selCard=-1;
+let S=null,selId=null,selProjectId=null,fails=0,pollT=Date.now(),prevMC=0,selCard=-1,navCollapsed=false;
 const expCards=new Set(),expMsgs=new Set();
 const E=s=>s?String(s).replace(/&/g,'&amp;').replace(/</g,'&lt;').replace(/>/g,'&gt;').replace(/"/g,'&quot;'):'';
 const D=ms=>{const s=Math.floor(Math.abs(ms)/1000);return s<60?s+'s':s<3600?Math.floor(s/60)+'m':Math.floor(s/3600)+'h'};
@@ -63,13 +63,20 @@ function allTeams(){
   const archived=[...S.teams.filter(t=>t.status!=='active')].sort((a,b)=>b.timeUpdated-a.timeUpdated);
   return{active,archived};
 }
-function cur(){const{active,archived}=allTeams(),all=[...active,...archived];if(!all.length)return null;if(selId){const t=all.find(t=>t.id===selId);if(t)return t}return active[0]||all[0]}
+function allProjects(){return S?.projects?[...S.projects].sort((a,b)=>b.timeUpdated-a.timeUpdated):[]}
+function curProject(){const ps=allProjects();if(!ps.length)return null;if(selProjectId){const p=ps.find(p=>p.id===selProjectId);if(p)return p}var t=cur();return t?ps.find(p=>p.id===t.projectId)||ps[0]:ps[0]}
+function cur(){const{active,archived}=allTeams(),all=[...active,...archived];if(!all.length)return null;if(selId){const t=all.find(t=>t.id===selId);if(t){selProjectId=t.projectId;return t}}const p=selProjectId&&S?.projects?.find(p=>p.id===selProjectId);const pt=p?[...(p.teams||[])].filter(t=>t.status==='active'):[ ];const t=pt.sort((a,b)=>b.timeUpdated-a.timeUpdated)[0]||active[0]||all[0];if(t){selId=t.id;selProjectId=t.projectId}return t}
 
 function deriveHealth(t){
   const mm=t.members||[];if(!mm.length)return{w:0,i:0,e:0,d:0,total:0};
   return{w:mm.filter(m=>m.status==='busy').length,i:mm.filter(m=>m.status==='ready').length,e:mm.filter(m=>m.status==='error').length,d:mm.filter(m=>m.status==='shutdown'||m.status==='shutdown_requested').length,total:mm.length};
 }
 
+function coarseTeamStatus(t){const h=deriveHealth(t),blocked=(t.tasks||[]).filter(x=>x.status==='blocked').length;if(h.e)return{label:'error',color:'red',dot:'bg-red-500'};if(blocked)return{label:'blocked',color:'amber',dot:'bg-amber-500'};if(h.w)return{label:'working',color:'blue',dot:'bg-blue-500'};if(h.i)return{label:'idle',color:'muted',dot:'bg-txt-500'};return{label:t.status==='active'?'empty':t.status,color:'muted',dot:'bg-base-600'}}
+function projectStatus(p){const teams=p.teams||[],counts={working:0,blocked:0,error:0,idle:0,done:0};teams.forEach(t=>{const s=coarseTeamStatus(t).label;if(s==='working')counts.working++;else if(s==='blocked')counts.blocked++;else if(s==='error')counts.error++;else if(s==='idle'||s==='empty')counts.idle++;else counts.done++});if(counts.error)return{label:'error',color:'red',dot:'bg-red-500',counts};if(counts.blocked)return{label:'blocked',color:'amber',dot:'bg-amber-500',counts};if(counts.working)return{label:'working',color:'blue',dot:'bg-blue-500',counts};return{label:'idle',color:'muted',dot:'bg-txt-500',counts}}
+function statusTitleProject(p){const s=projectStatus(p),teams=p.teams||[];return (p.name||p.path||p.id)+'\nStatus: '+s.label+'\nTeams: '+teams.length+'\nWorking: '+s.counts.working+' · Blocked: '+s.counts.blocked+' · Error: '+s.counts.error+' · Idle: '+s.counts.idle}
+function statusTitleTeam(t){const h=deriveHealth(t),tasks=t.tasks||[],blocked=tasks.filter(x=>x.status==='blocked').length,active=tasks.filter(x=>x.status==='in_progress').length,pending=tasks.filter(x=>x.status==='pending').length,done=tasks.filter(x=>x.status==='completed').length;return t.name+'\nStatus: '+coarseTeamStatus(t).label+'\nAgents: '+h.total+' total, '+h.w+' working, '+h.i+' idle, '+h.e+' error\nTasks: '+active+' active, '+blocked+' blocked, '+pending+' pending, '+done+' done'}
+
 function lastMessageFor(name,msgs){return msgs.filter(m=>m.fromName===name||m.toName===name).sort((a,b)=>b.timeCreated-a.timeCreated)[0]||null}
 function activeTaskFor(name,tasks){return tasks.find(x=>x.assignee===name&&x.status==='in_progress')||tasks.find(x=>x.assignee===name&&x.status==='blocked')||null}
 function blockedTaskFor(name,tasks){return tasks.find(x=>x.assignee===name&&x.status==='blocked')||null}
diff --git a/src/dashboard-js-part2.ts b/src/dashboard-js-part2.ts
index e777e8e..4a70ac0 100644
--- a/src/dashboard-js-part2.ts
+++ b/src/dashboard-js-part2.ts
@@ -1,13 +1,20 @@
 /** Dashboard JS — render functions. */
 export const DASHBOARD_JS_PART2 = `
 function rSel(){
-  const el=document.getElementById('sel'),{active,archived}=allTeams(),c=cur();
-  if(!active.length&&!archived.length){el.innerHTML='<option>No teams</option>';return}
-  let h='';
-  if(active.length){h+='<optgroup label="Active">';h+=active.map(t=>'<option value="'+t.id+'">'+E(t.name)+' ('+relT(t.timeUpdated)+')</option>').join('');h+='</optgroup>'}
-  if(archived.length){h+='<optgroup label="Archived">';h+=archived.slice(0,5).map(t=>'<option value="'+t.id+'">'+E(t.name)+'</option>').join('');if(archived.length>5)h+='<option disabled>+ '+(archived.length-5)+' more</option>';h+='</optgroup>'}
-  if(el._lh!==h){el.innerHTML=h;el._lh=h}
-  if(c)el.value=c.id;
+  const el=document.getElementById('projects'),ps=allProjects(),c=cur(),cp=curProject();
+  if(!ps.length){patch(el,'<div class="text-center text-txt-500 text-[12px] py-6">No projects yet</div>');return}
+  let h='<nav class="text-[12px]" aria-label="Projects"><div class="text-[10px] uppercase tracking-[.18em] text-txt-500 mb-3">Projects</div><div class="space-y-4">';
+  ps.forEach(function(p){
+    const teams=p.teams||[],active=teams.filter(t=>t.status==='active').length,sel=cp&&cp.id===p.id,pss=projectStatus(p);
+    h+='<section><button type="button" aria-current="'+(sel?'true':'false')+'" title="'+E(statusTitleProject(p))+'" class="project-link group w-full text-left text-txt-300 hover:text-txt-100 transition-colors" data-project="'+E(p.id)+'" onclick="selectProject(this.dataset.project)">'+
+      '<div class="flex items-center gap-2 min-w-0"><span class="w-[5px] h-[5px] rounded-full '+pss.dot+(pss.label==='working'?' pulse':'')+' shrink-0"></span><span class="font-mono font-semibold truncate">'+E(p.name||p.path||p.id)+'</span>'+chip(pss.label,pss.color)+'</div>'+
+      '<div class="mt-1 ml-3 text-[10px] text-txt-500">'+active+' team'+(active!==1?'s':'')+'</div></button>';
+    h+='<div class="mt-2 ml-[7px] border-l border-base-800/80">';
+    teams.sort((a,b)=>b.timeUpdated-a.timeUpdated).forEach(function(t){const ss=coarseTeamStatus(t),tsel=c&&c.id===t.id;h+='<button type="button" title="'+E(statusTitleTeam(t))+'" class="team-link block w-full text-left border-l-2 border-transparent -ml-px py-1.5 pl-3 pr-2 text-[11px] text-txt-500 hover:text-txt-200 hover:bg-base-900/70 transition-colors" aria-current="'+(tsel?'true':'false')+'" data-team="'+E(t.id)+'" onclick="selectTeam(this.dataset.team)"><div class="flex items-center gap-2 min-w-0"><span class="w-[5px] h-[5px] rounded-full '+ss.dot+(ss.label==='working'?' pulse':'')+' shrink-0"></span><span class="truncate font-mono">'+E(t.name)+'</span><span class="ml-auto text-[9px] uppercase tracking-wide text-txt-500">'+E(ss.label)+'</span></div></button>'});
+    h+='</div></section>';
+  });
+  h+='</div></nav>';
+  patch(el,h);
 }
 
 function rHealth(t){
@@ -37,6 +44,7 @@ function rSum(t){
   patch(el,
     '<span class="w-[6px] h-[6px] rounded-full '+(t.status==='active'?'bg-emerald-500':'bg-txt-500')+'"></span>'+
     '<span class="font-mono font-semibold text-txt-200">'+E(t.name)+'</span>'+
+    (t.projectId?chip(E(t.projectId),'muted'):'')+
     (mm.length?chip(mm.length+' agent'+(mm.length!==1?'s':''),'gray'):'')+
     (h.w?chip(h.w+' working','blue'):'')+
     (h.i?chip(h.i+' idle','muted'):'')+
diff --git a/src/dashboard-js-part3.ts b/src/dashboard-js-part3.ts
index c1bbb1c..7429ba3 100644
--- a/src/dashboard-js-part3.ts
+++ b/src/dashboard-js-part3.ts
@@ -7,9 +7,14 @@ function render(){
   const empty=document.getElementById('empty'),content=document.getElementById('content');
   if(!t){empty.classList.remove('hidden');empty.classList.add('flex');content.classList.add('hidden');document.getElementById('tl').classList.add('hidden');return}
   empty.classList.add('hidden');empty.classList.remove('flex');content.classList.remove('hidden');
+  content.classList.toggle('nav-collapsed',navCollapsed);document.getElementById('nav-toggle').setAttribute('aria-expanded',String(!navCollapsed));
+  const p=curProject();document.getElementById('crumb').textContent=p?' / '+(p.name||p.path||p.id)+' / '+t.name:'';
   rHealth(t);rSum(t);rAttention(t);rAgents(t);rTasks(t);rActivity(t);rTimeline(t);
 }
 
+function selectProject(id){selProjectId=id;const p=S?.projects?.find(p=>p.id===id);const t=(p?.teams||[]).filter(t=>t.status==='active').sort((a,b)=>b.timeUpdated-a.timeUpdated)[0]||(p?.teams||[])[0];if(t)selId=t.id;selCard=-1;render()}
+function selectTeam(id){selId=id;selCard=-1;render()}
+
 function conn(ok){
   document.getElementById('cd').className='w-[7px] h-[7px] rounded-full '+(ok?'bg-emerald-500 pulse':'bg-red-500');
   document.getElementById('ct').textContent=ok?D(Date.now()-pollT)+' ago':'reconnecting to dashboard state';
@@ -56,6 +61,8 @@ setInterval(function(){var t=cur();if(t)rClock(t);if(fails<3)conn(true)},1000);
 // Poll every 2.5s
 setInterval(poll,2500);
 
+document.getElementById('nav-toggle').addEventListener('click',function(){navCollapsed=!navCollapsed;render()});
+
 // Keyboard shortcuts
 document.addEventListener('keydown',function(e){
   const shortcutsOpen=document.getElementById('sco').classList.contains('show');
@@ -80,9 +87,6 @@ document.addEventListener('keydown',function(e){
   }
 });
 
-// Select handler
-document.getElementById('sel').addEventListener('change',function(){selId=this.value;render()});
-
 // Initial poll
 poll();
 
diff --git a/src/dashboard.ts b/src/dashboard.ts
index 7deeb23..5bc8e1a 100644
--- a/src/dashboard.ts
+++ b/src/dashboard.ts
@@ -11,12 +11,22 @@ const DASHBOARD_HTML = DASHBOARD_HEAD + "\n<script>" + DASHBOARD_JS_PART1 + DASH
 interface TeamRow {
   id: string
   name: string
+  project_id: string
   status: string
   lead_agent: string | null
   time_created: number
   time_updated: number
 }
 
+interface ProjectRow {
+  id: string
+  name: string
+  path: string
+  status: string
+  time_created: number
+  time_updated: number
+}
+
 interface MemberRow {
   name: string
   agent: string
@@ -73,32 +83,35 @@ function parseDependsOn(value: string | null): string[] {
   return []
 }
 
-function buildState(db: Database): { teams: unknown[] } {
-  const teams = db.query("SELECT id, name, status, lead_agent, time_created, time_updated FROM team ORDER BY time_created DESC").all() as TeamRow[]
+function buildState(db: Database): { projects: unknown[]; teams: unknown[] } {
+  const projects = db.query("SELECT id, name, path, status, time_created, time_updated FROM project ORDER BY time_updated DESC").all() as ProjectRow[]
+  const teams = db.query("SELECT id, name, project_id, status, lead_agent, time_created, time_updated FROM team ORDER BY time_created DESC").all() as TeamRow[]
   const memberStmt = db.query("SELECT name, agent, status, execution_status, worktree_branch, prompt, model, plan_approval, time_created, time_updated FROM team_member WHERE team_id = ?")
   const taskStmt = db.query("SELECT id, content, status, priority, assignee, depends_on, time_created, time_updated FROM team_task WHERE team_id = ?")
   const msgStmt = db.query("SELECT id, from_name, to_name, content, delivered, read, time_created FROM team_message WHERE team_id = ? ORDER BY time_created DESC LIMIT 50")
 
-  return {
-    teams: teams.map((t) => ({
+  const mappedTeams = teams.map((t) => {
+    const members = (memberStmt.all(t.id) as MemberRow[]).map((m) => ({
+      name: m.name,
+      agent: m.agent,
+      status: m.status,
+      executionStatus: m.execution_status,
+      worktreeBranch: m.worktree_branch,
+      prompt: m.prompt,
+      model: m.model,
+      planApproval: m.plan_approval,
+      timeCreated: m.time_created,
+      timeUpdated: m.time_updated,
+    }))
+    return {
       id: t.id,
       name: t.name,
+      projectId: t.project_id,
       status: t.status,
       leadAgent: t.lead_agent,
       timeCreated: t.time_created,
       timeUpdated: t.time_updated,
-      members: (memberStmt.all(t.id) as MemberRow[]).map((m) => ({
-        name: m.name,
-        agent: m.agent,
-        status: m.status,
-        executionStatus: m.execution_status,
-        worktreeBranch: m.worktree_branch,
-        prompt: m.prompt,
-        model: m.model,
-        planApproval: m.plan_approval,
-        timeCreated: m.time_created,
-        timeUpdated: m.time_updated,
-      })),
+      members,
       tasks: (taskStmt.all(t.id) as TaskRow[]).map((tk) => ({
         id: tk.id,
         content: tk.content,
@@ -118,7 +131,35 @@ function buildState(db: Database): { teams: unknown[] } {
         read: msg.read === 1,
         timeCreated: msg.time_created,
       })),
-    })),
+    }
+  })
+
+  const teamsByProject = new Map<string, unknown[]>()
+  mappedTeams.forEach(team => {
+    const projectId = (team as { projectId: string }).projectId
+    teamsByProject.set(projectId, [...(teamsByProject.get(projectId) ?? []), team])
+  })
+
+  return {
+    projects: projects.flatMap(project => {
+      const projectTeams = teamsByProject.get(project.id) ?? []
+      if (projectTeams.length === 0) return []
+      return {
+        id: project.id,
+        name: project.name,
+        path: project.path,
+        status: project.status,
+        timeCreated: project.time_created,
+        timeUpdated: project.time_updated,
+        activeTeams: projectTeams.filter(team => (team as { status: string }).status === "active").length,
+        workingAgents: projectTeams.reduce<number>((count, team) => {
+          const members = (team as { members: Array<{ status: string }> }).members
+          return count + members.filter(member => member.status === "busy").length
+        }, 0),
+        teams: projectTeams,
+      }
+    }),
+    teams: mappedTeams,
   }
 }
 
diff --git a/src/db.ts b/src/db.ts
index 8c9b9d3..284bc55 100644
--- a/src/db.ts
+++ b/src/db.ts
@@ -5,9 +5,8 @@ import { applyMigrations } from "./schema"
 let instance: Database | undefined
 
 /**
- * Resolve the path for the ensemble SQLite database.
- * Always uses the global ~/.config/opencode/ directory, never the project directory.
- * Accepts an env override for testability.
+ * Resolve the path for the global ensemble SQLite database.
+ * Project data is logically isolated by project_id inside this DB.
  */
 export function getDbPath(env: Record<string, string | undefined> = process.env): string {
   const home = env.HOME ?? env.USERPROFILE ?? "~"
diff --git a/src/index.ts b/src/index.ts
index 9491ae2..7a040c7 100644
--- a/src/index.ts
+++ b/src/index.ts
@@ -45,7 +45,7 @@ const DEFAULT_WATCHDOG_CHECK_MS = 60 * 1000 // 60 seconds
  * peer-to-peer communication, shared task management, and coordinated execution.
  */
 const plugin: Plugin = async (input) => {
-  // Initialize SQLite database in the global OpenCode config directory
+  // Initialize SQLite database in the global OpenCode config directory.
   const dbPath = getDbPath()
   mkdirSync(path.dirname(dbPath), { recursive: true })
   const db = createDb(dbPath)
@@ -81,8 +81,8 @@ const plugin: Plugin = async (input) => {
     if (recovery.interrupted > 0) {
       log(`init:recovery:interrupted=${recovery.interrupted}`)
       const members = db.query(
-        "SELECT tm.team_id, tm.name, tm.session_id FROM team_member tm JOIN team t ON tm.team_id = t.id WHERE t.status = 'active'"
-      ).all() as Array<{ team_id: string; name: string; session_id: string }>
+        "SELECT tm.team_id, tm.name, tm.session_id FROM team_member tm JOIN team t ON tm.team_id = t.id WHERE t.status = 'active' AND t.project_id = ?"
+      ).all(input.directory) as Array<{ team_id: string; name: string; session_id: string }>
       for (const m of members) {
         registry.register(m.team_id, m.name, m.session_id)
       }
@@ -360,6 +360,7 @@ const plugin: Plugin = async (input) => {
         description: "Create a new agent team. You become the team lead. Use this before spawning teammates.",
         args: {
           name: tool.schema.string().describe("Team name (lowercase alphanumeric with hyphens, 1-64 chars)"),
+          project_name: tool.schema.string().optional().describe("Project display name for first use of this working directory. If omitted, a short random name is generated."),
         },
         async execute(args, ctx) {
           const result = await executeTeamCreate(deps, args, ctx.sessionID)
diff --git a/src/recovery.ts b/src/recovery.ts
index 0cda3d8..2797bb4 100644
--- a/src/recovery.ts
+++ b/src/recovery.ts
@@ -16,16 +16,17 @@ export async function recoverStaleMembers(db: Database, client?: PluginClient, c
   // Find stale members with branch info so we can preserve before aborting
   const stale = db.query(
     `SELECT tm.session_id, tm.worktree_branch, tm.name, tm.team_id, t.name as team_name
-     FROM team_member tm
-     JOIN team t ON tm.team_id = t.id
-     WHERE tm.status = 'busy' AND t.status = 'active'`
-  ).all() as Array<{ session_id: string; worktree_branch: string | null; name: string; team_id: string; team_name: string }>
+      FROM team_member tm
+      JOIN team t ON tm.team_id = t.id
+      WHERE tm.status = 'busy' AND t.status = 'active'
+        AND (? IS NULL OR t.project_id = ?)`
+  ).all(cwd ?? null, cwd ?? null) as Array<{ session_id: string; worktree_branch: string | null; name: string; team_id: string; team_name: string }>
 
   const result = db.run(
     `UPDATE team_member SET status = 'error', execution_status = 'idle', time_updated = ?
-     WHERE status = 'busy'
-       AND team_id IN (SELECT id FROM team WHERE status = 'active')`,
-    [Date.now()]
+      WHERE status = 'busy'
+        AND team_id IN (SELECT id FROM team WHERE status = 'active' AND (? IS NULL OR project_id = ?))`,
+    [Date.now(), cwd ?? null, cwd ?? null]
   )
 
   // Preserve branches then abort orphaned sessions
@@ -153,15 +154,17 @@ export async function recoverUndeliveredMessages(
 export async function recoverOrphanedBranches(db: Database, cwd: string): Promise<{ removed: number }> {
   let removed = 0
 
-  // Get archived team names that have NO active members
+  // Get archived team names for this project that have NO active members.
+  // Project scoping matters because preserved branch names only include team names.
   const archivedTeams = db.query(
     `SELECT t.name FROM team t
      WHERE t.status = 'archived'
+      AND t.project_id = ?
      AND NOT EXISTS (
-       SELECT 1 FROM team_member tm
-       WHERE tm.team_id = t.id AND tm.status NOT IN ('shutdown', 'error')
-     )`
-  ).all() as Array<{ name: string }>
+        SELECT 1 FROM team_member tm
+        WHERE tm.team_id = t.id AND tm.status NOT IN ('shutdown', 'error')
+      )`
+  ).all(cwd) as Array<{ name: string }>
 
   if (archivedTeams.length === 0) return { removed: 0 }
 
diff --git a/src/schema.ts b/src/schema.ts
index 280b57d..c24f71a 100644
--- a/src/schema.ts
+++ b/src/schema.ts
@@ -82,6 +82,110 @@ export const MIGRATIONS: string[] = [
   `ALTER TABLE team_member ADD COLUMN workspace_id TEXT;`,
   // Migration 7: Track whether teammate has reported to lead (completion loop prevention, issue #3)
   `ALTER TABLE team_member ADD COLUMN reported_to_lead INTEGER NOT NULL DEFAULT 0;`,
+  // Migration 8: Add project as the dashboard grouping level. For this initial
+  // project-first step, project_id is the team lead's working directory.
+  `PRAGMA foreign_keys=OFF;
+   ALTER TABLE team RENAME TO team_old_m8;
+   CREATE TABLE IF NOT EXISTS project (
+     id              TEXT PRIMARY KEY,
+     name            TEXT NOT NULL,
+     path            TEXT NOT NULL,
+     status          TEXT NOT NULL DEFAULT 'active' CHECK(status IN ('active', 'archived')),
+     time_created    INTEGER NOT NULL,
+     time_updated    INTEGER NOT NULL
+   );
+   INSERT OR IGNORE INTO project (id, name, path, status, time_created, time_updated)
+     VALUES ('default', 'Default Project', '', 'active', strftime('%s','now') * 1000, strftime('%s','now') * 1000);
+   CREATE TABLE team (
+     id              TEXT PRIMARY KEY,
+     name            TEXT NOT NULL,
+     project_id      TEXT NOT NULL DEFAULT 'default' REFERENCES project(id) ON DELETE CASCADE,
+     lead_session_id TEXT NOT NULL,
+     status          TEXT NOT NULL DEFAULT 'active' CHECK(status IN ('active', 'archived')),
+     delegate        INTEGER NOT NULL DEFAULT 0,
+     time_created    INTEGER NOT NULL,
+     time_updated    INTEGER NOT NULL,
+     lead_agent      TEXT
+   );
+   INSERT INTO team (id, name, project_id, lead_session_id, status, delegate, time_created, time_updated, lead_agent)
+     SELECT id, name, 'default', lead_session_id, status, delegate, time_created, time_updated, lead_agent FROM team_old_m8;
+   DROP TABLE team_old_m8;
+
+   ALTER TABLE team_member RENAME TO team_member_old_m8;
+   CREATE TABLE team_member (
+     team_id          TEXT NOT NULL REFERENCES team(id) ON DELETE CASCADE,
+     name             TEXT NOT NULL,
+     session_id       TEXT NOT NULL,
+     agent            TEXT NOT NULL,
+     status           TEXT NOT NULL DEFAULT 'ready'
+                        CHECK(status IN ('ready', 'busy', 'shutdown_requested', 'shutdown', 'error')),
+     execution_status TEXT NOT NULL DEFAULT 'idle'
+                        CHECK(execution_status IN ('idle', 'starting', 'running',
+                          'cancel_requested', 'cancelling', 'cancelled',
+                          'completing', 'completed', 'failed', 'timed_out')),
+     model            TEXT,
+     prompt           TEXT,
+     time_created     INTEGER NOT NULL,
+     time_updated     INTEGER NOT NULL,
+     worktree_dir     TEXT,
+     worktree_branch  TEXT,
+     plan_approval    TEXT NOT NULL DEFAULT 'none'
+                        CHECK(plan_approval IN ('none', 'pending', 'approved', 'rejected')),
+     workspace_id     TEXT,
+     reported_to_lead INTEGER NOT NULL DEFAULT 0,
+     PRIMARY KEY (team_id, name)
+   );
+   INSERT INTO team_member (team_id, name, session_id, agent, status, execution_status, model, prompt, time_created, time_updated, worktree_dir, worktree_branch, plan_approval, workspace_id, reported_to_lead)
+     SELECT team_id, name, session_id, agent, status, execution_status, model, prompt, time_created, time_updated, worktree_dir, worktree_branch, plan_approval, workspace_id, reported_to_lead FROM team_member_old_m8;
+   DROP TABLE team_member_old_m8;
+
+   ALTER TABLE team_task RENAME TO team_task_old_m8;
+   CREATE TABLE team_task (
+     id            TEXT PRIMARY KEY,
+     team_id       TEXT NOT NULL REFERENCES team(id) ON DELETE CASCADE,
+     content       TEXT NOT NULL,
+     status        TEXT NOT NULL DEFAULT 'pending'
+                     CHECK(status IN ('pending', 'in_progress', 'completed', 'cancelled', 'blocked')),
+     priority      TEXT NOT NULL DEFAULT 'medium'
+                     CHECK(priority IN ('high', 'medium', 'low')),
+     assignee      TEXT,
+     depends_on    TEXT,
+     time_created  INTEGER NOT NULL,
+     time_updated  INTEGER NOT NULL
+   );
+   INSERT INTO team_task (id, team_id, content, status, priority, assignee, depends_on, time_created, time_updated)
+     SELECT id, team_id, content, status, priority, assignee, depends_on, time_created, time_updated FROM team_task_old_m8;
+   DROP TABLE team_task_old_m8;
+
+   ALTER TABLE team_message RENAME TO team_message_old_m8;
+   CREATE TABLE team_message (
+     id            TEXT PRIMARY KEY,
+     team_id       TEXT NOT NULL REFERENCES team(id) ON DELETE CASCADE,
+     from_name     TEXT NOT NULL,
+     to_name       TEXT,
+     content       TEXT NOT NULL,
+     delivered     INTEGER NOT NULL DEFAULT 0,
+     time_created  INTEGER NOT NULL,
+     read          INTEGER NOT NULL DEFAULT 0
+   );
+   INSERT INTO team_message (id, team_id, from_name, to_name, content, delivered, time_created, read)
+     SELECT id, team_id, from_name, to_name, content, delivered, time_created, read FROM team_message_old_m8;
+   DROP TABLE team_message_old_m8;
+
+   CREATE INDEX IF NOT EXISTS team_lead_idx ON team(lead_session_id);
+   CREATE INDEX IF NOT EXISTS team_status_idx ON team(status);
+   CREATE INDEX IF NOT EXISTS team_project_idx ON team(project_id, status);
+   CREATE UNIQUE INDEX IF NOT EXISTS team_active_project_name_idx ON team(project_id, name) WHERE status = 'active';
+   CREATE INDEX IF NOT EXISTS team_member_session_idx ON team_member(session_id);
+   CREATE INDEX IF NOT EXISTS team_member_status_idx ON team_member(team_id, status);
+   CREATE INDEX IF NOT EXISTS team_task_team_idx ON team_task(team_id);
+   CREATE INDEX IF NOT EXISTS team_task_assignee_idx ON team_task(assignee);
+   CREATE INDEX IF NOT EXISTS team_task_status_idx ON team_task(team_id, status);
+   CREATE INDEX IF NOT EXISTS team_message_team_idx ON team_message(team_id);
+   CREATE INDEX IF NOT EXISTS team_message_to_idx ON team_message(to_name);
+   CREATE INDEX IF NOT EXISTS team_message_undelivered_idx ON team_message(team_id, delivered) WHERE delivered = 0;
+   CREATE INDEX IF NOT EXISTS team_message_unread_idx ON team_message(team_id, read) WHERE read = 0;
+   PRAGMA foreign_keys=ON;`,
 ]
 
 /**
diff --git a/src/tools/team-cleanup.ts b/src/tools/team-cleanup.ts
index e765c89..3baac57 100644
--- a/src/tools/team-cleanup.ts
+++ b/src/tools/team-cleanup.ts
@@ -13,6 +13,7 @@ type BranchExistsFn = (branch: string, cwd: string) => Promise<boolean>
 interface PurgeTarget {
   id: string
   name: string
+  project_id: string
   time_updated: number
 }
 
@@ -78,24 +79,30 @@ function resolvePurgeTargets(deps: ToolDeps, purge: string[]): PurgeTarget[] {
   }
 
   if (purge.includes("*")) {
-    return deps.db.query("SELECT id, name, time_updated FROM team WHERE status = 'archived' ORDER BY time_updated DESC, name ASC")
+    return deps.db.query("SELECT id, name, project_id, time_updated FROM team WHERE status = 'archived' ORDER BY time_updated DESC, name ASC")
       .all() as PurgeTarget[]
   }
 
   const uniqueNames = [...new Set(purge)]
   const rows = uniqueNames.map(name => ({
     name,
-    team: deps.db.query("SELECT id, name, status, time_updated FROM team WHERE name = ?").get(name) as { id: string; name: string; status: string; time_updated: number } | null,
+    teams: deps.db.query("SELECT id, name, project_id, status, time_updated FROM team WHERE name = ? ORDER BY project_id ASC, time_updated DESC")
+      .all(name) as Array<{ id: string; name: string; project_id: string; status: string; time_updated: number }>,
   }))
 
-  const missing = rows.filter(row => row.team === null).map(row => row.name)
+  const missing = rows.filter(row => row.teams.length === 0).map(row => row.name)
   if (missing.length > 0) throw new Error(`Team not found: ${missing.join(", ")}`)
 
-  const active = rows.filter(row => row.team?.status === "active").map(row => row.name)
+  const active = rows.filter(row => row.teams.some(team => team.status === "active")).map(row => row.name)
   if (active.length > 0) throw new Error(`Cannot purge active team: ${active.join(", ")}`)
 
+  const ambiguous = rows.filter(row => row.teams.length > 1).map(row => row.name)
+  if (ambiguous.length > 0) {
+    throw new Error(`Ambiguous archived team name across projects: ${ambiguous.join(", ")}. Use purge: ['*'] or clean up one project at a time.`)
+  }
+
   return rows
-    .map(row => row.team!)
+    .map(row => row.teams[0]!)
     .sort((a, b) => b.time_updated - a.time_updated || a.name.localeCompare(b.name))
 }
 
diff --git a/src/tools/team-create.ts b/src/tools/team-create.ts
index 8bfa93f..ce1cb25 100644
--- a/src/tools/team-create.ts
+++ b/src/tools/team-create.ts
@@ -1,5 +1,5 @@
 import type { ToolDeps } from "../types"
-import { generateId, validateTeamName } from "../util"
+import { generateId, generateProjectName, validateProjectName, validateTeamName } from "../util"
 import { findTeamBySession } from "../types"
 
 /**
@@ -7,14 +7,19 @@ import { findTeamBySession } from "../types"
  */
 export async function executeTeamCreate(
   deps: ToolDeps,
-  args: { name: string },
+  args: { name: string; project_name?: string },
   sessionId: string,
 ): Promise<string> {
   const nameError = validateTeamName(args.name)
   if (nameError) throw new Error(nameError)
+  if (args.project_name) {
+    const projectNameError = validateProjectName(args.project_name)
+    if (projectNameError) throw new Error(projectNameError)
+  }
 
   // Check if team name already exists
-  const existing = deps.db.query("SELECT id FROM team WHERE name = ? AND status = 'active'").get(args.name)
+  const projectId = deps.directory
+  const existing = deps.db.query("SELECT id FROM team WHERE name = ? AND project_id = ? AND status = 'active'").get(args.name, projectId)
   if (existing) throw new Error(`Team "${args.name}" already exists`)
 
   // Check if session already leads a team
@@ -23,9 +28,16 @@ export async function executeTeamCreate(
 
   const id = generateId("team")
   const now = Date.now()
+  const projectName = args.project_name ?? generateProjectName()
   deps.db.run(
-    "INSERT INTO team (id, name, lead_session_id, status, delegate, time_created, time_updated) VALUES (?, ?, ?, 'active', 0, ?, ?)",
-    [id, args.name, sessionId, now, now]
+    `INSERT INTO project (id, name, path, status, time_created, time_updated)
+     VALUES (?, ?, ?, 'active', ?, ?)
+     ON CONFLICT(id) DO UPDATE SET time_updated = excluded.time_updated`,
+    [projectId, projectName, projectId, now, now]
+  )
+  deps.db.run(
+    "INSERT INTO team (id, name, project_id, lead_session_id, status, delegate, time_created, time_updated) VALUES (?, ?, ?, ?, 'active', 0, ?, ?)",
+    [id, args.name, projectId, sessionId, now, now]
   )
 
   return `Team "${args.name}" created. You are the lead. Use team_spawn to add teammates.`
diff --git a/src/util.ts b/src/util.ts
index 1a2a908..6e511af 100644
--- a/src/util.ts
+++ b/src/util.ts
@@ -23,6 +23,23 @@ export function validateTeamName(name: string): string | undefined {
   return undefined
 }
 
+const PROJECT_ADJECTIVES = ["amber", "brave", "calm", "copper", "crisp", "dark", "ember", "frost", "quiet", "silver", "steady", "swift"]
+const PROJECT_NOUNS = ["atlas", "beacon", "comet", "harbor", "lab", "orbit", "river", "signal", "sparrow", "summit", "vector", "voyage"]
+
+/** Generate a short human-readable project name for implicit project creation. */
+export function generateProjectName(): string {
+  const adjective = PROJECT_ADJECTIVES[Math.floor(Math.random() * PROJECT_ADJECTIVES.length)] ?? "quiet"
+  const noun = PROJECT_NOUNS[Math.floor(Math.random() * PROJECT_NOUNS.length)] ?? "project"
+  return `${adjective}-${noun}`
+}
+
+/** Validate a project display name. Returns an error if invalid. */
+export function validateProjectName(name: string): string | undefined {
+  if (name.length < 1 || name.length > 64) return "Project name must be 1-64 characters"
+  if (!NAME_PATTERN.test(name)) return "Project name must be lowercase alphanumeric with hyphens only"
+  return undefined
+}
+
 /**
  * Detect if the plugin is loading inside a teammate's worktree instance.
  * Worktree instances should skip recovery to avoid deadlocking the server.
diff --git a/test/dashboard-ui-contract.test.ts b/test/dashboard-ui-contract.test.ts
index c43a810..6e6d6c6 100644
--- a/test/dashboard-ui-contract.test.ts
+++ b/test/dashboard-ui-contract.test.ts
@@ -23,6 +23,7 @@ describe("dashboard UI contract", () => {
   test("HTML shell exposes triage cockpit regions", () => {
     expect(DASHBOARD_HEAD).toContain('id="attention"')
     expect(DASHBOARD_HEAD).toContain('aria-label="Team attention"')
+    expect(DASHBOARD_HEAD).toContain('aria-label="Project navigation"')
     expect(DASHBOARD_HEAD).toContain('aria-label="Agent roster"')
     expect(DASHBOARD_HEAD).toContain('aria-label="Task board"')
     expect(DASHBOARD_HEAD).toContain('aria-label="Activity feed"')
@@ -34,10 +35,28 @@ describe("dashboard UI contract", () => {
   test("fixed dashboard chrome is constrained on narrow viewports", () => {
     expect(DASHBOARD_HEAD).toContain("px-3 sm:px-4")
     expect(DASHBOARD_HEAD).toContain("gap-2 sm:gap-3 min-w-0 flex-1")
-    expect(DASHBOARD_HEAD).toContain("max-w-[180px] sm:max-w-[320px] min-w-0")
     expect(DASHBOARD_HEAD).toContain("overflow-x-auto scroll whitespace-nowrap")
   })
 
+  test("project navigation uses docs-style outline semantics", () => {
+    expect(DASHBOARD_HEAD).toContain('id="projects"')
+    expect(DASHBOARD_JS_PART2).toContain('<nav class="text-[12px]"')
+    expect(DASHBOARD_JS_PART2).toContain('class="project-link')
+    expect(DASHBOARD_JS_PART2).toContain('class="team-link')
+    expect(DASHBOARD_JS_PART2).toContain('border-l-2')
+    expect(DASHBOARD_JS_PART2).toContain("statusTitleProject")
+    expect(DASHBOARD_JS_PART2).toContain("statusTitleTeam")
+    expect(DASHBOARD_JS_PART3).toContain("function selectProject")
+    expect(DASHBOARD_JS_PART3).toContain("function selectTeam")
+  })
+
+  test("project navigation can collapse", () => {
+    expect(DASHBOARD_HEAD).toContain('id="nav-toggle"')
+    expect(DASHBOARD_HEAD).toContain("#content.nav-collapsed")
+    expect(DASHBOARD_JS_PART3).toContain("navCollapsed=!navCollapsed")
+    expect(DASHBOARD_JS_PART3).toContain("aria-expanded")
+  })
+
   test("agent prioritization helpers are defined", () => {
     expect(DASHBOARD_JS_PART1).toContain("function rankAgent")
     expect(DASHBOARD_JS_PART1).toContain("function deriveAttention")
diff --git a/test/dashboard.test.ts b/test/dashboard.test.ts
index 2564c30..a228fd4 100644
--- a/test/dashboard.test.ts
+++ b/test/dashboard.test.ts
@@ -23,7 +23,8 @@ function insertMessage(db: Database, teamId: string, id: string, fromName: strin
 
 // biome-lint: use Record for JSON response shape
 interface HealthResponse { ensemble: boolean; pid: number }
-interface StateResponse { teams: Array<{ id: string; name: string; status: string; timeCreated: number; timeUpdated: number; members: Array<Record<string, unknown>>; tasks: Array<Record<string, unknown>>; messages: Array<Record<string, unknown>> }> }
+interface DashboardTeam { id: string; name: string; projectId: string; status: string; timeCreated: number; timeUpdated: number; members: Array<Record<string, unknown>>; tasks: Array<Record<string, unknown>>; messages: Array<Record<string, unknown>> }
+interface StateResponse { projects: Array<{ id: string; name: string; path: string; activeTeams: number; workingAgents: number; teams: DashboardTeam[] }>; teams: DashboardTeam[] }
 
 describe("dashboard", () => {
   let db: Database
@@ -60,7 +61,7 @@ describe("dashboard", () => {
       expect(res.status).toBe(200)
       expect(res.headers.get("access-control-allow-origin")).toBe("*")
       const body = (await res.json()) as StateResponse
-      expect(body).toEqual({ teams: [] })
+      expect(body).toEqual({ projects: [], teams: [] })
     })
 
     test("returns team with members, tasks, messages", async () => {
@@ -77,6 +78,7 @@ describe("dashboard", () => {
       const team = body.teams[0]!
       expect(team.id).toBe("t1")
       expect(team.name).toBe("alpha")
+      expect(team.projectId).toBe("/tmp/test-project")
       expect(team.status).toBe("active")
       expect(typeof team.timeCreated).toBe("number")
       expect(typeof team.timeUpdated).toBe("number")
@@ -99,6 +101,35 @@ describe("dashboard", () => {
       expect(team.messages[0]!.fromName).toBe("alice")
       expect(team.messages[0]!.toName).toBe("lead")
       expect(team.messages[0]!.content).toBe("Done with auth fix")
+      expect(body.projects).toHaveLength(1)
+      expect(body.projects[0]!.id).toBe("/tmp/test-project")
+      expect(body.projects[0]!.path).toBe("/tmp/test-project")
+      expect(body.projects[0]!.activeTeams).toBe(1)
+      expect(body.projects[0]!.workingAgents).toBe(1)
+      expect(body.projects[0]!.teams[0]!.id).toBe("t1")
+    })
+
+    test("summarizes progress across projects", async () => {
+      insertTeam(db, "t1", "alpha", "lead-1")
+      db.run("INSERT OR IGNORE INTO project (id, name, path, status, time_created, time_updated) VALUES (?, ?, ?, 'active', ?, ?)", ["/tmp/project-a", "project-a", "/tmp/project-a", Date.now(), Date.now()])
+      db.run("UPDATE team SET project_id = ? WHERE id = ?", ["/tmp/project-a", "t1"])
+      insertMember(db, "t1", "alice", "sess-a", "busy", "running")
+
+      insertTeam(db, "t2", "beta", "lead-2")
+      db.run("INSERT OR IGNORE INTO project (id, name, path, status, time_created, time_updated) VALUES (?, ?, ?, 'active', ?, ?)", ["/tmp/project-b", "project-b", "/tmp/project-b", Date.now(), Date.now()])
+      db.run("UPDATE team SET project_id = ? WHERE id = ?", ["/tmp/project-b", "t2"])
+      insertMember(db, "t2", "bob", "sess-b", "ready", "idle")
+
+      server = await startDashboard(db, port)
+      const res = await fetch(`http://localhost:${port}/api/state`)
+      const body = (await res.json()) as StateResponse
+
+      const projects = [...body.projects].sort((a, b) => a.id.localeCompare(b.id))
+      expect(projects.map(project => ({ id: project.id, activeTeams: project.activeTeams, workingAgents: project.workingAgents }))).toEqual([
+        { id: "/tmp/project-a", activeTeams: 1, workingAgents: 1 },
+        { id: "/tmp/project-b", activeTeams: 1, workingAgents: 0 },
+      ])
+      expect(body.teams.map(team => team.projectId).sort()).toEqual(["/tmp/project-a", "/tmp/project-b"])
     })
 
     test("returns archived teams", async () => {
diff --git a/test/db.test.ts b/test/db.test.ts
index 8da86b2..45ee6c4 100644
--- a/test/db.test.ts
+++ b/test/db.test.ts
@@ -24,6 +24,12 @@ describe("schema migrations", () => {
     expect(row).toBeTruthy()
   })
 
+  test("creates project table", () => {
+    applyMigrations(db)
+    const row = db.query("SELECT name FROM sqlite_master WHERE type='table' AND name='project'").get()
+    expect(row).toBeTruthy()
+  })
+
   test("creates team_member table", () => {
     applyMigrations(db)
     const row = db.query("SELECT name FROM sqlite_master WHERE type='table' AND name='team_member'").get()
@@ -52,8 +58,12 @@ describe("schema migrations", () => {
   test("can insert and query a team", () => {
     applyMigrations(db)
     db.run(
-      "INSERT INTO team (id, name, lead_session_id, status, delegate, time_created, time_updated) VALUES (?, ?, ?, ?, ?, ?, ?)",
-      ["t1", "my-team", "sess1", "active", 0, Date.now(), Date.now()]
+      "INSERT INTO project (id, name, path, status, time_created, time_updated) VALUES (?, ?, ?, 'active', ?, ?)",
+      ["/tmp/test-project", "test-project", "/tmp/test-project", Date.now(), Date.now()]
+    )
+    db.run(
+      "INSERT INTO team (id, name, project_id, lead_session_id, status, delegate, time_created, time_updated) VALUES (?, ?, ?, ?, ?, ?, ?, ?)",
+      ["t1", "my-team", "/tmp/test-project", "sess1", "active", 0, Date.now(), Date.now()]
     )
     const row = db.query("SELECT * FROM team WHERE id = ?").get("t1") as Record<string, unknown>
     expect(row.name).toBe("my-team")
@@ -63,8 +73,12 @@ describe("schema migrations", () => {
   test("can insert and query a team_member", () => {
     applyMigrations(db)
     db.run(
-      "INSERT INTO team (id, name, lead_session_id, status, delegate, time_created, time_updated) VALUES (?, ?, ?, ?, ?, ?, ?)",
-      ["t1", "my-team", "sess1", "active", 0, Date.now(), Date.now()]
+      "INSERT INTO project (id, name, path, status, time_created, time_updated) VALUES (?, ?, ?, 'active', ?, ?)",
+      ["/tmp/test-project", "test-project", "/tmp/test-project", Date.now(), Date.now()]
+    )
+    db.run(
+      "INSERT INTO team (id, name, project_id, lead_session_id, status, delegate, time_created, time_updated) VALUES (?, ?, ?, ?, ?, ?, ?, ?)",
+      ["t1", "my-team", "/tmp/test-project", "sess1", "active", 0, Date.now(), Date.now()]
     )
     db.run(
       "INSERT INTO team_member (team_id, name, session_id, agent, status, execution_status, time_created, time_updated) VALUES (?, ?, ?, ?, ?, ?, ?, ?)",
@@ -81,7 +95,8 @@ describe("schema migrations", () => {
     freshDb.exec("PRAGMA foreign_keys=ON")
     applyMigrations(freshDb)
 
-    freshDb.run("INSERT INTO team (id, name, lead_session_id, status, delegate, time_created, time_updated) VALUES ('t1', 'test', 'sess-1', 'active', 0, 1, 1)")
+    freshDb.run("INSERT INTO project (id, name, path, status, time_created, time_updated) VALUES ('/tmp/test-project', 'test-project', '/tmp/test-project', 'active', 1, 1)")
+    freshDb.run("INSERT INTO team (id, name, project_id, lead_session_id, status, delegate, time_created, time_updated) VALUES ('t1', 'test', '/tmp/test-project', 'sess-1', 'active', 0, 1, 1)")
     freshDb.run("INSERT INTO team_member (team_id, name, session_id, agent, status, execution_status, time_created, time_updated) VALUES ('t1', 'alice', 'sess-a', 'build', 'ready', 'idle', 1, 1)")
 
     const row = freshDb.query("SELECT workspace_id FROM team_member WHERE name = 'alice'").get() as { workspace_id: string | null }
@@ -93,8 +108,12 @@ describe("schema migrations", () => {
     applyMigrations(db)
     db.run("PRAGMA foreign_keys = ON")
     db.run(
-      "INSERT INTO team (id, name, lead_session_id, status, delegate, time_created, time_updated) VALUES (?, ?, ?, ?, ?, ?, ?)",
-      ["t1", "my-team", "sess1", "active", 0, Date.now(), Date.now()]
+      "INSERT INTO project (id, name, path, status, time_created, time_updated) VALUES (?, ?, ?, 'active', ?, ?)",
+      ["/tmp/test-project", "test-project", "/tmp/test-project", Date.now(), Date.now()]
+    )
+    db.run(
+      "INSERT INTO team (id, name, project_id, lead_session_id, status, delegate, time_created, time_updated) VALUES (?, ?, ?, ?, ?, ?, ?, ?)",
+      ["t1", "my-team", "/tmp/test-project", "sess1", "active", 0, Date.now(), Date.now()]
     )
     db.run(
       "INSERT INTO team_member (team_id, name, session_id, agent, status, execution_status, time_created, time_updated) VALUES (?, ?, ?, ?, ?, ?, ?, ?)",
diff --git a/test/helpers.ts b/test/helpers.ts
index 75a8f12..4d636dd 100644
--- a/test/helpers.ts
+++ b/test/helpers.ts
@@ -99,8 +99,12 @@ export function setupDeps(db?: Database): ToolDeps & { client: ReturnType<typeof
 /** Insert a team directly into the DB. */
 export function insertTeam(db: Database, id: string, name: string, leadSession: string, status = "active") {
   db.run(
-    "INSERT INTO team (id, name, lead_session_id, status, delegate, time_created, time_updated) VALUES (?, ?, ?, ?, 0, ?, ?)",
-    [id, name, leadSession, status, Date.now(), Date.now()]
+    "INSERT OR IGNORE INTO project (id, name, path, status, time_created, time_updated) VALUES (?, ?, ?, 'active', ?, ?)",
+    ["/tmp/test-project", "test-project", "/tmp/test-project", Date.now(), Date.now()]
+  )
+  db.run(
+    "INSERT INTO team (id, name, project_id, lead_session_id, status, delegate, time_created, time_updated) VALUES (?, ?, ?, ?, ?, 0, ?, ?)",
+    [id, name, "/tmp/test-project", leadSession, status, Date.now(), Date.now()]
   )
 }
 
diff --git a/test/recovery.test.ts b/test/recovery.test.ts
index d54d8b1..9f95043 100644
--- a/test/recovery.test.ts
+++ b/test/recovery.test.ts
@@ -1,7 +1,7 @@
 import { describe, test, expect, beforeEach } from "bun:test"
 import { Database } from "bun:sqlite"
 import { applyMigrations } from "../src/schema"
-import { recoverStaleMembers, recoverUndeliveredMessages } from "../src/recovery"
+import { recoverStaleMembers, recoverUndeliveredMessages, recoverOrphanedBranches } from "../src/recovery"
 import type { PluginClient } from "../src/types"
 import { MemberRegistry } from "../src/state"
 import { sendMessage, broadcastMessage } from "../src/messaging"
@@ -150,6 +150,30 @@ describe("recoverStaleMembers", () => {
     const result = await recoverStaleMembers(db, client)
     expect(result.interrupted).toBe(0)
   })
+
+  test("only recovers stale members for the current project when provided", async () => {
+    insertTeam(db, "t1", "my-team", "lead-sess")
+    db.run("INSERT OR IGNORE INTO project (id, name, path, status, time_created, time_updated) VALUES (?, ?, ?, 'active', ?, ?)", ["/tmp/project-a", "project-a", "/tmp/project-a", Date.now(), Date.now()])
+    db.run("UPDATE team SET project_id = ? WHERE id = ?", ["/tmp/project-a", "t1"])
+    insertMember(db, "t1", "alice", "sess-1", "busy", "running")
+
+    insertTeam(db, "t2", "other-team", "other-lead")
+    db.run("INSERT OR IGNORE INTO project (id, name, path, status, time_created, time_updated) VALUES (?, ?, ?, 'active', ?, ?)", ["/tmp/project-b", "project-b", "/tmp/project-b", Date.now(), Date.now()])
+    db.run("UPDATE team SET project_id = ? WHERE id = ?", ["/tmp/project-b", "t2"])
+    insertMember(db, "t2", "bob", "sess-2", "busy", "running")
+
+    const result = await recoverStaleMembers(db, client, "/tmp/project-a")
+    expect(result.interrupted).toBe(1)
+
+    const alice = db.query("SELECT status FROM team_member WHERE name = ?").get("alice") as { status: string }
+    const bob = db.query("SELECT status FROM team_member WHERE name = ?").get("bob") as { status: string }
+    expect(alice.status).toBe("error")
+    expect(bob.status).toBe("busy")
+
+    const abortCalls = client.calls.filter(c => c.method === "session.abort")
+    expect(abortCalls).toHaveLength(1)
+    expect((abortCalls[0]!.args[0] as { sessionID: string }).sessionID).toBe("sess-1")
+  })
 })
 
 describe("recoverUndeliveredMessages", () => {
@@ -298,6 +322,53 @@ describe("recoverUndeliveredMessages", () => {
   })
 })
 
+describe("recoverOrphanedBranches", () => {
+  let db: Database
+
+  beforeEach(() => {
+    db = setupDb()
+  })
+
+  test("only deletes preserved branches for archived teams in the current project", async () => {
+    insertTeam(db, "t1", "alpha", "lead-a")
+    db.run("INSERT OR IGNORE INTO project (id, name, path, status, time_created, time_updated) VALUES (?, ?, ?, 'active', ?, ?)", ["/tmp/project-a", "project-a", "/tmp/project-a", Date.now(), Date.now()])
+    db.run("UPDATE team SET status = 'archived', project_id = ? WHERE id = ?", ["/tmp/project-a", "t1"])
+
+    insertTeam(db, "t2", "beta", "lead-b")
+    db.run("INSERT OR IGNORE INTO project (id, name, path, status, time_created, time_updated) VALUES (?, ?, ?, 'active', ?, ?)", ["/tmp/project-b", "project-b", "/tmp/project-b", Date.now(), Date.now()])
+    db.run("UPDATE team SET status = 'archived', project_id = ? WHERE id = ?", ["/tmp/project-b", "t2"])
+
+    const originalSpawn = Bun.spawn
+    const deleted: string[] = []
+    Bun.spawn = ((cmd: string[]) => {
+      if (cmd[0] === "git" && cmd[1] === "branch" && cmd[2] === "--list") {
+        return {
+          stdout: new Response("ensemble/preserved/alpha/alice\nensemble/preserved/beta/bob\n").body!,
+          stderr: new Response("").body!,
+          exited: Promise.resolve(0),
+        }
+      }
+      if (cmd[0] === "git" && cmd[1] === "branch" && cmd[2] === "-D") {
+        deleted.push(cmd[3]!)
+        return {
+          stdout: new Response("").body!,
+          stderr: new Response("").body!,
+          exited: Promise.resolve(0),
+        }
+      }
+      return originalSpawn(cmd)
+    }) as typeof Bun.spawn
+
+    try {
+      const result = await recoverOrphanedBranches(db, "/tmp/project-a")
+      expect(result.removed).toBe(1)
+      expect(deleted).toEqual(["ensemble/preserved/alpha/alice"])
+    } finally {
+      Bun.spawn = originalSpawn
+    }
+  })
+})
+
 describe("recoverOrphanedWorktrees", () => {
   let db: Database
   let client: ReturnType<typeof mockClient>
diff --git a/test/tools/team-create.test.ts b/test/tools/team-create.test.ts
index 4bdfb00..64f043a 100644
--- a/test/tools/team-create.test.ts
+++ b/test/tools/team-create.test.ts
@@ -18,7 +18,25 @@ describe("team_create", () => {
     const row = deps.db.query("SELECT * FROM team WHERE name = ?").get("my-team") as Record<string, unknown>
     expect(row).toBeTruthy()
     expect(row.lead_session_id).toBe("lead-sess")
+    expect(row.project_id).toBe("/tmp/test-project")
     expect(row.status).toBe("active")
+
+    const project = deps.db.query("SELECT id, name, path FROM project WHERE id = ?").get("/tmp/test-project") as Record<string, unknown>
+    expect(project.path).toBe("/tmp/test-project")
+    expect(typeof project.name).toBe("string")
+    expect(project.name).not.toBe("test-project")
+  })
+
+  test("uses explicit project name on first team in a project", async () => {
+    await executeTeamCreate(deps, { name: "my-team", project_name: "silver-river" }, "lead-sess")
+
+    const project = deps.db.query("SELECT name FROM project WHERE id = ?").get("/tmp/test-project") as { name: string }
+    expect(project.name).toBe("silver-river")
+  })
+
+  test("rejects invalid explicit project name", async () => {
+    await expect(executeTeamCreate(deps, { name: "my-team", project_name: "Silver River" }, "lead-sess"))
+      .rejects.toThrow("Project name")
   })
 
   test("rejects duplicate team name", async () => {
@@ -27,6 +45,19 @@ describe("team_create", () => {
       .rejects.toThrow("already exists")
   })
 
+  test("allows same active team name in different projects", async () => {
+    await executeTeamCreate(deps, { name: "my-team" }, "lead-sess")
+
+    const otherDeps = setupDeps(deps.db)
+    otherDeps.directory = "/tmp/other-project"
+
+    await executeTeamCreate(otherDeps, { name: "my-team" }, "other-sess")
+
+    const rows = deps.db.query("SELECT name, project_id FROM team WHERE name = ? ORDER BY project_id").all("my-team") as Array<{ name: string; project_id: string }>
+    expect(rows).toHaveLength(2)
+    expect(rows.map(row => row.project_id)).toEqual(["/tmp/other-project", "/tmp/test-project"])
+  })
+
   test("rejects if session already leads a team", async () => {
     await executeTeamCreate(deps, { name: "team-a" }, "lead-sess")
     await expect(executeTeamCreate(deps, { name: "team-b" }, "lead-sess"))
diff --git a/test/tools/team-lifecycle.test.ts b/test/tools/team-lifecycle.test.ts
index c14082d..fc141c9 100644
--- a/test/tools/team-lifecycle.test.ts
+++ b/test/tools/team-lifecycle.test.ts
@@ -618,6 +618,22 @@ describe("team_cleanup", () => {
     expect(deps.db.query("SELECT id FROM team WHERE id = 'old-1'").get()).not.toBeNull()
   })
 
+  test("purge rejects ambiguous archived team names across projects", async () => {
+    insertTeam(deps.db, "old-1", "old-team", "old-lead-1", "archived")
+    deps.db.run(
+      "INSERT OR IGNORE INTO project (id, name, path, status, time_created, time_updated) VALUES (?, ?, ?, 'active', ?, ?)",
+      ["/tmp/other-project", "other-project", "/tmp/other-project", Date.now(), Date.now()]
+    )
+    insertTeam(deps.db, "old-2", "other-old-team", "old-lead-2", "archived")
+    deps.db.run("UPDATE team SET name = ?, project_id = ? WHERE id = ?", ["old-team", "/tmp/other-project", "old-2"])
+
+    await expect(executeTeamCleanup(deps, { force: false, purge: ["old-team"] }, "main-sess", undefined, noopMerge, noopDelete, false))
+      .rejects.toThrow("Ambiguous archived team name")
+
+    expect(deps.db.query("SELECT id FROM team WHERE id = 'old-1'").get()).not.toBeNull()
+    expect(deps.db.query("SELECT id FROM team WHERE id = 'old-2'").get()).not.toBeNull()
+  })
+
   test("purge rejects active team members", async () => {
     insertMember(deps.db, "t1", "alice", "sess-alice", "ready", "idle")
     deps.registry.register("t1", "alice", "sess-alice")

From 7993524efd2c48aaa191f19ace4ab20d08ba31c6 Mon Sep 17 00:00:00 2001
From: cl <cailue@apache.org>
Date: Tue, 12 May 2026 18:17:17 +0800
Subject: [PATCH 2/5] Fix dashboard sidebar collapse

---
 src/dashboard-html.ts              |  4 ++--
 src/dashboard-js-part1.ts          |  4 ++--
 src/dashboard-js-part3.ts          | 13 +++++++++++--
 test/dashboard-ui-contract.test.ts |  7 +++++++
 4 files changed, 22 insertions(+), 6 deletions(-)

diff --git a/src/dashboard-html.ts b/src/dashboard-html.ts
index 52fe0f2..430eb5c 100644
--- a/src/dashboard-html.ts
+++ b/src/dashboard-html.ts
@@ -30,7 +30,7 @@ select{-webkit-appearance:none;appearance:none;background-image:url("data:image/
 .project-link[aria-current="true"]{color:#e2e8f0}
 .team-link[aria-current="true"]{color:#e2e8f0;border-left-color:#22c55e;background:rgba(34,197,94,.06)}
 #content.nav-collapsed{grid-template-columns:minmax(0,1fr)}
-#content.nav-collapsed #projects{display:none}
+#projects[hidden]{display:none!important}
 .xp{max-height:0;overflow:hidden;transition:max-height .3s ease-out}.xp-open{max-height:3000px;transition:max-height .5s ease-in}
 .card-sel{outline:2px solid rgba(59,130,246,.4);outline-offset:1px}
 .md pre{background:#1a1f2e;border:1px solid #1e2433;border-radius:6px;padding:8px 12px;overflow-x:auto;margin:6px 0;font-size:12px;line-height:1.5}
@@ -51,7 +51,7 @@ select{-webkit-appearance:none;appearance:none;background-image:url("data:image/
 <header class="fixed top-0 inset-x-0 h-11 bg-base-950/95 backdrop-blur border-b border-base-800 flex items-center justify-between px-3 sm:px-4 z-50">
 <div class="flex items-center gap-2 sm:gap-3 min-w-0 flex-1">
 <span class="font-mono font-semibold text-[13px] tracking-[.08em] text-txt-200">ensemble</span>
-<button id="nav-toggle" type="button" aria-label="Toggle project navigation" aria-expanded="true" class="text-[10px] text-txt-500 border border-base-800 rounded px-1.5 py-[2px] hover:text-txt-200 hover:border-base-700 transition-colors">projects</button>
+<button id="nav-toggle" type="button" aria-label="Toggle project navigation" aria-controls="projects" aria-expanded="true" class="text-[10px] text-txt-500 border border-base-800 rounded px-1.5 py-[2px] hover:text-txt-200 hover:border-base-700 transition-colors">hide projects</button>
 <span id="crumb" class="text-[11px] text-txt-500 font-mono truncate"></span>
 </div>
 <div class="flex items-center gap-2 sm:gap-4 shrink-0">
diff --git a/src/dashboard-js-part1.ts b/src/dashboard-js-part1.ts
index 7f7fac1..e0d49d6 100644
--- a/src/dashboard-js-part1.ts
+++ b/src/dashboard-js-part1.ts
@@ -74,8 +74,8 @@ function deriveHealth(t){
 
 function coarseTeamStatus(t){const h=deriveHealth(t),blocked=(t.tasks||[]).filter(x=>x.status==='blocked').length;if(h.e)return{label:'error',color:'red',dot:'bg-red-500'};if(blocked)return{label:'blocked',color:'amber',dot:'bg-amber-500'};if(h.w)return{label:'working',color:'blue',dot:'bg-blue-500'};if(h.i)return{label:'idle',color:'muted',dot:'bg-txt-500'};return{label:t.status==='active'?'empty':t.status,color:'muted',dot:'bg-base-600'}}
 function projectStatus(p){const teams=p.teams||[],counts={working:0,blocked:0,error:0,idle:0,done:0};teams.forEach(t=>{const s=coarseTeamStatus(t).label;if(s==='working')counts.working++;else if(s==='blocked')counts.blocked++;else if(s==='error')counts.error++;else if(s==='idle'||s==='empty')counts.idle++;else counts.done++});if(counts.error)return{label:'error',color:'red',dot:'bg-red-500',counts};if(counts.blocked)return{label:'blocked',color:'amber',dot:'bg-amber-500',counts};if(counts.working)return{label:'working',color:'blue',dot:'bg-blue-500',counts};return{label:'idle',color:'muted',dot:'bg-txt-500',counts}}
-function statusTitleProject(p){const s=projectStatus(p),teams=p.teams||[];return (p.name||p.path||p.id)+'\nStatus: '+s.label+'\nTeams: '+teams.length+'\nWorking: '+s.counts.working+' · Blocked: '+s.counts.blocked+' · Error: '+s.counts.error+' · Idle: '+s.counts.idle}
-function statusTitleTeam(t){const h=deriveHealth(t),tasks=t.tasks||[],blocked=tasks.filter(x=>x.status==='blocked').length,active=tasks.filter(x=>x.status==='in_progress').length,pending=tasks.filter(x=>x.status==='pending').length,done=tasks.filter(x=>x.status==='completed').length;return t.name+'\nStatus: '+coarseTeamStatus(t).label+'\nAgents: '+h.total+' total, '+h.w+' working, '+h.i+' idle, '+h.e+' error\nTasks: '+active+' active, '+blocked+' blocked, '+pending+' pending, '+done+' done'}
+function statusTitleProject(p){const s=projectStatus(p),teams=p.teams||[];return (p.name||p.path||p.id)+'\\nStatus: '+s.label+'\\nTeams: '+teams.length+'\\nWorking: '+s.counts.working+' · Blocked: '+s.counts.blocked+' · Error: '+s.counts.error+' · Idle: '+s.counts.idle}
+function statusTitleTeam(t){const h=deriveHealth(t),tasks=t.tasks||[],blocked=tasks.filter(x=>x.status==='blocked').length,active=tasks.filter(x=>x.status==='in_progress').length,pending=tasks.filter(x=>x.status==='pending').length,done=tasks.filter(x=>x.status==='completed').length;return t.name+'\\nStatus: '+coarseTeamStatus(t).label+'\\nAgents: '+h.total+' total, '+h.w+' working, '+h.i+' idle, '+h.e+' error\\nTasks: '+active+' active, '+blocked+' blocked, '+pending+' pending, '+done+' done'}
 
 function lastMessageFor(name,msgs){return msgs.filter(m=>m.fromName===name||m.toName===name).sort((a,b)=>b.timeCreated-a.timeCreated)[0]||null}
 function activeTaskFor(name,tasks){return tasks.find(x=>x.assignee===name&&x.status==='in_progress')||tasks.find(x=>x.assignee===name&&x.status==='blocked')||null}
diff --git a/src/dashboard-js-part3.ts b/src/dashboard-js-part3.ts
index 7429ba3..cb37842 100644
--- a/src/dashboard-js-part3.ts
+++ b/src/dashboard-js-part3.ts
@@ -2,12 +2,21 @@
 export const DASHBOARD_JS_PART3 = `
 function toggleMsg(id){if(expMsgs.has(id))expMsgs.delete(id);else expMsgs.add(id);render()}
 
+function applyNavCollapse(){
+  const content=document.getElementById('content'),projects=document.getElementById('projects'),toggle=document.getElementById('nav-toggle');
+  content.classList.toggle('nav-collapsed',navCollapsed);
+  projects.hidden=navCollapsed;
+  projects.setAttribute('aria-hidden',String(navCollapsed));
+  toggle.setAttribute('aria-expanded',String(!navCollapsed));
+  toggle.textContent=navCollapsed?'show projects':'hide projects';
+}
+
 function render(){
   rSel();const t=cur();
   const empty=document.getElementById('empty'),content=document.getElementById('content');
   if(!t){empty.classList.remove('hidden');empty.classList.add('flex');content.classList.add('hidden');document.getElementById('tl').classList.add('hidden');return}
   empty.classList.add('hidden');empty.classList.remove('flex');content.classList.remove('hidden');
-  content.classList.toggle('nav-collapsed',navCollapsed);document.getElementById('nav-toggle').setAttribute('aria-expanded',String(!navCollapsed));
+  applyNavCollapse();
   const p=curProject();document.getElementById('crumb').textContent=p?' / '+(p.name||p.path||p.id)+' / '+t.name:'';
   rHealth(t);rSum(t);rAttention(t);rAgents(t);rTasks(t);rActivity(t);rTimeline(t);
 }
@@ -61,7 +70,7 @@ setInterval(function(){var t=cur();if(t)rClock(t);if(fails<3)conn(true)},1000);
 // Poll every 2.5s
 setInterval(poll,2500);
 
-document.getElementById('nav-toggle').addEventListener('click',function(){navCollapsed=!navCollapsed;render()});
+document.getElementById('nav-toggle').addEventListener('click',function(){navCollapsed=!navCollapsed;applyNavCollapse()});
 
 // Keyboard shortcuts
 document.addEventListener('keydown',function(e){
diff --git a/test/dashboard-ui-contract.test.ts b/test/dashboard-ui-contract.test.ts
index 6e6d6c6..b73c3a3 100644
--- a/test/dashboard-ui-contract.test.ts
+++ b/test/dashboard-ui-contract.test.ts
@@ -52,9 +52,16 @@ describe("dashboard UI contract", () => {
 
   test("project navigation can collapse", () => {
     expect(DASHBOARD_HEAD).toContain('id="nav-toggle"')
+    expect(DASHBOARD_HEAD).toContain('aria-controls="projects"')
+    expect(DASHBOARD_HEAD).toContain('hide projects')
     expect(DASHBOARD_HEAD).toContain("#content.nav-collapsed")
+    expect(DASHBOARD_HEAD).toContain("#projects[hidden]")
+    expect(DASHBOARD_JS_PART3).toContain("function applyNavCollapse")
     expect(DASHBOARD_JS_PART3).toContain("navCollapsed=!navCollapsed")
     expect(DASHBOARD_JS_PART3).toContain("aria-expanded")
+    expect(DASHBOARD_JS_PART3).toContain("projects.hidden=navCollapsed")
+    expect(DASHBOARD_JS_PART3).toContain("aria-hidden")
+    expect(DASHBOARD_JS_PART3).toContain("show projects")
   })
 
   test("agent prioritization helpers are defined", () => {

From 5a1f938318373fae59db8d5bf0e70b27e0772493 Mon Sep 17 00:00:00 2001
From: cl <cailue@apache.org>
Date: Tue, 12 May 2026 18:22:27 +0800
Subject: [PATCH 3/5] Move dashboard sidebar toggle into project nav

---
 src/dashboard-html.ts              |  5 +++--
 src/dashboard-js-part2.ts          |  5 +++--
 src/dashboard-js-part3.ts          | 14 ++++++++++----
 test/dashboard-ui-contract.test.ts | 13 ++++++++-----
 4 files changed, 24 insertions(+), 13 deletions(-)

diff --git a/src/dashboard-html.ts b/src/dashboard-html.ts
index 430eb5c..ef863c6 100644
--- a/src/dashboard-html.ts
+++ b/src/dashboard-html.ts
@@ -29,8 +29,9 @@ details summary::-webkit-details-marker{display:none}details summary{list-style:
 select{-webkit-appearance:none;appearance:none;background-image:url("data:image/svg+xml,%3Csvg xmlns='http://www.w3.org/2000/svg' width='10' height='10' viewBox='0 0 24 24' fill='none' stroke='%235e6a82' stroke-width='2.5'%3E%3Cpath d='M6 9l6 6 6-6'/%3E%3C/svg%3E");background-repeat:no-repeat;background-position:right 8px center;padding-right:22px}
 .project-link[aria-current="true"]{color:#e2e8f0}
 .team-link[aria-current="true"]{color:#e2e8f0;border-left-color:#22c55e;background:rgba(34,197,94,.06)}
-#content.nav-collapsed{grid-template-columns:minmax(0,1fr)}
+#content.nav-collapsed{grid-template-columns:2rem minmax(0,1fr)}
 #projects[hidden]{display:none!important}
+#project-rail[hidden]{display:none!important}
 .xp{max-height:0;overflow:hidden;transition:max-height .3s ease-out}.xp-open{max-height:3000px;transition:max-height .5s ease-in}
 .card-sel{outline:2px solid rgba(59,130,246,.4);outline-offset:1px}
 .md pre{background:#1a1f2e;border:1px solid #1e2433;border-radius:6px;padding:8px 12px;overflow-x:auto;margin:6px 0;font-size:12px;line-height:1.5}
@@ -51,7 +52,6 @@ select{-webkit-appearance:none;appearance:none;background-image:url("data:image/
 <header class="fixed top-0 inset-x-0 h-11 bg-base-950/95 backdrop-blur border-b border-base-800 flex items-center justify-between px-3 sm:px-4 z-50">
 <div class="flex items-center gap-2 sm:gap-3 min-w-0 flex-1">
 <span class="font-mono font-semibold text-[13px] tracking-[.08em] text-txt-200">ensemble</span>
-<button id="nav-toggle" type="button" aria-label="Toggle project navigation" aria-controls="projects" aria-expanded="true" class="text-[10px] text-txt-500 border border-base-800 rounded px-1.5 py-[2px] hover:text-txt-200 hover:border-base-700 transition-colors">hide projects</button>
 <span id="crumb" class="text-[11px] text-txt-500 font-mono truncate"></span>
 </div>
 <div class="flex items-center gap-2 sm:gap-4 shrink-0">
@@ -72,6 +72,7 @@ select{-webkit-appearance:none;appearance:none;background-image:url("data:image/
 <div class="text-txt-500 text-[11px]">Run <code class="px-1.5 py-0.5 bg-base-900 rounded text-txt-300 font-mono text-[11px]">team_create</code> in OpenCode to get started</div>
 </div>
 <div id="content" class="hidden max-w-[1720px] mx-auto grid grid-cols-1 lg:grid-cols-[260px_minmax(0,1fr)] gap-4 items-start">
+<div id="project-rail" hidden class="lg:sticky lg:top-[88px]"><button id="nav-expand" type="button" aria-label="Show project navigation" aria-controls="projects" aria-expanded="false" class="h-8 w-8 rounded border border-base-800 text-txt-500 hover:text-txt-200 hover:border-base-700 transition-colors">&gt;</button></div>
 <aside id="projects" aria-label="Project navigation" class="bg-base-950/60 border-r border-base-800/70 pr-3 lg:sticky lg:top-[88px]"></aside>
 <div class="min-w-0">
 <section id="attention" aria-label="Team attention" class="mb-3"></section>
diff --git a/src/dashboard-js-part2.ts b/src/dashboard-js-part2.ts
index 4a70ac0..f5d7c0a 100644
--- a/src/dashboard-js-part2.ts
+++ b/src/dashboard-js-part2.ts
@@ -2,8 +2,9 @@
 export const DASHBOARD_JS_PART2 = `
 function rSel(){
   const el=document.getElementById('projects'),ps=allProjects(),c=cur(),cp=curProject();
-  if(!ps.length){patch(el,'<div class="text-center text-txt-500 text-[12px] py-6">No projects yet</div>');return}
-  let h='<nav class="text-[12px]" aria-label="Projects"><div class="text-[10px] uppercase tracking-[.18em] text-txt-500 mb-3">Projects</div><div class="space-y-4">';
+  const head='<div class="flex items-center justify-between gap-2 mb-3"><div class="text-[10px] uppercase tracking-[.18em] text-txt-500">Projects</div><button id="nav-toggle" type="button" aria-label="Hide project navigation" aria-controls="projects" aria-expanded="true" class="text-[10px] text-txt-500 border border-base-800 rounded px-1.5 py-[2px] hover:text-txt-200 hover:border-base-700 transition-colors">hide</button></div>';
+  if(!ps.length){patch(el,head+'<div class="text-center text-txt-500 text-[12px] py-6">No projects yet</div>');return}
+  let h='<nav class="text-[12px]" aria-label="Projects">'+head+'<div class="space-y-4">';
   ps.forEach(function(p){
     const teams=p.teams||[],active=teams.filter(t=>t.status==='active').length,sel=cp&&cp.id===p.id,pss=projectStatus(p);
     h+='<section><button type="button" aria-current="'+(sel?'true':'false')+'" title="'+E(statusTitleProject(p))+'" class="project-link group w-full text-left text-txt-300 hover:text-txt-100 transition-colors" data-project="'+E(p.id)+'" onclick="selectProject(this.dataset.project)">'+
diff --git a/src/dashboard-js-part3.ts b/src/dashboard-js-part3.ts
index cb37842..07cd721 100644
--- a/src/dashboard-js-part3.ts
+++ b/src/dashboard-js-part3.ts
@@ -3,12 +3,13 @@ export const DASHBOARD_JS_PART3 = `
 function toggleMsg(id){if(expMsgs.has(id))expMsgs.delete(id);else expMsgs.add(id);render()}
 
 function applyNavCollapse(){
-  const content=document.getElementById('content'),projects=document.getElementById('projects'),toggle=document.getElementById('nav-toggle');
+  const content=document.getElementById('content'),projects=document.getElementById('projects'),rail=document.getElementById('project-rail'),toggle=document.getElementById('nav-toggle'),expand=document.getElementById('nav-expand');
   content.classList.toggle('nav-collapsed',navCollapsed);
   projects.hidden=navCollapsed;
   projects.setAttribute('aria-hidden',String(navCollapsed));
-  toggle.setAttribute('aria-expanded',String(!navCollapsed));
-  toggle.textContent=navCollapsed?'show projects':'hide projects';
+  rail.hidden=!navCollapsed;
+  if(toggle)toggle.setAttribute('aria-expanded',String(!navCollapsed));
+  expand.setAttribute('aria-expanded',String(!navCollapsed));
 }
 
 function render(){
@@ -70,7 +71,12 @@ setInterval(function(){var t=cur();if(t)rClock(t);if(fails<3)conn(true)},1000);
 // Poll every 2.5s
 setInterval(poll,2500);
 
-document.getElementById('nav-toggle').addEventListener('click',function(){navCollapsed=!navCollapsed;applyNavCollapse()});
+document.addEventListener('click',function(e){
+  const id=e.target&&e.target.id;
+  if(id!=='nav-toggle'&&id!=='nav-expand')return;
+  navCollapsed=id==='nav-toggle';
+  applyNavCollapse();
+});
 
 // Keyboard shortcuts
 document.addEventListener('keydown',function(e){
diff --git a/test/dashboard-ui-contract.test.ts b/test/dashboard-ui-contract.test.ts
index b73c3a3..30cf43c 100644
--- a/test/dashboard-ui-contract.test.ts
+++ b/test/dashboard-ui-contract.test.ts
@@ -51,17 +51,20 @@ describe("dashboard UI contract", () => {
   })
 
   test("project navigation can collapse", () => {
-    expect(DASHBOARD_HEAD).toContain('id="nav-toggle"')
-    expect(DASHBOARD_HEAD).toContain('aria-controls="projects"')
-    expect(DASHBOARD_HEAD).toContain('hide projects')
+    expect(DASHBOARD_HEAD).not.toContain('<button id="nav-toggle"')
+    expect(DASHBOARD_HEAD).toContain('id="project-rail"')
+    expect(DASHBOARD_HEAD).toContain('id="nav-expand"')
+    expect(DASHBOARD_JS_PART2).toContain('id="nav-toggle"')
+    expect(DASHBOARD_JS_PART2).toContain('aria-label="Hide project navigation"')
     expect(DASHBOARD_HEAD).toContain("#content.nav-collapsed")
     expect(DASHBOARD_HEAD).toContain("#projects[hidden]")
+    expect(DASHBOARD_HEAD).toContain("#project-rail[hidden]")
     expect(DASHBOARD_JS_PART3).toContain("function applyNavCollapse")
-    expect(DASHBOARD_JS_PART3).toContain("navCollapsed=!navCollapsed")
+    expect(DASHBOARD_JS_PART3).toContain("id==='nav-toggle'")
     expect(DASHBOARD_JS_PART3).toContain("aria-expanded")
     expect(DASHBOARD_JS_PART3).toContain("projects.hidden=navCollapsed")
+    expect(DASHBOARD_JS_PART3).toContain("rail.hidden=!navCollapsed")
     expect(DASHBOARD_JS_PART3).toContain("aria-hidden")
-    expect(DASHBOARD_JS_PART3).toContain("show projects")
   })
 
   test("agent prioritization helpers are defined", () => {

From 1d0409700d0fef1ca172dd637b9914cec2d7ecb2 Mon Sep 17 00:00:00 2001
From: cl <cailue@apache.org>
Date: Tue, 12 May 2026 18:37:10 +0800
Subject: [PATCH 4/5] Tidy dashboard JS structure

---
 ...board-js-part1.ts => dashboard-js-core.ts} |   5 +-
 ...ard-js-part3.ts => dashboard-js-events.ts} |   6 +-
 ...ard-js-part2.ts => dashboard-js-render.ts} |  20 ++--
 src/dashboard.ts                              |   8 +-
 test/dashboard-ui-contract.test.ts            | 101 ++++++++++--------
 5 files changed, 73 insertions(+), 67 deletions(-)
 rename src/{dashboard-js-part1.ts => dashboard-js-core.ts} (97%)
 rename src/{dashboard-js-part3.ts => dashboard-js-events.ts} (95%)
 rename src/{dashboard-js-part2.ts => dashboard-js-render.ts} (87%)

diff --git a/src/dashboard-js-part1.ts b/src/dashboard-js-core.ts
similarity index 97%
rename from src/dashboard-js-part1.ts
rename to src/dashboard-js-core.ts
index e0d49d6..4cfa353 100644
--- a/src/dashboard-js-part1.ts
+++ b/src/dashboard-js-core.ts
@@ -1,5 +1,5 @@
 /** Dashboard JS — utilities, data helpers, and state management. */
-export const DASHBOARD_JS_PART1 = `
+export const DASHBOARD_JS_CORE = `
 let S=null,selId=null,selProjectId=null,fails=0,pollT=Date.now(),prevMC=0,selCard=-1,navCollapsed=false;
 const expCards=new Set(),expMsgs=new Set();
 const E=s=>s?String(s).replace(/&/g,'&amp;').replace(/</g,'&lt;').replace(/>/g,'&gt;').replace(/"/g,'&quot;'):'';
@@ -64,6 +64,7 @@ function allTeams(){
   return{active,archived};
 }
 function allProjects(){return S?.projects?[...S.projects].sort((a,b)=>b.timeUpdated-a.timeUpdated):[]}
+function projectLabel(p){return p?(p.name||p.path||p.id):''}
 function curProject(){const ps=allProjects();if(!ps.length)return null;if(selProjectId){const p=ps.find(p=>p.id===selProjectId);if(p)return p}var t=cur();return t?ps.find(p=>p.id===t.projectId)||ps[0]:ps[0]}
 function cur(){const{active,archived}=allTeams(),all=[...active,...archived];if(!all.length)return null;if(selId){const t=all.find(t=>t.id===selId);if(t){selProjectId=t.projectId;return t}}const p=selProjectId&&S?.projects?.find(p=>p.id===selProjectId);const pt=p?[...(p.teams||[])].filter(t=>t.status==='active'):[ ];const t=pt.sort((a,b)=>b.timeUpdated-a.timeUpdated)[0]||active[0]||all[0];if(t){selId=t.id;selProjectId=t.projectId}return t}
 
@@ -74,7 +75,7 @@ function deriveHealth(t){
 
 function coarseTeamStatus(t){const h=deriveHealth(t),blocked=(t.tasks||[]).filter(x=>x.status==='blocked').length;if(h.e)return{label:'error',color:'red',dot:'bg-red-500'};if(blocked)return{label:'blocked',color:'amber',dot:'bg-amber-500'};if(h.w)return{label:'working',color:'blue',dot:'bg-blue-500'};if(h.i)return{label:'idle',color:'muted',dot:'bg-txt-500'};return{label:t.status==='active'?'empty':t.status,color:'muted',dot:'bg-base-600'}}
 function projectStatus(p){const teams=p.teams||[],counts={working:0,blocked:0,error:0,idle:0,done:0};teams.forEach(t=>{const s=coarseTeamStatus(t).label;if(s==='working')counts.working++;else if(s==='blocked')counts.blocked++;else if(s==='error')counts.error++;else if(s==='idle'||s==='empty')counts.idle++;else counts.done++});if(counts.error)return{label:'error',color:'red',dot:'bg-red-500',counts};if(counts.blocked)return{label:'blocked',color:'amber',dot:'bg-amber-500',counts};if(counts.working)return{label:'working',color:'blue',dot:'bg-blue-500',counts};return{label:'idle',color:'muted',dot:'bg-txt-500',counts}}
-function statusTitleProject(p){const s=projectStatus(p),teams=p.teams||[];return (p.name||p.path||p.id)+'\\nStatus: '+s.label+'\\nTeams: '+teams.length+'\\nWorking: '+s.counts.working+' · Blocked: '+s.counts.blocked+' · Error: '+s.counts.error+' · Idle: '+s.counts.idle}
+function statusTitleProject(p){const s=projectStatus(p),teams=p.teams||[];return projectLabel(p)+'\\nStatus: '+s.label+'\\nTeams: '+teams.length+'\\nWorking: '+s.counts.working+' · Blocked: '+s.counts.blocked+' · Error: '+s.counts.error+' · Idle: '+s.counts.idle}
 function statusTitleTeam(t){const h=deriveHealth(t),tasks=t.tasks||[],blocked=tasks.filter(x=>x.status==='blocked').length,active=tasks.filter(x=>x.status==='in_progress').length,pending=tasks.filter(x=>x.status==='pending').length,done=tasks.filter(x=>x.status==='completed').length;return t.name+'\\nStatus: '+coarseTeamStatus(t).label+'\\nAgents: '+h.total+' total, '+h.w+' working, '+h.i+' idle, '+h.e+' error\\nTasks: '+active+' active, '+blocked+' blocked, '+pending+' pending, '+done+' done'}
 
 function lastMessageFor(name,msgs){return msgs.filter(m=>m.fromName===name||m.toName===name).sort((a,b)=>b.timeCreated-a.timeCreated)[0]||null}
diff --git a/src/dashboard-js-part3.ts b/src/dashboard-js-events.ts
similarity index 95%
rename from src/dashboard-js-part3.ts
rename to src/dashboard-js-events.ts
index 07cd721..20443f2 100644
--- a/src/dashboard-js-part3.ts
+++ b/src/dashboard-js-events.ts
@@ -1,5 +1,5 @@
 /** Dashboard JS — interaction handlers, keyboard, polling. */
-export const DASHBOARD_JS_PART3 = `
+export const DASHBOARD_JS_EVENTS = `
 function toggleMsg(id){if(expMsgs.has(id))expMsgs.delete(id);else expMsgs.add(id);render()}
 
 function applyNavCollapse(){
@@ -10,6 +10,8 @@ function applyNavCollapse(){
   rail.hidden=!navCollapsed;
   if(toggle)toggle.setAttribute('aria-expanded',String(!navCollapsed));
   expand.setAttribute('aria-expanded',String(!navCollapsed));
+  if(document.activeElement===toggle&&navCollapsed)expand.focus();
+  if(document.activeElement===expand&&!navCollapsed&&toggle)toggle.focus();
 }
 
 function render(){
@@ -18,7 +20,7 @@ function render(){
   if(!t){empty.classList.remove('hidden');empty.classList.add('flex');content.classList.add('hidden');document.getElementById('tl').classList.add('hidden');return}
   empty.classList.add('hidden');empty.classList.remove('flex');content.classList.remove('hidden');
   applyNavCollapse();
-  const p=curProject();document.getElementById('crumb').textContent=p?' / '+(p.name||p.path||p.id)+' / '+t.name:'';
+  const p=curProject();document.getElementById('crumb').textContent=p?' / '+projectLabel(p)+' / '+t.name:'';
   rHealth(t);rSum(t);rAttention(t);rAgents(t);rTasks(t);rActivity(t);rTimeline(t);
 }
 
diff --git a/src/dashboard-js-part2.ts b/src/dashboard-js-render.ts
similarity index 87%
rename from src/dashboard-js-part2.ts
rename to src/dashboard-js-render.ts
index f5d7c0a..246cc37 100644
--- a/src/dashboard-js-part2.ts
+++ b/src/dashboard-js-render.ts
@@ -1,23 +1,20 @@
 /** Dashboard JS — render functions. */
-export const DASHBOARD_JS_PART2 = `
+export const DASHBOARD_JS_RENDER = `
 function rSel(){
   const el=document.getElementById('projects'),ps=allProjects(),c=cur(),cp=curProject();
-  const head='<div class="flex items-center justify-between gap-2 mb-3"><div class="text-[10px] uppercase tracking-[.18em] text-txt-500">Projects</div><button id="nav-toggle" type="button" aria-label="Hide project navigation" aria-controls="projects" aria-expanded="true" class="text-[10px] text-txt-500 border border-base-800 rounded px-1.5 py-[2px] hover:text-txt-200 hover:border-base-700 transition-colors">hide</button></div>';
+  const head=renderProjectNavHeader();
   if(!ps.length){patch(el,head+'<div class="text-center text-txt-500 text-[12px] py-6">No projects yet</div>');return}
   let h='<nav class="text-[12px]" aria-label="Projects">'+head+'<div class="space-y-4">';
-  ps.forEach(function(p){
-    const teams=p.teams||[],active=teams.filter(t=>t.status==='active').length,sel=cp&&cp.id===p.id,pss=projectStatus(p);
-    h+='<section><button type="button" aria-current="'+(sel?'true':'false')+'" title="'+E(statusTitleProject(p))+'" class="project-link group w-full text-left text-txt-300 hover:text-txt-100 transition-colors" data-project="'+E(p.id)+'" onclick="selectProject(this.dataset.project)">'+
-      '<div class="flex items-center gap-2 min-w-0"><span class="w-[5px] h-[5px] rounded-full '+pss.dot+(pss.label==='working'?' pulse':'')+' shrink-0"></span><span class="font-mono font-semibold truncate">'+E(p.name||p.path||p.id)+'</span>'+chip(pss.label,pss.color)+'</div>'+
-      '<div class="mt-1 ml-3 text-[10px] text-txt-500">'+active+' team'+(active!==1?'s':'')+'</div></button>';
-    h+='<div class="mt-2 ml-[7px] border-l border-base-800/80">';
-    teams.sort((a,b)=>b.timeUpdated-a.timeUpdated).forEach(function(t){const ss=coarseTeamStatus(t),tsel=c&&c.id===t.id;h+='<button type="button" title="'+E(statusTitleTeam(t))+'" class="team-link block w-full text-left border-l-2 border-transparent -ml-px py-1.5 pl-3 pr-2 text-[11px] text-txt-500 hover:text-txt-200 hover:bg-base-900/70 transition-colors" aria-current="'+(tsel?'true':'false')+'" data-team="'+E(t.id)+'" onclick="selectTeam(this.dataset.team)"><div class="flex items-center gap-2 min-w-0"><span class="w-[5px] h-[5px] rounded-full '+ss.dot+(ss.label==='working'?' pulse':'')+' shrink-0"></span><span class="truncate font-mono">'+E(t.name)+'</span><span class="ml-auto text-[9px] uppercase tracking-wide text-txt-500">'+E(ss.label)+'</span></div></button>'});
-    h+='</div></section>';
-  });
+  ps.forEach(function(p){h+=renderProjectSection(p,cp,c)});
   h+='</div></nav>';
   patch(el,h);
 }
 
+function renderProjectNavHeader(){return '<div class="flex items-center justify-between gap-2 mb-3"><div class="text-[10px] uppercase tracking-[.18em] text-txt-500">Projects</div><button id="nav-toggle" type="button" aria-label="Hide project navigation" aria-controls="projects" aria-expanded="true" class="text-[10px] text-txt-500 border border-base-800 rounded px-1.5 py-[2px] hover:text-txt-200 hover:border-base-700 transition-colors">hide</button></div>'}
+function renderProjectSection(p,cp,c){const teams=p.teams||[];return '<section>'+renderProjectButton(p,cp)+'<div class="mt-2 ml-[7px] border-l border-base-800/80">'+[...teams].sort((a,b)=>b.timeUpdated-a.timeUpdated).map(t=>renderTeamLink(t,c)).join('')+'</div></section>'}
+function renderProjectButton(p,cp){const teams=p.teams||[],active=teams.filter(t=>t.status==='active').length,sel=cp&&cp.id===p.id,pss=projectStatus(p);return '<button type="button" aria-current="'+(sel?'true':'false')+'" title="'+E(statusTitleProject(p))+'" class="project-link group w-full text-left text-txt-300 hover:text-txt-100 transition-colors" data-project="'+E(p.id)+'" onclick="selectProject(this.dataset.project)"><div class="flex items-center gap-2 min-w-0"><span class="w-[5px] h-[5px] rounded-full '+pss.dot+(pss.label==='working'?' pulse':'')+' shrink-0"></span><span class="font-mono font-semibold truncate">'+E(projectLabel(p))+'</span>'+chip(pss.label,pss.color)+'</div><div class="mt-1 ml-3 text-[10px] text-txt-500">'+active+' team'+(active!==1?'s':'')+'</div></button>'}
+function renderTeamLink(t,c){const ss=coarseTeamStatus(t),tsel=c&&c.id===t.id;return '<button type="button" title="'+E(statusTitleTeam(t))+'" class="team-link block w-full text-left border-l-2 border-transparent -ml-px py-1.5 pl-3 pr-2 text-[11px] text-txt-500 hover:text-txt-200 hover:bg-base-900/70 transition-colors" aria-current="'+(tsel?'true':'false')+'" data-team="'+E(t.id)+'" onclick="selectTeam(this.dataset.team)"><div class="flex items-center gap-2 min-w-0"><span class="w-[5px] h-[5px] rounded-full '+ss.dot+(ss.label==='working'?' pulse':'')+' shrink-0"></span><span class="truncate font-mono">'+E(t.name)+'</span><span class="ml-auto text-[9px] uppercase tracking-wide text-txt-500">'+E(ss.label)+'</span></div></button>'}
+
 function rHealth(t){
   const el=document.getElementById('hring'),h=deriveHealth(t);
   if(!h.total){el.style.background='conic-gradient(#2a3144 0deg,#2a3144 360deg)';return}
@@ -45,7 +42,6 @@ function rSum(t){
   patch(el,
     '<span class="w-[6px] h-[6px] rounded-full '+(t.status==='active'?'bg-emerald-500':'bg-txt-500')+'"></span>'+
     '<span class="font-mono font-semibold text-txt-200">'+E(t.name)+'</span>'+
-    (t.projectId?chip(E(t.projectId),'muted'):'')+
     (mm.length?chip(mm.length+' agent'+(mm.length!==1?'s':''),'gray'):'')+
     (h.w?chip(h.w+' working','blue'):'')+
     (h.i?chip(h.i+' idle','muted'):'')+
diff --git a/src/dashboard.ts b/src/dashboard.ts
index 5bc8e1a..ae19548 100644
--- a/src/dashboard.ts
+++ b/src/dashboard.ts
@@ -1,12 +1,12 @@
 import type { Database } from "bun:sqlite"
 import { DASHBOARD_HEAD } from "./dashboard-html"
-import { DASHBOARD_JS_PART1 } from "./dashboard-js-part1"
-import { DASHBOARD_JS_PART2 } from "./dashboard-js-part2"
-import { DASHBOARD_JS_PART3 } from "./dashboard-js-part3"
+import { DASHBOARD_JS_CORE } from "./dashboard-js-core"
+import { DASHBOARD_JS_EVENTS } from "./dashboard-js-events"
+import { DASHBOARD_JS_RENDER } from "./dashboard-js-render"
 import { log } from "./log"
 
 /** Assemble the full dashboard HTML from parts. */
-const DASHBOARD_HTML = DASHBOARD_HEAD + "\n<script>" + DASHBOARD_JS_PART1 + DASHBOARD_JS_PART2 + DASHBOARD_JS_PART3 + "<\/script>\n</body></html>"
+const DASHBOARD_HTML = DASHBOARD_HEAD + "\n<script>" + DASHBOARD_JS_CORE + DASHBOARD_JS_RENDER + DASHBOARD_JS_EVENTS + "<\/script>\n</body></html>"
 
 interface TeamRow {
   id: string
diff --git a/test/dashboard-ui-contract.test.ts b/test/dashboard-ui-contract.test.ts
index 30cf43c..5dc6f30 100644
--- a/test/dashboard-ui-contract.test.ts
+++ b/test/dashboard-ui-contract.test.ts
@@ -1,8 +1,8 @@
 import { describe, expect, test } from "bun:test"
 import { DASHBOARD_HEAD } from "../src/dashboard-html"
-import { DASHBOARD_JS_PART1 } from "../src/dashboard-js-part1"
-import { DASHBOARD_JS_PART2 } from "../src/dashboard-js-part2"
-import { DASHBOARD_JS_PART3 } from "../src/dashboard-js-part3"
+import { DASHBOARD_JS_CORE } from "../src/dashboard-js-core"
+import { DASHBOARD_JS_EVENTS } from "../src/dashboard-js-events"
+import { DASHBOARD_JS_RENDER } from "../src/dashboard-js-render"
 
 function colorToken(group: string, key: string): string {
   const match = DASHBOARD_HEAD.match(new RegExp(`${group}:\\{[^}]*${key}:'#([0-9a-f]{6})'`))
@@ -40,48 +40,55 @@ describe("dashboard UI contract", () => {
 
   test("project navigation uses docs-style outline semantics", () => {
     expect(DASHBOARD_HEAD).toContain('id="projects"')
-    expect(DASHBOARD_JS_PART2).toContain('<nav class="text-[12px]"')
-    expect(DASHBOARD_JS_PART2).toContain('class="project-link')
-    expect(DASHBOARD_JS_PART2).toContain('class="team-link')
-    expect(DASHBOARD_JS_PART2).toContain('border-l-2')
-    expect(DASHBOARD_JS_PART2).toContain("statusTitleProject")
-    expect(DASHBOARD_JS_PART2).toContain("statusTitleTeam")
-    expect(DASHBOARD_JS_PART3).toContain("function selectProject")
-    expect(DASHBOARD_JS_PART3).toContain("function selectTeam")
+    expect(DASHBOARD_JS_RENDER).toContain('<nav class="text-[12px]"')
+    expect(DASHBOARD_JS_RENDER).toContain('class="project-link')
+    expect(DASHBOARD_JS_RENDER).toContain('class="team-link')
+    expect(DASHBOARD_JS_RENDER).toContain('border-l-2')
+    expect(DASHBOARD_JS_RENDER).toContain("function renderProjectNavHeader")
+    expect(DASHBOARD_JS_RENDER).toContain("function renderProjectButton")
+    expect(DASHBOARD_JS_RENDER).toContain("function renderTeamLink")
+    expect(DASHBOARD_JS_RENDER).toContain("[...teams].sort")
+    expect(DASHBOARD_JS_RENDER).toContain("statusTitleProject")
+    expect(DASHBOARD_JS_RENDER).toContain("statusTitleTeam")
+    expect(DASHBOARD_JS_CORE).toContain("function projectLabel")
+    expect(DASHBOARD_JS_EVENTS).toContain("function selectProject")
+    expect(DASHBOARD_JS_EVENTS).toContain("function selectTeam")
   })
 
   test("project navigation can collapse", () => {
     expect(DASHBOARD_HEAD).not.toContain('<button id="nav-toggle"')
     expect(DASHBOARD_HEAD).toContain('id="project-rail"')
     expect(DASHBOARD_HEAD).toContain('id="nav-expand"')
-    expect(DASHBOARD_JS_PART2).toContain('id="nav-toggle"')
-    expect(DASHBOARD_JS_PART2).toContain('aria-label="Hide project navigation"')
+    expect(DASHBOARD_JS_RENDER).toContain('id="nav-toggle"')
+    expect(DASHBOARD_JS_RENDER).toContain('aria-label="Hide project navigation"')
     expect(DASHBOARD_HEAD).toContain("#content.nav-collapsed")
     expect(DASHBOARD_HEAD).toContain("#projects[hidden]")
     expect(DASHBOARD_HEAD).toContain("#project-rail[hidden]")
-    expect(DASHBOARD_JS_PART3).toContain("function applyNavCollapse")
-    expect(DASHBOARD_JS_PART3).toContain("id==='nav-toggle'")
-    expect(DASHBOARD_JS_PART3).toContain("aria-expanded")
-    expect(DASHBOARD_JS_PART3).toContain("projects.hidden=navCollapsed")
-    expect(DASHBOARD_JS_PART3).toContain("rail.hidden=!navCollapsed")
-    expect(DASHBOARD_JS_PART3).toContain("aria-hidden")
+    expect(DASHBOARD_JS_EVENTS).toContain("function applyNavCollapse")
+    expect(DASHBOARD_JS_EVENTS).toContain("id==='nav-toggle'")
+    expect(DASHBOARD_JS_EVENTS).toContain("aria-expanded")
+    expect(DASHBOARD_JS_EVENTS).toContain("projects.hidden=navCollapsed")
+    expect(DASHBOARD_JS_EVENTS).toContain("rail.hidden=!navCollapsed")
+    expect(DASHBOARD_JS_EVENTS).toContain("expand.focus()")
+    expect(DASHBOARD_JS_EVENTS).toContain("toggle.focus()")
+    expect(DASHBOARD_JS_EVENTS).toContain("aria-hidden")
   })
 
   test("agent prioritization helpers are defined", () => {
-    expect(DASHBOARD_JS_PART1).toContain("function rankAgent")
-    expect(DASHBOARD_JS_PART1).toContain("function deriveAttention")
+    expect(DASHBOARD_JS_CORE).toContain("function rankAgent")
+    expect(DASHBOARD_JS_CORE).toContain("function deriveAttention")
   })
 
   test("attention renderer exposes urgent triage copy", () => {
-    expect(DASHBOARD_JS_PART2).toContain("function rAttention")
-    expect(DASHBOARD_JS_PART2).toContain("Needs attention")
+    expect(DASHBOARD_JS_RENDER).toContain("function rAttention")
+    expect(DASHBOARD_JS_RENDER).toContain("Needs attention")
   })
 
   test("keyboard and accessibility hooks are present", () => {
-    expect(DASHBOARD_JS_PART2).toContain("onkeydown")
-    expect(DASHBOARD_JS_PART2).toContain("aria-expanded")
-    expect(DASHBOARD_JS_PART3).toContain("e.key==='Enter'")
-    expect(DASHBOARD_JS_PART3).toContain("e.key==='Escape'")
+    expect(DASHBOARD_JS_RENDER).toContain("onkeydown")
+    expect(DASHBOARD_JS_RENDER).toContain("aria-expanded")
+    expect(DASHBOARD_JS_EVENTS).toContain("e.key==='Enter'")
+    expect(DASHBOARD_JS_EVENTS).toContain("e.key==='Escape'")
   })
 
   test("shortcut overlay exposes dialog semantics", () => {
@@ -94,28 +101,28 @@ describe("dashboard UI contract", () => {
   })
 
   test("shortcut overlay manages modal focus", () => {
-    expect(DASHBOARD_JS_PART3).toContain("function openShortcuts")
-    expect(DASHBOARD_JS_PART3).toContain("function closeShortcuts")
-    expect(DASHBOARD_JS_PART3).toContain("function setBackgroundInert")
-    expect(DASHBOARD_JS_PART3).toContain("function modalOpen")
-    expect(DASHBOARD_JS_PART3).toContain("function trapFocus")
-    expect(DASHBOARD_JS_PART3).toContain("el.inert=locked")
-    expect(DASHBOARD_JS_PART3).toContain("e.key==='Tab'")
-    expect(DASHBOARD_JS_PART3).toContain("document.getElementById('sco').focus()")
-    expect(DASHBOARD_JS_PART3).toContain("aria-hidden")
-    expect(DASHBOARD_JS_PART3).toContain("if(!modalOpen())setBackgroundInert(false)")
+    expect(DASHBOARD_JS_EVENTS).toContain("function openShortcuts")
+    expect(DASHBOARD_JS_EVENTS).toContain("function closeShortcuts")
+    expect(DASHBOARD_JS_EVENTS).toContain("function setBackgroundInert")
+    expect(DASHBOARD_JS_EVENTS).toContain("function modalOpen")
+    expect(DASHBOARD_JS_EVENTS).toContain("function trapFocus")
+    expect(DASHBOARD_JS_EVENTS).toContain("el.inert=locked")
+    expect(DASHBOARD_JS_EVENTS).toContain("e.key==='Tab'")
+    expect(DASHBOARD_JS_EVENTS).toContain("document.getElementById('sco').focus()")
+    expect(DASHBOARD_JS_EVENTS).toContain("aria-hidden")
+    expect(DASHBOARD_JS_EVENTS).toContain("if(!modalOpen())setBackgroundInert(false)")
   })
 
   test("agent drawer exposes named close control and modal focus handling", () => {
-    expect(DASHBOARD_JS_PART2).toContain('id="drawer-close"')
-    expect(DASHBOARD_JS_PART2).toContain('aria-label="Close agent detail"')
-    expect(DASHBOARD_JS_PART2).toContain("setBackgroundInert(true)")
-    expect(DASHBOARD_JS_PART2).toContain("drawer.inert=false")
-    expect(DASHBOARD_JS_PART2).toContain("drawer.inert=true")
-    expect(DASHBOARD_JS_PART2).toContain("drawer.focus()")
-    expect(DASHBOARD_JS_PART2).toContain("if(!modalOpen())setBackgroundInert(false)")
-    expect(DASHBOARD_JS_PART3).toContain("trapFocus(document.getElementById('drawer'),e)")
-    expect(DASHBOARD_JS_PART3).toContain("drawerOpen&&e.key==='?'")
+    expect(DASHBOARD_JS_RENDER).toContain('id="drawer-close"')
+    expect(DASHBOARD_JS_RENDER).toContain('aria-label="Close agent detail"')
+    expect(DASHBOARD_JS_RENDER).toContain("setBackgroundInert(true)")
+    expect(DASHBOARD_JS_RENDER).toContain("drawer.inert=false")
+    expect(DASHBOARD_JS_RENDER).toContain("drawer.inert=true")
+    expect(DASHBOARD_JS_RENDER).toContain("drawer.focus()")
+    expect(DASHBOARD_JS_RENDER).toContain("if(!modalOpen())setBackgroundInert(false)")
+    expect(DASHBOARD_JS_EVENTS).toContain("trapFocus(document.getElementById('drawer'),e)")
+    expect(DASHBOARD_JS_EVENTS).toContain("drawerOpen&&e.key==='?'")
   })
 
   test("small dashboard text tokens stay readable on dark surfaces", () => {
@@ -130,6 +137,6 @@ describe("dashboard UI contract", () => {
   })
 
   test("agent cards do not dim operational text with whole-card opacity", () => {
-    expect(DASHBOARD_JS_PART2).not.toContain("opacity-50")
+    expect(DASHBOARD_JS_RENDER).not.toContain("opacity-50")
   })
 })

From 4e54b62004460aab9dc526fbbaecffad2981b636 Mon Sep 17 00:00:00 2001
From: cl <cailue@apache.org>
Date: Thu, 14 May 2026 16:11:17 +0800
Subject: [PATCH 5/5] Make database migrations atomic

---
 src/schema.ts   | 20 ++++++++++++--
 test/db.test.ts | 71 +++++++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 89 insertions(+), 2 deletions(-)

diff --git a/src/schema.ts b/src/schema.ts
index c24f71a..e327257 100644
--- a/src/schema.ts
+++ b/src/schema.ts
@@ -195,9 +195,25 @@ export const MIGRATIONS: string[] = [
 export function applyMigrations(db: Database): void {
   const { user_version: current } = db.query("PRAGMA user_version").get() as { user_version: number }
 
+  if (current > MIGRATIONS.length) {
+    throw new Error(`Database schema version ${current} is newer than this plugin supports (${MIGRATIONS.length}). Upgrade opencode-ensemble before continuing.`)
+  }
+
   for (let i = current; i < MIGRATIONS.length; i++) {
     const migration = MIGRATIONS[i]
-    if (migration) db.exec(migration)
-    db.exec(`PRAGMA user_version = ${i + 1}`)
+    const { foreign_keys: foreignKeys } = db.query("PRAGMA foreign_keys").get() as { foreign_keys: number }
+
+    db.exec("PRAGMA foreign_keys = OFF")
+    db.exec("BEGIN IMMEDIATE")
+    try {
+      if (migration) db.exec(migration)
+      db.exec(`PRAGMA user_version = ${i + 1}`)
+      db.exec("COMMIT")
+    } catch (err) {
+      db.exec("ROLLBACK")
+      throw err
+    } finally {
+      db.exec(`PRAGMA foreign_keys = ${foreignKeys ? "ON" : "OFF"}`)
+    }
   }
 }
diff --git a/test/db.test.ts b/test/db.test.ts
index 45ee6c4..fecad43 100644
--- a/test/db.test.ts
+++ b/test/db.test.ts
@@ -55,6 +55,77 @@ describe("schema migrations", () => {
     expect(version.user_version).toBe(MIGRATIONS.length)
   })
 
+  test("rejects databases from newer plugin versions", () => {
+    db.exec(`PRAGMA user_version = ${MIGRATIONS.length + 1}`)
+    expect(() => applyMigrations(db)).toThrow("newer than this plugin supports")
+  })
+
+  test("rolls back a failed migration without leaving half-migrated tables", () => {
+    db.exec(`
+      CREATE TABLE team (
+        id TEXT PRIMARY KEY,
+        name TEXT NOT NULL UNIQUE,
+        lead_session_id TEXT NOT NULL,
+        status TEXT NOT NULL DEFAULT 'active',
+        delegate INTEGER NOT NULL DEFAULT 0,
+        time_created INTEGER NOT NULL,
+        time_updated INTEGER NOT NULL,
+        lead_agent TEXT
+      );
+      INSERT INTO team (id, name, lead_session_id, status, delegate, time_created, time_updated, lead_agent)
+        VALUES ('t1', 'old-team', 'sess-1', 'active', 0, 1, 1, NULL);
+      PRAGMA user_version = 7;
+    `)
+
+    expect(() => applyMigrations(db)).toThrow()
+
+    const version = db.query("PRAGMA user_version").get() as { user_version: number }
+    expect(version.user_version).toBe(7)
+    expect(db.query("SELECT name FROM sqlite_master WHERE type='table' AND name='team'").get()).toBeTruthy()
+    expect(db.query("SELECT name FROM sqlite_master WHERE type='table' AND name='team_old_m8'").get()).toBeNull()
+    expect(db.query("SELECT name FROM sqlite_master WHERE type='table' AND name='project'").get()).toBeNull()
+    const row = db.query("SELECT name FROM team WHERE id = 't1'").get() as { name: string }
+    expect(row.name).toBe("old-team")
+  })
+
+  test("upgrades a version 7 database to the current project schema", () => {
+    for (let i = 0; i < 7; i++) {
+      db.exec(MIGRATIONS[i]!)
+      db.exec(`PRAGMA user_version = ${i + 1}`)
+    }
+    db.run(
+      "INSERT INTO team (id, name, lead_session_id, status, delegate, time_created, time_updated, lead_agent) VALUES (?, ?, ?, 'active', 0, ?, ?, ?)",
+      ["t1", "legacy-team", "sess-1", 1, 2, "build"]
+    )
+    db.run(
+      "INSERT INTO team_member (team_id, name, session_id, agent, status, execution_status, prompt, time_created, time_updated, worktree_dir, worktree_branch, plan_approval, workspace_id, reported_to_lead) VALUES (?, ?, ?, ?, 'ready', 'idle', ?, ?, ?, ?, ?, 'none', ?, 0)",
+      ["t1", "alice", "sess-a", "build", "legacy prompt", 3, 4, "/tmp/wt", "ensemble-legacy-team-alice", "ws-1"]
+    )
+    db.run(
+      "INSERT INTO team_task (id, team_id, content, status, priority, time_created, time_updated) VALUES (?, ?, ?, 'pending', 'medium', ?, ?)",
+      ["task-1", "t1", "legacy task", 5, 6]
+    )
+    db.run(
+      "INSERT INTO team_message (id, team_id, from_name, to_name, content, delivered, time_created, read) VALUES (?, ?, ?, ?, ?, 1, ?, 0)",
+      ["msg-1", "t1", "alice", "lead", "legacy message", 7]
+    )
+
+    applyMigrations(db)
+
+    const version = db.query("PRAGMA user_version").get() as { user_version: number }
+    expect(version.user_version).toBe(MIGRATIONS.length)
+    const project = db.query("SELECT id, name FROM project WHERE id = 'default'").get() as { id: string; name: string }
+    expect(project.name).toBe("Default Project")
+    const team = db.query("SELECT name, project_id, lead_agent FROM team WHERE id = 't1'").get() as { name: string; project_id: string; lead_agent: string }
+    expect(team).toEqual({ name: "legacy-team", project_id: "default", lead_agent: "build" })
+    const member = db.query("SELECT prompt, workspace_id, reported_to_lead FROM team_member WHERE team_id = 't1' AND name = 'alice'").get() as { prompt: string; workspace_id: string; reported_to_lead: number }
+    expect(member).toEqual({ prompt: "legacy prompt", workspace_id: "ws-1", reported_to_lead: 0 })
+    const task = db.query("SELECT content FROM team_task WHERE id = 'task-1'").get() as { content: string }
+    expect(task.content).toBe("legacy task")
+    const message = db.query("SELECT content, read FROM team_message WHERE id = 'msg-1'").get() as { content: string; read: number }
+    expect(message).toEqual({ content: "legacy message", read: 0 })
+  })
+
   test("can insert and query a team", () => {
     applyMigrations(db)
     db.run(
