root/goodbuddy
1
0
Fork 0
Code Issues Pull Requests Actions 4 Packages Projects Releases Wiki Activity

fix: allow closing browser tabs during active requests

Browse Source 
Allow users to close leased browser tabs without cancelling the AI request or revoking its other tools. Closed-page operations report a recoverable error; explicit navigation creates a dedicated replacement tab for direct-model and MCP calls.

Add regression coverage and real Electron lifecycle checks, and update browser behavior documentation.

Release note: 浏览器标签页被 AI 请求占用时也可关闭，其他任务继续运行；再次导航会打开独立新页。
This commit is contained in:
mesalogo
2026-09-13 11:21:37 +08:00
parent 032ebc313f
commit b84250f62a
14 changed files with 534 additions and 72 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/agent/knowledge-mcp-gateway.test.ts
+84
View File
@@ -326,6 +326,7 @@ describe('KnowledgeMcpGateway', () => {
})
)
const browserService = {
createTab: vi.fn(),
getOrigin: vi.fn(() => undefined),
navigate: vi.fn(async () => ({
url: 'https://example.com/',
@@ -464,6 +465,89 @@ describe('KnowledgeMcpGateway', () => {
}
})
it('keeps shared tools and the MCP session alive after tab closure and navigates a dedicated replacement', async () => {
const { service } = createService()
const browserService = new BrowserService()
const controller = new AbortController()
const lease = browserService.reserveRequestTab('conversation', 'request', 21)
const gateway = new KnowledgeMcpGateway(service, { browserService })
gateways.push(gateway)
const token = gateway.grant('request', [firstLibraryId], controller.signal, 'none', undefined, 'conversation', lease.tabId, lease)!
const navigate = vi.spyOn(browserService, 'navigate').mockImplementation(
async (_conversationId, _url, signal) => new Promise<never>((_resolve, reject) => {
signal.addEventListener('abort', () => reject(signal.reason), { once: true })
})
)
const snapshot = vi.spyOn(browserService, 'snapshot').mockResolvedValue({} as never)
const replacementController = new AbortController()
const replacementTabId = browserTabIdSchema.parse(crypto.randomUUID())
const replacementLease = {
conversationId: 'conversation', tabId: replacementTabId, owner: 'request',
signal: replacementController.signal, release: vi.fn()
}
const createTab = vi.spyOn(browserService, 'createTab').mockResolvedValue({ tabId: replacementTabId } as never)
const acquire = vi.spyOn(browserService, 'acquireTabUsage').mockReturnValue(replacementLease)
await gateway.start()
const client = new Client({ name: 'closed-tab-test', version: '1.0.0' })
try {
await client.connect(new StreamableHTTPClientTransport(new URL(gateway.getEndpoint()!), {
requestInit: { headers: { Authorization: `Bearer ${token}` } }
}))
const pending = client.callTool({ name: 'browser_navigate', arguments: { url: 'https://example.com/' } })
await vi.waitFor(() => expect(navigate).toHaveBeenCalledOnce())
lease.release()
await expect(pending).resolves.toMatchObject({
isError: true, content: [{ type: 'text', text: expect.stringContaining('标签页已关闭') }]
})
expect(navigate.mock.calls[0]![2].aborted).toBe(true)
expect(controller.signal.aborted).toBe(false)
await expect(client.callTool({ name: 'knowledge_search', arguments: { query: 'evidence' } }))
.resolves.toMatchObject({ content: [{ type: 'text', text: expect.stringContaining(firstLibraryId) }] })
expect((await client.listTools()).tools.map(tool => tool.name)).toContain('browser_navigate')
for (const name of browserToolNames.filter(name => name !== 'browser_navigate')) {
await expect(client.callTool({ name, arguments: {} })).resolves.toMatchObject({
isError: true, content: [{ type: 'text', text: expect.stringContaining('标签页已关闭') }]
})
}
expect(snapshot).not.toHaveBeenCalled()
expect(createTab).not.toHaveBeenCalled()
await expect(client.callTool({ name: 'browser_navigate', arguments: {} })).resolves.toMatchObject({ isError: true })
expect(createTab).not.toHaveBeenCalled()
navigate.mockResolvedValue({ url: 'https://example.com/', origin: 'https://example.com' })
await client.callTool({ name: 'browser_navigate', arguments: { url: 'https://example.com/' } })
expect(createTab).toHaveBeenCalledWith('conversation', undefined, expect.any(AbortSignal),
`browser-recovery:request:${lease.tabId}`)
expect(acquire).toHaveBeenCalledExactlyOnceWith('conversation', replacementTabId, 'request')
expect(navigate).toHaveBeenLastCalledWith('conversation', 'https://example.com/', expect.any(AbortSignal), replacementTabId)
await client.callTool({ name: 'browser_snapshot', arguments: {} })
expect(snapshot).toHaveBeenCalledWith('conversation', expect.any(AbortSignal), replacementTabId)
expect(createTab).toHaveBeenCalledOnce()
snapshot.mockImplementationOnce(async (_conversationId, signal) => new Promise<never>((_resolve, reject) => {
signal.addEventListener('abort', () => reject(signal.reason), { once: true })
}))
const callController = new AbortController()
const canceled = client.callTool({ name: 'browser_snapshot', arguments: {} }, undefined, {
signal: callController.signal
})
const cancellation = expect(canceled).rejects.toThrow('cancel this call')
await vi.waitFor(() => expect(snapshot).toHaveBeenCalledTimes(2))
callController.abort(new Error('cancel this call'))
await cancellation
await vi.waitFor(() => expect(snapshot.mock.calls[1]![1].aborted).toBe(true))
expect(replacementController.signal.aborted).toBe(false)
expect(controller.signal.aborted).toBe(false)
await expect(client.callTool({ name: 'browser_navigate', arguments: { url: 'https://example.com/' } }))
.resolves.not.toHaveProperty('isError', true)
expect(createTab).toHaveBeenCalledOnce()
gateway.revoke(token)
expect(replacementLease.release).toHaveBeenCalledOnce()
} finally {
await client.close()
await gateway.dispose()
await browserService.dispose()
}
})
it('exposes GoodBuddy config reads in Ask and apply only in Execute', async () => {
const { service } = createService()
const configService = {
src/main/agent/knowledge-mcp-gateway.ts
+49 -16
View File
@@ -70,11 +70,12 @@ import {
import type { LaunchEnvironmentProvider } from '../local-tool-environment'
import {
BrowserModelTools,
browserNavigateInputSchema,
browserToolNames,
type BrowserToolName,
type BrowserToolService
} from '../browser/browser-model-tools'
import type { BrowserTabUsageLease } from '../browser/browser-service'
import type { BrowserService, BrowserTabUsageLease } from '../browser/browser-service'
import { BrowserStaleReferenceError } from '../browser/cdp-browser-driver'
import { safeToolErrorDetail } from './approval-summary'
@@ -238,6 +239,7 @@ export type KnowledgeMcpGatewayOptions = {
magicNotesDatabase?: MagicNotesDatabase
configService?: GoodBuddyConfigService
browserService?: BrowserToolService & {
createTab: BrowserService['createTab']
listTabs(conversationId: string): BrowserTabSummary[]
acquireTabUsage(
conversationId: string,
@@ -371,6 +373,7 @@ export class KnowledgeMcpGateway {
private readonly magicNotesDatabase?: MagicNotesDatabase
private readonly configService?: GoodBuddyConfigService
private readonly browserService?: BrowserToolService & {
createTab: BrowserService['createTab']
listTabs(conversationId: string): BrowserTabSummary[]
acquireTabUsage(
conversationId: string,
@@ -581,15 +584,7 @@ export class KnowledgeMcpGateway {
const abort = (): void => {
this.revoke(token)
}
const abortFromBrowser = (): void => {
this.revoke(token)
}
value.signal.addEventListener('abort', abort, { once: true })
value.browserUsageLease?.signal.addEventListener(
'abort',
abortFromBrowser,
{ once: true }
)
this.capabilities.set(token, {
...value,
expiresAt: this.now() + this.capabilityTtlMs,
@@ -597,10 +592,6 @@ export class KnowledgeMcpGateway {
references: new Map(),
removeAbortListener: () => {
value.signal.removeEventListener('abort', abort)
value.browserUsageLease?.signal.removeEventListener(
'abort',
abortFromBrowser
)
}
})
return token
@@ -1658,7 +1649,7 @@ export class KnowledgeMcpGateway {
}
}
const capability = this.getCapability(token)
const browserTools = capability.browserConversationId && capability.browserTabId
let browserTools = capability.browserConversationId && capability.browserTabId
? new BrowserModelTools({
service: this.browserService!,
conversationId: capability.browserConversationId,
@@ -1666,12 +1657,52 @@ export class KnowledgeMcpGateway {
})
: undefined
if (browserTools?.ownsTool(name)) {
let lease = capability.browserUsageLease!
try {
const callSignal = AbortSignal.any([
extra.signal,
capability.signal,
capability.brokerController.signal
])
callSignal.throwIfAborted()
if (lease.signal.aborted) {
if (name !== 'browser_navigate') {
throw new Error('浏览器标签页已关闭，请调用 browser_navigate 打开新标签页。')
}
browserNavigateInputSchema.parse(input)
// A stable, request-specific ID also deduplicates concurrent recovery calls.
const tab = await this.browserService!.createTab(
capability.browserConversationId!,
undefined,
callSignal,
`browser-recovery:${capability.requestId}:${lease.tabId}`
)
callSignal.throwIfAborted()
if (capability.browserUsageLease === lease) {
const replacement = this.browserService!.acquireTabUsage(
capability.browserConversationId!,
tab.tabId,
capability.requestId
)
capability.browserTabId = tab.tabId
capability.browserUsageLease = replacement
lease.release()
}
lease = capability.browserUsageLease!
browserTools = new BrowserModelTools({
service: this.browserService!,
conversationId: capability.browserConversationId!,
browserTabId: capability.browserTabId!
})
}
const browserSignal = AbortSignal.any([callSignal, lease.signal])
browserSignal.throwIfAborted()
const result = await browserTools.callTool(
name,
input,
extra.signal
browserSignal
)
browserSignal.throwIfAborted()
return {
content: result.parts.map((part) =>
part.type === 'text'
@@ -1685,7 +1716,9 @@ export class KnowledgeMcpGateway {
}
} catch (error) {
const detail =
safeToolErrorDetail(error, 2_000) ??
(lease.signal.aborted
? '浏览器标签页已关闭，请调用 browser_navigate 打开新标签页。'
: safeToolErrorDetail(error, 2_000)) ??
'内置浏览器工具执行失败'
return {
isError: true,
src/main/agent/model-tool-provider.test.ts
+66
View File
@@ -11,6 +11,7 @@ import { rgPath } from '@vscode/ripgrep'
import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest'
import type { ResolvedMcpServer } from '../capabilities/capability-service'
import type { BrowserToolService } from '../browser/browser-model-tools'
import { BrowserService } from '../browser/browser-service'
import { browserTabIdSchema } from '../../shared/contracts'
import { BrowserStaleReferenceError } from '../browser/cdp-browser-driver'
import {
@@ -1432,6 +1433,71 @@ describe('ModelToolProvider', () => {
})
})
it('recovers a closed direct-model tab across calls without cancelling the request', async () => {
const workspace = await createWorkspace()
await writeFile(join(workspace, 'note.txt'), 'request still active')
const service = new BrowserService()
const original = service.reserveRequestTab('browser-owner', 'request')
const provider = new ModelToolProvider(workspace, [], service)
const context = {
...toolContext, requestId: 'request', browserConversationId: 'browser-owner', browserTabId: original.tabId
}
const controller = new AbortController()
const navigate = vi.spyOn(service, 'navigate').mockImplementation(
async (_conversationId, _url, signal) => new Promise<never>((_resolve, reject) => {
signal.addEventListener('abort', () => reject(signal.reason), { once: true })
})
)
const snapshot = vi.spyOn(service, 'snapshot').mockResolvedValue({} as never)
const createTab = vi.spyOn(service, 'createTab').mockImplementation(async () => {
const replacement = service.reserveRequestTab('browser-owner', 'replacement')
return { tabId: replacement.tabId } as never
})
const acquire = vi.spyOn(service, 'acquireTabUsage')
try {
const pending = provider.callTool('browser_navigate', { url: 'https://example.com/' }, controller.signal, context)
const closed = expect(pending).rejects.toMatchObject({
name: 'RecoverableModelToolError', nextAction: expect.stringContaining('browser_navigate')
})
await vi.waitFor(() => expect(navigate).toHaveBeenCalledOnce())
await service.closeTab('browser-owner', original.tabId)
await closed
expect(controller.signal.aborted).toBe(false)
for (const [name, args] of [
['browser_snapshot', {}], ['browser_click', { ref: 'b_old' }],
['browser_type', { ref: 'b_old', text: 'value' }],
['browser_select', { ref: 'b_old', value: 'value' }],
['browser_back', {}], ['browser_screenshot', {}]
] as const) {
await expect(provider.callTool(name, args, controller.signal, context)).rejects.toMatchObject({
name: 'RecoverableModelToolError', nextAction: expect.stringContaining('browser_navigate')
})
}
expect(createTab).not.toHaveBeenCalled()
expect(snapshot).not.toHaveBeenCalled()
await expect(provider.callTool('workspace_read_text', { path: 'note.txt' }, controller.signal, context))
.resolves.toMatchObject({ parts: [{ type: 'text', text: expect.stringContaining('request still active') }] })
navigate.mockResolvedValue({ url: 'https://example.com/', origin: 'https://example.com' })
await provider.callTool('browser_navigate', { url: 'https://example.com/' }, controller.signal, context)
const replacementTabId = navigate.mock.calls[1]![3]!
expect(replacementTabId).not.toBe(original.tabId)
expect(createTab).toHaveBeenCalledWith('browser-owner', undefined, controller.signal,
expect.stringContaining(`:${original.tabId}`))
expect(acquire).toHaveBeenCalledWith('browser-owner', replacementTabId, expect.any(String))
await provider.listTools(context, controller.signal)
await provider.callTool('browser_snapshot', {}, controller.signal, context)
expect(snapshot).toHaveBeenLastCalledWith('browser-owner', expect.any(AbortSignal), replacementTabId)
await expect(provider.callTool('browser_snapshot', {}, controller.signal, { ...context, requestId: 'other-request' }))
.rejects.toMatchObject({ name: 'RecoverableModelToolError' })
expect(createTab).toHaveBeenCalledOnce()
expect(controller.signal.aborted).toBe(false)
} finally {
original.release()
await provider.dispose()
await service.dispose()
}
})
it('keeps a request on its bound tab when another tab changes or closes', async () => {
const workspace = await createWorkspace()
const browserService = createBrowserService()
src/main/agent/model-tool-provider.ts
+24 -10
View File
@@ -24,6 +24,7 @@ import type {
} from './runtime'
import {
BrowserModelTools,
BrowserTabClosedError,
browserToolNames,
type BrowserToolService
} from '../browser/browser-model-tools'
@@ -661,6 +662,8 @@ function normalizeMcpResult(result: unknown): ModelToolResult {
}
export class ModelToolProvider implements ModelToolProviderLike {
// ModelAgentRuntime reuses one context for all tool calls in a request.
private readonly browserToolsByContext = new WeakMap<ModelToolCallContext, BrowserModelTools>()
private readonly mcpConnections = new Map<
ResolvedMcpServer,
Promise<ConnectedMcp | undefined>
@@ -738,16 +741,20 @@ export class ModelToolProvider implements ModelToolProviderLike {
private getBrowserTools(
context: ModelToolCallContext
): BrowserModelTools | undefined {
return this.browserService &&
context.workMode === 'execute' &&
context.browserTabId
? new BrowserModelTools({
service: this.browserService,
conversationId:
context.browserConversationId ?? context.conversationId,
browserTabId: context.browserTabId
})
: undefined
if (!this.browserService || context.workMode !== 'execute' || !context.browserTabId) {
return undefined
}
let tools = this.browserToolsByContext.get(context)
if (!tools) {
tools = new BrowserModelTools({
service: this.browserService,
conversationId: context.browserConversationId ?? context.conversationId,
browserTabId: context.browserTabId,
recoverClosedTab: true
})
this.browserToolsByContext.set(context, tools)
}
return tools
}
private getReservedToolCount(): number {
@@ -1707,6 +1714,13 @@ export class ModelToolProvider implements ModelToolProviderLike {
try {
return await browserTools.callTool(name, argumentsValue, signal)
} catch (error) {
if (error instanceof BrowserTabClosedError) {
throw new RecoverableModelToolError(
error.message,
'调用 browser_navigate 打开新标签页，然后获取新快照继续操作',
{ cause: error }
)
}
if (error instanceof BrowserStaleReferenceError) {
throw new RecoverableModelToolError(
error.message,
src/main/browser/browser-model-tools.test.ts
+44
View File
@@ -245,4 +245,48 @@ describe('BrowserModelTools', () => {
tools.callTool('browser_snapshot', {}, controller.signal)
).rejects.toHaveProperty('name', 'AbortError')
})
it('validates explicit recovery navigation before creating a dedicated replacement', async () => {
const service = createService()
service.acquireTabUsage = vi.fn(() => { throw new Error('closed') })
service.createTab = vi.fn()
const tools = new BrowserModelTools({
service, conversationId: 'conversation', browserTabId, recoverClosedTab: true
})
for (const args of [{}, { url: 'file:///private' }, { url: 'https://example.com', extra: true }]) {
await expect(tools.callTool('browser_navigate', args, signal)).rejects.toThrow()
}
await expect(tools.callTool('browser_snapshot', {}, signal)).rejects.toHaveProperty('name', 'BrowserTabClosedError')
await expect(tools.callTool('browser_navigate', { url: 'https://example.com' }, AbortSignal.abort()))
.rejects.toHaveProperty('name', 'AbortError')
expect(service.createTab).not.toHaveBeenCalled()
expect(service.navigate).not.toHaveBeenCalled()
})
it('preserves request cancellation and releases the per-call lease', async () => {
const service = createService()
const leaseController = new AbortController()
const release = vi.fn()
service.acquireTabUsage = vi.fn(() => ({
conversationId: 'conversation', tabId: browserTabId, owner: 'request',
signal: leaseController.signal, release
}))
service.createTab = vi.fn()
vi.mocked(service.snapshot).mockImplementation(async (_conversationId, signal) =>
new Promise<never>((_resolve, reject) => {
signal.addEventListener('abort', () => reject(signal.reason), { once: true })
})
)
const tools = new BrowserModelTools({
service, conversationId: 'conversation', browserTabId, recoverClosedTab: true
})
const controller = new AbortController()
const reason = new Error('cancel request')
const pending = tools.callTool('browser_snapshot', {}, controller.signal)
const cancelled = expect(pending).rejects.toBe(reason)
controller.abort(reason)
await cancelled
expect(release).toHaveBeenCalledOnce()
expect(service.createTab).not.toHaveBeenCalled()
})
})
src/main/browser/browser-model-tools.ts
+69 -10
View File
@@ -7,7 +7,7 @@ import type {
} from '../agent/model-tool-provider'
import type { RuntimeApprovalRequest } from '../agent/runtime'
import { canonicalizeBrowserUrl } from './browser-url-policy'
import type { BrowserService } from './browser-service'
import type { BrowserService, BrowserTabUsageLease } from './browser-service'
import {
MAX_BROWSER_INPUT_LENGTH as MAX_INPUT_LENGTH,
MAX_BROWSER_SELECT_LENGTH as MAX_SELECT_LENGTH
@@ -191,12 +191,21 @@ export type BrowserToolService = Pick<
| 'back'
| 'screenshot'
| 'releaseConversation'
>
> & Partial<Pick<BrowserService, 'acquireTabUsage' | 'createTab'>>
export type BrowserModelToolsOptions = {
service: BrowserToolService
conversationId: string
browserTabId: BrowserTabId
// The scoped gateway manages its own binding and lease lifecycle.
recoverClosedTab?: boolean
}
export class BrowserTabClosedError extends Error {
constructor(options?: ErrorOptions) {
super('浏览器标签页已关闭，请调用 browser_navigate 打开新标签页。', options)
this.name = 'BrowserTabClosedError'
}
}
function createTextResult(value: unknown): ModelToolResult {
@@ -220,12 +229,15 @@ function navigationLabel(url: URL): string {
export class BrowserModelTools {
private readonly service: BrowserToolService
private readonly conversationId: string
private readonly browserTabId: BrowserTabId
private browserTabId: BrowserTabId
private readonly recoveryOwner = randomUUID()
private readonly recoverClosedTab: boolean
constructor(options: BrowserModelToolsOptions) {
this.service = options.service
this.conversationId = options.conversationId
this.browserTabId = options.browserTabId
this.recoverClosedTab = options.recoverClosedTab === true
if (!this.conversationId || this.conversationId.length > 500) {
throw new Error('浏览器对话标识无效')
}
@@ -321,6 +333,53 @@ export class BrowserModelTools {
if (!this.ownsTool(name)) {
throw new Error(`未知浏览器工具：${name}`)
}
if (!this.recoverClosedTab || !this.service.acquireTabUsage || !this.service.createTab) {
return this.callBoundTool(name, argumentsValue, signal, this.browserTabId)
}
let lease: BrowserTabUsageLease
try {
lease = this.service.acquireTabUsage(
this.conversationId, this.browserTabId, this.recoveryOwner
)
} catch (error) {
if (name !== 'browser_navigate') {
throw new BrowserTabClosedError({ cause: error })
}
const input = browserNavigateInputSchema.parse(argumentsValue)
canonicalizeBrowserUrl(input.url)
const tab = await this.service.createTab(
this.conversationId, undefined, signal,
`browser-recovery:${this.recoveryOwner}:${this.browserTabId}`
)
signal.throwIfAborted()
lease = this.service.acquireTabUsage(
this.conversationId, tab.tabId, this.recoveryOwner
)
this.browserTabId = tab.tabId
}
const browserSignal = AbortSignal.any([signal, lease.signal])
try {
const result = await this.callBoundTool(name, argumentsValue, browserSignal, lease.tabId)
browserSignal.throwIfAborted()
return result
} catch (error) {
signal.throwIfAborted()
if (lease.signal.aborted) {
throw new BrowserTabClosedError({ cause: error })
}
throw error
} finally {
lease.release()
}
}
private async callBoundTool(
name: BrowserToolName,
argumentsValue: Record<string, unknown>,
signal: AbortSignal,
browserTabId: BrowserTabId
): Promise<ModelToolResult> {
signal.throwIfAborted()
if (name === 'browser_navigate') {
const input = browserNavigateInputSchema.parse(argumentsValue)
return createTextResult(
@@ -328,7 +387,7 @@ export class BrowserModelTools {
this.conversationId,
input.url,
signal,
this.browserTabId
browserTabId
)
)
}
@@ -338,7 +397,7 @@ export class BrowserModelTools {
await this.service.snapshot(
this.conversationId,
signal,
this.browserTabId
browserTabId
)
)
}
@@ -348,7 +407,7 @@ export class BrowserModelTools {
this.conversationId,
input.ref,
signal,
this.browserTabId
browserTabId
)
return createTextResult({ clicked: input.ref })
}
@@ -359,7 +418,7 @@ export class BrowserModelTools {
input.ref,
input.text,
signal,
this.browserTabId
browserTabId
)
return createTextResult({
typed: input.ref,
@@ -374,7 +433,7 @@ export class BrowserModelTools {
input.ref,
input.value,
signal,
this.browserTabId
browserTabId
)
return createTextResult({ selected: input.ref, value: '[已隐藏]' })
}
@@ -384,7 +443,7 @@ export class BrowserModelTools {
await this.service.back(
this.conversationId,
signal,
this.browserTabId
browserTabId
)
)
}
@@ -392,7 +451,7 @@ export class BrowserModelTools {
const screenshot = await this.service.screenshot(
this.conversationId,
signal,
this.browserTabId
browserTabId
)
return {
parts: [
src/main/browser/browser-service.test.ts
+8 -8
View File
@@ -227,7 +227,8 @@ describe('BrowserService', () => {
expect(restored.tabId).toBe(first.tabId)
expect(harness.service.getTabCount()).toBe(1)
first.release()
await expect(harness.service.closeTab('conversation', first.tabId, 21)).rejects.toThrow('正在被活动请求使用')
await harness.service.closeTab('conversation', first.tabId, 21)
expect(second.signal.aborted).toBe(true)
second.release()
await harness.service.closeTab('conversation', first.tabId, 21)
await harness.service.closeTab('conversation', first.tabId, 21)
@@ -557,7 +558,7 @@ describe('BrowserService', () => {
await harness.service.dispose()
})
it('blocks closing a leased tab until every request releases it', async () => {
it('closes a leased tab and ends its leases without closing sibling tabs', async () => {
const harness = createHarness()
const signal = new AbortController().signal
const primary = await harness.service.createTab('conversation', 11, signal)
@@ -577,15 +578,14 @@ describe('BrowserService', () => {
await expect(
harness.service.closeTab('conversation', primary.tabId, 11)
).rejects.toThrow('浏览器标签页正在被活动请求使用，无法关闭')
await expect(
harness.service.closeTab('conversation', sibling.tabId, 11)
).resolves.toBeUndefined()
expect(first.signal.aborted).toBe(true)
expect(second.signal.aborted).toBe(true)
expect(harness.service.listTabs('conversation', 11).map((tab) => tab.tabId)).toEqual([sibling.tabId])
expect(harness.slots[0]?.session.dispose).toHaveBeenCalledOnce()
expect(harness.slots[1]?.session.dispose).not.toHaveBeenCalled()
first.release()
first.release()
await expect(
harness.service.closeTab('conversation', primary.tabId, 11)
).rejects.toThrow('浏览器标签页正在被活动请求使用，无法关闭')
second.release()
await expect(
harness.service.closeTab('conversation', primary.tabId, 11)
src/main/browser/browser-service.ts
+5 -6
View File
@@ -31,9 +31,6 @@ export class BrowserNavigationStoppedError extends Error {
}
}
export const BROWSER_TAB_IN_USE_ERROR =
'浏览器标签页正在被活动请求使用，无法关闭'
export type BrowserTabUsageLease = {
readonly conversationId: string
readonly tabId: BrowserTabId
@@ -908,12 +905,14 @@ export class BrowserService {
[...this.creations.entries()].some(([id, slot]) => slot.tabId === tabId && id !== conversationId) ||
[...this.requestTabs.values()].some((slot) => slot.tabId === tabId && slot.conversationId !== conversationId)
) throw new Error('浏览器标签页不存在或不属于当前对话')
if (reservation?.tabId === tabId && reservation.usageLeases.size > 0) {
throw new Error(BROWSER_TAB_IN_USE_ERROR)
if (reservation?.tabId === tabId) {
this.releaseRequestTab(conversationId)
}
if (creation?.tabId === tabId) {
creation.controller.abort(new Error('浏览器会话已关闭'))
}
return
}
if (tab.usageLeases.size > 0) throw new Error(BROWSER_TAB_IN_USE_ERROR)
await this.releaseTab(conversation!, tab)
}
src/main/ipc.test.ts
+88
View File
@@ -7739,6 +7739,94 @@ describe('registerIpcHandlers agent terminal state', () => {
await harness.dispose()
})
it('completes the runtime request and releases its lease after browser lease abort', async () => {
const requestId = '00000000-0000-4000-8000-000000000031'
const tabId = browserTabIdSchema.parse(
'00000000-0000-4000-8000-000000000423'
)
const leaseController = new AbortController()
const release = vi.fn()
const lease = {
conversationId: 'browser-lease-abort',
tabId,
owner: requestId,
signal: leaseController.signal,
release
}
let runtimeSignal: AbortSignal | undefined
const runtime = {
runtimeId: 'model',
capability: 'chat',
supportsToolExecution: true,
async *run(request: { requestId: string }, signal: AbortSignal) {
runtimeSignal = signal
leaseController.abort(new Error('browser tab closed'))
signal.throwIfAborted()
yield { requestId: request.requestId, type: 'done' }
}
}
let grantedLease: { release(): void } | undefined
const knowledgeGateway = {
grant: vi.fn((...args: unknown[]) => {
grantedLease = args[7] as { release(): void }
return 'browser-capability'
}),
getAvailableToolNames: vi.fn(() => ['browser_navigate']),
drainReferences: vi.fn(() => []),
revoke: vi.fn(() => grantedLease?.release())
}
const browserControl = {
listTabs: vi.fn(() => [{ tabId, primary: true }]),
getVisibleTabId: vi.fn(() => tabId),
acquireTabUsage: vi.fn(() => lease),
createTab: vi.fn(),
onState: vi.fn(() => () => undefined)
}
const harness = createHarness(
runtime,
undefined,
'always',
undefined,
false,
undefined,
undefined,
knowledgeGateway,
false,
undefined,
{ getEnabledBuiltinMcpServerIds: vi.fn(async () => ['builtin-browser']) },
browserControl
)
try {
await harness.handler?.(trustedEvent(harness.webContents), {
requestId,
conversationId: lease.conversationId,
prompt: 'Continue after the browser tab closes',
workMode: 'execute',
knowledgeLibraryIds: []
})
await vi.waitFor(() => expect(release).toHaveBeenCalledOnce())
expect(grantedLease).toBe(lease)
expect(lease.signal.aborted).toBe(true)
expect(runtimeSignal?.aborted).toBe(false)
expect(harness.assistantDatabase.updateTaskStatus).toHaveBeenCalledWith(
requestId,
'completed'
)
const publicEvents = harness.webContents.send.mock.calls
.filter(([channel]) => channel === ipcChannels.agentEvent)
.map(([, payload]) => payload)
expect(publicEvents).toContainEqual({ requestId, type: 'done' })
expect(publicEvents).not.toEqual(expect.arrayContaining([
expect.objectContaining({ type: 'error' })
]))
expect(knowledgeGateway.revoke).toHaveBeenCalledWith('browser-capability')
} finally {
await harness.dispose()
}
})
it.each(['error', 'cancel'] as const)(
'releases a request-created browser tab lease on runtime %s',
async (outcome) => {
src/main/ipc.ts
+2 -10
View File
@@ -552,7 +552,6 @@ async function grantScopedDataCapability(input: {
signal: AbortSignal
) => Promise<boolean>
signal: AbortSignal
abort?: (reason: unknown) => void
}): Promise<ScopedDataCapability> {
const enabledServers = new Set(input.enabledServers)
const libraryIds = enabledServers.has('knowledge-base')
@@ -590,11 +589,6 @@ async function grantScopedDataCapability(input: {
})
: undefined
const browserTabId = browserUsageLease?.tabId
browserUsageLease?.signal.addEventListener(
'abort',
() => input.abort?.(browserUsageLease.signal.reason),
{ once: true }
)
const config =
configAccess !== 'none' && input.workspacePath
? {
@@ -2485,8 +2479,7 @@ export function registerIpcHandlers(
? runtimeConversationId
: undefined,
ownerWindowId: window.webContents.id,
signal: controller.signal,
abort: (reason) => controller.abort(reason)
signal: controller.signal
})
knowledgeCapabilityToken = notesCapability.token
const noteTools = [
@@ -4060,8 +4053,7 @@ export function registerIpcHandlers(
? enrichedRequest.conversationId
: undefined,
ownerWindowId: event.sender.id,
signal: controller.signal,
abort: (reason) => controller.abort(reason)
signal: controller.signal
})
const knowledgeCapabilityToken = scopedCapability.token
const availableTools = [