@agent-link/agent 0.1.83 → 0.1.85

package/dist/team.js

@@ -7,22 +7,13 @@
  * while the Lead Claude process drives all planning/execution autonomously.
  */
 import { randomUUID } from 'crypto';
-import { existsSync, mkdirSync, readFileSync, writeFileSync, readdirSync, renameSync, unlinkSync } from 'fs';
-import { join } from 'path';
-import { CONFIG_DIR } from './config.js';
-// ── Color palette for auto-assigning agent colors ──────────────────────
-const AGENT_COLORS = [
-    '#EF4444', // red (Lead)
-    '#EAB308', // yellow
-    '#3B82F6', // blue
-    '#10B981', // emerald
-    '#8B5CF6', // violet
-    '#F97316', // orange
-    '#EC4899', // pink
-    '#06B6D4', // cyan
-    '#84CC16', // lime
-    '#6366F1', // indigo
-];
+export { buildAgentsDef, buildLeadPrompt } from './team-templates.js';
+export { getNextAgentColor, classifyRole, pickCharacter, deriveAgentDisplayName, deriveTaskTitle } from './team-naming.js';
+export { serializeTeam, deserializeTeam, persistTeam, persistTeamDebounced, loadTeam, listTeams, deleteTeam, renameTeam, } from './team-persistence.js';
+import { getNextAgentColor, deriveAgentDisplayName, deriveTaskTitle } from './team-naming.js';
+import { buildAgentsDef, buildLeadPrompt } from './team-templates.js';
+import { serializeTeam, persistTeam, flushPendingPersists as _flushPendingPersists, } from './team-persistence.js';
+// ── Module state ───────────────────────────────────────────────────────
 let activeTeam = null;
 let sendFn = () => { };
 let handleChatFn = null;
@@ -32,7 +23,6 @@ let clearOutputObserverFn = null;
 let setCloseObserverFn = null;
 let clearCloseObserverFn = null;
 let agentMessageIdCounter = 0;
