@nanmicoder/dsh-agent-teams 0.1.12 → 0.1.14

package/lib/client/ActivityPanel.js

@@ -18,11 +18,12 @@ import { jsx as _jsx, jsxs as _jsxs, Fragment as _Fragment } from "react/jsx-run
  * @module dsh-agent-teams/client/activity
  */
 import { useCallback, useEffect, useLayoutEffect, useMemo, useRef, useState, useSyncExternalStore, } from 'react';
-import { IconBranchOutline16, IconChevronDownOutline14, IconPanelLeftOutline16, } from '@deepseek-ai/dsh-client-ui-primitives';
-import { activityPanelExpandedForSession, compactDagLayout, COMPACT_DAG_NODE_HEIGHT, COMPACT_DAG_NODE_WIDTH, dependencyFocusTaskId, relatedTaskIds, usesParallelTaskGrid, } from "./activity-model.js";
-import { getActivityMonitorTargetsSnapshot, getActivitySnapshotsSnapshot, startActivityPolling, subscribeActivityMonitorTargets, subscribeActivitySnapshots, } from "./activity-monitor.js";
+import { IconBranchOutline16, IconChevronDownOutline14, IconPanelLeftOutline16, IconStopFill16, IconWarningOutline16, Modal, } from '@deepseek-ai/dsh-client-ui-primitives';
+import { activityPanelExpandedForSession, activityPanelShouldAutoExpand, compactDagLayout, compactModelLabel, COMPACT_DAG_NODE_HEIGHT, COMPACT_DAG_NODE_WIDTH, dependencyFocusTaskId, memberRouteLabel, relatedTaskIds, taskModelLabel, teamIsActive, usesParallelTaskGrid, } from "./activity-model.js";
+import { ACTIVITY_HALT_URL, getActivityMonitorTargetsSnapshot, getActivitySnapshotsSnapshot, startActivityPolling, subscribeActivityMonitorTargets, subscribeActivitySnapshots, } from "./activity-monitor.js";
 import { ACTION_ART, LEAD_ART, memberArtUrl } from "./artwork.js";
 import { OPEN_PANEL_EVENT } from "./AgentTeamsCard.js";
+import { StagingPlanEditor } from "./StagingPlanEditor.js";
 import { DEFAULT_PANEL_LAYOUT, PANEL_LAYOUT_STORAGE_KEY, compactPanelForBounds, dockPanelLayout, floatPanelLayout, movePanelLayout, panelMaximumHeight, panelUsesAutoHeight, parsePanelLayout, resizePanelLayout, resolvePanelGeometry, } from "./panel-geometry.js";
 import css from './ActivityPanel.module.css';
 /** Grace before the panel collapses once no team remains. */
@@ -39,6 +40,7 @@ const PANEL_OPEN_ATTRIBUTE = 'data-agent-teams-panel-open';
 const PANEL_SHIFT_PROPERTY = '--agent-teams-panel-shift';
 const PANEL_CONVERSATION_GAP = 14;
 const MOVE_THRESHOLD = 4;
