From 2c5c1e72bab6fe1d9dccef9f1d234b8336a43d14 Mon Sep 17 00:00:00 2001 From: imccyu <276526105+imccyu@users.noreply.github.com> Date: Tue, 28 Jul 2026 00:44:13 +0800 Subject: [PATCH] fix: merge conflicts --- packages/host/apiproxy/tests/api-proxy-models.spec.ts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/host/apiproxy/tests/api-proxy-models.spec.ts b/packages/host/apiproxy/tests/api-proxy-models.spec.ts index 645d6f8d2c..af8791431a 100644 --- a/packages/host/apiproxy/tests/api-proxy-models.spec.ts +++ b/packages/host/apiproxy/tests/api-proxy-models.spec.ts @@ -186,13 +186,13 @@ describe('Web session model selection', () => { reasoningEffort: 'max', }) await expect(agentEvents(ctx, agent).waterfall( - 'agent/request', 1, 0, seed, signal, () => Promise.resolve(seed), + 'agent/request', 1, 0, signal, () => Promise.resolve(seed), )).resolves.toMatchObject({ provider: 'deepseek', model: 'deepseek-chat' }) expect((await ctx.systemPrompt.assemble()).variables) .toMatchObject({ provider: 'deepseek', model: 'private-preview' }) await expect(agentEvents(ctx, agent).waterfall( - 'agent/request', 1, 1, seed, signal, () => Promise.resolve(seed), + 'agent/request', 1, 1, signal, () => Promise.resolve(seed), )).resolves.toMatchObject({ provider: 'deepseek', model: 'private-preview',