= ({
aria-label={t('flowChatHeader.agentTreeActions')}
aria-haspopup="menu"
aria-expanded={openActionSessionId === node.sessionId}
- disabled={isCancelling}
+ disabled={isCancelling || deletingSessionId !== null}
icon={}
/>
@@ -500,7 +513,7 @@ export const SessionTreePopover: React.FC
= ({
style={actionMenuPosition}
data-testid="flowchat-header-session-tree-menu"
>
-
+ : null}
+ {canDelete ? : null}
,
getAppearanceOverlayHost(),
) : null}
@@ -532,10 +554,10 @@ export const SessionTreePopover: React.FC = ({
};
const panelLabel = t('flowChatHeader.agentTree');
- const renderedTreeNodes = tree
+ const renderedTreeNodes = visibleTree
? embedded
- ? tree.children.map(child => renderNode(child, 0))
- : renderNode(tree, 0)
+ ? visibleTree.children.map(child => renderNode(child, 0))
+ : renderNode(visibleTree, 0)
: null;
const treeBody = (
@@ -544,7 +566,7 @@ export const SessionTreePopover: React.FC = ({
data-openbitfun-component="flow-chat-header"
data-openbitfun-part="sessionTreeBody"
>
- {tree ? {renderedTreeNodes}
: null}
+ {visibleTree ? {renderedTreeNodes}
: null}
{isLoading && !tree ? (
= ({
data-openbitfun-part="sessionTreeState"
data-openbitfun-state="empty"
>
- {t('flowChatHeader.agentTreeEmpty')}
+ {t(activeOnly ? 'flowChatHeader.agentTreeNoActive' : 'flowChatHeader.agentTreeEmpty')}
) : null}
{loadFailed ? (
diff --git a/src/web-ui/src/flow_chat/services/deleteSessionTreeBranch.test.ts b/src/web-ui/src/flow_chat/services/deleteSessionTreeBranch.test.ts
new file mode 100644
index 0000000000..f59a544116
--- /dev/null
+++ b/src/web-ui/src/flow_chat/services/deleteSessionTreeBranch.test.ts
@@ -0,0 +1,64 @@
+import { beforeEach, describe, expect, it, vi } from 'vitest';
+import { deleteSessionTreeBranch } from './deleteSessionTreeBranch';
+
+const mocks = vi.hoisted(() => ({
+ lineage: vi.fn(), deleteSession: vi.fn(), discard: vi.fn(), assertCurrent: vi.fn(),
+ clearIntent: vi.fn(), clearTransition: vi.fn(),
+}));
+vi.mock('@/infrastructure/api/service-api/SessionAPI', () => ({ sessionAPI: { getSessionLineage: mocks.lineage } }));
+vi.mock('@/infrastructure/api/service-api/AgentAPI', () => ({ agentAPI: { deleteSession: mocks.deleteSession } }));
+vi.mock('@/infrastructure/peer-device/deviceSurface', () => ({ getActiveSurfaceScope: () => ({ assertCurrent: mocks.assertCurrent }) }));
+vi.mock('../store/FlowChatStore', () => ({ flowChatStore: { getState: () => ({ sessions: new Map() }) } }));
+vi.mock('./FlowChatManager', () => ({ FlowChatManager: { getInstance: () => ({ discardLocalSession: mocks.discard }) } }));
+vi.mock('./sessionOpenIntent', () => ({ clearRecentHistorySessionOpenIntent: mocks.clearIntent, clearHistorySessionOpenTransition: mocks.clearTransition }));
+
+const location = { sessionId: 'child', workspacePath: '/remote/project', remoteConnectionId: 'ssh-1', remoteSshHost: 'host' };
+describe('deleteSessionTreeBranch', () => {
+ beforeEach(() => {
+ vi.resetAllMocks();
+ mocks.lineage.mockResolvedValue({ rootSessionId: 'root', sessions: [
+ { sessionId: 'root', sessionName: 'Root', createdAtMs: 1 },
+ { sessionId: 'child', parentSessionId: 'root', sessionName: 'Child', createdAtMs: 2 },
+ { sessionId: 'grandchild', parentSessionId: 'child', sessionName: 'Done', status: 'completed', createdAtMs: 3 },
+ { sessionId: 'sibling', parentSessionId: 'root', sessionName: 'Sibling', createdAtMs: 4 },
+ ] });
+ });
+
+ it('deletes unloaded, inactive descendants before their parent and preserves the remote location', async () => {
+ await deleteSessionTreeBranch(location);
+ expect(mocks.lineage).toHaveBeenCalledWith(location);
+ expect(mocks.deleteSession.mock.calls).toEqual([
+ ['grandchild', '/remote/project', 'ssh-1', 'host'],
+ ['child', '/remote/project', 'ssh-1', 'host'],
+ ]);
+ expect(mocks.discard.mock.calls).toEqual([['grandchild'], ['child']]);
+ expect(mocks.clearIntent.mock.calls).toEqual([['grandchild'], ['child']]);
+ });
+
+ it('keeps failed descendants and their parent available for retry', async () => {
+ mocks.deleteSession.mockRejectedValue(new Error('offline'));
+ await expect(deleteSessionTreeBranch(location)).rejects.toThrow('offline');
+ expect(mocks.deleteSession).toHaveBeenCalledTimes(1);
+ expect(mocks.discard).not.toHaveBeenCalled();
+ });
+
+ it('does not delete against another peer after the lineage request', async () => {
+ mocks.assertCurrent.mockImplementationOnce(() => {}).mockImplementationOnce(() => { throw new Error('surface changed'); });
+ await expect(deleteSessionTreeBranch(location)).rejects.toThrow('surface changed');
+ expect(mocks.deleteSession).not.toHaveBeenCalled();
+ });
+
+ it('does not discard another peer projection after a successful backend deletion', async () => {
+ mocks.deleteSession.mockImplementationOnce(async () => {
+ mocks.assertCurrent.mockImplementation(() => { throw new Error('surface changed'); });
+ });
+ await expect(deleteSessionTreeBranch(location)).rejects.toThrow('surface changed');
+ expect(mocks.discard).not.toHaveBeenCalled();
+ });
+
+ it('refuses deletion without a complete lineage response', async () => {
+ mocks.lineage.mockResolvedValue(null);
+ await expect(deleteSessionTreeBranch(location)).rejects.toThrow('lineage is unavailable');
+ expect(mocks.deleteSession).not.toHaveBeenCalled();
+ });
+});
diff --git a/src/web-ui/src/flow_chat/services/deleteSessionTreeBranch.ts b/src/web-ui/src/flow_chat/services/deleteSessionTreeBranch.ts
new file mode 100644
index 0000000000..f7e9bbdf84
--- /dev/null
+++ b/src/web-ui/src/flow_chat/services/deleteSessionTreeBranch.ts
@@ -0,0 +1,56 @@
+import { agentAPI } from '@/infrastructure/api/service-api/AgentAPI';
+import { sessionAPI } from '@/infrastructure/api/service-api/SessionAPI';
+import { getActiveSurfaceScope, type SurfaceScope } from '@/infrastructure/peer-device/deviceSurface';
+import { flowChatStore } from '../store/FlowChatStore';
+import { buildSessionLineageTree, type SessionLineageNode } from '../utils/sessionLineage';
+import { FlowChatManager } from './FlowChatManager';
+import { clearHistorySessionOpenTransition, clearRecentHistorySessionOpenIntent } from './sessionOpenIntent';
+
+export interface SessionTreeBranchLocation {
+ sessionId: string;
+ workspacePath: string;
+ remoteConnectionId?: string;
+ remoteSshHost?: string;
+}
+
+/** Read the complete lineage: the visible tree may hide inactive or unloaded descendants. */
+export async function deleteSessionTreeBranch(
+ location: SessionTreeBranchLocation,
+ scope: SurfaceScope = getActiveSurfaceScope(),
+): Promise {
+ scope.assertCurrent('read session branch before deletion');
+ const snapshot = await sessionAPI.getSessionLineage(location);
+ scope.assertCurrent('resolve session branch deletion');
+ if (!snapshot) throw new Error('Agent session lineage is unavailable');
+ const tree = buildSessionLineageTree(location.sessionId, snapshot, flowChatStore.getState().sessions);
+ const findBranch = (node: SessionLineageNode | null): SessionLineageNode | undefined => {
+ if (!node) return undefined;
+ if (node.sessionId === location.sessionId) return node;
+ for (const child of node.children) {
+ const found = findBranch(child);
+ if (found) return found;
+ }
+ return undefined;
+ };
+ const branch = findBranch(tree);
+ if (!branch || !branch.parentSessionId) throw new Error('Agent session branch not found');
+ const nodes: SessionLineageNode[] = [];
+ const collect = (node: SessionLineageNode) => {
+ node.children.forEach(collect);
+ nodes.push(node);
+ };
+ collect(branch);
+ for (const node of nodes) {
+ scope.assertCurrent('delete session branch node');
+ clearRecentHistorySessionOpenIntent(node.sessionId);
+ clearHistorySessionOpenTransition(node.sessionId);
+ await agentAPI.deleteSession(
+ node.sessionId,
+ location.workspacePath,
+ location.remoteConnectionId,
+ location.remoteSshHost,
+ );
+ scope.assertCurrent('apply session branch deletion');
+ FlowChatManager.getInstance().discardLocalSession(node.sessionId);
+ }
+}
diff --git a/src/web-ui/src/flow_chat/utils/sessionLineage.ts b/src/web-ui/src/flow_chat/utils/sessionLineage.ts
index cebb58e9ce..42c0519d19 100644
--- a/src/web-ui/src/flow_chat/utils/sessionLineage.ts
+++ b/src/web-ui/src/flow_chat/utils/sessionLineage.ts
@@ -69,6 +69,17 @@ function isActiveSessionLineageLifecycle(lifecycle: SessionLineageLifecycle): bo
return lifecycle === 'running' || lifecycle === 'finishing';
}
+/** Keep active nodes and the ancestor paths needed to reach them. */
+export function filterActiveSessionLineageTree(node: SessionLineageNode | null): SessionLineageNode | null {
+ if (!node) return null;
+ const children = node.children
+ .map(filterActiveSessionLineageTree)
+ .filter((child): child is SessionLineageNode => child !== null);
+ return isActiveSessionLineageLifecycle(node.lifecycle) || children.length > 0
+ ? { ...node, children }
+ : null;
+}
+
function nodeFromMetadata(metadata: SessionLineageEntry): FlatSessionLineageNode {
return {
sessionId: metadata.sessionId,
diff --git a/src/web-ui/src/locales/en-US/flow-chat.json b/src/web-ui/src/locales/en-US/flow-chat.json
index 92cb0b8fc5..08f34d3846 100644
--- a/src/web-ui/src/locales/en-US/flow-chat.json
+++ b/src/web-ui/src/locales/en-US/flow-chat.json
@@ -1379,6 +1379,12 @@
"sessionOverviewBackgroundFinished": "{{count}} recently finished",
"sessionOverviewPullRequests": "Open workspace pull requests",
"agentTree": "Agents",
+ "agentTreeDelete": "Delete session",
+ "agentTreeDeleteConfirm": "Delete \"{{name}}\" and all its descendant sessions? This cannot be undone.",
+ "agentTreeDeleteFailed": "Failed to delete the Agent session branch.",
+ "agentTreeDeleteUnsupported": "Deleting individual agents in a detached task is not supported.",
+ "agentTreeActiveOnly": "Active agents only",
+ "agentTreeNoActive": "No active agents",
"agentTreeLoading": "Loading Agent tree...",
"agentTreeEmpty": "No subagents in this session",
"agentTreeLoadFailed": "Unable to load the Agent tree.",
diff --git a/src/web-ui/src/locales/zh-CN/flow-chat.json b/src/web-ui/src/locales/zh-CN/flow-chat.json
index d71c6eddb6..cb2fd5f672 100644
--- a/src/web-ui/src/locales/zh-CN/flow-chat.json
+++ b/src/web-ui/src/locales/zh-CN/flow-chat.json
@@ -1379,6 +1379,12 @@
"sessionOverviewBackgroundFinished": "{{count}} 个最近已结束",
"sessionOverviewPullRequests": "打开工作区拉取请求",
"agentTree": "Agents",
+ "agentTreeDelete": "删除会话",
+ "agentTreeDeleteConfirm": "确定删除“{{name}}”及其所有后代会话吗？此操作无法撤销。",
+ "agentTreeDeleteFailed": "删除 Agent 会话分支失败。",
+ "agentTreeDeleteUnsupported": "暂不支持单独删除离线派发任务中的 Agent。",
+ "agentTreeActiveOnly": "仅显示活跃 Agent",
+ "agentTreeNoActive": "当前没有活跃 Agent",
"agentTreeLoading": "正在加载 Agent 会话树...",
"agentTreeEmpty": "当前会话没有子 Agent",
"agentTreeLoadFailed": "无法加载 Agent 会话树。",
diff --git a/src/web-ui/src/locales/zh-TW/flow-chat.json b/src/web-ui/src/locales/zh-TW/flow-chat.json
index 1ca70b0b81..32863ce52f 100644
--- a/src/web-ui/src/locales/zh-TW/flow-chat.json
+++ b/src/web-ui/src/locales/zh-TW/flow-chat.json
@@ -1379,6 +1379,12 @@
"sessionOverviewBackgroundFinished": "{{count}} 個最近已結束",
"sessionOverviewPullRequests": "開啟工作區拉取請求",
"agentTree": "Agents",
+ "agentTreeDelete": "刪除會話",
+ "agentTreeDeleteConfirm": "確定刪除「{{name}}」及其所有後代會話嗎？此操作無法復原。",
+ "agentTreeDeleteFailed": "刪除 Agent 會話分支失敗。",
+ "agentTreeDeleteUnsupported": "暫不支援單獨刪除離線派發任務中的 Agent。",
+ "agentTreeActiveOnly": "僅顯示活躍 Agent",
+ "agentTreeNoActive": "目前沒有活躍 Agent",
"agentTreeLoading": "正在載入 Agent 會話樹...",
"agentTreeEmpty": "目前會話沒有子 Agent",
"agentTreeLoadFailed": "無法載入 Agent 會話樹。",