| ... | @@ -176,6 +176,32 @@ export type ThreadFeedLatestTurn = Pick< | ... | @@ -176,6 +176,32 @@ export type ThreadFeedLatestTurn = Pick< |
| 176 | "turnId" | "state" | "startedAt" | "completedAt" | 176 | "turnId" | "state" | "startedAt" | "completedAt" |
| 177 | >; | 177 | >; |
| 178 | | 178 | |
| | 179 | type ThreadFeedActivityGroup = Extract<ThreadFeedEntry, { readonly type: "activity-group" }>; |
| | 180 | |
| | 181 | // These keys are immutable inputs. Weak caches release old histories with their source data. |
| | 182 | const activityEntriesCache = new WeakMap< |
| | 183 | ReadonlyArray<OrchestrationThreadActivity>, |
| | 184 | ReadonlyArray<Extract<RawThreadFeedEntry, { readonly type: "activity" }>> |
| | 185 | >(); |
| | 186 | const messageEntriesCache = new WeakMap< |
| | 187 | OrchestrationThread["messages"][number], |
| | 188 | Extract<RawThreadFeedEntry, { readonly type: "message" }> |
| | 189 | >(); |
| | 190 | const activityGroupsCache = new WeakMap<ThreadFeedActivity, ThreadFeedActivityGroup>(); |
| | 191 | const presentedActivityGroupsCache = new WeakMap< |
| | 192 | ThreadFeedActivityGroup, |
| | 193 | { |
| | 194 | readonly unsettledTurnId: TurnId | null; |
| | 195 | readonly isWorking: boolean; |
| | 196 | readonly activeTail: boolean; |
| | 197 | readonly rows: ReadonlyArray<ThreadFeedEntry>; |
| | 198 | } |
| | 199 | >(); |
| | 200 | const turnFoldRowsCache = new WeakMap< |
| | 201 | ThreadFeedEntry, |
| | 202 | Extract<ThreadFeedEntry, { readonly type: "turn-fold" }> |
| | 203 | >(); |
| | 204 | |
| 179 | export function isContextCompactionActivityGroup( | 205 | export function isContextCompactionActivityGroup( |
| 180 | entry: Extract<ThreadFeedEntry, { readonly type: "activity-group" }>, | 206 | entry: Extract<ThreadFeedEntry, { readonly type: "activity-group" }>, |
| 181 | ): boolean { | 207 | ): boolean { |
| ... | @@ -1266,11 +1292,31 @@ function isEmptyMessage(entry: RawThreadFeedEntry): boolean { | ... | @@ -1266,11 +1292,31 @@ function isEmptyMessage(entry: RawThreadFeedEntry): boolean { |
| 1266 | | 1292 | |
| 1267 | function groupAdjacentActivities(entries: ReadonlyArray<RawThreadFeedEntry>): ThreadFeedEntry[] { | 1293 | function groupAdjacentActivities(entries: ReadonlyArray<RawThreadFeedEntry>): ThreadFeedEntry[] { |
| 1268 | const grouped: ThreadFeedEntry[] = []; | 1294 | const grouped: ThreadFeedEntry[] = []; |
| 1269 | // Mutable backing array for the trailing group so appending an activity is | 1295 | let firstActivityEntry: Extract<RawThreadFeedEntry, { readonly type: "activity" }> | null = null; |
| 1270 | // O(1) instead of re-copying the group (which made this loop quadratic on | 1296 | let openGroupActivities: ThreadFeedActivity[] = []; |
| 1271 | // long tool runs). The array is only mutated while it is the trailing group. | 1297 | const flushGroup = () => { |
| 1272 | let openGroupActivities: ThreadFeedActivity[] | null = null; | 1298 | if (firstActivityEntry === null) return; |
| 1273 | let openGroupTurnId: TurnId | null = null; | 1299 | const cached = activityGroupsCache.get(firstActivityEntry.activity); |
| | 1300 | if ( |
| | 1301 | cached && |
| | 1302 | cached.activities.length === openGroupActivities.length && |
| | 1303 | cached.activities.every((activity, index) => activity === openGroupActivities[index]) |
| | 1304 | ) { |
| | 1305 | grouped.push(cached); |
| | 1306 | } else { |
| | 1307 | const group: ThreadFeedActivityGroup = { |
| | 1308 | type: "activity-group", |
| | 1309 | id: firstActivityEntry.id, |
| | 1310 | createdAt: firstActivityEntry.createdAt, |
| | 1311 | turnId: firstActivityEntry.turnId, |
| | 1312 | activities: openGroupActivities, |
| | 1313 | }; |
| | 1314 | activityGroupsCache.set(firstActivityEntry.activity, group); |
| | 1315 | grouped.push(group); |
| | 1316 | } |
| | 1317 | firstActivityEntry = null; |
| | 1318 | openGroupActivities = []; |
| | 1319 | }; |
| 1274 | | 1320 | |
| 1275 | for (const entry of entries) { | 1321 | for (const entry of entries) { |
| 1276 | // Skip empty messages so they don't break activity grouping. | 1322 | // Skip empty messages so they don't break activity grouping. |
| ... | @@ -1279,39 +1325,22 @@ function groupAdjacentActivities(entries: ReadonlyArray<RawThreadFeedEntry>): Th | ... | @@ -1279,39 +1325,22 @@ function groupAdjacentActivities(entries: ReadonlyArray<RawThreadFeedEntry>): Th |
| 1279 | } | 1325 | } |
| 1280 | | 1326 | |
| 1281 | if (entry.type !== "activity") { | 1327 | if (entry.type !== "activity") { |
| | 1328 | flushGroup(); |
| 1282 | grouped.push(entry); | 1329 | grouped.push(entry); |
| 1283 | openGroupActivities = null; | | |
| 1284 | continue; | 1330 | continue; |
| 1285 | } | 1331 | } |
| 1286 | | 1332 | |
| 1287 | if (entry.activity.workEntry.sourceActivityKind === "context-compaction") { | 1333 | const isCompaction = entry.activity.workEntry.sourceActivityKind === "context-compaction"; |
| 1288 | grouped.push({ | 1334 | if (isCompaction || firstActivityEntry?.turnId !== entry.turnId) { |
| 1289 | type: "activity-group", | 1335 | flushGroup(); |
| 1290 | id: entry.id, | | |
| 1291 | createdAt: entry.createdAt, | | |
| 1292 | turnId: entry.turnId, | | |
| 1293 | activities: [entry.activity], | | |
| 1294 | }); | | |
| 1295 | openGroupActivities = null; | | |
| 1296 | continue; | | |
| 1297 | } | 1336 | } |
| 1298 | | 1337 | firstActivityEntry ??= entry; |
| 1299 | if (openGroupActivities !== null && openGroupTurnId === entry.turnId) { | 1338 | openGroupActivities.push(entry.activity); |
| 1300 | openGroupActivities.push(entry.activity); | 1339 | if (isCompaction) { |
| 1301 | continue; | 1340 | flushGroup(); |
| 1302 | } | 1341 | } |
| 1303 | | | |
| 1304 | openGroupActivities = [entry.activity]; | | |
| 1305 | openGroupTurnId = entry.turnId; | | |
| 1306 | grouped.push({ | | |
| 1307 | type: "activity-group", | | |
| 1308 | id: entry.id, | | |
| 1309 | createdAt: entry.createdAt, | | |
| 1310 | turnId: entry.turnId, | | |
| 1311 | activities: openGroupActivities, | | |
| 1312 | }); | | |
| 1313 | } | 1342 | } |
| 1314 | | 1343 | flushGroup(); |
| 1315 | return grouped; | 1344 | return grouped; |
| 1316 | } | 1345 | } |
| 1317 | | 1346 | |
| ... | @@ -1509,14 +1538,26 @@ export function deriveThreadFeedPresentation( | ... | @@ -1509,14 +1538,26 @@ export function deriveThreadFeedPresentation( |
| 1509 | entry.turnId === unsettledTurnId; | 1538 | entry.turnId === unsettledTurnId; |
| 1510 | const fold = foldsByAnchorId.get(entry.id); | 1539 | const fold = foldsByAnchorId.get(entry.id); |
| 1511 | if (fold) { | 1540 | if (fold) { |
| 1512 | result.push({ | 1541 | const expanded = expandedTurnIds.has(fold.turnId); |
| 1513 | type: "turn-fold", | 1542 | let row = turnFoldRowsCache.get(entry); |
| 1514 | id: `turn-fold:${fold.turnId}`, | 1543 | if ( |
| 1515 | createdAt: fold.createdAt, | 1544 | !row || |
| 1516 | turnId: fold.turnId, | 1545 | row.turnId !== fold.turnId || |
| 1517 | label: fold.label, | 1546 | row.createdAt !== fold.createdAt || |
| 1518 | expanded: expandedTurnIds.has(fold.turnId), | 1547 | row.label !== fold.label || |
| 1519 | }); | 1548 | row.expanded !== expanded |
| | 1549 | ) { |
| | 1550 | row = { |
| | 1551 | type: "turn-fold", |
| | 1552 | id: `turn-fold:${fold.turnId}`, |
| | 1553 | createdAt: fold.createdAt, |
| | 1554 | turnId: fold.turnId, |
| | 1555 | label: fold.label, |
| | 1556 | expanded, |
| | 1557 | }; |
| | 1558 | turnFoldRowsCache.set(entry, row); |
| | 1559 | } |
| | 1560 | result.push(row); |
| 1520 | } | 1561 | } |
| 1521 | if (!collapsedEntryIds.has(entry.id)) { | 1562 | if (!collapsedEntryIds.has(entry.id)) { |
| 1522 | appendPresentedFeedEntry( | 1563 | appendPresentedFeedEntry( |
| ... | @@ -1549,6 +1590,41 @@ function appendPresentedFeedEntry( | ... | @@ -1549,6 +1590,41 @@ function appendPresentedFeedEntry( |
| 1549 | return; | 1590 | return; |
| 1550 | } | 1591 | } |
| 1551 | | 1592 | |
| | 1593 | let cached = presentedActivityGroupsCache.get(entry); |
| | 1594 | if ( |
| | 1595 | !cached || |
| | 1596 | cached.unsettledTurnId !== unsettledTurnId || |
| | 1597 | cached.isWorking !== isWorking || |
| | 1598 | cached.activeTail !== activeTail || |
| | 1599 | cached.rows.some( |
| | 1600 | (row) => row.type === "work-toggle" && expandedWorkGroupIds.has(row.groupId) !== row.expanded, |
| | 1601 | ) |
| | 1602 | ) { |
| | 1603 | const rows: ThreadFeedEntry[] = []; |
| | 1604 | appendActivityGroupRows( |
| | 1605 | rows, |
| | 1606 | entry, |
| | 1607 | expandedWorkGroupIds, |
| | 1608 | unsettledTurnId, |
| | 1609 | isWorking, |
| | 1610 | activeTail, |
| | 1611 | ); |
| | 1612 | cached = { unsettledTurnId, isWorking, activeTail, rows }; |
| | 1613 | presentedActivityGroupsCache.set(entry, cached); |
| | 1614 | } |
| | 1615 | for (const row of cached.rows) { |
| | 1616 | result.push(row); |
| | 1617 | } |
| | 1618 | } |
| | 1619 | |
| | 1620 | function appendActivityGroupRows( |
| | 1621 | result: ThreadFeedEntry[], |
| | 1622 | entry: ThreadFeedActivityGroup, |
| | 1623 | expandedWorkGroupIds: ReadonlySet<string>, |
| | 1624 | unsettledTurnId: TurnId | null, |
| | 1625 | isWorking: boolean, |
| | 1626 | activeTail: boolean, |
| | 1627 | ): void { |
| 1552 | const activities = omitSupersededLifecycleMarkers( | 1628 | const activities = omitSupersededLifecycleMarkers( |
| 1553 | entry.activities.filter( | 1629 | entry.activities.filter( |
| 1554 | (activity) => | 1630 | (activity) => |
| ... | @@ -1920,7 +1996,7 @@ export function buildPendingUserInputAnswers( | ... | @@ -1920,7 +1996,7 @@ export function buildPendingUserInputAnswers( |
| 1920 | } | 1996 | } |
| 1921 | | 1997 | |
| 1922 | export function buildThreadFeed( | 1998 | export function buildThreadFeed( |
| 1923 | thread: OrchestrationThread, | 1999 | thread: Pick<OrchestrationThread, "messages" | "activities">, |
| 1924 | options?: { | 2000 | options?: { |
| 1925 | readonly loadedMessages?: ReadonlyArray<OrchestrationThread["messages"][number]>; | 2001 | readonly loadedMessages?: ReadonlyArray<OrchestrationThread["messages"][number]>; |
| 1926 | readonly localMessages?: ReadonlyArray<OrchestrationThread["messages"][number]>; | 2002 | readonly localMessages?: ReadonlyArray<OrchestrationThread["messages"][number]>; |
| ... | @@ -1932,70 +2008,21 @@ export function buildThreadFeed( | ... | @@ -1932,70 +2008,21 @@ export function buildThreadFeed( |
| 1932 | : loadedMessages; | 2008 | : loadedMessages; |
| 1933 | const oldestLoadedMessageCreatedAt = | 2009 | const oldestLoadedMessageCreatedAt = |
| 1934 | options?.loadedMessages !== undefined ? (loadedMessages[0]?.createdAt ?? null) : null; | 2010 | options?.loadedMessages !== undefined ? (loadedMessages[0]?.createdAt ?? null) : null; |
| 1935 | const workLogEntries = deriveWorkLogEntries(thread.activities); | 2011 | const activityEntries = getThreadFeedActivityEntries(thread.activities); |
| 1936 | const entries = Arr.sortWith( | 2012 | const entries = Arr.sortWith( |
| 1937 | [ | 2013 | [ |
| 1938 | ...messages.map<RawThreadFeedEntry>((message) => ({ | 2014 | ...messages.map((message) => { |
| 1939 | type: "message", | 2015 | let entry = messageEntriesCache.get(message); |
| 1940 | id: message.id, | 2016 | if (!entry) { |
| 1941 | createdAt: message.createdAt, | 2017 | entry = { type: "message", id: message.id, createdAt: message.createdAt, message }; |
| 1942 | message, | 2018 | messageEntriesCache.set(message, entry); |
| 1943 | })), | 2019 | } |
| 1944 | ...workLogEntries | 2020 | return entry; |
| 1945 | .filter((entry) => { | 2021 | }), |
| 1946 | if (options?.loadedMessages === undefined) { | 2022 | ...activityEntries.filter( |
| 1947 | return true; | 2023 | (entry) => |
| 1948 | } | 2024 | oldestLoadedMessageCreatedAt === null || entry.createdAt >= oldestLoadedMessageCreatedAt, |
| 1949 | return ( | 2025 | ), |
| 1950 | oldestLoadedMessageCreatedAt === null || entry.createdAt >= oldestLoadedMessageCreatedAt | | |
| 1951 | ); | | |
| 1952 | }) | | |
| 1953 | .map<RawThreadFeedEntry>((entry) => { | | |
| 1954 | const summary = workEntryHeading(entry); | | |
| 1955 | const detail = workEntryPreview(entry); | | |
| 1956 | const getFullDetail = memoizeValue(() => buildWorkEntryExpandedBody(entry)); | | |
| 1957 | const getCopyText = memoizeValue(() => { | | |
| 1958 | const copyLabel = capitalizePhrase( | | |
| 1959 | normalizeCompactToolLabel(entry.toolTitle || entry.label), | | |
| 1960 | ); | | |
| 1961 | const fullDetail = getFullDetail(); | | |
| 1962 | if (entry.command) { | | |
| 1963 | const normalizedCommand = | | |
| 1964 | entry.rawCommand && copyLabel.trim() !== entry.command.trim() | | |
| 1965 | ? entry.command | | |
| 1966 | : null; | | |
| 1967 | return [copyLabel, normalizedCommand, fullDetail ?? entry.command] | | |
| 1968 | .filter((value): value is string => Boolean(value)) | | |
| 1969 | .join("\n"); | | |
| 1970 | } | | |
| 1971 | return [copyLabel, detail, fullDetail] | | |
| 1972 | .filter((value, index, values): value is string => { | | |
| 1973 | return Boolean(value) && values.indexOf(value) === index; | | |
| 1974 | }) | | |
| 1975 | .join("\n"); | | |
| 1976 | }); | | |
| 1977 | return { | | |
| 1978 | type: "activity", | | |
| 1979 | id: entry.id, | | |
| 1980 | createdAt: entry.createdAt, | | |
| 1981 | turnId: entry.turnId, | | |
| 1982 | activity: { | | |
| 1983 | id: entry.id, | | |
| 1984 | createdAt: entry.createdAt, | | |
| 1985 | turnId: entry.turnId, | | |
| 1986 | summary, | | |
| 1987 | detail, | | |
| 1988 | canExpand: workEntryHasExpandedBody(entry), | | |
| 1989 | getFullDetail, | | |
| 1990 | getCopyText, | | |
| 1991 | icon: workEntryIcon(entry), | | |
| 1992 | toolLike: workLogEntryIsToolLike(entry), | | |
| 1993 | status: workEntryStatus(entry), | | |
| 1994 | ...(entry.toolLifecycleStatus ? { lifecycleStatus: entry.toolLifecycleStatus } : {}), | | |
| 1995 | workEntry: entry, | | |
| 1996 | }, | | |
| 1997 | }; | | |
| 1998 | }), | | |
| 1999 | ], | 2026 | ], |
| 2000 | (s) => new Date(s.createdAt), | 2027 | (s) => new Date(s.createdAt), |
| 2001 | Order.Date, | 2028 | Order.Date, |
| ... | @@ -2003,3 +2030,56 @@ export function buildThreadFeed( | ... | @@ -2003,3 +2030,56 @@ export function buildThreadFeed( |
| 2003 | | 2030 | |
| 2004 | return groupAdjacentActivities(entries); | 2031 | return groupAdjacentActivities(entries); |
| 2005 | } | 2032 | } |
| | 2033 | |
| | 2034 | function getThreadFeedActivityEntries(activities: ReadonlyArray<OrchestrationThreadActivity>) { |
| | 2035 | const cached = activityEntriesCache.get(activities); |
| | 2036 | if (cached) return cached; |
| | 2037 | const entries = deriveWorkLogEntries(activities).map(toThreadFeedActivityEntry); |
| | 2038 | activityEntriesCache.set(activities, entries); |
| | 2039 | return entries; |
| | 2040 | } |
| | 2041 | |
| | 2042 | function toThreadFeedActivityEntry( |
| | 2043 | entry: DerivedWorkLogEntry, |
| | 2044 | ): Extract<RawThreadFeedEntry, { readonly type: "activity" }> { |
| | 2045 | const summary = workEntryHeading(entry); |
| | 2046 | const detail = workEntryPreview(entry); |
| | 2047 | const getFullDetail = memoizeValue(() => buildWorkEntryExpandedBody(entry)); |
| | 2048 | const getCopyText = memoizeValue(() => { |
| | 2049 | const copyLabel = capitalizePhrase(normalizeCompactToolLabel(entry.toolTitle || entry.label)); |
| | 2050 | const fullDetail = getFullDetail(); |
| | 2051 | if (entry.command) { |
| | 2052 | const normalizedCommand = |
| | 2053 | entry.rawCommand && copyLabel.trim() !== entry.command.trim() ? entry.command : null; |
| | 2054 | return [copyLabel, normalizedCommand, fullDetail ?? entry.command] |
| | 2055 | .filter((value): value is string => Boolean(value)) |
| | 2056 | .join("\n"); |
| | 2057 | } |
| | 2058 | return [copyLabel, detail, fullDetail] |
| | 2059 | .filter((value, index, values): value is string => { |
| | 2060 | return Boolean(value) && values.indexOf(value) === index; |
| | 2061 | }) |
| | 2062 | .join("\n"); |
| | 2063 | }); |
| | 2064 | return { |
| | 2065 | type: "activity", |
| | 2066 | id: entry.id, |
| | 2067 | createdAt: entry.createdAt, |
| | 2068 | turnId: entry.turnId, |
| | 2069 | activity: { |
| | 2070 | id: entry.id, |
| | 2071 | createdAt: entry.createdAt, |
| | 2072 | turnId: entry.turnId, |
| | 2073 | summary, |
| | 2074 | detail, |
| | 2075 | canExpand: workEntryHasExpandedBody(entry), |
| | 2076 | getFullDetail, |
| | 2077 | getCopyText, |
| | 2078 | icon: workEntryIcon(entry), |
| | 2079 | toolLike: workLogEntryIsToolLike(entry), |
| | 2080 | status: workEntryStatus(entry), |
| | 2081 | ...(entry.toolLifecycleStatus ? { lifecycleStatus: entry.toolLifecycleStatus } : {}), |
| | 2082 | workEntry: entry, |
| | 2083 | }, |
| | 2084 | }; |
| | 2085 | } |
Theo Browne <me@t3.gg> 2026-09-04 07:25:15-07:00
GitHub <noreply@github.com> 2026-09-04 07:25:15-07:00