-const TEAMS_DIR = join(CONFIG_DIR, 'teams');
 // ── Public API ─────────────────────────────────────────────────────────
 export function setTeamSendFn(fn) {
     sendFn = fn;
@@ -82,7 +72,7 @@ export function createTeamState(config, conversationId) {
     };
     // Register Lead as the first agent
     team.agents.set('lead', {
-        role: { id: 'lead', name: 'Lead', color: AGENT_COLORS[0] },
+        role: { id: 'lead', name: 'Lead', color: getNextAgentColor(team) },
         toolUseId: null,
         agentTaskId: null,
         status: 'working',
@@ -100,78 +90,13 @@ export function createTeamState(config, conversationId) {
 export function clearActiveTeam() {
     activeTeam = null;
 }
-/**
- * Get the next color for an agent (based on current count).
- */
-export function getNextAgentColor(team) {
-    const idx = team.agents.size % AGENT_COLORS.length;
-    return AGENT_COLORS[idx];
-}
-/**
- * Derive a human-readable display name for a subagent from the Agent tool input.
- * Priority: descriptive input.name → short description → colon-prefixed description → prompt extraction → "Agent N"
- */
-function deriveAgentDisplayName(input, agentIndex) {
-    // If input.name is descriptive (not a generic ID like "worker-1", "agent-2"), use it directly
-    if (input.name && !/^(worker|agent|hypothesis)-\d+$/i.test(input.name)) {
-        return input.name;
-    }
-    // Short description → use directly (e.g. "Implement the login page")
-    if (input.description && input.description.length <= 60) {
-        return input.description;
-    }
-    // Colon-prefixed description → use prefix (e.g. "Designer: review design doc" → "Designer")
-    if (input.description) {
-        const colonIdx = input.description.indexOf(':');
-        if (colonIdx > 0 && colonIdx <= 30) {
-            return input.description.slice(0, colonIdx).trim();
-        }
-    }
-    // Extract role from prompt text
-    const text = input.prompt || input.description || '';
-    if (text) {
-        // "You are tasked with writing/creating/implementing/..." pattern
-        const taskMatch = text.match(/\btasked with\s+(writing|creating|implementing|reviewing|testing|designing|building|debugging|analyzing|refactoring|fixing|optimizing|setting up|configuring)\b\s*(.*)/i);
-        if (taskMatch) {
-            const verb = taskMatch[1].toLowerCase();
-            const rest = taskMatch[2];
-            const roleMap = {
-                'writing': 'Writer', 'creating': 'Creator', 'implementing': 'Implementer',
-                'reviewing': 'Reviewer', 'testing': 'Tester', 'designing': 'Designer',
-                'building': 'Builder', 'debugging': 'Debugger', 'analyzing': 'Analyst',
-                'refactoring': 'Refactorer', 'fixing': 'Fixer', 'optimizing': 'Optimizer',
-                'setting up': 'Setup', 'configuring': 'Config',
-            };
-            let roleName = roleMap[verb] || verb.charAt(0).toUpperCase() + verb.slice(1);
-            // Extract object for specificity (e.g. "writing tests" → "Tester", "writing a design document" → "Designer")
-            const objectMatch = rest.match(/^(?:a\s+|the\s+)?(\w+)/i);
-            if (objectMatch) {
-                const obj = objectMatch[1].toLowerCase();
-                if (obj === 'tests' || obj === 'test')
-                    roleName = 'Tester';
-                else if (obj === 'design')
-                    roleName = 'Designer';
-                else if (obj === 'docs' || obj === 'documentation')
-                    roleName = 'Docs Writer';
-                else
-                    roleName = obj.charAt(0).toUpperCase() + obj.slice(1) + ' ' + roleName;
-            }
-            return roleName;
-        }
-        // "You are a [role]..." pattern
-        const roleMatch = text.match(/\bYou are (?:a |an |the )?([A-Z][\w\s]{2,30}?)(?:\.|,|\s+(?:who|that|tasked|responsible|focused))/);
-        if (roleMatch) {
-            return roleMatch[1].trim();
-        }
-    }
-    return input.name || `Agent ${agentIndex}`;
-}
 /**
  * Register a subagent when Lead calls the Agent tool.
  */
 export function registerSubagent(team, toolUseId, input) {
     const agentId = (input.name || `agent-${team.agents.size}`).toLowerCase().replace(/\s+/g, '-');
-    const displayName = deriveAgentDisplayName(input, team.agents.size);
+    const displayName = deriveAgentDisplayName(team, input);
+    const taskTitle = deriveTaskTitle(input);
     const color = getNextAgentColor(team);
     const teammate = {
         role: { id: agentId, name: displayName, color },
@@ -185,7 +110,7 @@ export function registerSubagent(team, toolUseId, input) {
     // Auto-create a task for this agent
     const task = {
         id: `task-${randomUUID().slice(0, 8)}`,
-        title: displayName,
+        title: taskTitle,
         description: input.prompt || input.description || '',
         status: 'pending',
         assignee: agentId,
@@ -294,325 +219,73 @@ export function allSubagentsDone(team) {
     return subagents.every(a => a.status === 'done' || a.status === 'error');
 }
 /**
- * Serialize TeamState for persistence/transmission (Map → array).
+ * Wrapper for flushPendingPersists that passes activeTeam.
  */
-export function serializeTeam(team, includeMessages = false) {
-    return {
+export function flushPendingPersists() {
+    _flushPendingPersists(activeTeam);
+}
+// ── Shared helpers (deduplicated) ────────────────────────────────────────
+/**
+ * Emit agent status + task update + feed entry to web client.
+ * Consolidates the 3-message broadcast pattern used in multiple places.
+ */
+function emitAgentUpdate(team, agent, feedType, feedMessage) {
+    sendFn({
+        type: 'team_agent_status',
         teamId: team.teamId,
-        title: team.title,
-        config: team.config,
-        conversationId: team.conversationId,
-        claudeSessionId: team.claudeSessionId,
-        agents: [...team.agents.entries()].map(([, agent]) => ({
+        agent: {
             id: agent.role.id,
             name: agent.role.name,
             color: agent.role.color,
-            toolUseId: agent.toolUseId,
-            agentTaskId: agent.agentTaskId,
             status: agent.status,
-            currentTaskId: agent.currentTaskId,
-            ...(includeMessages ? { messages: agent.messages } : {}),
-        })),
-        tasks: team.tasks,
-        feed: team.feed,
-        status: team.status,
-        leadStatus: team.leadStatus,
-        summary: team.summary,
-        totalCost: team.totalCost,
-        durationMs: team.durationMs,
-        createdAt: team.createdAt,
-    };
-}
-// ── Persistence ──────────────────────────────────────────────────────────
-function ensureTeamsDir() {
-    if (!existsSync(TEAMS_DIR)) {
-        mkdirSync(TEAMS_DIR, { recursive: true });
-    }
-}
-/**
- * Deserialize a TeamStateSerialized back into a live TeamState.
- */
-function deserializeTeam(data) {
-    const agents = new Map();
-    for (const a of data.agents) {
-        agents.set(a.id, {
-            role: { id: a.id, name: a.name, color: a.color },
-            toolUseId: a.toolUseId,
-            agentTaskId: a.agentTaskId,
-            status: a.status,
-            currentTaskId: a.currentTaskId,
-            messages: a.messages || [],
+            taskId: agent.currentTaskId,
+        },
+    });
+    const task = team.tasks.find(t => t.assignee === agent.role.id);
+    if (task) {
+        sendFn({
+            type: 'team_task_update',
+            teamId: team.teamId,
+            task,
         });
     }
-    return {
-        teamId: data.teamId,
-        title: data.title,
-        config: data.config,
-        conversationId: data.conversationId,
-        claudeSessionId: data.claudeSessionId,
-        agents,
-        tasks: data.tasks,
-        feed: data.feed,
-        status: data.status,
-        leadStatus: data.leadStatus || '',
-        summary: data.summary,
-        totalCost: data.totalCost,
-        durationMs: data.durationMs,
-        createdAt: data.createdAt,
-    };
-}
-/**
- * Persist team state to disk (atomic write: tmp → rename).
- */
-export function persistTeam(team) {
-    ensureTeamsDir();
-    const serialized = serializeTeam(team, true);
-    const filePath = join(TEAMS_DIR, `${team.teamId}.json`);
-    const tmpPath = filePath + '.tmp';
-    writeFileSync(tmpPath, JSON.stringify(serialized, null, 2), 'utf-8');
-    renameSync(tmpPath, filePath);
-}
-// Debounce timers for persist calls per team
-const persistTimers = new Map();
-/**
- * Debounced persist — coalesces rapid state changes into a single write.
- * Flushes after 500ms of quiet.
- */
-export function persistTeamDebounced(team) {
-    const existing = persistTimers.get(team.teamId);
-    if (existing)
-        clearTimeout(existing);
-    persistTimers.set(team.teamId, setTimeout(() => {
-        persistTimers.delete(team.teamId);
-        persistTeam(team);
-    }, 500));
-}
-/**
- * Flush all pending debounced persists immediately.
- */
-export function flushPendingPersists() {
-    for (const [teamId, timer] of persistTimers.entries()) {
-        clearTimeout(timer);
-        persistTimers.delete(teamId);
-        if (activeTeam?.teamId === teamId) {
-            persistTeam(activeTeam);
-        }
-    }
-}
-/**
- * Load a team from disk by teamId.
- */
-export function loadTeam(teamId) {
-    const filePath = join(TEAMS_DIR, `${teamId}.json`);
-    try {
-        const raw = readFileSync(filePath, 'utf-8');
-        const data = JSON.parse(raw);
-        return deserializeTeam(data);
-    }
-    catch {
-        return null;
-    }
+    addFeedEntry(team, agent.role.id, feedType, feedMessage);
+    sendFn({
+        type: 'team_feed',
+        teamId: team.teamId,
+        entry: team.feed[team.feed.length - 1],
+    });
 }
 /**
- * List all persisted teams, sorted by createdAt descending (newest first).
+ * Mark all active agents and tasks to a final status.
+ * Used by both dissolveTeam and completeTeam.
  */
-export function listTeams() {
-    ensureTeamsDir();
-    const files = readdirSync(TEAMS_DIR).filter(f => f.endsWith('.json'));
-    const teams = [];
-    for (const file of files) {
-        try {
-            const raw = readFileSync(join(TEAMS_DIR, file), 'utf-8');
-            const data = JSON.parse(raw);
-            teams.push({
-                teamId: data.teamId,
-                title: data.title,
-                status: data.status,
-                template: data.config.template,
-                agentCount: data.agents.length,
-                taskCount: data.tasks.length,
-                totalCost: data.totalCost,
-                createdAt: data.createdAt,
-            });
+function finalizeAgentsAndTasks(team, agentStatus, taskStatus) {
+    for (const agent of team.agents.values()) {
+        if (agentStatus === 'done') {
+            if (agent.status !== 'error')
+                agent.status = 'done';
         }
-        catch {
-            // Skip corrupted files
+        else {
+            if (agent.status === 'starting' || agent.status === 'working')
+                agent.status = 'error';
         }
     }
-    teams.sort((a, b) => b.createdAt - a.createdAt);
-    return teams;
-}
-/**
- * Delete a persisted team file.
- */
-export function deleteTeam(teamId) {
-    const filePath = join(TEAMS_DIR, `${teamId}.json`);
-    try {
-        unlinkSync(filePath);
-        return true;
-    }
-    catch {
-        return false;
-    }
-}
-export function renameTeam(teamId, newTitle) {
-    const filePath = join(TEAMS_DIR, `${teamId}.json`);
-    try {
-        const raw = readFileSync(filePath, 'utf-8');
-        const data = JSON.parse(raw);
-        data.title = newTitle;
-        const tmpPath = filePath + '.tmp';
-        writeFileSync(tmpPath, JSON.stringify(data, null, 2), 'utf-8');
-        renameSync(tmpPath, filePath);
-        return true;
-    }
-    catch {
-        return false;
+    for (const task of team.tasks) {
+        if (task.status === 'pending' || task.status === 'active') {
+            task.status = taskStatus;
+            task.updatedAt = Date.now();
+        }
     }
 }
-const TEMPLATE_AGENTS = {
-    'code-review': {
-        'security-reviewer': {
-            description: 'Security expert focused on cryptographic, auth, and injection vulnerabilities',
-            prompt: 'You are a security reviewer. Analyze code for vulnerabilities including injection attacks, authentication/authorization flaws, cryptographic issues, and data exposure risks. Provide specific file/line references and severity ratings.',
-            tools: ['Read', 'Grep', 'Glob'],
-        },
-        'quality-reviewer': {
-            description: 'Code quality expert focused on maintainability, patterns, and best practices',
-            prompt: 'You are a code quality reviewer. Analyze code structure, naming conventions, error handling, test coverage, and adherence to best practices. Identify code smells, unnecessary complexity, and improvement opportunities.',
-            tools: ['Read', 'Grep', 'Glob'],
-        },
-        'performance-reviewer': {
-            description: 'Performance expert focused on efficiency, resource usage, and scalability',
-            prompt: 'You are a performance reviewer. Identify performance bottlenecks, memory leaks, inefficient algorithms, unnecessary allocations, and scalability concerns. Suggest concrete optimizations with benchmarks where possible.',
-            tools: ['Read', 'Grep', 'Glob'],
-        },
-    },
-    'full-stack': {
-        'backend-dev': {
-            description: 'Backend developer for API endpoints, database, and server-side logic',
-            prompt: 'You are a backend developer. Implement server-side features including API endpoints, data models, business logic, and integrations. Write clean, tested, production-ready code.',
-            tools: ['Read', 'Write', 'Edit', 'Grep', 'Glob', 'Bash'],
-        },
-        'frontend-dev': {
-            description: 'Frontend developer for UI components, styling, and client-side logic',
-            prompt: 'You are a frontend developer. Build user interface components, handle state management, implement responsive layouts, and ensure good UX. Follow the project\'s existing patterns and framework conventions.',
-            tools: ['Read', 'Write', 'Edit', 'Grep', 'Glob', 'Bash'],
-        },
-        'test-engineer': {
-            description: 'Test engineer for unit tests, integration tests, and quality assurance',
-            prompt: 'You are a test engineer. Write comprehensive tests (unit, integration, E2E) for new and existing code. Ensure edge cases are covered, mocks are appropriate, and tests are maintainable.',
-            tools: ['Read', 'Write', 'Edit', 'Grep', 'Glob', 'Bash'],
-        },
-    },
-    'debug': {
-        'hypothesis-a': {
-            description: 'Debug investigator exploring the first hypothesis',
-            prompt: 'You are a debugging specialist. Investigate the bug by exploring one specific hypothesis. Read relevant code, trace execution paths, check logs, and report your findings with evidence.',
-            tools: ['Read', 'Grep', 'Glob', 'Bash'],
-        },
-        'hypothesis-b': {
-            description: 'Debug investigator exploring an alternative hypothesis',
-            prompt: 'You are a debugging specialist. Investigate the bug by exploring an alternative hypothesis different from other investigators. Read relevant code, trace execution paths, check logs, and report your findings with evidence.',
-            tools: ['Read', 'Grep', 'Glob', 'Bash'],
-        },
-        'hypothesis-c': {
-            description: 'Debug investigator exploring a third hypothesis',
-            prompt: 'You are a debugging specialist. Investigate the bug by exploring yet another hypothesis different from the other investigators. Think creatively about less obvious causes. Report findings with evidence.',
-            tools: ['Read', 'Grep', 'Glob', 'Bash'],
-        },
-    },
-    'custom': {
-        'worker-1': {
-            description: 'General-purpose development agent',
-            prompt: 'You are a skilled software engineer. Complete the assigned task thoroughly and report your results.',
-            tools: ['Read', 'Write', 'Edit', 'Grep', 'Glob', 'Bash'],
-        },
-        'worker-2': {
-            description: 'General-purpose development agent',
-            prompt: 'You are a skilled software engineer. Complete the assigned task thoroughly and report your results.',
-            tools: ['Read', 'Write', 'Edit', 'Grep', 'Glob', 'Bash'],
-        },
-        'worker-3': {
-            description: 'General-purpose development agent',
-            prompt: 'You are a skilled software engineer. Complete the assigned task thoroughly and report your results.',
-            tools: ['Read', 'Write', 'Edit', 'Grep', 'Glob', 'Bash'],
-        },
-    },
-};
-const TEMPLATE_LEAD_INSTRUCTIONS = {
-    'code-review': `You are a team lead coordinating a code review.
-
-Instructions:
-1. First, analyze the codebase to understand its structure and what needs reviewing
-2. Use the Agent tool to spawn each reviewer IN PARALLEL (multiple Agent calls simultaneously)
-3. Give each reviewer specific, detailed instructions referencing exact files and directories to review
-4. After all reviewers complete, synthesize their findings into a unified summary with prioritized action items
-
-Important:
-- When calling the Agent tool, use a descriptive role-based name (e.g., "Security Reviewer", "Quality Analyst", "Performance Auditor") instead of generic names. The name should reflect the agent's specialty.
-- Spawn agents in parallel for efficiency. Each agent should focus on their specialty area.`,
-    'full-stack': `You are a team lead coordinating full-stack development.
-
-Instructions:
-1. First, analyze the codebase to understand the architecture, existing patterns, and what needs building
-2. Break the task into backend, frontend, and test subtasks, and analyze dependencies between them
-3. Define clear interfaces, API contracts, and data schemas before spawning any agents
-4. Spawn independent subtasks IN PARALLEL using the Agent tool. If a subtask depends on another's output (e.g., frontend needs the API built first, tests need the implementation), wait for the dependency to complete, then spawn the dependent agent with the prior result as context
-5. Provide each agent with specific, detailed instructions including file paths and shared contracts
-6. After all agents complete, review their work and provide a summary of what was built
-
-Important:
-- When calling the Agent tool, use a descriptive role-based name (e.g., "Backend Engineer", "Frontend Engineer", "Test Engineer") instead of generic names. The name should reflect the agent's responsibility.
-- Maximize parallelism for truly independent tasks, but respect dependencies. Do not spawn all agents simultaneously if some need others' output first.`,
-    'debug': `You are a team lead coordinating a debugging investigation.
-
-Instructions:
-1. First, analyze the bug report and relevant code to understand the problem space
-2. Formulate 3 distinct hypotheses about the root cause
-3. Use the Agent tool to assign each hypothesis to a different investigator IN PARALLEL
-4. Give each investigator specific areas of code to examine and tests to run
-5. After all investigators complete, compare their findings and synthesize a diagnosis with a recommended fix
-
-Important:
-- When calling the Agent tool, use a descriptive name that reflects the hypothesis being investigated (e.g., "Race Condition Investigator", "Memory Leak Analyst", "Config Error Detective") instead of generic names.
-- Each investigator should explore a DIFFERENT hypothesis. Avoid overlap.`,
-    'custom': `You are a team lead coordinating a development task.
-
-Instructions:
-1. First, analyze the codebase and the user's request to understand what needs to be done
-2. Break the task into subtasks and analyze dependencies between them
-3. Spawn independent tasks IN PARALLEL using the Agent tool for efficiency
-4. If a task depends on another's output (e.g., implementation needs a design doc, tests need the implementation), wait for the dependency to complete first, then spawn the dependent task with the prior result as context
-5. Give each worker specific, detailed instructions
-6. After all workers complete, review their work and provide a summary
-
-Important:
-- When calling the Agent tool, use a descriptive role-based name (e.g., "Designer", "Developer", "Tester", "Architect") instead of generic names like "Agent 1". The name should reflect what the agent does.
-- Maximize parallelism for truly independent tasks, but respect dependencies. For example, if one agent writes a design doc and another implements it, spawn the doc agent first, wait for its result, then spawn the implementation agent with the doc content.`,
-};
-/**
- * Build the agents definition JSON for the --agents CLI flag.
- */
-export function buildAgentsDef(template) {
-    const key = template && TEMPLATE_AGENTS[template] ? template : 'custom';
-    return { ...TEMPLATE_AGENTS[key] };
-}
 /**
- * Build the lead prompt that instructs the Lead to use Agent tool.
+ * Remove output and close observers.
  */
-export function buildLeadPrompt(config, agentsDef) {
-    const template = config.template || 'custom';
-    const instructions = TEMPLATE_LEAD_INSTRUCTIONS[template] || TEMPLATE_LEAD_INSTRUCTIONS['custom'];
-    const agentList = Object.entries(agentsDef)
-        .map(([id, def]) => `- ${id}: ${def.description}`)
-        .join('\n');
-    return `${instructions}
-
-Available agents (use the Agent tool to delegate to them):
-${agentList}
-
-User's request: "${config.instruction}"`;
+function cleanupObservers() {
+    if (clearOutputObserverFn)
+        clearOutputObserverFn();
+    if (clearCloseObserverFn)
+        clearCloseObserverFn();
 }
 // ── Output stream parser (observer callback) ────────────────────────────
 /**
@@ -674,32 +347,7 @@ export function onLeadOutput(conversationId, msg) {
                     const input = (block.input || {});
                     const toolUseId = block.id;
                     const agent = registerSubagent(team, toolUseId, input);
-                    // Emit agent status + task update to web
-                    sendFn({
-                        type: 'team_agent_status',
-                        teamId: team.teamId,
-                        agent: {
-                            id: agent.role.id,
-                            name: agent.role.name,
-                            color: agent.role.color,
-                            status: agent.status,
-                            taskId: agent.currentTaskId,
-                        },
-                    });
-                    const task = team.tasks.find(t => t.assignee === agent.role.id);
-                    if (task) {
-                        sendFn({
-                            type: 'team_task_update',
-                            teamId: team.teamId,
-                            task,
-                        });
-                    }
-                    addFeedEntry(team, agent.role.id, 'status_change', `${agent.role.name} has joined and is getting ready`);
-                    sendFn({
-                        type: 'team_feed',
-                        teamId: team.teamId,
-                        entry: team.feed[team.feed.length - 1],
-                    });
+                    emitAgentUpdate(team, agent, 'status_change', `${agent.role.name} has joined and is getting ready`);
                 }
             }
         }
@@ -715,31 +363,7 @@ export function onLeadOutput(conversationId, msg) {
         const taskId = msg.task_id;
         const agent = linkSubagentTaskId(team, toolUseId, taskId);
         if (agent) {
-            addFeedEntry(team, agent.role.id, 'task_started', `${agent.role.name} started working on the task`);
-            sendFn({
-                type: 'team_agent_status',
-                teamId: team.teamId,
-                agent: {
-                    id: agent.role.id,
-                    name: agent.role.name,
-                    color: agent.role.color,
-                    status: agent.status,
-                    taskId: agent.currentTaskId,
-                },
-            });
-            sendFn({
-                type: 'team_feed',
-                teamId: team.teamId,
-                entry: team.feed[team.feed.length - 1],
-            });
-            const task = team.tasks.find(t => t.assignee === agent.role.id);
-            if (task) {
-                sendFn({
-                    type: 'team_task_update',
-                    teamId: team.teamId,
-                    task,
-                });
-            }
+            emitAgentUpdate(team, agent, 'task_started', `${agent.role.name} started working on the task`);
         }
         return true; // suppress system.task_started from normal forwarding
     }
@@ -765,31 +389,7 @@ export function onLeadOutput(conversationId, msg) {
                         if (agent.currentTaskId) {
                             updateTaskStatus(team, agent.currentTaskId, isError ? 'failed' : 'done');
                         }
-                        addFeedEntry(team, agent.role.id, isError ? 'task_failed' : 'task_completed', isError ? `${agent.role.name} ran into an issue and stopped` : `${agent.role.name} finished the task successfully`);
-                        sendFn({
-                            type: 'team_agent_status',
-                            teamId: team.teamId,
-                            agent: {
-                                id: agent.role.id,
-                                name: agent.role.name,
-                                color: agent.role.color,
-                                status: agent.status,
-                                taskId: agent.currentTaskId,
-                            },
-                        });
-                        const task = team.tasks.find(t => t.assignee === agent.role.id);
-                        if (task) {
-                            sendFn({
-                                type: 'team_task_update',
-                                teamId: team.teamId,
-                                task,
-                            });
-                        }
-                        sendFn({
-                            type: 'team_feed',
-                            teamId: team.teamId,
-                            entry: team.feed[team.feed.length - 1],
-                        });
+                        emitAgentUpdate(team, agent, isError ? 'task_failed' : 'task_completed', isError ? `${agent.role.name} ran into an issue and stopped` : `${agent.role.name} finished the task successfully`);
                         // Check if all subagents are done → transition to summarizing
                         if (allSubagentsDone(team) && team.status === 'running') {
                             team.status = 'summarizing';
@@ -829,27 +429,11 @@ export function onLeadClose(conversationId, _exitCode, resultReceived) {
     // Lead process crashed without producing a result — dissolve the team
     console.log(`[Team] Lead process exited without result — marking team as failed`);
     const team = activeTeam;
-    // Mark remaining agents as error
-    for (const agent of team.agents.values()) {
-        if (agent.status === 'starting' || agent.status === 'working') {
-            agent.status = 'error';
-        }
-    }
-    // Mark remaining tasks as failed
-    for (const task of team.tasks) {
-        if (task.status === 'pending' || task.status === 'active') {
-            task.status = 'failed';
-            task.updatedAt = Date.now();
-        }
-    }
+    finalizeAgentsAndTasks(team, 'error', 'failed');
     team.status = 'failed';
     team.durationMs = Date.now() - team.createdAt;
     persistTeam(team);
-    // Remove observers
-    if (clearOutputObserverFn)
-        clearOutputObserverFn();
-    if (clearCloseObserverFn)
-        clearCloseObserverFn();
+    cleanupObservers();
     // Notify clients
     sendFn({
         type: 'team_completed',
@@ -1025,29 +609,10 @@ export function dissolveTeam() {
     if (cancelExecutionFn) {
         cancelExecutionFn(team.conversationId);
     }
-    // Mark remaining agents as error
-    for (const agent of team.agents.values()) {
-        if (agent.status === 'starting' || agent.status === 'working') {
-            agent.status = 'error';
-        }
-    }
-    // Mark remaining tasks as failed
-    for (const task of team.tasks) {
-        if (task.status === 'pending' || task.status === 'active') {
-            task.status = 'failed';
-            task.updatedAt = Date.now();
-        }
-    }
+    finalizeAgentsAndTasks(team, 'error', 'failed');
     team.status = 'failed';
     persistTeam(team);
-    // Remove output observer
-    if (clearOutputObserverFn) {
-        clearOutputObserverFn();
-    }
-    // Remove close observer
-    if (clearCloseObserverFn) {
-        clearCloseObserverFn();
-    }
+    cleanupObservers();
     // Notify clients
     sendFn({
         type: 'team_completed',
@@ -1069,28 +634,9 @@ export function completeTeam(summary) {
     if (summary) {
         team.summary = summary;
     }
-    // Mark all agents as done (unless they already errored)
-    for (const agent of team.agents.values()) {
-        if (agent.status !== 'error') {
-            agent.status = 'done';
-        }
-    }
-    // Mark remaining active/pending tasks as done
-    for (const task of team.tasks) {
-        if (task.status === 'active' || task.status === 'pending') {
-            task.status = 'done';
-            task.updatedAt = Date.now();
-        }
-    }
+    finalizeAgentsAndTasks(team, 'done', 'done');
     persistTeam(team);
-    // Remove output observer
-    if (clearOutputObserverFn) {
-        clearOutputObserverFn();
-    }
-    // Remove close observer
-    if (clearCloseObserverFn) {
-        clearCloseObserverFn();
-    }
+    cleanupObservers();
     // Notify clients
     sendFn({
         type: 'team_completed',