The agent that grows with you
Python aiai-agentai-agentsanthropicchatgptclaudeclaude-codecodexhermeshermes-agentllmnous-researchopenai
refactor(tui): close a canonical live row through the shared detach path
Tekniumd0ee3ffab405
diff --git a/ui-tui/src/__tests__/canonicalSwitcherClose.test.tsx b/ui-tui/src/__tests__/canonicalSwitcherClose.test.tsxindex b4623dd382a..ffa77d96cdf 100644--- a/ui-tui/src/__tests__/canonicalSwitcherClose.test.tsx+++ b/ui-tui/src/__tests__/canonicalSwitcherClose.test.tsx@@ -112,6 +112,20 @@ it('closeLiveView sends nothing for a canonical row this view holds no subscript}})+it('a close shares the detach flight tracking: a second close in flight sends nothing (#140183 Greptile)', async () => {+ const f = detachFixture()++ try {+ await f.attach('x')+ const [first, second] = await Promise.all([f.lifecycle().closeLiveView('x'), f.lifecycle().closeLiveView('x')])++ expect([first, second]).toEqual([{ closed: true }, null])+ expect(detaches(f.request)).toEqual([{ session_id: 'x', subscription_id: 'sub-1', end_reason: 'tui_close' }])+ } finally {+ f.cleanup()+ }+})+function mountSwitcher(onClose: (id: string) => Promise<null | { closed?: boolean; ok?: boolean }>) {const request = vi.fn(async (method: string, params: Record<string, unknown>) => {if (method === 'session.list') {diff --git a/ui-tui/src/app/useSessionLifecycle.ts b/ui-tui/src/app/useSessionLifecycle.tsindex f577192b7a0..34c1ea5b70a 100644--- a/ui-tui/src/app/useSessionLifecycle.ts+++ b/ui-tui/src/app/useSessionLifecycle.ts@@ -195,27 +195,47 @@ export function useSessionLifecycle(opts: UseSessionLifecycleOptions) {// `endReason`: main's `session.close` stamp for a view this TUI closes for good (`tui_close` on /new or// a resume switch, `tui_shutdown` on exit); the owner applies it once no other viewer remains.+ // The one path that sends `session.detach`: it serializes detaches per session (flight tracking) and+ // forgets the subscription only while it is still the one this view holds. Resolves the owner's+ // reply, or null when nothing was sent; a failed RPC resolves null unless `surfaceErrors` asks for+ // the rejection (the switcher's close reports it; background detaches never do). `onlyIfHeld`: when+ // its turn in the flight comes, send only if this view still holds that subscription (a close that+ // queued behind another close of the same row has nothing left to end).const detachCanonical = useCallback(- (sessionId?: null | string, subscriptionId?: null | string, endReason?: CanonicalEndReason) => {+ (+ sessionId?: null | string,+ subscriptionId?: null | string,+ endReason?: CanonicalEndReason,+ { onlyIfHeld = false, surfaceErrors = false }: { onlyIfHeld?: boolean; surfaceErrors?: boolean } = {}+ ): Promise<null | SessionDetachResponse> => {if (!gw.isCanonical || !sessionId || !subscriptionId) {- return+ return Promise.resolve(null)}- const detach = () =>- rpc<SessionDetachResponse>('session.detach', {- session_id: sessionId,- subscription_id: subscriptionId,- ...(endReason ? { end_reason: endReason } : {})- })- .then(result => {- if (result?.detached && canonicalSubscriptions.current.get(sessionId) === subscriptionId) {- canonicalSubscriptions.current.delete(sessionId)- }- })- .catch(() => undefined)+ const detach = (): Promise<null | SessionDetachResponse> =>+ onlyIfHeld && canonicalSubscriptions.current.get(sessionId) !== subscriptionId+ ? Promise.resolve(null)+ : rpc<SessionDetachResponse>('session.detach', {+ session_id: sessionId,+ subscription_id: subscriptionId,+ ...(endReason ? { end_reason: endReason } : {})+ }).then(raw => {+ const result = asRpcResult<SessionDetachResponse>(raw)++ if (result?.detached && canonicalSubscriptions.current.get(sessionId) === subscriptionId) {+ canonicalSubscriptions.current.delete(sessionId)+ }++ return result+ })const previous = canonicalDetachFlights.current.get(sessionId)- const pending = previous ? previous.then(detach) : detach()+ const run = previous ? previous.then(detach) : detach()++ const pending: Promise<void> = run.then(+ () => undefined,+ () => undefined+ )canonicalDetachFlights.current.set(sessionId, pending)void pending.then(() => {@@ -224,7 +244,7 @@ export function useSessionLifecycle(opts: UseSessionLifecycleOptions) {}})- return pending+ return surfaceErrors ? run : run.catch(() => null)},[gw.isCanonical, rpc])@@ -261,24 +281,19 @@ export function useSessionLifecycle(opts: UseSessionLifecycleOptions) {return null}- const result = asRpcResult<SessionDetachResponse>(- await rpc<SessionDetachResponse>('session.detach', {- end_reason: 'tui_close',- session_id: targetSid,- subscription_id: subscriptionId- })- )+ const result = await detachCanonical(targetSid, subscriptionId, 'tui_close', {+ onlyIfHeld: true,+ surfaceErrors: true+ })if (!result?.detached) {// The subscription was already stale: main had dropped this view's hold, so nothing was closed.return null}- canonicalSubscriptions.current.delete(targetSid)-return { closed: true }},- [gw.isCanonical, rpc, sys]+ [detachCanonical, gw.isCanonical, rpc, sys])const disposeStaleAttachments = useCallback(() => {