refactor: deduplicate findCurrentAgent into display-utils

Author: Tarquinen

lib/core/janitor.ts

@@ -11,6 +11,7 @@ import {
     sendUnifiedNotification,
     type NotificationContext
 } from "../ui/notification"
+import { findCurrentAgent } from "../ui/display-utils"
 
 export interface SessionStats {
     totalToolsPruned: number
@@ -437,16 +438,7 @@ export function parseMessages(
     return { toolCallIds, toolOutputs, toolMetadata }
 }
 
-function findCurrentAgent(messages: any[]): string | undefined {
-    for (let i = messages.length - 1; i >= 0; i--) {
-        const msg = messages[i]
-        const info = msg.info
-        if (info?.role === 'user') {
-            return info.agent || 'build'
-        }
-    }
-    return undefined
-}
+
 
 // ============================================================================
 // Helpers

lib/pruning-tool.ts

@@ -6,6 +6,7 @@ import { resetToolTrackerCount } from "./fetch-wrapper/tool-tracker"
 import { isSubagentSession } from "./hooks"
 import { getActualId } from "./state/id-mapping"
 import { formatPruningResultForTool, sendUnifiedNotification, type NotificationContext } from "./ui/notification"
+import { findCurrentAgent } from "./ui/display-utils"
 import { ensureSessionRestored } from "./state"
 import { saveSessionState } from "./state/persistence"
 import type { Logger } from "./logger"
@@ -136,19 +137,6 @@ export function createPruningTool(
     })
 }
 
-/**
- * Finds the current agent from messages (same logic as janitor.ts).
- */
-function findCurrentAgent(messages: any[]): string | undefined {
-    for (let i = messages.length - 1; i >= 0; i--) {
-        const msg = messages[i]
-        const info = msg.info
-        if (info?.role === 'user') {
-            return info.agent || 'build'
-        }
-    }
-    return undefined
-}
 
 /**
  * Calculates approximate tokens saved by pruning the given tool call IDs.

lib/ui/display-utils.ts

@@ -71,3 +71,18 @@ export function extractParameterKey(metadata: { tool: string, parameters?: any }
     }
     return paramStr.substring(0, 50)
 }
+
+/**
+ * Finds the current agent from messages by looking for the most recent user message.
+ * Used by janitor and pruning-tool to determine notification context.
+ */
+export function findCurrentAgent(messages: any[]): string | undefined {
+    for (let i = messages.length - 1; i >= 0; i--) {
+        const msg = messages[i]
+        const info = msg.info
+        if (info?.role === 'user') {
+            return info.agent || 'build'
+        }
+    }
+    return undefined
+}