diff --git a/doc/run-log-events.md b/doc/run-log-events.md index 8b1566c2b0f..5720fb6dad1 100644 --- a/doc/run-log-events.md +++ b/doc/run-log-events.md @@ -984,15 +984,18 @@ never affects the response or the turn. Each `item.completed` usage event (`payload.kind: "usage"`) carries two fields in `payload.usage`: -- `upstreamProvider`: the host that served the most recent model call when the - usage was reported, such as `Novita` or `DeepInfra`. +- `upstreamProvider`: the host that served the most recently finished model + call when the usage was reported, such as `Novita` or `DeepInfra`. - `providerRequestId`: that call's OpenRouter generation ID, such as `gen-1762981234-AbCdEfGh`. -The proxy clears the recorded host when each new model request starts, and a -session clears it when it attaches another run. A call whose host the proxy -could not read therefore carries neither field. It never inherits an earlier -call's or an earlier run's values. +The proxy records a call's host when that call's response ends, not when the +request starts. OpenCode reports a step's usage only a few milliseconds before +it sends the next model request, so a step's usage still names its own call's +host while the next call is in flight. A call whose host the proxy could not +read records no host when it ends, and a session clears the recorded host when +it attaches another run. Such a call therefore carries neither field. It never +inherits an earlier call's or an earlier run's values. The runner's internal `usage.reported` event carries the same values, using its existing `providerRequestId` field and an optional `upstreamProvider` field. diff --git a/packages/paperclip-runner/src/drivers/opencode/opencode-server-driver.test.ts b/packages/paperclip-runner/src/drivers/opencode/opencode-server-driver.test.ts index 5dab58875b1..fe3dea0a1a5 100644 --- a/packages/paperclip-runner/src/drivers/opencode/opencode-server-driver.test.ts +++ b/packages/paperclip-runner/src/drivers/opencode/opencode-server-driver.test.ts @@ -1249,6 +1249,64 @@ describe("OpenCodeServerDriver", () => { } }); + it("keeps a finished call's host on its usage while OpenCode's next model call is already in flight", async () => { + await chmod(fixture, 0o755); + const model = "deepseek/deepseek-v4.1-flash-1017"; + let releaseNext: (() => void) | undefined; + let call = 0; + const upstream = createHttpServer((request, response) => { + void (async () => { + for await (const _chunk of request) void _chunk; + call += 1; + response.writeHead(200, { "content-type": "text/event-stream" }); + if (call === 1) { + response.end('data: {"id":"gen-first","provider":"Novita","choices":[{"delta":{"content":"Hi"}}]}\n\ndata: [DONE]\n\n'); + return; + } + response.write('data: {"id":"gen-next","provider":"Chutes","choices":[{"delta":{"content":"Hi"}}]}\n\n'); + await new Promise(resolve => { releaseNext = resolve; }); + response.end("data: [DONE]\n\n"); + })().catch(() => response.destroy()); + }); + await new Promise(resolve => upstream.listen(0, "127.0.0.1", resolve)); + const address = upstream.address(); + if (!address || typeof address === "string") throw new Error("Missing fixture address"); + upstreamTransport.endpoint = `http://127.0.0.1:${address.port}/chat/completions`; + upstreamTransport.urls = []; + const root = await mkdtemp(join(tmpdir(), "paperclip-openrouter-inflight-")); + roots.push(root); + let session: Awaited> | undefined; + try { + const driver = new OpenCodeServerDriver({ model: `openrouter/${model}`, runtimeDirectory: root, command: fixture, + environment: { PATH: process.env.PATH, OPENROUTER_API_KEY: "synthetic-inflight-key" } }); + session = await driver.openSession({ runId: "inflight", normalizedSessionId: "inflight", workingDirectory: root }); + const config = JSON.parse(await readFile(join(root, "inflight", "config", "opencode", "opencode.json"), "utf8")); + const { baseURL, apiKey } = config.provider.openrouter.options; + const send = () => fetch(`${baseURL}/chat/completions`, { method: "POST", + headers: { Authorization: `Bearer ${apiKey}`, "Content-Type": "application/json" }, + body: JSON.stringify({ model, stream: true, messages: [{ role: "user", content: "synthetic" }] }) }); + await (await send()).arrayBuffer(); + const next = await send(); + expect(next.status).toBe(200); + const reader = next.body!.getReader(); + expect(new TextDecoder().decode((await reader.read()).value)).toContain('"provider":"Chutes"'); + await session.startTurn({ message: { role: "user", text: "finish" } }); + const events = await collectTurnEvents(session.events()); + const usage = events.find(event => event.eventType === "item.completed" && event.payload.kind === "usage")?.payload.usage; + expect(usage).toMatchObject({ upstreamProvider: "Novita", providerRequestId: "gen-first" }); + releaseNext?.(); + while (!(await reader.read()).done); + await session.startTurn({ message: { role: "user", text: "finish" } }); + await collectTurnEvents(session.events()); + expect(await session.usage?.()).toMatchObject({ upstreamProvider: "Chutes", providerRequestId: "gen-next" }); + } finally { + releaseNext?.(); + await session?.close({ reason: "test" }); + upstreamTransport.endpoint = ""; + await new Promise(resolve => { upstream.close(() => resolve()); upstream.closeAllConnections(); }); + } + }); + it("does not carry an earlier call's host onto a call the tap skips, or into another run", async () => { await chmod(fixture, 0o755); const model = "deepseek/deepseek-v4.1-flash-1017"; diff --git a/packages/paperclip-runner/src/drivers/opencode/opencode-server-driver.ts b/packages/paperclip-runner/src/drivers/opencode/opencode-server-driver.ts index 800fdc599d0..e296d581734 100644 --- a/packages/paperclip-runner/src/drivers/opencode/opencode-server-driver.ts +++ b/packages/paperclip-runner/src/drivers/opencode/opencode-server-driver.ts @@ -2537,32 +2537,37 @@ async function startOpenCodeProviderProxy(baseUrl: string, key: string, model: s const redacted = redactOpenCodeModelRequest(body, secretValues, payload); if (redacted) body = redacted; } - try { onServed?.(null); } catch { /* Recording never affects the request. */ } - const upstream = await new Promise((resolve, reject) => { - const outgoing = (upstreamUrl.protocol === "https:" ? requestHttps : requestHttp)(upstreamUrl, { - method: "POST", - agent, - headers: { ...(isOpenRouterUrl(baseUrl) ? OPENROUTER_ATTRIBUTION_HEADERS : {}), "Content-Type": "application/json", "Content-Length": body.length, ...(key ? { Authorization: `Bearer ${key}` } : {}) }, - signal: AbortSignal.any([controller.signal, AbortSignal.timeout(600_000)]), - }, resolve); - outgoing.once("error", reject); - outgoing.end(body); - }); - // Never forward authentication to a redirect destination. - const status = upstream.statusCode ?? 502; - if (status >= 300 && status < 400) { - upstream.destroy(); - throw new Error("Provider redirects are not supported"); + let served: UpstreamServed | null = null; + try { + const upstream = await new Promise((resolve, reject) => { + const outgoing = (upstreamUrl.protocol === "https:" ? requestHttps : requestHttp)(upstreamUrl, { + method: "POST", + agent, + headers: { ...(isOpenRouterUrl(baseUrl) ? OPENROUTER_ATTRIBUTION_HEADERS : {}), "Content-Type": "application/json", "Content-Length": body.length, ...(key ? { Authorization: `Bearer ${key}` } : {}) }, + signal: AbortSignal.any([controller.signal, AbortSignal.timeout(600_000)]), + }, resolve); + outgoing.once("error", reject); + outgoing.end(body); + }); + // Never forward authentication to a redirect destination. + const status = upstream.statusCode ?? 502; + if (status >= 300 && status < 400) { + upstream.destroy(); + throw new Error("Provider redirects are not supported"); + } + const headers: Record = {}; + for (const name of ["content-type", "content-encoding", "cache-control", "retry-after"]) { + const value = upstream.headers[name]; + if (typeof value === "string") headers[name] = value; + } + response.writeHead(status, headers); + if (onServed && status >= 200 && status < 300) { + await pipeline(upstream, createUpstreamServedTap({ contentType: headers["content-type"], contentEncoding: headers["content-encoding"], + onServed: value => { served = value; } }), response); + } else await pipeline(upstream, response); + } finally { + try { onServed?.(served); } catch { /* Recording never affects the response. */ } } - const headers: Record = {}; - for (const name of ["content-type", "content-encoding", "cache-control", "retry-after"]) { - const value = upstream.headers[name]; - if (typeof value === "string") headers[name] = value; - } - response.writeHead(status, headers); - if (onServed && status >= 200 && status < 300) { - await pipeline(upstream, createUpstreamServedTap({ contentType: headers["content-type"], contentEncoding: headers["content-encoding"], onServed }), response); - } else await pipeline(upstream, response); })().catch(() => { if (!response.headersSent) response.writeHead(502).end("Provider request failed"); else response.destroy();