Complete Luna Responses output

codex-luna-compat.patch

@@ -139,10 +139,10 @@ index 697cc96..299247f 100644
  			if streamResponse.Response != nil {
 diff --git a/relay/channel/openai/responses_codex_compat.go b/relay/channel/openai/responses_codex_compat.go
 new file mode 100644
-index 0000000..cb18b81
+index 0000000..00aa2f6
 --- /dev/null
 +++ b/relay/channel/openai/responses_codex_compat.go
-@@ -0,0 +1,170 @@
+@@ -0,0 +1,244 @@
 +package openai
 +
 +import (
@@ -155,7 +155,10 @@ index 0000000..cb18b81
 +	"github.com/tidwall/sjson"
 +)
 +
-+const codexLunaOriginModel = "gpt-5.6-luna"
++const (
++	codexLunaOriginModel   = "gpt-5.6-luna"
++	codexLunaUpstreamModel = "gemini-3.7-flash-high"
++)
 +
 +type codexResponsesStreamState struct {
 +	nextOutputIndex  int
@@ -181,6 +184,13 @@ index 0000000..cb18b81
 +	if s == nil || event == nil || data == "" {
 +		return nil, data, nil, nil
 +	}
++	if event.Response != nil {
++		event.Response.Model = codexLunaUpstreamModel
++		data, err = sjson.Set(data, "response.model", codexLunaUpstreamModel)
++		if err != nil {
++			return nil, "", nil, fmt.Errorf("set responses model: %w", err)
++		}
++	}
 +
 +	itemID := event.ItemID
 +	if itemID == "" && event.Item != nil {
@@ -270,6 +280,27 @@ index 0000000..cb18b81
 +			before = append(before, codexContentPartEvent("response.content_part.done", itemID, outputIndex, text))
 +			s.contentDoneBy[itemID] = true
 +		}
++		if event.Item != nil && event.Item.Type == "message" {
++			text := ""
++			if builder := s.textByID[itemID]; builder != nil {
++				text = builder.String()
++			}
++			data, err = ensureCodexMessageOutputItem(data, text)
++			if err != nil {
++				return nil, "", nil, err
++			}
++		}
++	case "response.completed", "response.done":
++		if event.Response != nil && len(event.Response.Output) == 0 && itemID != "" {
++			text := ""
++			if builder := s.textByID[itemID]; builder != nil {
++				text = builder.String()
++			}
++			data, err = ensureCodexCompletedOutput(data, itemID, text)
++			if err != nil {
++				return nil, "", nil, err
++			}
++		}
 +	}
 +
 +	return before, data, after, nil
@@ -287,6 +318,49 @@ index 0000000..cb18b81
 +	return updated, nil
 +}
 +
++func ensureCodexMessageOutputItem(data, text string) (string, error) {
++	if gjson.Get(data, "item.content").Exists() && gjson.Get(data, "item.content").IsArray() && len(gjson.Get(data, "item.content").Array()) > 0 {
++		return data, nil
++	}
++	data, err := sjson.Set(data, "item.role", "assistant")
++	if err != nil {
++		return "", fmt.Errorf("set responses output item role: %w", err)
++	}
++	content := []dto.ResponsesOutputContent{{Type: "output_text", Text: text, Annotations: []interface{}{}}}
++	contentData, err := common.Marshal(content)
++	if err != nil {
++		return "", fmt.Errorf("marshal responses output item content: %w", err)
++	}
++	data, err = sjson.SetRaw(data, "item.content", string(contentData))
++	if err != nil {
++		return "", fmt.Errorf("set responses output item content: %w", err)
++	}
++	return data, nil
++}
++
++func ensureCodexCompletedOutput(data, itemID, text string) (string, error) {
++	output := []dto.ResponsesOutput{{
++		Type:   "message",
++		ID:     itemID,
++		Status: "completed",
++		Role:   "assistant",
++		Content: []dto.ResponsesOutputContent{{
++			Type:        "output_text",
++			Text:        text,
++			Annotations: []interface{}{},
++		}},
++	}}
++	outputData, err := common.Marshal(output)
++	if err != nil {
++		return "", fmt.Errorf("marshal responses output: %w", err)
++	}
++	updated, err := sjson.SetRaw(data, "response.output", string(outputData))
++	if err != nil {
++		return "", fmt.Errorf("set responses output: %w", err)
++	}
++	return updated, nil
++}
++
 +func codexContentPartEvent(eventType, itemID string, outputIndex *int, text string) dto.ResponsesStreamResponse {
 +	return dto.ResponsesStreamResponse{
 +		Type:         eventType,
@@ -315,10 +389,10 @@ index 0000000..cb18b81
 +}
 diff --git a/relay/channel/openai/responses_codex_compat_test.go b/relay/channel/openai/responses_codex_compat_test.go
 new file mode 100644
-index 0000000..3cb1082
+index 0000000..aa59f50
 --- /dev/null
 +++ b/relay/channel/openai/responses_codex_compat_test.go
-@@ -0,0 +1,57 @@
+@@ -0,0 +1,91 @@
 +package openai
 +
 +import (
@@ -376,6 +450,40 @@ index 0000000..3cb1082
 +	assert.Equal(t, 0, *event.OutputIndex)
 +	assert.Equal(t, 0, *event.ContentIndex)
 +}
++
++func TestCodexResponsesStreamStateCompletesMessageOutput(t *testing.T) {
++	state := newCodexResponsesStreamState()
++
++	added := dto.ResponsesStreamResponse{
++		Type: "response.output_item.added",
++		Item: &dto.ResponsesOutput{ID: "item_1", Type: "message", Role: "assistant"},
++	}
++	_, _, _, err := state.normalize(&added, `{"type":"response.output_item.added","item":{"id":"item_1","type":"message"}}`)
++	require.NoError(t, err)
++
++	delta := dto.ResponsesStreamResponse{Type: "response.output_text.delta", ItemID: "item_1", Delta: "OK"}
++	_, _, _, err = state.normalize(&delta, `{"type":"response.output_text.delta","item_id":"item_1","delta":"OK"}`)
++	require.NoError(t, err)
++
++	done := dto.ResponsesStreamResponse{
++		Type:   dto.ResponsesOutputTypeItemDone,
++		ItemID: "item_1",
++		Item:   &dto.ResponsesOutput{ID: "item_1", Type: "message", Status: "completed"},
++	}
++	_, doneData, _, err := state.normalize(&done, `{"type":"response.output_item.done","item_id":"item_1","item":{"id":"item_1","type":"message","status":"completed"}}`)
++	require.NoError(t, err)
++	assert.Equal(t, "OK", gjson.Get(doneData, "item.content.0.text").String())
++
++	completed := dto.ResponsesStreamResponse{
++		Type:     "response.completed",
++		ItemID:   "item_1",
++		Response: &dto.OpenAIResponsesResponse{Model: "gemini-3.7-flash", Output: []dto.ResponsesOutput{}},
++	}
++	_, completedData, _, err := state.normalize(&completed, `{"type":"response.completed","response":{"model":"gemini-3.7-flash","output":[]}}`)
++	require.NoError(t, err)
++	assert.Equal(t, codexLunaUpstreamModel, gjson.Get(completedData, "response.model").String())
++	assert.Equal(t, "OK", gjson.Get(completedData, "response.output.0.content.0.text").String())
++}
 diff --git a/relay/responses_handler.go b/relay/responses_handler.go
 index 5fa23d0..9c74145 100644
 --- a/relay/responses_handler.go