Skip to content
Closed
Show file tree
Hide file tree
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,6 @@ export function mapOpenAICompatibleFinishReason(
case "tool_calls":
return "tool-calls"
default:
return "other"
return "unknown"
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -345,6 +345,7 @@ export class OpenAICompatibleChatLanguageModel implements LanguageModelV3 {
unified: "other",
raw: undefined,
}
let receivedFinishReason = false
const usage: {
completionTokens: number | undefined
completionTokensDetails: {
Expand Down Expand Up @@ -453,6 +454,7 @@ export class OpenAICompatibleChatLanguageModel implements LanguageModelV3 {
const choice = value.choices[0]

if (choice?.finish_reason != null) {
receivedFinishReason = true
finishReason = {
unified: mapOpenAICompatibleFinishReason(choice.finish_reason),
raw: choice.finish_reason ?? undefined,
Expand Down Expand Up @@ -645,6 +647,10 @@ export class OpenAICompatibleChatLanguageModel implements LanguageModelV3 {
},

flush(controller) {
if (!receivedFinishReason && !isFirstChunk) {
finishReason = { unified: "unknown", raw: undefined }
}

if (isActiveReasoning) {
controller.enqueue({
type: "reasoning-end",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,6 @@ export function mapOpenAIResponseFinishReason({
case "content_filter":
return "content-filter"
default:
return hasFunctionCall ? "tool-calls" : "other"
return hasFunctionCall ? "tool-calls" : "unknown"
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -803,6 +803,7 @@ export class OpenAIResponsesLanguageModel implements LanguageModelV3 {
unified: "other",
raw: undefined,
}
let receivedFinishChunk = false
const usage: {
inputTokens: number | undefined
outputTokens: number | undefined
Expand Down Expand Up @@ -1259,6 +1260,7 @@ export class OpenAIResponsesLanguageModel implements LanguageModelV3 {
})
}
} else if (isResponseFinishedChunk(value)) {
receivedFinishChunk = true
finishReason = {
unified: mapOpenAIResponseFinishReason({
finishReason: value.response.incomplete_details?.reason,
Expand Down Expand Up @@ -1305,6 +1307,10 @@ export class OpenAIResponsesLanguageModel implements LanguageModelV3 {
currentTextId = null
}

if (!receivedFinishChunk && responseId !== null) {
finishReason = { unified: "unknown", raw: undefined }
}

const providerMetadata: SharedV3ProviderMetadata = {
openai: {
responseId,
Expand Down
12 changes: 12 additions & 0 deletions packages/opencode/src/session/processor.ts
Original file line number Diff line number Diff line change
Expand Up @@ -625,6 +625,18 @@ export const layer: Layer.Layer<
Stream.takeUntil(() => ctx.needsCompaction),
Stream.runDrain,
)

if (ctx.assistantMessage.finish === "unknown") {
const parts = MessageV2.parts(ctx.assistantMessage.id)
if (!parts.some((p) => p.type === "tool")) {
Comment thread
Varuu-0 marked this conversation as resolved.
Outdated
yield* Effect.fail(
new MessageV2.APIError({
message: "Stream terminated prematurely without a finish reason",
isRetryable: true,
}).toObject()
Comment thread
Varuu-0 marked this conversation as resolved.
Outdated
)
}
}
}).pipe(
Effect.onInterrupt(() =>
Effect.gen(function* () {
Expand Down
2 changes: 1 addition & 1 deletion packages/opencode/src/session/prompt.ts
Original file line number Diff line number Diff line change
Expand Up @@ -1592,7 +1592,7 @@ NOTE: At any point in time through this workflow you should feel free to ask the
return "break" as const
}

const finished = handle.message.finish && !["tool-calls", "unknown"].includes(handle.message.finish)
const finished = handle.message.finish && !["tool-calls", "unknown", "other"].includes(handle.message.finish)
Comment thread
Varuu-0 marked this conversation as resolved.
Outdated
if (finished && !handle.message.error) {
if (format.type === "json_schema") {
handle.message.error = new MessageV2.StructuredOutputError({
Expand Down
Loading