| @@ -36,6 +36,48 @@ const ( · 35 unmodified lines |
| 36 | | 36 | |
| 37 | var dataTag = []byte("data:") | 37 | var dataTag = []byte("data:") |
| 38 | | 38 | |
| | 39 | // Streamed Codex responses may emit response.output_item.done events while leaving |
| | 40 | // response.completed.response.output empty. Keep the stream path aligned with the |
| | 41 | // already-patched non-stream path by reconstructing response.output from those items. |
| | 42 | func collectCodexOutputItemDone(eventData []byte, outputItemsByIndex map[int64][]byte, outputItemsFallback *[][]byte) { |
| | 43 | itemResult := gjson.GetBytes(eventData, "item") |
| | 44 | if !itemResult.Exists() || itemResult.Type != gjson.JSON { |
| | 45 | return |
| | 46 | } |
| | 47 | outputIndexResult := gjson.GetBytes(eventData, "output_index") |
| | 48 | if outputIndexResult.Exists() { |
| | 49 | outputItemsByIndex[outputIndexResult.Int()] = []byte(itemResult.Raw) |
| | 50 | return |
| | 51 | } |
| | 52 | *outputItemsFallback = append(*outputItemsFallback, []byte(itemResult.Raw)) |
| | 53 | } |
| | 54 | |
| | 55 | func patchCodexCompletedOutput(eventData []byte, outputItemsByIndex map[int64][]byte, outputItemsFallback [][]byte) []byte { |
| | 56 | outputResult := gjson.GetBytes(eventData, "response.output") |
| | 57 | shouldPatchOutput := (!outputResult.Exists() || !outputResult.IsArray() || len(outputResult.Array()) == 0) && (len(outputItemsByIndex) > 0 || len(outputItemsFallback) > 0) |
| | 58 | if !shouldPatchOutput { |
| | 59 | return eventData |
| | 60 | } |
| | 61 | |
| | 62 | completedDataPatched := eventData |
| | 63 | completedDataPatched, _ = sjson.SetRawBytes(completedDataPatched, "response.output", []byte(`[]`)) |
| | 64 | |
| | 65 | indexes := make([]int64, 0, len(outputItemsByIndex)) |
| | 66 | for idx := range outputItemsByIndex { |
| | 67 | indexes = append(indexes, idx) |
| | 68 | } |
| | 69 | sort.Slice(indexes, func(i, j int) bool { |
| | 70 | return indexes[i] < indexes[j] |
| | 71 | }) |
| | 72 | for _, idx := range indexes { |
| | 73 | completedDataPatched, _ = sjson.SetRawBytes(completedDataPatched, "response.output.-1", outputItemsByIndex[idx]) |
| | 74 | } |
| | 75 | for _, item := range outputItemsFallback { |
| | 76 | completedDataPatched, _ = sjson.SetRawBytes(completedDataPatched, "response.output.-1", item) |
| | 77 | } |
| | 78 | return completedDataPatched |
| | 79 | } |
| | 80 | |
| 39 | // CodexExecutor is a stateless executor for Codex (OpenAI Responses API entrypoint). | 81 | // CodexExecutor is a stateless executor for Codex (OpenAI Responses API entrypoint). |
| 40 | // If api_key is unavailable on auth, it falls back to legacy via ClientAdapter. | 82 | // If api_key is unavailable on auth, it falls back to legacy via ClientAdapter. |
| 41 | type CodexExecutor struct { | 83 | type CodexExecutor struct { |
| @@ -414,20 +456,28 @@ func (e *CodexExecutor) ExecuteStream(ctx context.Context, auth *cliproxyauth.Au · 372 unmodified lines |
| 414 | scanner := bufio.NewScanner(httpResp.Body) | 456 | scanner := bufio.NewScanner(httpResp.Body) |
| 415 | scanner.Buffer(nil, 52_428_800) // 50MB | 457 | scanner.Buffer(nil, 52_428_800) // 50MB |
| 416 | var param any | 458 | var param any |
| | 459 | outputItemsByIndex := make(map[int64][]byte) |
| | 460 | var outputItemsFallback [][]byte |
| 417 | for scanner.Scan() { | 461 | for scanner.Scan() { |
| 418 | line := scanner.Bytes() | 462 | line := scanner.Bytes() |
| 419 | helps.AppendAPIResponseChunk(ctx, e.cfg, line) | 463 | helps.AppendAPIResponseChunk(ctx, e.cfg, line) |
| | 464 | translatedLine := bytes.Clone(line) |
| 420 | | 465 | |
| 421 | if bytes.HasPrefix(line, dataTag) { | 466 | if bytes.HasPrefix(line, dataTag) { |
| 422 | data := bytes.TrimSpace(line[5:]) | 467 | data := bytes.TrimSpace(line[5:]) |
| 423 | if gjson.GetBytes(data, "type").String() == "response.completed" { | 468 | switch gjson.GetBytes(data, "type").String() { |
| | 469 | case "response.output_item.done": |
| | 470 | collectCodexOutputItemDone(data, outputItemsByIndex, &outputItemsFallback) |
| | 471 | case "response.completed": |
| 424 | if detail, ok := helps.ParseCodexUsage(data); ok { | 472 | if detail, ok := helps.ParseCodexUsage(data); ok { |
| 425 | reporter.Publish(ctx, detail) | 473 | reporter.Publish(ctx, detail) |
| 426 | } | 474 | } |
| | 475 | data = patchCodexCompletedOutput(data, outputItemsByIndex, outputItemsFallback) |
| | 476 | translatedLine = append([]byte("data: "), data...) |
| 427 | } | 477 | } |
| 428 | } | 478 | } |
| 429 | | 479 | |
| 430 | chunks := sdktranslator.TranslateStream(ctx, to, from, req.Model, originalPayload, body, bytes.Clone(line), ¶m) | 480 | chunks := sdktranslator.TranslateStream(ctx, to, from, req.Model, originalPayload, body, translatedLine, ¶m) |
| 431 | for i := range chunks { | 481 | for i := range chunks { |
| 432 | out <- cliproxyexecutor.StreamChunk{Payload: chunks[i]} | 482 | out <- cliproxyexecutor.StreamChunk{Payload: chunks[i]} |
| 433 | } | 483 | } |