diff --git a/packages/core/tools/src/code-mode.ts b/packages/core/tools/src/code-mode.ts index 904c65ef0e..970bb6e208 100644 --- a/packages/core/tools/src/code-mode.ts +++ b/packages/core/tools/src/code-mode.ts @@ -259,6 +259,10 @@ export function createRunCodeTool(registry: ToolRegistry, requireRuntime: () => // an in-flight sub-dispatch, abandoning queued ones), then await the // queue's drain — an aborted sub-call still settles and logs its // event INSIDE the open turn; nothing can append after we return. + // `queue` is the FOLDED tail (every link swallows its rejection into + // undefined), so this await cannot itself reject — an abandoned + // queued call can never mask the runtime's own `result.error` below; + // rejections surface only on the per-call promises the program holds. runController.abort('run_code settled') await queue diff --git a/packages/core/tools/tests/code-mode.spec.ts b/packages/core/tools/tests/code-mode.spec.ts index 7fcd0890e6..7cbceb5361 100644 --- a/packages/core/tools/tests/code-mode.spec.ts +++ b/packages/core/tools/tests/code-mode.spec.ts @@ -119,6 +119,26 @@ describe('mode-aware wire contribution', () => { expect(assembly.sections.some(section => section.name === 'tools:sdk')).toBe(true) }) + it("never exposes run_code to programs, even under mode 'both' (no recursive dispatch path)", async () => { + const { ctx, runtime } = await setup({ mode: 'both' }) + registerEcho(ctx) + runtime.behavior = (request) => { + const functions = request.bindings[0]!.functions + return Promise.resolve({ + logs: [], + value: JSON.stringify({ + names: Object.keys(functions).sort(), + // Own-property AND prototype-chain reads both come back empty — + // there is no handle a program could re-enter run_code through. + runCode: String(functions[RUN_CODE_NAME]), + }), + }) + } + const result = await runCode(ctx, 'program') + expect(result.isError).toBe(false) + expect(JSON.parse((result.content[0] as { text: string }).text)).toEqual({ names: ['echo'], runCode: 'undefined' }) + }) + it('renders byte-identical SDK text across consecutive assemblies of an unchanged tool set', async () => { const { ctx, systemPrompt } = await setup({ mode: 'code' }) registerEcho(ctx)