Skip to content

Commit 054ee42

Browse files
committed
fix(session): harden Gemini step cap and retry telemetry (#121)
1 parent a54b7e4 commit 054ee42

13 files changed

Lines changed: 532 additions & 183 deletions

File tree

‎EVENTS.md‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -188,13 +188,13 @@ Emitted when a primary-session model attempt fails with a retryable error and th
188188
"invocationID": "7d142250-8bdc-43df-99af-efa252db62a7",
189189
"sessionID": "session_01abc...",
190190
"attempt": 1,
191-
"reason": "Provider ended stream without finishReason or a tool call.",
191+
"code": "no_finish_reason",
192192
"next": 1741500001000
193193
}
194194
```
195195

196196
- `attempt` (number, **required**) — retry number, starting at 1.
197-
- `reason` (string, **required**) — human-readable reason for retrying.
197+
- `code` (string, **required**) — safe retry reason: `no_finish_reason`, `rate_limited`, `overloaded`, `server_error`, `network`, or `unknown`. Provider error text is omitted from this event.
198198
- `next` (number, **required**) — scheduled next-attempt time in Unix milliseconds.
199199

200200
### `message_complete`

‎packages/cli/src/cli/cmd/run.ts‎

Lines changed: 20 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -565,14 +565,27 @@ export const RunCommand = cmd({
565565
async function loop() {
566566
const toggles = new Map<string, boolean>()
567567

568-
for await (const event of events.stream) {
569-
if (
570-
event.type === "session.status" &&
571-
event.properties.sessionID === sessionID &&
572-
event.properties.status.type === "retry"
573-
) {
568+
eventsLoop: for await (const event of events.stream) {
569+
if (event.type === "session.status") {
574570
const status = event.properties.status
575-
if (emit("retry", { attempt: status.attempt, reason: status.message, next: status.next })) continue
571+
switch (status.type) {
572+
case "retry":
573+
if (event.properties.sessionID === sessionID) {
574+
if (emit("retry", { attempt: status.attempt, code: status.reason, next: status.next })) continue
575+
}
576+
break
577+
case "idle":
578+
if (event.properties.sessionID === sessionID) break eventsLoop
579+
if (childSessions.has(event.properties.sessionID)) {
580+
emit("subagent_complete", {
581+
subagentSessionID: event.properties.sessionID,
582+
parentSessionID: sessionID,
583+
})
584+
}
585+
break
586+
case "busy":
587+
break
588+
}
576589
}
577590

578591
if (event.type === "message.updated" && event.properties.info.role === "assistant") {
@@ -769,18 +782,6 @@ export const RunCommand = cmd({
769782
}
770783
}
771784

772-
if (event.type === "session.status" && event.properties.status.type === "idle") {
773-
if (event.properties.sessionID === sessionID) {
774-
break
775-
}
776-
if (childSessions.has(event.properties.sessionID)) {
777-
emit("subagent_complete", {
778-
subagentSessionID: event.properties.sessionID,
779-
parentSessionID: sessionID,
780-
})
781-
}
782-
}
783-
784785
if (event.type === "permission.asked") {
785786
const permission = event.properties
786787
const ownSession = permission.sessionID === sessionID

‎packages/cli/src/provider/transform.ts‎

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,11 @@ function mimeToModality(mime: string): Modality | undefined {
2020
export namespace ProviderTransform {
2121
export const OUTPUT_TOKEN_MAX = Flag.AICTRL_EXPERIMENTAL_OUTPUT_TOKEN_MAX || 32_000
2222

23+
export function isGeminiTarget(model: Provider.Model) {
24+
const id = model.api.id.toLowerCase()
25+
return sdkKey(model.api.npm) === "google" || id.includes("gemini") || id.startsWith("google/")
26+
}
27+
2328
// Maps npm package to the key the AI SDK expects for providerOptions
2429
function sdkKey(npm: string): string | undefined {
2530
switch (npm) {
@@ -172,9 +177,8 @@ export namespace ProviderTransform {
172177
}
173178

174179
function dropTrailingNonToolAssistant(msgs: ModelMessage[]): ModelMessage[] {
175-
// Gemini rejects requests ending on a model turn. This applies only to
176-
// @ai-sdk/google and @ai-sdk/google-vertex; even a trailing text answer
177-
// must go, because the MAX_STEPS assistant prefill would still cause a 400.
180+
// Gemini rejects requests ending on a model turn, including proxy routes.
181+
// A trailing text answer must go as well.
178182
// Unlike MessageV2's history filter, this also removes text-bearing turns.
179183
const user = msgs.some((msg) => msg.role === "user")
180184
if (!user) return msgs
@@ -266,7 +270,7 @@ export namespace ProviderTransform {
266270
msgs = unsupportedParts(msgs, model)
267271
msgs = normalizeMessages(msgs, model, options)
268272
const key = sdkKey(model.api.npm)
269-
if (key === "google") {
273+
if (isGeminiTarget(model)) {
270274
msgs = dropTrailingNonToolAssistant(msgs)
271275
}
272276
if (

‎packages/cli/src/session/message-v2.ts‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,9 @@ import { type SystemError } from "bun"
1717
import type { Provider } from "@/provider/provider"
1818

1919
export namespace MessageV2 {
20+
export function hasVisibleOutput(parts: Part[]) {
21+
return parts.some((part) => (part.type === "text" && !!part.text.trim()) || part.type === "tool")
22+
}
2023
export const OutputLengthError = NamedError.create("MessageOutputLengthError", z.object({}))
2124
export const AbortedError = NamedError.create("MessageAbortedError", z.object({ message: z.string() }))
2225
export const StructuredOutputError = NamedError.create(
@@ -599,7 +602,7 @@ export namespace MessageV2 {
599602
) {
600603
continue
601604
}
602-
if (!msg.parts.some((part) => (part.type === "text" && part.text.trim()) || part.type === "tool")) {
605+
if (!hasVisibleOutput(msg.parts)) {
603606
continue
604607
}
605608
const assistantMessage: UIMessage = {

‎packages/cli/src/session/processor.ts‎

Lines changed: 65 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -50,11 +50,15 @@ export namespace SessionProcessor {
5050
while (true) {
5151
const parts = new Set<string>()
5252
const texts: MessageV2.TextPart[] = []
53-
let failed = false
53+
const before = {
54+
finish: input.assistantMessage.finish,
55+
cost: input.assistantMessage.cost,
56+
tokens: structuredClone(input.assistantMessage.tokens),
57+
usageStatus: input.assistantMessage.usageStatus,
58+
}
5459
try {
5560
let currentText: MessageV2.TextPart | undefined
5661
let reasoningMap: Record<string, MessageV2.ReasoningPart> = {}
57-
let sawToolCall = false
5862
const stream = await LLM.stream(streamInput)
5963

6064
for await (const value of stream.fullStream) {
@@ -115,7 +119,6 @@ export namespace SessionProcessor {
115119
break
116120

117121
case "tool-input-start":
118-
sawToolCall = true
119122
const part = await Session.updatePart({
120123
id: toolcalls[value.id]?.id ?? Identifier.ascending("part"),
121124
messageID: input.assistantMessage.id,
@@ -130,6 +133,7 @@ export namespace SessionProcessor {
130133
},
131134
})
132135
toolcalls[value.id] = part as MessageV2.ToolPart
136+
parts.add(part.id)
133137
break
134138

135139
case "tool-input-delta":
@@ -139,7 +143,6 @@ export namespace SessionProcessor {
139143
break
140144

141145
case "tool-call": {
142-
sawToolCall = true
143146
const match = toolcalls[value.toolCallId]
144147
if (match) {
145148
const part = await Session.updatePart({
@@ -155,9 +158,10 @@ export namespace SessionProcessor {
155158
metadata: value.providerMetadata,
156159
})
157160
toolcalls[value.toolCallId] = part as MessageV2.ToolPart
161+
parts.add(part.id)
158162

159-
const parts = await MessageV2.parts(input.assistantMessage.id)
160-
const lastThree = parts.slice(-DOOM_LOOP_THRESHOLD)
163+
const history = await MessageV2.parts(input.assistantMessage.id)
164+
const lastThree = history.slice(-DOOM_LOOP_THRESHOLD)
161165

162166
if (
163167
lastThree.length === DOOM_LOOP_THRESHOLD &&
@@ -257,7 +261,10 @@ export namespace SessionProcessor {
257261
usage: value.usage,
258262
metadata: value.providerMetadata,
259263
})
260-
input.assistantMessage.finish = value.finishReason
264+
input.assistantMessage.finish =
265+
value.finishReason === "unknown" && texts.some((part) => part.text.trim())
266+
? "stop"
267+
: value.finishReason
261268
input.assistantMessage.cost += usage.cost
262269
input.assistantMessage.tokens = usage.tokens
263270
input.assistantMessage.usageStatus = usage.usageStatus
@@ -292,8 +299,12 @@ export namespace SessionProcessor {
292299
cost: usage.cost,
293300
})
294301
await Session.updateMessage(input.assistantMessage)
295-
if (value.finishReason === "unknown" && !sawToolCall && !texts.some((part) => part.text.trim())) {
296-
failed = true
302+
if (
303+
value.finishReason === "unknown" &&
304+
!MessageV2.hasVisibleOutput(
305+
(await MessageV2.parts(input.assistantMessage.id)).filter((part) => parts.has(part.id)),
306+
)
307+
) {
297308
throw new MessageV2.APIError({
298309
message: "Provider ended stream without finishReason or a tool call.",
299310
isRetryable: true,
@@ -310,8 +321,10 @@ export namespace SessionProcessor {
310321
if (snapshot) {
311322
const patch = await Snapshot.patch(snapshot)
312323
if (patch.files.length) {
324+
const id = Identifier.ascending("part")
325+
parts.add(id)
313326
await Session.updatePart({
314-
id: Identifier.ascending("part"),
327+
id,
315328
messageID: input.assistantMessage.id,
316329
sessionID: input.sessionID,
317330
type: "patch",
@@ -405,41 +418,69 @@ export namespace SessionProcessor {
405418
const error = MessageV2.APIError.isInstance(e)
406419
? e
407420
: MessageV2.fromError(e, { providerID: input.model.providerID })
421+
const apiError = MessageV2.APIError.isInstance(error)
408422
if (MessageV2.ContextOverflowError.isInstance(error)) {
409423
// TODO: Handle context overflow error
410424
}
411425
const retry = SessionRetry.retryable(error)
412426
if (retry !== undefined) {
427+
if (snapshot) {
428+
const patch = await Snapshot.patch(snapshot)
429+
if (patch.files.length) {
430+
const id = Identifier.ascending("part")
431+
parts.add(id)
432+
await Session.updatePart({
433+
id,
434+
messageID: input.assistantMessage.id,
435+
sessionID: input.sessionID,
436+
type: "patch",
437+
hash: patch.hash,
438+
files: patch.files,
439+
})
440+
}
441+
snapshot = undefined
442+
}
443+
for (const partID of parts) {
444+
await Session.removePart({
445+
sessionID: input.sessionID,
446+
messageID: input.assistantMessage.id,
447+
partID,
448+
})
449+
}
450+
for (const key of Object.keys(toolcalls)) {
451+
if (parts.has(toolcalls[key].id)) delete toolcalls[key]
452+
}
453+
input.assistantMessage.finish = before.finish
454+
input.assistantMessage.cost = before.cost
455+
input.assistantMessage.tokens = before.tokens
456+
input.assistantMessage.usageStatus = before.usageStatus
457+
await Session.updateMessage(input.assistantMessage)
413458
attempt++
414459
if (attempt > SessionRetry.MAX_RETRY_ATTEMPTS) {
415460
log.error("max retry attempts reached", { attempt, retry })
416-
input.assistantMessage.error = MessageV2.APIError.isInstance(error)
461+
input.assistantMessage.error = apiError
417462
? new MessageV2.APIError({
418-
...error.data,
419-
message: `Max retry attempts (${SessionRetry.MAX_RETRY_ATTEMPTS}) reached: ${retry}`,
463+
message: `Max retry attempts (${SessionRetry.MAX_RETRY_ATTEMPTS}) reached: ${SessionRetry.reason(error)}`,
464+
statusCode: error.data.statusCode,
465+
isRetryable: error.data.isRetryable,
466+
metadata: error.data.metadata?.finishReason
467+
? { finishReason: error.data.metadata.finishReason }
468+
: undefined,
420469
}).toObject()
421470
: new NamedError.Unknown({
422-
message: `Max retry attempts (${SessionRetry.MAX_RETRY_ATTEMPTS}) reached: ${retry}`,
471+
message: `Max retry attempts (${SessionRetry.MAX_RETRY_ATTEMPTS}) reached: ${SessionRetry.reason(error)}`,
423472
}).toObject()
424473
await Bus.publish(Session.Event.Error, {
425474
sessionID: input.assistantMessage.sessionID,
426475
error: input.assistantMessage.error,
427476
})
428477
} else {
429-
if (failed) {
430-
for (const partID of parts) {
431-
await Session.removePart({
432-
sessionID: input.sessionID,
433-
messageID: input.assistantMessage.id,
434-
partID,
435-
})
436-
}
437-
}
438-
const delay = SessionRetry.delay(attempt, error.name === "APIError" ? error : undefined)
478+
const delay = SessionRetry.delay(attempt, apiError ? error : undefined)
439479
SessionStatus.set(input.sessionID, {
440480
type: "retry",
441481
attempt,
442482
message: retry,
483+
reason: SessionRetry.reason(error),
443484
next: Date.now() + delay,
444485
})
445486
await SessionRetry.sleep(delay, input.abort).catch(() => {})

‎packages/cli/src/session/prompt.ts‎

Lines changed: 16 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -342,6 +342,21 @@ export namespace SessionPrompt {
342342
}
343343

344344
step++
345+
const agent = await Agent.get(lastUser.agent)
346+
const maxSteps = agent.steps ?? Infinity
347+
if (step > maxSteps) {
348+
if (lastAssistant) {
349+
lastAssistant.error = new MessageV2.APIError({
350+
message: `Agent step limit (${maxSteps}) reached before a final response.`,
351+
isRetryable: false,
352+
}).toObject()
353+
lastAssistant.finish = "stop"
354+
lastAssistant.time.completed = Date.now()
355+
await Session.updateMessage(lastAssistant)
356+
await Bus.publish(Session.Event.Error, { sessionID, error: lastAssistant.error })
357+
}
358+
break
359+
}
345360
if (step === 1)
346361
ensureTitle({
347362
session,
@@ -572,8 +587,6 @@ export namespace SessionPrompt {
572587
}
573588

574589
// normal processing
575-
const agent = await Agent.get(lastUser.agent)
576-
const maxSteps = agent.steps ?? Infinity
577590
const isLastStep = step >= maxSteps
578591
msgs = await insertReminders({
579592
messages: msgs,
@@ -687,7 +700,7 @@ export namespace SessionPrompt {
687700
...(isLastStep
688701
? [
689702
{
690-
role: "assistant" as const,
703+
role: ProviderTransform.isGeminiTarget(model) ? ("user" as const) : ("assistant" as const),
691704
content: MAX_STEPS,
692705
},
693706
]

‎packages/cli/src/session/retry.ts‎

Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,32 @@ import { MessageV2 } from "./message-v2"
33
import { iife } from "@/util/iife"
44

55
export namespace SessionRetry {
6+
export const Reason = [
7+
"no_finish_reason",
8+
"rate_limited",
9+
"overloaded",
10+
"server_error",
11+
"network",
12+
"unknown",
13+
] as const
14+
export type Reason = (typeof Reason)[number]
15+
16+
export function reason(error: ReturnType<NamedError["toObject"]>): Reason {
17+
if (MessageV2.APIError.isInstance(error)) {
18+
if (error.data.metadata?.finishReason === "unknown") return "no_finish_reason"
19+
if (error.data.statusCode === 429) return "rate_limited"
20+
if (error.data.statusCode === 503 || /overload|unavailable/i.test(error.data.message)) return "overloaded"
21+
if (error.data.statusCode && error.data.statusCode >= 500) return "server_error"
22+
if (/network|connect|socket|fetch failed/i.test(error.data.message)) return "network"
23+
return "unknown"
24+
}
25+
const message = typeof error.data?.message === "string" ? error.data.message : ""
26+
if (/rate.limit|too.many.requests|exhausted/i.test(message)) return "rate_limited"
27+
if (/overload|unavailable/i.test(message)) return "overloaded"
28+
if (/network|connect|socket|fetch failed/i.test(message)) return "network"
29+
return "unknown"
30+
}
31+
632
export const RETRY_INITIAL_DELAY = 2000
733
export const RETRY_BACKOFF_FACTOR = 2
834
export const RETRY_MAX_DELAY_NO_HEADERS = 30_000 // 30 seconds

‎packages/cli/src/session/status.ts‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@ import { BusEvent } from "@/bus/bus-event"
22
import { Bus } from "@/bus"
33
import { Instance } from "@/project/instance"
44
import z from "zod"
5+
import { SessionRetry } from "./retry"
56

67
export namespace SessionStatus {
78
export const Info = z
@@ -13,6 +14,7 @@ export namespace SessionStatus {
1314
type: z.literal("retry"),
1415
attempt: z.number(),
1516
message: z.string(),
17+
reason: z.enum(SessionRetry.Reason),
1618
next: z.number(),
1719
}),
1820
z.object({

0 commit comments

Comments
 (0)