+const CAPTAIN_ASSIGNEE = 'captain';
 function initialPanelLayout() {
     if (typeof window === 'undefined')
         return DEFAULT_PANEL_LAYOUT;
@@ -87,6 +89,15 @@ function taskStatusLabel(status, t) {
 function formatTaskIds(ids, t) {
     return ids.join(t('format.listSeparator'));
 }
+function taskTitle(task, model) {
+    const extras = [
+        task.kind,
+        task.round === undefined ? undefined : `r${task.round}`,
+        task.verdict,
+        model === '' ? undefined : model,
+    ].filter((item) => item !== undefined);
+    return extras.length === 0 ? `${task.id} · ${task.subject}` : `${task.id} · ${task.subject} · ${extras.join(' · ')}`;
+}
 /** Badge/bar coloring key: visual state, widened for terminal statuses. */
 function taskTone(state, status) {
     if (status === 'failed')
@@ -125,8 +136,12 @@ function memberStatusText(member, tasks, t) {
     const owned = tasks.filter((task) => task.assignee === member.name);
     const current = owned.find((task) => task.id === member.currentTask);
     const blocked = owned.find((task) => task.state === 'blocked');
-    if (member.activity === 'working' && current !== undefined)
-        return t('member.status.executing', { taskId: current.id });
+    if (member.activity === 'working' && current !== undefined) {
+        const model = taskModelLabel(current, [member]);
+        return model === ''
+            ? t('member.status.executing', { taskId: current.id })
+            : t('member.status.executingModel', { taskId: current.id, model });
+    }
     if (member.activity === 'working')
         return t('member.status.working');
     if (blocked !== undefined) {
@@ -150,15 +165,31 @@ function compactTaskLabel(subject) {
     const head = withoutVerb.split(/[（(·：:]/u)[0]?.trim() ?? withoutVerb;
     return head.length > 18 ? `${head.slice(0, 17)}…` : head;
 }
-function taskSummary(team, t) {
+function taskSummary(team, t, discarded = false) {
     const completed = team.tasks.filter((task) => task.status === 'completed');
+    const cancelled = team.tasks.filter((task) => task.status === 'cancelled');
     const running = team.tasks.filter((task) => task.state === 'running');
     const blocked = team.tasks.filter((task) => task.state === 'blocked');
-    const ready = team.tasks.filter((task) => task.state === 'open' && task.status !== 'completed');
+    const ready = team.tasks.filter((task) => task.state === 'open' && task.status !== 'completed' && task.status !== 'failed' && task.status !== 'cancelled');
+    const failed = team.tasks.filter((task) => task.status === 'failed');
+    if (discarded)
+        return t('task.summary.discarded', { count: team.tasks.length });
     if (team.tasks.length === 0)
         return t('task.summary.waitingBreakdown');
+    if (team.phase === 'staged')
+        return t('task.summary.staged', { count: team.tasks.length });
     if (completed.length === team.tasks.length)
         return t('task.summary.allDelivered', { count: completed.length });
+    if (completed.length + cancelled.length + failed.length === team.tasks.length) {
+        return t('task.summary.ended', {
+            completed: completed.length,
+            cancelled: cancelled.length,
+            failed: failed.length,
+        });
+    }
+    if (failed.length > 0 && running.length === 0 && ready.length === 0 && blocked.length === 0) {
+        return t('task.summary.failedSettled', { count: failed.length });
+    }
     if (blocked.length > 0 && running.length > 0) {
         return t('task.summary.blockedAndRunning', {
             tasks: formatTaskIds(blocked.slice(0, 3).map((task) => task.id), t),
@@ -173,14 +204,15 @@ function taskSummary(team, t) {
         return t('task.summary.blocked', { tasks: formatTaskIds(blocked.map((task) => task.id), t) });
     return t('task.summary.waitingSchedule');
 }
-function ProgressOverview({ team, t }) {
-    const running = team.tasks.filter((task) => task.state === 'running').length;
-    const blocked = team.tasks.filter((task) => task.state === 'blocked').length;
-    const completed = team.tasks.filter((task) => task.status === 'completed').length;
-    const summaryTone = blocked > 0 ? 'warning' : completed === team.tasks.length && team.tasks.length > 0 ? 'completed' : 'running';
-    return (_jsxs("section", { className: css.progressOverview, "aria-label": t('progress.aria'), "data-progress-summary": true, children: [_jsx("span", { className: css.progressTitle, children: t('progress.title') }), team.tasks.length > 0 ? (_jsx("span", { className: css.progressSegments, "aria-hidden": true, children: team.tasks.map((task) => _jsx("span", { "data-state": taskTone(task.state, task.status) }, task.id)) })) : _jsx("span", { className: css.progressEmpty }), _jsxs("span", { className: css.progressLegend, children: [_jsx("span", { "data-state": "running", children: t('progress.running', { count: running }) }), _jsx("span", { "data-state": "blocked", children: t('progress.blocked', { count: blocked }) }), _jsx("span", { "data-state": "completed", children: t('progress.delivered', { count: completed }) })] }), _jsxs("span", { className: css.progressSummary, "data-state": summaryTone, children: [_jsx("span", { className: css.progressSummaryDot }), _jsx("span", { children: taskSummary(team, t) })] })] }));
+function ProgressOverview({ team, t, discarded = false }) {
+    const running = discarded ? 0 : team.tasks.filter((task) => task.state === 'running').length;
+    const blocked = discarded ? 0 : team.tasks.filter((task) => task.state === 'blocked').length;
+    const completed = discarded ? 0 : team.tasks.filter((task) => task.status === 'completed').length;
+    const settled = !discarded && team.tasks.length > 0 && team.tasks.every((task) => (task.status === 'completed' || task.status === 'failed' || task.status === 'cancelled'));
+    const summaryTone = discarded ? 'discarded' : blocked > 0 ? 'warning' : settled ? 'completed' : 'running';
+    return (_jsxs("section", { className: css.progressOverview, "aria-label": t('progress.aria'), "data-progress-summary": true, children: [_jsx("span", { className: css.progressTitle, children: t('progress.title') }), team.tasks.length > 0 ? (_jsx("span", { className: css.progressSegments, "aria-hidden": true, children: team.tasks.map((task) => _jsx("span", { "data-state": discarded ? 'cancelled' : taskTone(task.state, task.status) }, task.id)) })) : _jsx("span", { className: css.progressEmpty }), _jsxs("span", { className: css.progressLegend, children: [_jsx("span", { "data-state": "running", children: t('progress.running', { count: running }) }), _jsx("span", { "data-state": "blocked", children: t('progress.blocked', { count: blocked }) }), _jsx("span", { "data-state": "completed", children: t('progress.delivered', { count: completed }) })] }), _jsxs("span", { className: css.progressSummary, "data-state": summaryTone, children: [_jsx("span", { className: css.progressSummaryDot }), _jsx("span", { children: taskSummary(team, t, discarded) })] })] }));
 }
-function DependencyMap({ tasks, t }) {
+function DependencyMap({ tasks, members, t, discarded = false }) {
     const [open, setOpen] = useState(true);
     const [hoverTaskId, setHoverTaskId] = useState(null);
     const [keyboardTaskId, setKeyboardTaskId] = useState(null);
@@ -222,6 +254,7 @@ function DependencyMap({ tasks, t }) {
         ?? tasks.find((task) => task.state === 'running')
         ?? tasks[0];
     const detailTask = tasks.find((task) => task.id === focusedTaskId) ?? fallbackTask;
+    const detailModel = taskModelLabel(detailTask, members);
     const waitingOn = detailTask.dependencies.filter((dependency) => (tasks.find((task) => task.id === dependency)?.status !== 'completed'));
     const dependents = tasks.filter((task) => task.dependencies.includes(detailTask.id));
     return (_jsxs("section", { className: css.dependencySection, "aria-label": t('dependency.aria'), "data-dependency-map": true, children: [_jsxs("header", { className: css.sectionHead, children: [_jsxs("button", { type: "button", className: css.sectionToggleTitle, onClick: () => { setOpen((current) => !current); }, "aria-expanded": open, children: [_jsx(Chevron, { open: open }), _jsx(IconBranchOutline16, {}), " ", t(parallel ? 'dependency.parallel' : 'dependency.title')] }), _jsx("span", { className: css.sectionHint, children: pinnedTaskId === null
@@ -229,39 +262,129 @@ function DependencyMap({ tasks, t }) {
                             : t('dependency.hint.pinned', { taskId: pinnedTaskId }) })] }), open && (_jsxs(_Fragment, { children: [_jsx("div", { className: css.dagViewport, children: _jsxs("div", { className: css.dagCanvas, "data-layout": parallel ? 'parallel' : 'dependency', style: parallel ? undefined : { width: layout.width, height: layout.height }, children: [!parallel && _jsx("svg", { className: css.dagEdges, width: layout.width, height: layout.height, "aria-hidden": true, children: layout.edges.map((edge) => {
                                         const active = related !== null && related.has(edge.from) && related.has(edge.to);
                                         return _jsx("path", { d: edge.path, "data-active": active, "data-dimmed": related !== null && !active }, `${edge.from}:${edge.to}`);
-                                    }) }), layout.nodes.map(({ task, x, y }) => (_jsxs("button", { type: "button", className: css.dagNode, style: parallel
-                                        ? { height: COMPACT_DAG_NODE_HEIGHT }
-                                        : { left: x, top: y, width: COMPACT_DAG_NODE_WIDTH, height: COMPACT_DAG_NODE_HEIGHT }, "data-task-id": task.id, "data-state": taskTone(task.state, task.status), "data-focused": related?.has(task.id) ?? false, "data-dimmed": related !== null && !related.has(task.id), "aria-pressed": pinnedTaskId === task.id, title: `${task.id} · ${task.subject}`, onClick: () => { setPinnedTaskId((current) => current === task.id ? null : task.id); }, onMouseEnter: () => { scheduleHover(task.id); }, onMouseLeave: () => { scheduleHover(null); }, onFocus: () => { setKeyboardTaskId(task.id); }, onBlur: () => { setKeyboardTaskId(null); }, children: [_jsxs("span", { className: css.dagNodeHead, children: [_jsx("span", { className: css.dagNodeDot }), task.id] }), _jsx("span", { className: css.dagNodeLabel, children: compactTaskLabel(task.subject) }), task.state === 'running' && (_jsx("span", { className: css.dagRunningState, "aria-label": t('task.runningAria'), children: _jsx(WorkGlyph, { active: true }) }))] }, task.id)))] }) }), _jsxs("section", { className: css.taskDetail, "data-task-detail": detailTask.id, children: [_jsxs("span", { className: css.taskDetailHead, children: [_jsx("span", { className: css.taskDetailId, children: detailTask.id }), _jsx("span", { className: css.taskDetailSubject, title: detailTask.subject, children: detailTask.subject.replace(/^开发\s*/u, '') }), _jsx("span", { className: css.taskDetailBadge, "data-state": taskTone(detailTask.state, detailTask.status), children: taskStatusLabel(detailTask.status, t) })] }), _jsxs("span", { className: css.taskDetailLine, children: [detailTask.assignee || t('task.assignee.unclaimed'), " \u00B7 ", detailTask.status === 'completed'
-                                        ? t('task.detail.completed')
-                                        : detailTask.dependencies.length === 0
-                                            ? t('task.detail.noPrerequisite')
-                                            : waitingOn.length === 0
-                                                ? t('task.detail.ready')
-                                                : t('task.detail.waitingOn', { tasks: formatTaskIds(waitingOn, t) })] }), _jsx("span", { className: css.taskDetailMeta, children: dependents.length === 0
+                                    }) }), layout.nodes.map(({ task, x, y }) => {
+                                    const model = taskModelLabel(task, members);
+                                    const shortModel = compactModelLabel(model);
+                                    return (_jsxs("button", { type: "button", className: css.dagNode, style: parallel
+                                            ? { height: COMPACT_DAG_NODE_HEIGHT }
+                                            : { left: x, top: y, width: COMPACT_DAG_NODE_WIDTH, height: COMPACT_DAG_NODE_HEIGHT }, "data-task-id": task.id, "data-state": discarded ? 'cancelled' : taskTone(task.state, task.status), "data-task-model": model || undefined, "data-focused": related?.has(task.id) ?? false, "data-dimmed": related !== null && !related.has(task.id), "aria-pressed": pinnedTaskId === task.id, title: taskTitle(task, model), onClick: () => { setPinnedTaskId((current) => current === task.id ? null : task.id); }, onMouseEnter: () => { scheduleHover(task.id); }, onMouseLeave: () => { scheduleHover(null); }, onFocus: () => { setKeyboardTaskId(task.id); }, onBlur: () => { setKeyboardTaskId(null); }, children: [_jsxs("span", { className: css.dagNodeHead, children: [_jsx("span", { className: css.dagNodeDot }), task.id] }), _jsx("span", { className: css.dagNodeLabel, children: task.state === 'running' && shortModel !== '' ? shortModel : compactTaskLabel(task.subject) }), task.state === 'running' && (_jsx("span", { className: css.dagRunningState, "aria-label": t('task.runningAria'), children: _jsx(WorkGlyph, { active: true }) }))] }, task.id));
+                                })] }) }), _jsxs("section", { className: css.taskDetail, "data-task-detail": detailTask.id, children: [_jsxs("span", { className: css.taskDetailHead, children: [_jsx("span", { className: css.taskDetailId, children: detailTask.id }), _jsx("span", { className: css.taskDetailSubject, title: detailTask.subject, children: detailTask.subject.replace(/^开发\s*/u, '') }), _jsx("span", { className: css.taskDetailBadge, "data-state": discarded ? 'cancelled' : taskTone(detailTask.state, detailTask.status), children: discarded ? t('task.status.notRun') : taskStatusLabel(detailTask.status, t) })] }), _jsxs("span", { className: css.taskDetailLine, children: [detailTask.assignee || t('task.assignee.unclaimed'), " \u00B7 ", discarded
+                                        ? t('task.detail.notRun')
+                                        : detailTask.status === 'completed'
+                                            ? t('task.detail.completed')
+                                            : detailTask.dependencies.length === 0
+                                                ? t('task.detail.noPrerequisite')
+                                                : waitingOn.length === 0
+                                                    ? t('task.detail.ready')
+                                                    : t('task.detail.waitingOn', { tasks: formatTaskIds(waitingOn, t) })] }), detailModel !== '' && (_jsx("span", { className: css.taskDetailModel, "data-task-model": detailModel, children: t('task.model', { model: detailModel }) })), _jsx("span", { className: css.taskDetailMeta, children: dependents.length === 0
                                     ? t('task.detail.noDownstream')
                                     : t('task.detail.unlocks', { tasks: formatTaskIds(dependents.map((task) => task.id), t) }) })] })] }))] }));
 }
-function TeamSection({ team, onNavigate, t, historic = false }) {
+function TeamSection({ team, modelDirectory, onContinuePlanning, onDiscarded, onNavigate, t, historic = false }) {
     const [membersOpen, setMembersOpen] = useState(true);
+    const [stopOpen, setStopOpen] = useState(false);
+    const [stopping, setStopping] = useState(false);
+    const [stopError, setStopError] = useState('');
+    const discarded = historic && team.phase === 'staged';
+    const stopped = !historic && team.halted === true;
     const busyCount = team.members.filter((member) => member.activity === 'working').length;
-    const assignedCount = team.tasks.filter((task) => task.assignee !== '').length;
+    const assignedCount = team.tasks.filter((task) => task.assignee !== '' && task.assignee !== CAPTAIN_ASSIGNEE).length;
+    const captainOwned = team.tasks.filter((task) => task.assignee === CAPTAIN_ASSIGNEE
+        && task.status !== 'completed' && task.status !== 'failed' && task.status !== 'cancelled');
+    const captainBusy = captainOwned.length > 0;
+    const captainTaskIds = formatTaskIds(captainOwned.map((task) => task.id), t);
     const completedCount = team.tasks.filter((task) => task.status === 'completed').length;
     const allCompleted = team.tasks.length > 0 && completedCount === team.tasks.length;
-    return (_jsxs("section", { className: css.team, "data-team-id": team.teamId, children: [_jsxs("header", { className: css.teamHead, children: [_jsx("span", { className: css.teamName, title: team.name, children: team.name }), historic && _jsx("span", { className: css.historicPill, children: t('team.ended') }), _jsxs("span", { className: css.teamStats, children: [_jsx("span", { "data-stat": "members", children: t('team.stats.members', { count: team.members.length }) }), _jsx("span", { "data-stat": "tasks", children: t('team.stats.completed', { completed: completedCount, total: team.tasks.length }) }), _jsx("span", { "data-stat": "messages", children: t('team.stats.messages', { count: team.messageCount }) })] })] }), _jsxs("section", { className: css.delegationSection, "aria-label": t('delegation.aria'), "data-delegation-map": true, children: [_jsxs("div", { className: css.captainNode, children: [_jsx("span", { className: css.captainAvatar, children: _jsx("img", { className: css.leadAvatar, src: LEAD_ART, alt: "", "aria-hidden": true }) }), _jsxs("span", { className: css.captainInfo, children: [_jsxs("span", { className: css.captainLine, children: [_jsx("span", { className: css.captainName, children: t('captain.name') }), _jsx("span", { className: css.captainRole, children: t('captain.role') })] }), _jsx("span", { className: css.captainSummary, children: t('captain.summary', {
-                                            tasks: assignedCount,
-                                            members: team.members.length,
-                                        }) })] }), _jsxs("span", { className: css.captainState, "data-busy": busyCount > 0, children: [_jsx(WorkGlyph, { active: busyCount > 0 }), busyCount > 0
-                                        ? t('captain.state.working', { count: busyCount })
-                                        : t(allCompleted ? 'captain.state.collected' : 'captain.state.waiting')] })] }), _jsx(ProgressOverview, { team: team, t: t }), _jsxs("button", { type: "button", className: css.membersToggle, onClick: () => { setMembersOpen((current) => !current); }, "aria-expanded": membersOpen, "data-members-toggle": true, children: [_jsxs("span", { children: [_jsx(Chevron, { open: membersOpen }), t('members.toggle', { count: team.members.length })] }), _jsx("span", { children: t(membersOpen ? 'members.collapse' : 'members.expand') })] }), membersOpen && _jsxs("div", { className: css.delegationTree, children: [team.members.length === 0 && _jsx("span", { className: css.emptyHint, children: t('members.empty') }), team.members.map((member) => {
-                                const owned = team.tasks.filter((task) => task.assignee === member.name);
-                                return (_jsxs("div", { className: css.memberBlock, "data-activity": member.activity, children: [_jsx("span", { className: css.memberBranch, "aria-hidden": true, children: _jsx("span", {}) }), _jsxs("button", { type: "button", className: css.memberRow, "data-activity": member.activity, onClick: () => {
-                                                if (member.id !== '') {
-                                                    onNavigate(team.captainSessionId, member.id);
-                                                }
-                                            }, children: [_jsxs("span", { className: css.memberAvatar, "data-unread": member.unread > 0, children: [memberArtUrl(member.name, member.role) !== null ? (_jsx("img", { className: css.memberArt, src: memberArtUrl(member.name, member.role) ?? '', alt: "", "aria-hidden": true })) : (_jsx("span", { className: css.memberInitial, style: { background: accentOf(member.id) }, children: memberInitial(member.name) })), _jsx("img", { className: css.stateArt, "data-activity": member.activity, src: ACTION_ART[member.activity], alt: "", "aria-hidden": true })] }), _jsxs("span", { className: css.memberInfo, children: [_jsxs("span", { className: css.memberLine, children: [_jsx("span", { className: css.memberName, children: member.name }), member.role !== '' && _jsx("span", { className: css.memberRole, children: member.role }), _jsxs("span", { className: css.memberState, "data-activity": member.activity, children: [_jsx(WorkGlyph, { active: member.activity === 'working' }), memberStateLabel(member, team.tasks, historic, t)] })] }), _jsx("span", { className: css.memberStatusLine, children: memberStatusText(member, team.tasks, t) })] }), _jsxs("span", { className: css.memberCount, children: [member.done, "/", member.total] })] }), _jsxs("div", { className: css.assignmentLine, children: [_jsx("span", { className: css.assignmentLabel, children: t('assignment.label') }), _jsx("span", { className: css.assignmentTasks, children: owned.length === 0
-                                                        ? _jsx("span", { className: css.taskEmpty, children: t('assignment.empty') })
-                                                        : owned.map((task) => (_jsx("span", { className: css.assignmentChip, "data-state": taskTone(task.state, task.status), title: task.subject, children: task.id }, task.id))) })] })] }, member.id));
-                            })] })] }), _jsx(DependencyMap, { tasks: team.tasks, t: t })] }));
+    const allSettled = team.tasks.length > 0 && team.tasks.every((task) => (task.status === 'completed' || task.status === 'failed' || task.status === 'cancelled'));
+    const unfinishedCount = team.tasks.filter((task) => (task.status !== 'completed' && task.status !== 'failed' && task.status !== 'cancelled')).length;
+    const canStop = !historic && team.phase === 'running' && team.halted !== true && teamIsActive(team);
+    const stopTeam = async () => {
+        if (stopping)
+            return;
+        setStopping(true);
+        setStopError('');
+        try {
+            const response = await fetch(ACTIVITY_HALT_URL, {
+                method: 'POST',
+                cache: 'no-store',
+                headers: { 'content-type': 'application/json' },
+                body: JSON.stringify({ sessionId: team.captainSessionId, teamId: team.teamId }),
+            });
+            if (!response.ok) {
+                let message = t('team.stopRequestFailed');
+                try {
+                    const body = await response.json();
+                    if (typeof body.error === 'string' && body.error.trim() !== '')
+                        message = body.error;
+                }
+                catch { }
+                throw new Error(message);
+            }
+            setStopOpen(false);
+        }
+        catch (error) {
+            setStopError(t('team.stopFailed', { message: error instanceof Error ? error.message : String(error) }));
+        }
+        finally {
+            setStopping(false);
+        }
+    };
+    return (_jsxs(_Fragment, { children: [_jsxs("section", { className: css.team, "data-team-id": team.teamId, children: [_jsxs("header", { className: css.teamHead, children: [_jsx("span", { className: css.teamName, title: team.name, children: team.name }), historic && _jsx("span", { className: css.historicPill, children: t(discarded ? 'team.discarded' : 'team.ended') }), stopped && _jsx("span", { className: css.historicPill, children: t('team.stopped') }), _jsxs("span", { className: css.teamStats, children: [_jsx("span", { "data-stat": "members", children: t('team.stats.members', { count: team.members.length }) }), _jsx("span", { "data-stat": "tasks", children: t('team.stats.completed', { completed: completedCount, total: team.tasks.length }) }), _jsx("span", { "data-stat": "messages", children: t('team.stats.messages', { count: team.messageCount }) })] }), canStop && (_jsx("button", { type: "button", className: css.teamStopButton, "aria-label": t('team.stop'), title: t('team.stop'), onClick: () => { setStopError(''); setStopOpen(true); }, children: _jsx(IconStopFill16, {}) }))] }), team.phase === 'staged' && !historic && modelDirectory !== undefined && onContinuePlanning !== undefined && onDiscarded !== undefined && (_jsx(StagingPlanEditor, { team: team, modelDirectory: modelDirectory, onContinuePlanning: onContinuePlanning, onDiscarded: onDiscarded, t: t })), _jsxs("section", { className: css.delegationSection, "aria-label": t('delegation.aria'), "data-delegation-map": true, children: [_jsxs("div", { className: css.captainNode, children: [_jsx("span", { className: css.captainAvatar, children: _jsx("img", { className: css.leadAvatar, src: LEAD_ART, alt: "", "aria-hidden": true }) }), _jsxs("span", { className: css.captainInfo, children: [_jsxs("span", { className: css.captainLine, children: [_jsx("span", { className: css.captainName, children: t('captain.name') }), _jsx("span", { className: css.captainRole, children: t('captain.role') })] }), _jsx("span", { className: css.captainSummary, children: discarded
+                                                    ? t('captain.summary.discarded', { tasks: team.tasks.length, members: team.members.length })
+                                                    : captainBusy
+                                                        ? t('captain.summary.withTakeover', { tasks: assignedCount, captainTasks: captainTaskIds })
+                                                        : team.phase === 'staged'
+                                                            ? t(team.planReviewState === 'awaiting_feedback'
+                                                                ? 'captain.summary.awaitingFeedback'
+                                                                : 'captain.summary.staged', { tasks: team.tasks.length, members: team.members.length })
+                                                            : t('captain.summary', { tasks: assignedCount, members: team.members.length }) })] }), _jsxs("span", { className: css.captainState, "data-busy": captainBusy || busyCount > 0, children: [_jsx(WorkGlyph, { active: captainBusy || busyCount > 0 }), discarded
+                                                ? t('captain.state.discarded')
+                                                : captainBusy
+                                                    ? t('captain.state.takeover', { tasks: captainTaskIds })
+                                                    : team.phase === 'staged'
+                                                        ? t(team.planReviewState === 'awaiting_feedback'
+                                                            ? 'captain.state.awaitingFeedback'
+                                                            : 'captain.state.staged')
+                                                        : busyCount > 0
+                                                            ? t('captain.state.working', { count: busyCount })
+                                                            : t(allCompleted
+                                                                ? 'captain.state.collected'
+                                                                : allSettled
+                                                                    ? 'captain.state.settled'
+                                                                    : 'captain.state.waiting')] })] }), _jsx(ProgressOverview, { team: team, t: t, discarded: discarded }), _jsxs("button", { type: "button", className: css.membersToggle, onClick: () => { setMembersOpen((current) => !current); }, "aria-expanded": membersOpen, "data-members-toggle": true, children: [_jsxs("span", { children: [_jsx(Chevron, { open: membersOpen }), t('members.toggle', { count: team.members.length })] }), _jsx("span", { children: t(membersOpen ? 'members.collapse' : 'members.expand') })] }), membersOpen && _jsxs("div", { className: css.delegationTree, children: [team.members.length === 0 && _jsx("span", { className: css.emptyHint, children: t('members.empty') }), team.members.map((member) => {
+                                        const owned = team.tasks.filter((task) => task.assignee === member.name);
+                                        const memberModel = memberRouteLabel(member);
+                                        return (_jsxs("div", { className: css.memberBlock, "data-activity": member.activity, children: [_jsx("span", { className: css.memberBranch, "aria-hidden": true, children: _jsx("span", {}) }), _jsxs("button", { type: "button", className: css.memberRow, "data-activity": member.activity, onClick: () => {
+                                                        if (member.id !== '') {
+                                                            onNavigate(team.captainSessionId, member.id);
+                                                        }
+                                                    }, children: [_jsxs("span", { className: css.memberAvatar, "data-unread": member.unread > 0, children: [memberArtUrl(member.name, member.role) !== null ? (_jsx("img", { className: css.memberArt, src: memberArtUrl(member.name, member.role) ?? '', alt: "", "aria-hidden": true })) : (_jsx("span", { className: css.memberInitial, style: { background: accentOf(member.id) }, children: memberInitial(member.name) })), _jsx("img", { className: css.stateArt, "data-activity": member.activity, src: ACTION_ART[member.activity], alt: "", "aria-hidden": true })] }), _jsxs("span", { className: css.memberInfo, children: [_jsxs("span", { className: css.memberLine, children: [_jsx("span", { className: css.memberName, children: member.name }), member.role !== '' && _jsx("span", { className: css.memberRole, children: member.role }), _jsxs("span", { className: css.memberState, "data-activity": member.activity, children: [_jsx(WorkGlyph, { active: member.activity === 'working' }), discarded
+                                                                                    ? t('member.state.notCreated')
+                                                                                    : stopped
+                                                                                        ? t('member.state.stopped')
+                                                                                        : team.phase === 'staged'
+                                                                                            ? t('member.state.staged')
+                                                                                            : memberStateLabel(member, team.tasks, historic, t)] })] }), _jsx("span", { className: css.memberStatusLine, children: discarded
+                                                                        ? t('member.status.discarded')
+                                                                        : stopped
+                                                                            ? t('member.status.stopped')
+                                                                            : team.phase === 'staged'
+                                                                                ? t('member.status.staged')
+                                                                                : historic && owned.length > 0 && owned.every((task) => (task.status === 'completed' || task.status === 'failed' || task.status === 'cancelled'))
+                                                                                    ? t('member.status.settled')
+                                                                                    : memberStatusText(member, team.tasks, t) }), memberModel !== '' && (_jsx("span", { className: css.memberModel, "data-member-model": memberModel, children: t('member.model', { model: memberModel }) }))] }), _jsxs("span", { className: css.memberCount, children: [member.done, "/", member.total] })] }), _jsxs("div", { className: css.assignmentLine, children: [_jsx("span", { className: css.assignmentLabel, children: t(discarded
+                                                                ? 'assignment.discarded'
+                                                                : team.phase === 'staged'
+                                                                    ? 'assignment.staged'
+                                                                    : 'assignment.label') }), _jsx("span", { className: css.assignmentTasks, children: owned.length === 0
+                                                                ? _jsx("span", { className: css.taskEmpty, children: t('assignment.empty') })
+                                                                : owned.map((task) => {
+                                                                    const model = taskModelLabel(task, team.members);
+                                                                    const shortModel = compactModelLabel(model);
+                                                                    return (_jsx("span", { className: css.assignmentChip, "data-state": discarded ? 'cancelled' : taskTone(task.state, task.status), "data-task-model": model || undefined, title: taskTitle(task, model), children: task.state === 'running' && shortModel !== '' ? `${task.id} · ${shortModel}` : task.id }, task.id));
+                                                                }) })] })] }, member.id || member.name));
+                                    })] })] }), _jsx(DependencyMap, { tasks: team.tasks, members: team.members, t: t, discarded: discarded })] }), _jsx(Modal, { open: stopOpen, onClose: () => { if (!stopping)
+                    setStopOpen(false); }, title: t('team.stopTitle', { team: team.name }), closeLabel: t('plan.cancel'), description: t('team.stopDescription', { tasks: unfinishedCount, members: busyCount }), footer: (_jsxs("span", { className: css.stopModalActions, children: [_jsx("button", { type: "button", disabled: stopping, onClick: () => { setStopOpen(false); }, children: t('team.stopCancel') }), _jsxs("button", { type: "button", "data-danger": true, disabled: stopping, onClick: () => { void stopTeam(); }, children: [_jsx(IconStopFill16, {}), stopping ? t('team.stopping') : t('team.stopConfirm')] })] })), children: stopError !== '' && _jsxs("p", { className: css.stopModalError, role: "alert", children: [_jsx(IconWarningOutline16, {}), stopError] }) })] }));
 }
 /** Legacy conversation cards may outlive their host archive. Project their
  * durable roster through the same rebuilt panel instead of a second UI. */
@@ -271,6 +394,7 @@ function historicCardTeam(data, owner) {
         teamId: data.teamId,
         name: data.teamName,
         captainSessionId: data.captainSessionId || owner,
+        phase: 'running',
         members: data.members.map((member) => ({
             ...member,
             status: 'removed',
@@ -286,7 +410,7 @@ function historicCardTeam(data, owner) {
         captainInbox: [],
     };
 }
-export function ActivityPanel({ sessionsList, openMember, t }) {
+export function ActivityPanel({ sessionsList, modelDirectories, openMember, t }) {
     // Navigating to a member's subagent transcript is an explicit departure:
     // hide the floater immediately instead of waiting out the autocollapse
     // grace, so the panel never lingers over the member session.
@@ -309,7 +433,15 @@ export function ActivityPanel({ sessionsList, openMember, t }) {
     const frameRef = useRef(null);
     const pendingLayoutRef = useRef(null);
     const current = useSyncExternalStore(sessionsList.subscribe, sessionsList.getSnapshot).current;
+    const autoOpenTrackerRef = useRef({ sessionId: current, restoreComplete: false, liveTeamIds: new Set() });
     const monitorTargets = useSyncExternalStore(subscribeActivityMonitorTargets, getActivityMonitorTargetsSnapshot);
+    const returnToComposer = () => {
+        setOpen(false);
+        setOpenOwner(undefined);
+        window.requestAnimationFrame(() => {
+            document.querySelector('[data-composer-card] textarea')?.focus();
+        });
+    };
     const { teams, archivedTeams } = useSyncExternalStore(subscribeActivitySnapshots, getActivitySnapshotsSnapshot);
     const currentTargets = useMemo(() => current === undefined ? [] : monitorTargets.filter((target) => target.sessionId === current), [current, monitorTargets]);
     const currentRef = useRef(current);
@@ -374,12 +506,18 @@ export function ActivityPanel({ sessionsList, openMember, t }) {
     // removes the old panel immediately instead of waiting for the no-team
     // autoclose grace period on the destination page.
     useLayoutEffect(() => {
+        const tracker = autoOpenTrackerRef.current;
+        if (tracker.sessionId !== current) {
+            tracker.sessionId = current;
+            tracker.restoreComplete = false;
+            tracker.liveTeamIds = new Set();
+            setWasActive(false);
+            setAutoOpened(false);
+        }
         if (openOwner === undefined || openOwner === current)
             return;
         setOpen(false);
         setOpenOwner(undefined);
-        setWasActive(false);
-        setAutoOpened(false);
     }, [current, openOwner]);
     // Only the wide docked mode asks the conversation column to yield. Floating
     // and compact modes are intentionally true overlays. The width is written as
@@ -407,7 +545,23 @@ export function ActivityPanel({ sessionsList, openMember, t }) {
         // also performs one cold-start discovery pass so archived/cardless teams
         // survive a browser or `dsh web` restart.
         const controller = startActivityPolling(currentTargets, { discoverySessionId: current });
-        return () => { controller.stop(); };
+        let active = true;
+        const tracker = autoOpenTrackerRef.current;
+        if (tracker.sessionId === current && !tracker.restoreComplete) {
+            void controller.firstTick.then(() => {
+                const latest = autoOpenTrackerRef.current;
+                if (!active || latest.sessionId !== current || latest.restoreComplete)
+                    return;
+                latest.liveTeamIds = new Set(getActivitySnapshotsSnapshot().teams
+                    .filter((team) => team.captainSessionId === current)
+                    .map((team) => team.teamId));
+                latest.restoreComplete = true;
+            });
+        }
+        return () => {
+            active = false;
+            controller.stop();
+        };
     }, [current, currentTargets]);
     useEffect(() => {
         const onOpenPanel = (event) => {
@@ -443,13 +597,26 @@ export function ActivityPanel({ sessionsList, openMember, t }) {
     const visibleHistoric = useMemo(() => (current === undefined ? [] : [...historic.values()].filter(({ data, owner }) => owner === current && !teams.some((live) => live.captainSessionId === current && live.teamId === data.teamId) && !archivedTeams.some((archived) => archived.captainSessionId === current && archived.teamId === data.teamId))), [historic, current, teams, archivedTeams]);
     const visibleArchived = useMemo(() => (current === undefined ? [] : archivedTeams.filter((team) => team.captainSessionId === current && !teams.some((live) => live.captainSessionId === current && live.teamId === team.teamId))), [archivedTeams, current, teams]);
     const visibleCount = visibleTeams.length + visibleArchived.length + visibleHistoric.length;
+    const visibleLiveTeamIds = useMemo(() => visibleTeams.map((team) => team.teamId).sort(), [visibleTeams]);
+    const visibleLiveTeamKey = visibleLiveTeamIds.join('\u0000');
     useEffect(() => {
+        const tracker = autoOpenTrackerRef.current;
+        const settled = performance.now() - mountedAtRef.current >= AUTO_OPEN_SETTLE_MS;
+        const shouldAutoExpand = tracker.sessionId === current && activityPanelShouldAutoExpand({
+            alreadyAutoOpened: autoOpened,
+            pageSettled: settled,
+            restoreComplete: tracker.restoreComplete,
+            previousLiveTeamIds: tracker.liveTeamIds,
+            currentLiveTeamIds: visibleLiveTeamIds,
+        });
+        if (tracker.sessionId === current && tracker.restoreComplete) {
+            tracker.liveTeamIds = new Set(visibleLiveTeamIds);
+        }
         if (visibleCount > 0) {
             setWasActive(true);
-            // Auto-expand only after the page-settle window: opening (and its
-            // main-column yield) right after load reads as a whole-page flicker.
-            const settled = performance.now() - mountedAtRef.current >= AUTO_OPEN_SETTLE_MS;
-            if (!autoOpened && settled) {
+            // Existing state restored for a reopened conversation stays collapsed.
+            // Only a live team that appears after the restore pass may auto-expand.
+            if (shouldAutoExpand) {
                 setOpenOwner(current);
                 setOpen(true);
                 setAutoOpened(true);
@@ -467,7 +634,7 @@ export function ActivityPanel({ sessionsList, openMember, t }) {
             setAutoOpened(false);
         }, AUTOCLOSE_GRACE_MS);
         return () => { clearTimeout(timer); };
-    }, [visibleCount, autoOpened, wasActive]);
+    }, [visibleCount, visibleLiveTeamKey, autoOpened, wasActive, current]);
     const busy = useMemo(() => visibleTeams.some((team) => team.members.some((member) => member.activity === 'working')), [visibleTeams]);
     const hasTeams = visibleCount > 0;
     // Auto-height panels do not store their live content height. Capture the
@@ -599,7 +766,9 @@ export function ActivityPanel({ sessionsList, openMember, t }) {
                                             setOpenOwner(undefined);
                                         }, "aria-label": t('activity.collapse'), title: t('activity.collapse'), children: _jsx(IconChevronDownOutline14, {}) })] })] }), _jsx("div", { className: css.teams, children: visibleCount === 0
                             ? _jsx("span", { className: css.emptyHint, children: t('activity.empty') })
-                            : (_jsxs(_Fragment, { children: [visibleTeams.map((team) => (_jsx(TeamSection, { team: team, onNavigate: navigateToSession, t: t }, team.teamId))), visibleArchived.map((team) => (_jsxs("div", { "data-team-id": team.teamId, "data-historic": true, className: css.archivedWrap, children: [_jsx("span", { className: css.archiveLabel, children: t('archive.label') }), _jsx(TeamSection, { team: team, onNavigate: navigateToSession, t: t, historic: true })] }, `${team.captainSessionId}:${team.teamId}`))), visibleHistoric.map(({ data: team, owner }) => {
+                            : (_jsxs(_Fragment, { children: [visibleTeams.map((team) => (_jsx(TeamSection, { team: team, modelDirectory: team.phase === 'staged'
+                                            ? modelDirectories.directoryFor(team.captainSessionId)
+                                            : undefined, onContinuePlanning: returnToComposer, onDiscarded: returnToComposer, onNavigate: navigateToSession, t: t }, team.teamId))), visibleArchived.map((team) => (_jsxs("div", { "data-team-id": team.teamId, "data-historic": true, className: css.archivedWrap, children: [_jsx("span", { className: css.archiveLabel, children: t(team.phase === 'staged' ? 'archive.discardedLabel' : 'archive.label') }), _jsx(TeamSection, { team: team, onNavigate: navigateToSession, t: t, historic: true })] }, `${team.captainSessionId}:${team.teamId}`))), visibleHistoric.map(({ data: team, owner }) => {
                                         const teamKey = `${owner}:${team.teamId}`;
                                         return (_jsx(TeamSection, { team: historicCardTeam(team, owner), onNavigate: navigateToSession, t: t, historic: true }, teamKey));
                                     })] })) }), !compact && (_jsx("div", { className: css.resizeHandle, "data-resize-edge": "left", onPointerDown: (event) => { beginResize('left', event); }, onPointerMove: updateGesture, onPointerUp: endGesture, onPointerCancel: cancelGesture, "aria-hidden": true })), !compact && geometry.mode === 'floating' && (_jsxs(_Fragment, { children: [_jsx("div", { className: css.resizeHandle, "data-resize-edge": "bottom", onPointerDown: (event) => { beginResize('bottom', event); }, onPointerMove: updateGesture, onPointerUp: endGesture, onPointerCancel: cancelGesture, "aria-hidden": true }), _jsx("div", { className: css.resizeHandle, "data-resize-edge": "corner", onPointerDown: (event) => { beginResize('corner', event); }, onPointerMove: updateGesture, onPointerUp: endGesture, onPointerCancel: cancelGesture, "aria-hidden": true })] }))] }))] }));