Merge commit 'ba21ca122496e1038993378753de863e571cdc2a' into codex/product-providers-pr2-claude-code

This commit is contained in:
pku-xht
2026-08-04 22:52:07 +08:00
4 changed files with 6 additions and 6 deletions

View File

@@ -1968,8 +1968,8 @@ export interface Config {
* requires the provider's `depthLimit` capability (mount fails loud * requires the provider's `depthLimit` capability (mount fails loud
* otherwise). The provider checks the calling agent's current depth at every * otherwise). The provider checks the calling agent's current depth at every
* start; the tool remains model-visible so runtime policy owns rejection. * start; the tool remains model-visible so runtime policy owns rejection.
* `'provider-managed'` is for an out-of-process provider (ACP) whose * `'provider-managed'` is for an out-of-process provider whose recursion
* recursion budget belongs to the child harness's own deployment. * budget belongs to the child runtime or its own deployment.
*/ */
maxDepth?: number | 'provider-managed' maxDepth?: number | 'provider-managed'
} }

View File

@@ -150,7 +150,7 @@ export async function startCodexRun(
) )
} }
if (runAbort.signal.aborted) { if (runAbort.signal.aborted) {
throw new Error('subagent-codex: request was aborted before app-server startup') throw new Error('subagent-codex: request was aborted before run publication')
} }
throw thrownError(error) throw thrownError(error)
} }

View File

@@ -939,7 +939,7 @@ describe('run lifecycle and quiescence', () => {
const threadStart = await child.peer.nextMethod('thread/start') const threadStart = await child.peer.nextMethod('thread/start')
child.peer.respond(threadStart, { thread: { id: 'thread-1', ephemeral: true } }) child.peer.respond(threadStart, { thread: { id: 'thread-1', ephemeral: true } })
controller.abort('startup race') controller.abort('startup race')
await expect(starting).rejects.toThrow('aborted before app-server startup') await expect(starting).rejects.toThrow('aborted before run publication')
expect(child.terminate).toHaveBeenCalledTimes(1) expect(child.terminate).toHaveBeenCalledTimes(1)
}) })

View File

@@ -67,8 +67,8 @@ export interface Config {
* requires the provider's `depthLimit` capability (mount fails loud * requires the provider's `depthLimit` capability (mount fails loud
* otherwise). The provider checks the calling agent's current depth at every * otherwise). The provider checks the calling agent's current depth at every
* start; the tool remains model-visible so runtime policy owns rejection. * start; the tool remains model-visible so runtime policy owns rejection.
* `'provider-managed'` is for an out-of-process provider (ACP) whose * `'provider-managed'` is for an out-of-process provider whose recursion
* recursion budget belongs to the child harness's own deployment. * budget belongs to the child runtime or its own deployment.
*/ */
maxDepth?: number | 'provider-managed' maxDepth?: number | 'provider-managed'
} }