Skip to content

fix: prevent repeated session lineage resolution #3

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
ss251 merged 2 commits into from
Jul 20, 2026
Merged

fix: prevent repeated session lineage resolution #3

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
63c73b1
perf(lineage): resolve once per rebuild, key sessions once, sort with…
ss251 Jul 20, 2026
a5abb62
no-mistakes(review): Fix lineage memoization and keyed projection reuse
ss251 Jul 20, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions Sources/Trifola/AppServices.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -529,7 +529,9 @@ final class AppServices: ObservableObject {
liveTerminalSessionIDs: liveTerminalSessionIDs,
searchIndex: sessions.searchIndex,
searchState: sessions.searchState,
sessionsRevision: sessions.revision,
lineageEvidence: sessions.lineageEvidence,
lineageEvidenceRevision: sessions.lineageEvidenceRevision,
showHeuristicLinks: preferences.value.showHeuristicLineageLinks,
lineageIsProvisional: sessions.scanPresentation.isProvisional
|| sessions.scanProgress.isInProgress,
Expand Down
112 changes: 95 additions & 17 deletions Sources/Trifola/NavigationSnapshotStore.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -130,14 +130,28 @@ final class NavigationSnapshotStore: ObservableObject {
let liveTerminalSessionIDs: Set<String>
let searchIndex: SearchIndex
let searchState: SearchIndexState
let sessionsRevision: Int
let lineageEvidence: SessionLineageEvidence
let lineageEvidenceRevision: Int
let showHeuristicLinks: Bool
let lineageIsProvisional: Bool
let now: Date
}

private struct LineageSource: Sendable, Equatable {
let sessionsRevision: Int
let evidenceRevision: Int
let includeHeuristics: Bool
}

private var inputs: Inputs?
private var sessionGeneration = 0
/// Resolved forest for one rebuild's inputs. Keystrokes and same-source
/// refreshes must never pay the ~10k-session resolve again.
private var lineageMemo:
(source: LineageSource, resolution: SessionLineageResolution)?
private var lineageInFlight:
(source: LineageSource, task: Task<SessionLineageResolution?, Never>)?
private var corpusGeneration = 0
private var fleetGeneration = 0
private var deadlineGeneration = 0
Expand Down Expand Up @@ -191,6 +205,7 @@ final class NavigationSnapshotStore: ObservableObject {

deinit {
sessionTask?.cancel()
lineageInFlight?.task.cancel()
corpusTask?.cancel()
fleetTask?.cancel()
deadlineTask?.cancel()
Expand All @@ -207,12 +222,25 @@ final class NavigationSnapshotStore: ObservableObject {
liveTerminalSessionIDs: Set<String>,
searchIndex: SearchIndex,
searchState: SearchIndexState,
sessionsRevision: Int,
lineageEvidence: SessionLineageEvidence,
lineageEvidenceRevision: Int,
showHeuristicLinks: Bool,
lineageIsProvisional: Bool,
now: Date
) {
sourceGeneration += 1
let lineageSource = LineageSource(
sessionsRevision: sessionsRevision,
evidenceRevision: lineageEvidenceRevision,
includeHeuristics: showHeuristicLinks)
if lineageMemo?.source != lineageSource {
lineageMemo = nil
}
if let pending = lineageInFlight, pending.source != lineageSource {
pending.task.cancel()
lineageInFlight = nil
}
inputs = Inputs(
sessions: sessions,
attentionSignals: attentionSignals,
Expand All @@ -223,7 +251,9 @@ final class NavigationSnapshotStore: ObservableObject {
liveTerminalSessionIDs: liveTerminalSessionIDs,
searchIndex: searchIndex,
searchState: searchState,
sessionsRevision: sessionsRevision,
lineageEvidence: lineageEvidence,
lineageEvidenceRevision: lineageEvidenceRevision,
showHeuristicLinks: showHeuristicLinks,
lineageIsProvisional: lineageIsProvisional,
now: now)
Expand Down Expand Up @@ -360,6 +390,28 @@ final class NavigationSnapshotStore: ObservableObject {
sessionGeneration += 1
let generation = sessionGeneration
let filter = sessionFilter
let lineageSource = LineageSource(
sessionsRevision: inputs.sessionsRevision,
evidenceRevision: inputs.lineageEvidenceRevision,
includeHeuristics: inputs.showHeuristicLinks)
let cachedResolution = lineageMemo.flatMap {
$0.source == lineageSource ? $0.resolution : nil
}
let resolutionTask: Task<SessionLineageResolution?, Never>? = {
guard cachedResolution == nil else { return nil }
if let pending = lineageInFlight,
pending.source == lineageSource {
return pending.task
}
let task = Task.detached(priority: .userInitiated) {
try? SessionLineage.resolveWithIndexCancellable(
sessions: inputs.sessions,
evidence: inputs.lineageEvidence,
includeHeuristicLinks: inputs.showHeuristicLinks)
}
lineageInFlight = (source: lineageSource, task: task)
return task
}()
sessionTask?.cancel()
var state = sessionSearch
let request = state.begin(query: filter.query)
Expand All @@ -369,6 +421,27 @@ final class NavigationSnapshotStore: ObservableObject {
try? await Task.sleep(for: .milliseconds(250))
guard !Task.isCancelled else { return }
}
let resolution: SessionLineageResolution
if let cachedResolution {
resolution = cachedResolution
} else if let resolutionTask {
guard let completed = await resolutionTask.value else { return }
resolution = completed
guard let self else { return }
if self.inputs.map({ LineageSource(
sessionsRevision: $0.sessionsRevision,
evidenceRevision: $0.lineageEvidenceRevision,
includeHeuristics: $0.showHeuristicLinks)
}) == lineageSource {
self.lineageMemo = (
source: lineageSource,
resolution: resolution)
self.lineageInFlight = nil
}
} else {
return
}
guard !Task.isCancelled else { return }
let result = await Task.detached(priority: .userInitiated) {
let metric = NavigationMetrics.beginProjection(
.sessions, generation: generation)
Expand All @@ -379,12 +452,8 @@ final class NavigationSnapshotStore: ObservableObject {
liveTerminalSessionIDs: inputs.liveTerminalSessionIDs,
filter: eligibilityFilter,
now: inputs.now)
let lineage = SessionLineage.resolve(
sessions: inputs.sessions,
evidence: inputs.lineageEvidence,
includeHeuristicLinks: inputs.showHeuristicLinks)
let projected = Self.projectLineage(
lineage,
resolution,
summaries: inputs.sessions,
liveTerminalSessionIDs: inputs.liveTerminalSessionIDs,
filter: filter,
Expand Down Expand Up @@ -594,15 +663,13 @@ final class NavigationSnapshotStore: ObservableObject {
}

private nonisolated static func projectLineage(
_ forest: SessionLineageForest,
_ resolution: SessionLineageResolution,
summaries: [SessionSummary],
liveTerminalSessionIDs: Set<String>,
filter: SessionProjectionFilter,
now: Date
) -> ProjectedLineage {
let summaryByKey = Dictionary(
summaries.map { (SessionLineage.key($0), $0) },
uniquingKeysWith: { first, _ in first })
let forest = resolution.forest
var counts = SessionLineageCounts()
for node in forest.allNodes where node.spawnDepth > 0 {
switch node.edgeKind {
Expand All @@ -622,11 +689,14 @@ final class NavigationSnapshotStore: ObservableObject {
if let machine = filter.machineID, reference.machineID != machine { return false }
if filter.liveInTerminalOnly,
!liveTerminalSessionIDs.contains(reference.id) { return false }
guard let summary = summaryByKey[reference.stableKey] else {
guard !reference.isMetadataOnly else {
return !filter.activeOnly && !filter.heavyOnly
}
if filter.activeOnly && !summary.isActive(at: now) { return false }
if filter.heavyOnly && !summary.isContextHeavy { return false }
if filter.activeOnly {
guard let last = reference.lastActivity,
now.timeIntervalSince(last) < 15 * 60 else { return false }
}
if filter.heavyOnly && reference.contextWeight <= 200_000 { return false }
return true
}

Expand Down Expand Up @@ -703,7 +773,11 @@ final class NavigationSnapshotStore: ObservableObject {

func displayRow(_ node: LineageNode, parent: LineageNode?,
contextOnly: Bool) -> SessionLineageDisplayRow {
let summary = summaryByKey[node.session.stableKey]
let reference = node.session
let isActive = !reference.isMetadataOnly
&& reference.lastActivity.map {
now.timeIntervalSince($0) < 15 * 60
} == true
return SessionLineageDisplayRow(
id: node.session.stableKey,
sessionID: node.session.id,
Expand All @@ -718,8 +792,9 @@ final class NavigationSnapshotStore: ObservableObject {
cost: node.session.cost,
machineID: node.session.machineID,
isRemote: node.session.machineID != Machine.localID,
isActive: summary?.isActive(at: now) ?? false,
isContextHeavy: summary?.isContextHeavy ?? false,
isActive: isActive,
isContextHeavy: !reference.isMetadataOnly
&& reference.contextWeight > 200_000,
isMetadataOnly: node.session.isMetadataOnly,
transcriptNote: node.session.transcriptNote,
edgeKind: node.edgeKind,
Expand Down Expand Up @@ -774,8 +849,11 @@ final class NavigationSnapshotStore: ObservableObject {
now: now)
let matches = SessionBrowserSearch.titlePathMatches(
eligible, query: filter.query)
rows = sortSessions(matches, by: filter.sort).prefix(400).map { summary in
let reference = LineageSessionReference(summary: summary)
rows = sortSessions(matches, by: filter.sort).prefix(400).compactMap { summary in
guard let key = resolution.key(for: summary) else { return nil }
let reference = LineageSessionReference(
summary: summary,
stableKey: key)
let node = LineageNode(
session: reference, children: [], edgeKind: nil,
confidence: nil, spawnDepth: 0, displayDepth: 0,
Expand Down
Loading
Loading