From 9728801985f7a11c331cb56833c24ca2f4079145 Mon Sep 17 00:00:00 2001 From: Brennan Benson <79079362+brennanb2025@users.noreply.github.com> Date: Mon, 9 Nov 2026 23:18:12 -0800 Subject: [PATCH] Forward brief clear through Claude close --- src/main/claude/structured/claude-structured-session-close.ts | 4 +++- .../host/testing/structured-conversation-command.test.ts | 3 +++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/src/main/claude/structured/claude-structured-session-close.ts b/src/main/claude/structured/claude-structured-session-close.ts index c2f89e3116b..265c54674a5 100644 --- a/src/main/claude/structured/claude-structured-session-close.ts +++ b/src/main/claude/structured/claude-structured-session-close.ts @@ -21,6 +21,7 @@ import { claudeHeldSends } from '../claude-command-lifecycle' import { settledClaudeTurnEndLeaf } from './claude-structured-resume-point' import { settleClaudeTurnEndWaiters } from '../claude-request-end-wait' import type { StructuredAgentSessionLogger } from '../../native-chat/agent-session-wire/host/structured-agent-session-logger' +import type { ProviderProcessCloseOptions } from '../../provider-process/provider-process-close' /** Root exit releases the lease even with unverified descendants; a failed spawn proves no exit. */ export function claudeRootExitObserved( @@ -107,6 +108,7 @@ type CloseClaudePublishedSessionInput = { onEvent?: (event: ClaudeStructuredSessionEvent) => void logger?: StructuredAgentSessionLogger settledExitErrors?: Map + closeOptions?: ProviderProcessCloseOptions } async function finalizeClaudePublishedSession( @@ -120,7 +122,7 @@ async function finalizeClaudePublishedSession( for (const prompt of session.prompts.clear()) { prompt.settle(null) } - const connectionClosed = await session.connection.close() + const connectionClosed = await session.connection.close(input.closeOptions) session.unbindReadingControl?.() const rootExitVerdict = claudeCloseReport( session.connection, diff --git a/src/main/native-chat/agent-session-wire/host/testing/structured-conversation-command.test.ts b/src/main/native-chat/agent-session-wire/host/testing/structured-conversation-command.test.ts index bd951506c47..8e5acddd1c2 100644 --- a/src/main/native-chat/agent-session-wire/host/testing/structured-conversation-command.test.ts +++ b/src/main/native-chat/agent-session-wire/host/testing/structured-conversation-command.test.ts @@ -175,6 +175,9 @@ describe('same-conversation clear', () => { ).toBe('pending') await withTestAgentSessionDatabase(generationRoot(), (db) => db.exec('DROP TRIGGER fail_clear')) await clearCommits(params) + expect(adapter.closeSession).toHaveBeenCalledWith(HOST_TEST_SESSION, undefined, { + grace: 'brief' + }) expect(await clearRows()).toHaveLength(1) expect( store.getOperationRow(caller.callerKey, params.envelope.clientOperationId)?.outcome.status