mirror of
https://github.com/stablyai/orca.git
synced 2026-11-17 03:15:01 +00:00
perf: reuse AI-vault title requests across a sync pass until an input changes
The title pass rebuilt every tab's conversation 2 + 2 x batches times per 20 s pass. Keep one request snapshot per sync and rebuild it only when a conversation, tab, layout or owner input changed; request timing and titles are unchanged.
This commit is contained in:
@@ -31,7 +31,8 @@ export function batchAiVaultTitleRequests(
|
||||
export async function settleAiVaultTitleRequestBatches(
|
||||
requests: AiVaultTitleRequest[],
|
||||
resolveBatch: (batch: AiVaultTitleRequest[]) => Promise<void>,
|
||||
currentRequests: () => AiVaultTitleRequest[] = () => requests
|
||||
currentRequestsByKey: () => ReadonlyMap<string, AiVaultTitleRequest> = () =>
|
||||
new Map(requests.map((request) => [aiVaultTitleRequestKey(request), request]))
|
||||
): Promise<void> {
|
||||
const batchesByHost = new Map<ExecutionHostId, AiVaultTitleRequest[][]>()
|
||||
for (const batch of batchAiVaultTitleRequests(requests)) {
|
||||
@@ -44,9 +45,7 @@ export async function settleAiVaultTitleRequestBatches(
|
||||
[...batchesByHost.values()].map(async (hostBatches) => {
|
||||
for (const batch of hostBatches) {
|
||||
try {
|
||||
const current = new Map(
|
||||
currentRequests().map((request) => [aiVaultTitleRequestKey(request), request])
|
||||
)
|
||||
const current = currentRequestsByKey()
|
||||
const owned = batch.filter((request) => {
|
||||
const live = current.get(aiVaultTitleRequestKey(request))
|
||||
return live && (!request.refresh || live.refresh)
|
||||
|
||||
+36
-10
@@ -102,7 +102,11 @@ function agentRecordsEqual(current: AppState, previous: AppState): boolean {
|
||||
)
|
||||
}
|
||||
|
||||
function terminalTabsEqual(current: AppState, previous: AppState): boolean {
|
||||
function terminalTabsEqual(
|
||||
current: AppState,
|
||||
previous: AppState,
|
||||
includeStoredTitles: boolean
|
||||
): boolean {
|
||||
const currentKeys = Object.keys(current.tabsByWorktree)
|
||||
const previousKeys = Object.keys(previous.tabsByWorktree)
|
||||
if (currentKeys.length !== previousKeys.length) {
|
||||
@@ -121,7 +125,7 @@ function terminalTabsEqual(current: AppState, previous: AppState): boolean {
|
||||
left.id !== right.id ||
|
||||
left.worktreeId !== right.worktreeId ||
|
||||
left.sessionTitleFromHost !== right.sessionTitleFromHost ||
|
||||
!sameAiVaultSessionTitle(left.aiVaultTitle, right.aiVaultTitle)
|
||||
(includeStoredTitles && !sameAiVaultSessionTitle(left.aiVaultTitle, right.aiVaultTitle))
|
||||
) {
|
||||
return false
|
||||
}
|
||||
@@ -210,7 +214,11 @@ export function aiVaultTitleSyncInputsChanged(current: AppState, previous: AppSt
|
||||
return changed
|
||||
}
|
||||
|
||||
function syncInputsChanged(current: AppState, previous: AppState): boolean {
|
||||
function requestFactsChanged(
|
||||
current: AppState,
|
||||
previous: AppState,
|
||||
includeStoredTitles: boolean
|
||||
): boolean {
|
||||
const agentRecordsChanged =
|
||||
current.agentStatusByPaneKey !== previous.agentStatusByPaneKey ||
|
||||
current.agentConversationsByPaneKey !== previous.agentConversationsByPaneKey ||
|
||||
@@ -218,17 +226,20 @@ function syncInputsChanged(current: AppState, previous: AppState): boolean {
|
||||
if (agentRecordsChanged && !agentRecordsEqual(current, previous)) {
|
||||
return true
|
||||
}
|
||||
if (current.tabsByWorktree !== previous.tabsByWorktree && !terminalTabsEqual(current, previous)) {
|
||||
return true
|
||||
}
|
||||
if (
|
||||
current.terminalLayoutsByTabId !== previous.terminalLayoutsByTabId &&
|
||||
(!activePanesEqual(current, previous) || !placedPanesEqual(current, previous))
|
||||
current.tabsByWorktree !== previous.tabsByWorktree &&
|
||||
!terminalTabsEqual(current, previous, includeStoredTitles)
|
||||
) {
|
||||
return true
|
||||
}
|
||||
return (
|
||||
current.terminalLayoutsByTabId !== previous.terminalLayoutsByTabId &&
|
||||
(!activePanesEqual(current, previous) || !placedPanesEqual(current, previous))
|
||||
)
|
||||
}
|
||||
|
||||
const ownerInputsChanged =
|
||||
function ownerInputsChanged(current: AppState, previous: AppState): boolean {
|
||||
return (
|
||||
current.repos !== previous.repos ||
|
||||
worktreeOwnerRowsTokenOf(selectWorktreesByRepo(current)) !==
|
||||
worktreeOwnerRowsTokenOf(selectWorktreesByRepo(previous)) ||
|
||||
@@ -243,5 +254,20 @@ function syncInputsChanged(current: AppState, previous: AppState): boolean {
|
||||
current.runtimeEnvironments !== previous.runtimeEnvironments ||
|
||||
current.runtimeEnvironmentCatalogHydrated !== previous.runtimeEnvironmentCatalogHydrated ||
|
||||
current.removedRuntimeEnvironmentIds !== previous.removedRuntimeEnvironmentIds
|
||||
return ownerInputsChanged && !requestOwnersEqual(current, previous)
|
||||
)
|
||||
}
|
||||
|
||||
function syncInputsChanged(current: AppState, previous: AppState): boolean {
|
||||
return (
|
||||
requestFactsChanged(current, previous, true) ||
|
||||
(ownerInputsChanged(current, previous) && !requestOwnersEqual(current, previous))
|
||||
)
|
||||
}
|
||||
|
||||
/** False means collectAiVaultTitleRequests returns the same requests for both states, so a pass can reuse them. */
|
||||
export function aiVaultTitleRequestInputsChanged(current: AppState, previous: AppState): boolean {
|
||||
return (
|
||||
current !== previous &&
|
||||
(requestFactsChanged(current, previous, false) || ownerInputsChanged(current, previous))
|
||||
)
|
||||
}
|
||||
|
||||
@@ -9,7 +9,10 @@ import {
|
||||
type AiVaultTitleRequest
|
||||
} from './ai-vault-tab-title-requests'
|
||||
import { settleAiVaultTitleRequestBatches } from './ai-vault-tab-title-batches'
|
||||
import { aiVaultTitleSyncInputsChanged } from './ai-vault-tab-title-sync-inputs'
|
||||
import {
|
||||
aiVaultTitleRequestInputsChanged,
|
||||
aiVaultTitleSyncInputsChanged
|
||||
} from './ai-vault-tab-title-sync-inputs'
|
||||
|
||||
import {
|
||||
aiVaultTitleRequestKey,
|
||||
@@ -23,6 +26,13 @@ function requestIdentity(request: AiVaultTitleRequest): string {
|
||||
return `${request.executionHostId}\0${request.agent}\0${request.providerSession.id}`
|
||||
}
|
||||
|
||||
type RequestSnapshot = {
|
||||
state: AppState
|
||||
requests: AiVaultTitleRequest[]
|
||||
byKey: Map<string, AiVaultTitleRequest>
|
||||
byTabId: Map<string, AiVaultTitleRequest>
|
||||
}
|
||||
|
||||
type SyncDependencies = {
|
||||
getState: () => AppState
|
||||
resolveSessionTitles: (args: AiVaultSessionTitlesArgs) => Promise<AiVaultSessionTitlesResult>
|
||||
@@ -59,6 +69,23 @@ export function startAiVaultTabTitleSync(dependencies: SyncDependencies): () =>
|
||||
let writing = false
|
||||
const lastSettledAttemptAt = new Map<string, number>()
|
||||
const dirty = new Set<string>()
|
||||
// Why: rebuilding requests walks every tab and conversation; a pass and its batches reuse them until an input changes.
|
||||
let snapshot: RequestSnapshot | null = null
|
||||
|
||||
const currentRequests = (state = dependencies.getState()): RequestSnapshot => {
|
||||
if (snapshot && !aiVaultTitleRequestInputsChanged(state, snapshot.state)) {
|
||||
snapshot.state = state
|
||||
return snapshot
|
||||
}
|
||||
const requests = collectAiVaultTitleRequests(state)
|
||||
snapshot = {
|
||||
state,
|
||||
requests,
|
||||
byKey: new Map(requests.map((request) => [aiVaultTitleRequestKey(request), request])),
|
||||
byTabId: new Map(requests.map((request) => [request.tabId, request]))
|
||||
}
|
||||
return snapshot
|
||||
}
|
||||
|
||||
const writeTitle = (
|
||||
request: AiVaultTitleRequest,
|
||||
@@ -106,12 +133,7 @@ export function startAiVaultTabTitleSync(dependencies: SyncDependencies): () =>
|
||||
})
|
||||
}
|
||||
}
|
||||
const currentByTabId = new Map(
|
||||
collectAiVaultTitleRequests(dependencies.getState()).map((request) => [
|
||||
request.tabId,
|
||||
request
|
||||
])
|
||||
)
|
||||
const currentByTabId = currentRequests().byTabId
|
||||
for (const request of requests) {
|
||||
const current = currentByTabId.get(request.tabId)
|
||||
const title = titleByIdentity.get(requestIdentity(request))
|
||||
@@ -136,13 +158,7 @@ export function startAiVaultTabTitleSync(dependencies: SyncDependencies): () =>
|
||||
}
|
||||
|
||||
const state = dependencies.getState()
|
||||
const tabsById = new Map(
|
||||
Object.values(state.tabsByWorktree)
|
||||
.flat()
|
||||
.map((tab) => [tab.id, tab] as const)
|
||||
)
|
||||
const requests = collectAiVaultTitleRequests(state)
|
||||
const currentKeys = new Set(requests.map(aiVaultTitleRequestKey))
|
||||
const { requests, byKey: currentKeys } = currentRequests(state)
|
||||
for (const key of lastSettledAttemptAt.keys()) {
|
||||
if (!currentKeys.has(key)) {
|
||||
lastSettledAttemptAt.delete(key)
|
||||
@@ -155,7 +171,9 @@ export function startAiVaultTabTitleSync(dependencies: SyncDependencies): () =>
|
||||
}
|
||||
const now = Date.now()
|
||||
const requestsToScan = requests.filter((request) => {
|
||||
const stored = tabsById.get(request.tabId)?.aiVaultTitle
|
||||
const stored = state.tabsByWorktree[request.worktreeId]?.find(
|
||||
(tab) => tab.id === request.tabId
|
||||
)?.aiVaultTitle
|
||||
const identityMatches =
|
||||
stored?.agent === request.agent && stored.sessionId === request.providerSession.id
|
||||
if (stored && !identityMatches) {
|
||||
@@ -193,7 +211,7 @@ export function startAiVaultTabTitleSync(dependencies: SyncDependencies): () =>
|
||||
}
|
||||
}
|
||||
},
|
||||
() => (stopped ? [] : collectAiVaultTitleRequests(dependencies.getState()))
|
||||
() => (stopped ? new Map() : currentRequests().byKey)
|
||||
)
|
||||
scanInFlight = false
|
||||
}
|
||||
@@ -203,9 +221,8 @@ export function startAiVaultTabTitleSync(dependencies: SyncDependencies): () =>
|
||||
schedule()
|
||||
} else if (!stopped) {
|
||||
const currentState = dependencies.getState()
|
||||
const currentRequests = collectAiVaultTitleRequests(currentState)
|
||||
const delays = currentRequests
|
||||
.filter((request) => request.refresh)
|
||||
const delays = currentRequests(currentState)
|
||||
.requests.filter((request) => request.refresh)
|
||||
.map((request) =>
|
||||
Math.max(
|
||||
0,
|
||||
@@ -216,6 +233,9 @@ export function startAiVaultTabTitleSync(dependencies: SyncDependencies): () =>
|
||||
)
|
||||
if (delays.length > 0) {
|
||||
refreshTimer = setTimer(schedule, Math.min(...delays))
|
||||
} else {
|
||||
// Nothing comes back on a timer, so don't hold an old store snapshot until the next change.
|
||||
snapshot = null
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -260,6 +280,7 @@ export function startAiVaultTabTitleSync(dependencies: SyncDependencies): () =>
|
||||
|
||||
return () => {
|
||||
stopped = true
|
||||
snapshot = null
|
||||
unsubscribe()
|
||||
cancelScheduled?.()
|
||||
cancelScheduled = null
|
||||
|
||||
@@ -145,8 +145,11 @@ export class AcceptedAgentStatuses implements ReadonlyMap<string, AgentStatusEnt
|
||||
? [entry.agentType, entry.paneKey, entry.tabId, entry.worktreeId, entry.providerSession]
|
||||
: undefined
|
||||
const changes = this.changes()
|
||||
// A moved key changes iteration order, which picks between equal-priority panes of one tab.
|
||||
const titleChanged = changes.some(
|
||||
(change) => !equal(fact(change.previous), fact(change.current))
|
||||
(change) =>
|
||||
!equal(fact(change.previous), fact(change.current)) ||
|
||||
(this.moved.has(change.paneKey) && fact(change.current) !== undefined)
|
||||
)
|
||||
const titleRevision = this.titleRevision + Number(titleChanged)
|
||||
return () => {
|
||||
|
||||
Reference in New Issue
Block a user