Skip to content

Commit e3edb05

Browse files
author
shiyanYX
committed
fix(stream): surface upstream truncation honestly + retry dead-empty streams
x-preview-f 等 Zen 隐身模型会以三类异常方式收尾(opencode#44210/#44092): 非标准 finish 值(内容过滤掐流返回 "sensitive")、协议外未知值、以及没有 finish_reason 就提前断流。旧逻辑把它们一律洗白成正常完成(end_turn/stop/ response.completed),下游无法感知截断,重试也无从谈起。 L1 诚实信号: - 新增 classifyFinishReason/mapUpstreamFinishReason:过滤别名归一为 content_filter(Claude 输出 refusal);未知值按异常终止改写为配置的 截断原因(默认 length) - Claude 流式:无合法 finish 时 message_delta 声明 max_tokens 而非 end_turn - Chat 流式:补发带截断 finish 的终止 chunk + [DONE],闭合客户端状态机, 并沿用原 chunk 的 id/created/model 保持流连续性 - Responses 流式:终止事件改 response.incomplete;读错误不再无声 return - 非流式双协议同步映射;新增 truncation_stop_reason 配置项(默认 length) L2 透明重试: - 三条流式路径对"零字节转发且无合法 finish"的死流补试一次; chat 读错误在未转发任何字节时也先重试而非直接报错收场 Ref: anomalyco/opencode#44210 #44092 #44141 #43939
1 parent ab95f7a commit e3edb05

3 files changed

Lines changed: 623 additions & 138 deletions

File tree

‎chat_protocol.go‎

Lines changed: 65 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,71 @@ func normalizeFinishReason(reason string) string {
1717
}
1818
}
1919

20+
// ======================== finish_reason 语义分类 ========================
21+
//
22+
// 上游(尤其 Zen 网关的隐身预览模型)会出现三类异常收尾:
23+
// 1. 非标准 finish 值:如内容过滤掐流时返回的 "sensitive"(opencode#44092);
24+
// 2. 协议外未知值;
25+
// 3. 干脆没有 finish_reason 就结束(SSE 提前 EOF,opencode#44210 失败模式 2)。
26+
//
27+
// 老行为把它们一律洗白成正常完成(end_turn/stop),下游无法感知截断。
28+
// 这里提供统一分类,让各输出路径给出诚实信号。
29+
30+
// finishSignal 分类上游 finish_reason 值的语义。
31+
type finishSignal int
32+
33+
const (
34+
finishNone finishSignal = iota // 缺失或空:流未以合法 finish 收尾
35+
finishNormal // OpenAI 协议内已知值
36+
finishFilter // content_filter 及已知过滤别名(如 Zen 的 "sensitive")
37+
finishUnknown // 非空但协议外,视为异常终止
38+
)
39+
40+
// classifyFinishReason 判定上游 finish_reason 的语义类别。
41+
func classifyFinishReason(raw string) finishSignal {
42+
switch raw {
43+
case "":
44+
return finishNone
45+
case "stop", "length", "tool_calls", "function_call":
46+
return finishNormal
47+
case "content_filter", "sensitive", "moderation", "safety":
48+
// "sensitive"/"moderation"/"safety" 是 Zen 内容过滤掐流的实测签名。
49+
return finishFilter
50+
default:
51+
return finishUnknown
52+
}
53+
}
54+
55+
// mapUpstreamFinishReason 把上游 finish_reason 规范化为 OpenAI 语义值:
56+
// 过滤别名归一为 content_filter;无法识别的值按异常终止处理(改用配置的截断原因);
57+
// 空值原样返回(由调用方决定缺失时的兜底)。
58+
func mapUpstreamFinishReason(raw string) string {
59+
switch classifyFinishReason(raw) {
60+
case finishNormal:
61+
return raw
62+
case finishFilter:
63+
return "content_filter"
64+
case finishUnknown:
65+
return truncationStopReason()
66+
default:
67+
return ""
68+
}
69+
}
70+
71+
// claudeStopReasonFromOpenAI 把 OpenAI 语义停止原因映射到 Anthropic stop_reason。
72+
func claudeStopReasonFromOpenAI(reason string) string {
73+
switch reason {
74+
case "max_tokens", "length":
75+
return "max_tokens"
76+
case "tool_calls", "tool_use":
77+
return "tool_use"
78+
case "refusal", "content_filter":
79+
return "refusal"
80+
default:
81+
return "end_turn"
82+
}
83+
}
84+
2085
func anthropicUsageToChat(usage map[string]any) map[string]any {
2186
if usage == nil {
2287
return nil

0 commit comments

Comments
 (0)