@@ -285,7 +285,7 @@ export class EditorKeyboardController {
     };
 
     editor.onOpenExternalEditor = () => {
-      host.surveyController.closeSilently();
+      host.surveyController.notifyDisplaced();
       host.track('shortcut_editor');
       void this.openExternalEditor();
     };
 
@@ -302,6 +302,8 @@ export class SessionEventHandler {
       case 'compaction.blocked': break;
       case 'compaction.cancelled': this.handleCompactionCancel(event, sendQueued); break;
       case 'subagent.spawned':
+        this.host.surveyController.notifySubagentSpawned(event);
+        this.subAgentEventHandler.handleLifecycleEvent(event); break;
       case 'subagent.started':
       case 'subagent.suspended':
       case 'subagent.completed':
@@ -619,7 +621,7 @@ export class SessionEventHandler {
 
   private handleToolCall(event: ToolCallStartedEvent): void {
     const { streamingUI } = this.host;
-    this.host.surveyController.notifyToolCallStarted();
+    this.host.surveyController.notifyToolCallStarted(event.toolCallId, event.name);
     streamingUI.flushNow();
     const { turnId, step } = streamingUI.getTurnContext();
     const toolCall: ToolCallBlockData = {
@@ -683,6 +685,7 @@ export class SessionEventHandler {
 
   private handleToolResult(event: ToolResultEvent): void {
     const { streamingUI } = this.host;
+    this.host.surveyController.notifyToolCallEnded(event.toolCallId);
     streamingUI.flushNow();
     this.clearStepRetry();
     const resultData: ToolResultBlockData = {
 
@@ -53,7 +53,11 @@ import type { BtwPanelController } from './btw-panel';
 export interface SurveyHost {
   readonly state: TUIState;
   readonly btwPanelController: BtwPanelController;
-  track(event: string, props?: Record<string, unknown>): void;
+  track(
+    event: string,
+    props?: Record<string, unknown>,
+    context?: { readonly sessionId?: string },
+  ): void;
 }
 
 function resolveKfcModelId(appState: TUIState['appState']): string | undefined {
@@ -64,6 +68,31 @@ function resolveKfcModelId(appState: TUIState['appState']): string | undefined {
   return entry.model;
 }
 
+interface SurveyAppearanceSnapshot {
+  readonly sessionId: string;
+  readonly fields: SurveyEventEnvironmentFields;
+}
+
+interface ResumedAgentSeed {
+  readonly type: string;
+  readonly profileName?: string;
+  readonly swarmItem?: string;
+  readonly sessionInit?: string;
+}
+
+const TOWER_WORKER_PROFILE_NAME = 'tower-worker';
+const SESSION_INIT_PARENT_TOOL_CALL_ID = 'generate-agents-md';
+
+function recordModel(models: Set<string>, model: string | undefined): void {
+  if (model === undefined || model.length === 0) return;
+  models.add(model);
+}
+
+function joinModels(models: ReadonlySet<string>): string | undefined {
+  if (models.size === 0) return undefined;
+  return [...models].toSorted().join(',');
+}
+
 export interface SurveyControllerDeps {
   readonly config?: () => SurveyPopupConfig;
   readonly monotonicNow?: () => number;
@@ -136,6 +165,13 @@ export class SurveyController {
   private configRefreshedAt = 0;
   private coldRefreshAttemptedAt = 0;
   private configRegion: string | undefined;
+  private pendingTraceId: string | undefined;
+  private appearanceSnapshot: SurveyAppearanceSnapshot | undefined;
+  private subagentCount = 0;
+  private subagentModels = new Set<string>();
+  private swarmRunCount = 0;
+  private swarmModels = new Set<string>();
+  private readonly toolCallFamilies = new Map<string, string>();
 
   constructor(
     private readonly host: SurveyHost,
@@ -148,6 +184,7 @@ export class SurveyController {
   }
 
   reset(): void {
+    this.notifyDisplaced();
     this.generation += 1;
     this.clearIdleTimer();
     this.clearDigitTimer();
@@ -167,6 +204,13 @@ export class SurveyController {
     this.appearanceConfig = undefined;
     this.currentTurnUserOrigin = undefined;
     this.evaluationPending = false;
+    this.pendingTraceId = undefined;
+    this.appearanceSnapshot = undefined;
+    this.subagentCount = 0;
+    this.subagentModels = new Set();
+    this.swarmRunCount = 0;
+    this.swarmModels = new Set();
+    this.toolCallFamilies.clear();
     const generation = this.generation;
     this.cooldownReady = false;
     void (this.deps.readGlobalLastShown ?? defaultDeps.readGlobalLastShown)()
@@ -194,15 +238,19 @@ export class SurveyController {
     this.currentTurnUserOrigin = userOrigin;
     this.idleSince = undefined;
     this.clearIdleTimer();
-    if (this.machine.phase !== 'closed') this.applyAction({ type: 'close-silently' });
+    this.notifyDisplaced();
     if (userOrigin) {
       this.userTurnCount += 1;
       this.evaluationPending = false;
+      this.pendingTraceId = undefined;
     }
   }
 
-  notifyTurnEnded(): void {
-    if (this.currentTurnUserOrigin === true) this.evaluationPending = true;
+  notifyTurnEnded(traceId?: string): void {
+    if (this.currentTurnUserOrigin === true) {
+      this.evaluationPending = true;
+      this.pendingTraceId = traceId;
+    }
     this.currentTurnUserOrigin = undefined;
     if (!this.evaluationPending) return;
     this.idleSince = this.now();
@@ -214,8 +262,52 @@ export class SurveyController {
     }, SURVEY_IDLE_EVALUATION_DELAY_MS);
   }
 
-  notifyToolCallStarted(): void {
+  notifyToolCallStarted(toolCallId: string, toolName: string): void {
     this.toolCallCount += 1;
+    this.toolCallFamilies.set(toolCallId, toolName);
+    if (toolName === 'AgentSwarm') this.swarmRunCount += 1;
+  }
+
+  notifyToolCallEnded(toolCallId: string): void {
+    this.toolCallFamilies.delete(toolCallId);
+  }
+
+  notifySubagentSpawned(event: {
+    readonly parentToolCallId?: string;
+    readonly swarmIndex?: number;
+    readonly model?: string;
+  }): void {
+    if (event.parentToolCallId === SESSION_INIT_PARENT_TOOL_CALL_ID) return;
+    const toolName =
+      event.parentToolCallId === undefined
+        ? undefined
+        : this.toolCallFamilies.get(event.parentToolCallId);
+    if (toolName === 'Agent') {
+      this.subagentCount += 1;
+      recordModel(this.subagentModels, event.model);
+      return;
+    }
+    if (toolName === 'AgentSwarm') {
+      recordModel(this.swarmModels, event.model);
+      return;
+    }
+    if (toolName !== undefined) return;
+    if (event.swarmIndex !== undefined) {
+      recordModel(this.swarmModels, event.model);
+      return;
+    }
+    this.subagentCount += 1;
+    recordModel(this.subagentModels, event.model);
+  }
+
+  seedFromResumedAgents(agents: Readonly<Record<string, ResumedAgentSeed>>): void {
+    this.subagentCount = Object.values(agents).filter(
+      (agent) =>
+        agent.type === 'sub' &&
+        agent.swarmItem === undefined &&
+        agent.sessionInit === undefined &&
+        agent.profileName !== TOWER_WORKER_PROFILE_NAME,
+    ).length;
   }
 
   notifyCompactionFinished(): void {
@@ -224,17 +316,15 @@ export class SurveyController {
 
   notifyInputModeChanged(mode: 'prompt' | 'bash'): void {
     if (mode !== 'bash') return;
-    if (this.machine.phase === 'closed') return;
+    this.notifyDisplaced();
+  }
+
+  notifyDisplaced(): void {
     if (this.machine.phase === 'open') {
       this.applyAction({ type: 'abandon' });
       return;
     }
-    this.applyAction({ type: 'close-silently' });
-  }
-
-  closeSilently(): void {
-    if (this.machine.phase === 'closed') return;
-    this.applyAction({ type: 'close-silently' });
+    if (this.machine.phase !== 'closed') this.applyAction({ type: 'close-silently' });
   }
 
   handlePreInput(data: string): boolean {
@@ -465,6 +555,9 @@ export class SurveyController {
     };
     const shownAt = this.now();
     this.appearanceConfig = config;
+    const traceId = this.pendingTraceId;
+    this.pendingTraceId = undefined;
+    this.appearanceSnapshot = this.captureSnapshot(traceId);
     this.applyAction({ type: 'open', appearance });
     if (this.machine.phase !== 'open') return;
     this.openedAt = shownAt;
@@ -497,19 +590,22 @@ export class SurveyController {
     switch (effect.type) {
       case 'report': {
         if (appearance === undefined) return;
-        this.host.track(
-          SURVEY_EVENT_NAMES[appearance.survey],
-          buildSurveyEventProperties(
-            {
-              event_type: effect.eventType,
-              appearance_id: appearance.appearanceId,
-              appearance_index: appearance.appearanceIndex,
-              response: effect.response,
-            },
-            this.environmentFields(),
-            this.appearanceConfig ?? (this.deps.config ?? defaultDeps.config)(),
-          ),
+        const properties = buildSurveyEventProperties(
+          {
+            event_type: effect.eventType,
+            appearance_id: appearance.appearanceId,
+            appearance_index: appearance.appearanceIndex,
+            response: effect.response,
+          },
+          this.appearanceSnapshot?.fields ?? this.environmentFields(),
+          this.appearanceConfig ?? (this.deps.config ?? defaultDeps.config)(),
         );
+        const sessionId = this.appearanceSnapshot?.sessionId ?? '';
+        if (sessionId.length > 0) {
+          this.host.track(SURVEY_EVENT_NAMES[appearance.survey], properties, { sessionId });
+        } else {
+          this.host.track(SURVEY_EVENT_NAMES[appearance.survey], properties);
+        }
         return;
       }
       case 'schedule': {
@@ -593,6 +689,18 @@ export class SurveyController {
     this.host.state.ui.requestRender();
   }
 
+  private captureSnapshot(traceId: string | undefined): SurveyAppearanceSnapshot {
+    const { appState } = this.host.state;
+    const kfcModelId = resolveKfcModelId(appState);
+    return {
+      sessionId: appState.sessionId,
+      fields: {
+        ...this.environmentFields(),
+        kfc_trace_id: kfcModelId === undefined ? undefined : traceId,
+      },
+    };
+  }
+
   private environmentFields(): SurveyEventEnvironmentFields {
     const { appState } = this.host.state;
     return {
@@ -605,6 +713,10 @@ export class SurveyController {
       compaction_count: this.compactionCount,
       permission_mode: appState.permissionMode,
       thinking_effort: appState.thinkingEffort,
+      subagent_count: this.subagentCount,
+      subagent_models: joinModels(this.subagentModels),
+      swarm_run_count: this.swarmRunCount,
+      swarm_models: joinModels(this.swarmModels),
     };
   }
 
 
@@ -420,8 +420,16 @@ export class KimiTUI {
    */
   public exitForegroundTask: ((exitCode: number) => Promise<void>) | undefined;
 
-  track(event: string, properties?: Parameters<KimiHarness['track']>[1]): void {
-    this.harness.track(event, properties);
+  track(
+    event: string,
+    properties?: Parameters<KimiHarness['track']>[1],
+    context?: { readonly sessionId?: string },
+  ): void {
+    if (context === undefined) {
+      this.harness.track(event, properties);
+      return;
+    }
+    this.harness.trackWithContext(event, properties, { sessionId: context.sessionId });
   }
 
   constructor(harness: KimiHarness, startupInput: KimiTUIStartupInput) {
@@ -836,6 +844,7 @@ export class KimiTUI {
       this.applyStartupPermissionAndPlanToAppState();
     }
     const resumeState = this.session?.getResumeState();
+    this.surveyController.seedFromResumedAgents(resumeState?.sessionMetadata.agents ?? {});
     if (resumeState?.warning !== undefined) {
       this.showStatus(`Warning: ${resumeState.warning}`, 'warning');
     }
@@ -1758,7 +1767,7 @@ export class KimiTUI {
 
   handleTurnEnded(event: TurnEndedEvent): void {
     this.staging.handleTurnEnded(event);
-    this.surveyController.notifyTurnEnded();
+    this.surveyController.notifyTurnEnded(event.traceId);
   }
 
   releaseStagingMedia(mediaAttachmentIds: readonly number[]): void {
@@ -2683,6 +2692,7 @@ export class KimiTUI {
       this.sessionEventHandler.startSubscription();
     }
     const resumeState = session.getResumeState();
+    this.surveyController.seedFromResumedAgents(resumeState?.sessionMetadata.agents ?? {});
     if (resumeState?.warning !== undefined) {
       this.showStatus(`Warning: ${resumeState.warning}`, 'warning');
     }
@@ -2714,6 +2724,7 @@ export class KimiTUI {
     }
     this.sessionEventHandler.startSubscription();
     const resumeState = session.getResumeState();
+    this.surveyController.seedFromResumedAgents(resumeState?.sessionMetadata.agents ?? {});
     if (resumeState?.warning !== undefined) {
       this.showStatus(`Warning: ${resumeState.warning}`, 'warning');
     }
@@ -3751,7 +3762,7 @@ export class KimiTUI {
   // =========================================================================
 
   mountEditorReplacement(panel: Component & Focusable): void {
-    this.surveyController.closeSilently();
+    this.surveyController.notifyDisplaced();
     this.state.editorReplacementMounted = true;
     this.state.editorContainer.clear();
     this.state.editorContainer.addChild(panel);
 
@@ -345,13 +345,18 @@ export interface SurveyEventCoreFields {
 export interface SurveyEventEnvironmentFields {
   readonly current_model: string;
   readonly kfc_model_id?: string;
+  readonly kfc_trace_id?: string;
   readonly user_turn_count: number;
   readonly cumulative_tokens: number;
   readonly virtual_context_tokens: number;
   readonly tool_call_count: number;
   readonly compaction_count: number;
   readonly permission_mode: string;
   readonly thinking_effort: string;
+  readonly subagent_count: number;
+  readonly subagent_models?: string;
+  readonly swarm_run_count: number;
+  readonly swarm_models?: string;
 }
 
 export function buildSurveyEventProperties(