fix: avoid fake subagent management entries

Author: 0xSolarPunk

web/src/lib/chat/__tests__/subagent-management.test.ts

@@ -102,4 +102,36 @@ describe('buildSubagentManagementModel', () => {
 			lastActionLabel: 'Closed',
 		});
 	});
+
+	it('does not create a fake subagent entry for list operations', () => {
+		const messages: ChatMessage[] = [
+			new CodexSubagentToolUseMessage(TS, 'tool-subagent-list', 'list_agents'),
+		];
+
+		const model = buildSubagentManagementModel(messages);
+
+		expect(model.subagents).toHaveLength(0);
+	});
+
+	it('applies multi-target lifecycle events to each targeted subagent', () => {
+		const messages: ChatMessage[] = [
+			new CodexSubagentToolUseMessage(TS, 'tool-subagent-1', 'spawn_agent', {
+				taskName: 'review-auth',
+			}),
+			new CodexSubagentToolUseMessage(TS, 'tool-subagent-2', 'spawn_agent', {
+				taskName: 'ui-polish',
+			}),
+			new CodexSubagentToolUseMessage(TS, 'tool-subagent-3', 'wait_agent', {
+				targets: ['/root/review-auth', '/root/ui-polish'],
+			}),
+		];
+
+		const model = buildSubagentManagementModel(messages);
+
+		expect(model.subagents).toHaveLength(2);
+		expect(model.subagents.map((entry) => [entry.name, entry.status])).toEqual([
+			['review-auth', 'waiting'],
+			['ui-polish', 'waiting'],
+		]);
+	});
 });

web/src/lib/chat/subagent-management.ts

@@ -68,16 +68,20 @@ export function buildSubagentManagementModel(
 		if (!(message instanceof CodexSubagentToolUseMessage)) continue;
 
 		const result = resultsByToolId.get(message.toolId);
-		const key = resolveEntryKey(message.details, message.toolId, aliasToKey);
-		let entry = subagentsByKey.get(key);
-		if (!entry) {
-			entry = createSubagentEntry(key, message);
-			subagentsByKey.set(key, entry);
-			orderedSubagents.push(entry);
+		for (const eventDetails of entryDetailsForMessage(message)) {
+			const key = resolveEntryKey(eventDetails, message.toolId, aliasToKey, message.action);
+			if (!key) continue;
+
+			let entry = subagentsByKey.get(key);
+			if (!entry) {
+				entry = createSubagentEntry(key, message, eventDetails);
+				subagentsByKey.set(key, entry);
+				orderedSubagents.push(entry);
+			}
+
+			registerAliases(key, eventDetails, aliasToKey);
+			applySubagentEvent(entry, message, result, eventDetails);
 		}
-
-		registerAliases(key, message.details, aliasToKey);
-		applySubagentEvent(entry, message, result);
 	}
 
 	return {
@@ -89,14 +93,15 @@ export function buildSubagentManagementModel(
 function createSubagentEntry(
 	key: string,
 	message: CodexSubagentToolUseMessage,
+	details: CodexSubagentDetails,
 ): SubagentManagementEntry {
 	return {
 		id: key,
 		kind: 'subagent',
-		name: displayNameFor(message.details, message.toolId),
-		path: message.details.target ?? message.details.pathPrefix ?? message.details.taskName,
-		model: message.details.model,
-		message: message.details.message,
+		name: displayNameFor(details, message.toolId),
+		path: details.target ?? details.pathPrefix ?? details.taskName,
+		model: details.model,
+		message: details.message,
 		status: 'running',
 		statusLabel: statusLabelFor('running'),
 		lastActionLabel: actionLabelFor(message.action),
@@ -108,21 +113,34 @@ function applySubagentEvent(
 	entry: SubagentManagementEntry,
 	message: CodexSubagentToolUseMessage,
 	result: ToolResultMessage | undefined,
+	details: CodexSubagentDetails,
 ): void {
-	entry.name = displayNameFor(message.details, entry.name);
-	entry.path = message.details.target ?? message.details.pathPrefix ?? entry.path;
-	entry.model = message.details.model ?? entry.model;
-	entry.message = message.details.message ?? entry.message;
+	entry.name = displayNameFor(details, entry.name);
+	entry.path = details.target ?? details.pathPrefix ?? entry.path;
+	entry.model = details.model ?? entry.model;
+	entry.message = details.message ?? entry.message;
 	entry.lastActionLabel = actionLabelFor(message.action);
 	entry.status = statusFor(message.action, result?.isError === true);
 	entry.statusLabel = statusLabelFor(entry.status);
 }
 
+function entryDetailsForMessage(message: CodexSubagentToolUseMessage): CodexSubagentDetails[] {
+	if (message.action === 'list_agents') return [];
+	const targets = message.details.targets?.filter((target) => target.trim().length > 0) ?? [];
+	if (targets.length === 0) return [message.details];
+	return targets.map((target) => ({
+		...message.details,
+		target,
+		targets: undefined,
+	}));
+}
+
 function resolveEntryKey(
 	details: CodexSubagentDetails,
 	fallback: string,
 	aliasToKey: Map<string, string>,
-): string {
+	action: CodexSubagentAction,
+): string | null {
 	const candidates = [
 		details.target,
 		details.pathPrefix,
@@ -136,7 +154,10 @@ function resolveEntryKey(
 		if (existing) return existing;
 	}
 
-	return normalizeAlias(details.target ?? details.pathPrefix ?? details.taskName ?? fallback);
+	const identity = details.target ?? details.pathPrefix ?? details.taskName;
+	if (identity) return normalizeAlias(identity);
+	if (action === 'spawn_agent') return normalizeAlias(fallback);
+	return null;
 }
 
 function registerAliases(