Keep hover session rows compact

Author: TimpiaAI

Sources/NoturcodeApp/DisplayCoordinator.swift

@@ -295,14 +295,12 @@ final class NotchPresentationState: ObservableObject {
     @Published private(set) var isExpanded: Bool
     @Published private(set) var hoveredSessionID: String?
     @Published private(set) var pressedSessionID: String?
-    @Published private(set) var activityExpandedSessionID: String?
     let isUITestSpotlight: Bool
     let isUITestRapidHover: Bool
 
     private var isArmed = true
     private var pointerInside = false
     private let isUITestForcedExpanded: Bool
-    private let isUITestActivityExpanded: Bool
     private var dwellTask: Task<Void, Never>?
     private var exitTask: Task<Void, Never>?
     private var hoverIntentTask: Task<Void, Never>?
@@ -313,7 +311,6 @@ final class NotchPresentationState: ObservableObject {
         isUITestSpotlight = CommandLine.arguments.contains("--ui-test-hover-first")
             || CommandLine.arguments.contains("--ui-test-live-transcript")
         isUITestRapidHover = CommandLine.arguments.contains("--ui-test-rapid-hover")
-        isUITestActivityExpanded = CommandLine.arguments.contains("--ui-test-expanded-activity")
         isExpanded = isUITestForcedExpanded
         isArmed = !isExpanded
     }
@@ -359,9 +356,6 @@ final class NotchPresentationState: ObservableObject {
         hoverClearTask?.cancel()
         hoverClearTask = nil
         if let id {
-            if hoveredSessionID != id, isUITestActivityExpanded {
-                activityExpandedSessionID = id
-            }
             if isUITestSpotlight || hoveredSessionID == nil {
                 hoveredSessionID = id
                 return
@@ -389,10 +383,6 @@ final class NotchPresentationState: ObservableObject {
         }
     }
 
-    func toggleActivityExpansion(for sessionID: String) {
-        activityExpandedSessionID = activityExpandedSessionID == sessionID ? nil : sessionID
-    }
-
     func expand() {
         dwellTask?.cancel()
         dwellTask = nil
@@ -408,8 +398,7 @@ final class NotchPresentationState: ObservableObject {
             $0.state.showsCompletionSummary && NoturcodeSummaryContract.isDisplayable($0.lastAgentMessage)
         }.count
         let summaryAllowance = min(42, CGFloat(summaryCount) * 14)
-        if activityExpandedSessionID != nil { return summaryAllowance + 207 }
-        return summaryAllowance + (hoveredSessionID == nil ? 0 : 95)
+        return summaryAllowance
     }
 
     func select(_ session: TrackedSession, action: @escaping @MainActor () -> Void) {
@@ -444,7 +433,6 @@ final class NotchPresentationState: ObservableObject {
         hoverClearTask = nil
         isExpanded = false
         hoveredSessionID = nil
-        activityExpandedSessionID = nil
         isArmed = false
     }
 }

Sources/NoturcodeApp/SessionViews.swift

@@ -550,14 +550,9 @@ private struct SessionRow: View {
                             .font(.system(size: 13, weight: .semibold))
                             .foregroundStyle(.white.opacity(0.95))
                             .lineLimit(1)
+                            .fixedSize(horizontal: true, vertical: false)
                     }
                     Spacer(minLength: 6)
-                    if let tokens = session.tokens {
-                        Text(DurationFormatting.tokens(tokens))
-                            .font(.system(size: 10.5, weight: .medium))
-                            .monospacedDigit()
-                            .foregroundStyle(.white.opacity(0.46))
-                    }
                     if !session.activeSubagents.isEmpty {
                         Text("\(session.activeSubagents.count) agent\(session.activeSubagents.count == 1 ? "" : "s")")
                             .font(.system(size: 10.5, weight: .medium))

Sources/NoturcodeCore/SessionStore.swift

@@ -22,8 +22,7 @@ public final class SessionStore: ObservableObject {
 
         switch event.kind {
         case .connect:
-            guard let name = event.name?.trimmingCharacters(in: .whitespacesAndNewlines),
-                  !name.isEmpty,
+            guard let name = Self.normalizedSessionName(event.name),
                   let terminalSessionID = event.terminalSessionID,
                   !terminalSessionID.isEmpty else { return nil }
             let session = TrackedSession(
@@ -197,6 +196,14 @@ public final class SessionStore: ObservableObject {
         sessions.sorted { $0.lastPromptAt > $1.lastPromptAt }
     }
 
+    private static func normalizedSessionName(_ rawName: String?) -> String? {
+        rawName?
+            .components(separatedBy: .newlines)
+            .lazy
+            .map { $0.trimmingCharacters(in: .whitespacesAndNewlines) }
+            .first(where: { !$0.isEmpty })
+    }
+
     private func session(at index: Int?) -> TrackedSession? {
         guard let index else { return nil }
         return sessions[index]

Tests/NoturcodeCoreTests/NoturcodeCoreTests.swift

@@ -1086,6 +1086,23 @@ final class NoturcodeCoreTests: XCTestCase {
         XCTAssertEqual(store.sessions.map(\.name), ["two"])
     }
 
+    @MainActor
+    func testSessionStoreUsesOnlyFirstNonEmptyLineOfConnectionName() throws {
+        let directory = FileManager.default.temporaryDirectory.appendingPathComponent(UUID().uuidString)
+        let store = SessionStore(persistence: SessionPersistence(fileURL: directory.appendingPathComponent("sessions.json")))
+
+        _ = store.apply(BridgeEvent(
+            kind: .connect,
+            source: .codex,
+            sessionID: "multiline-name",
+            timestamp: Date(timeIntervalSince1970: 1_000),
+            name: "  nc  \nthis is prompt text, not the session name",
+            terminalSessionID: "w0t1:NAME"
+        ))
+
+        XCTAssertEqual(store.sessions.first?.name, "nc")
+    }
+
     @MainActor
     func testHarnessSessionEndDoesNotRemoveExplicitConnection() throws {
         let directory = FileManager.default.temporaryDirectory.appendingPathComponent(UUID().uuidString)
@@ -1147,9 +1164,14 @@ final class NoturcodeCoreTests: XCTestCase {
             .deletingLastPathComponent()
         let surface = try String(contentsOf: repository.appendingPathComponent("Sources/NoturcodeApp/NotchSurfaceView.swift"))
         let sessions = try String(contentsOf: repository.appendingPathComponent("Sources/NoturcodeApp/SessionViews.swift"))
+        let coordinator = try String(contentsOf: repository.appendingPathComponent("Sources/NoturcodeApp/DisplayCoordinator.swift"))
 
         XCTAssertTrue(surface.contains("value: surfaceHeight"))
         XCTAssertFalse(sessions.contains(".transition(.opacity.combined(with: .move(edge: .top)))"))
+        XCTAssertTrue(coordinator.contains("return summaryAllowance"))
+        XCTAssertFalse(coordinator.contains("activityExpandedSessionID"))
+        XCTAssertFalse(coordinator.contains("toggleActivityExpansion"))
+        XCTAssertFalse(coordinator.contains("hoveredSessionID == nil ? 0 : 95"))
     }
 
     func testExpandedNotchMorphsContentInsideOnePersistentHeader() throws {
@@ -1203,6 +1225,21 @@ final class NoturcodeCoreTests: XCTestCase {
         XCTAssertFalse(sessions.contains("if isHovered || isActivityExpanded"))
     }
 
+    func testExpandedNotchSessionRowKeepsFullNameAndHidesTokenCounter() throws {
+        let repository = URL(fileURLWithPath: #filePath)
+            .deletingLastPathComponent()
+            .deletingLastPathComponent()
+            .deletingLastPathComponent()
+        let source = try String(contentsOf: repository.appendingPathComponent("Sources/NoturcodeApp/SessionViews.swift"))
+        let rowStart = try XCTUnwrap(source.range(of: "private struct SessionRow"))
+        let nextStart = try XCTUnwrap(source.range(of: "private struct ConversationSidebarToggle"))
+        let row = String(source[rowStart.lowerBound..<nextStart.lowerBound])
+
+        XCTAssertTrue(row.contains(".fixedSize(horizontal: true, vertical: false)"))
+        XCTAssertFalse(row.contains("if let tokens = session.tokens"))
+        XCTAssertFalse(row.contains("DurationFormatting.tokens"))
+    }
+
     func testExpandedNotchShowsRotatingQuoteAndKeepsEverySessionInList() throws {
         let repository = URL(fileURLWithPath: #filePath)
             .deletingLastPathComponent()