Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
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
123 changes: 88 additions & 35 deletions cmd/opencodereview/provider_tui.go
Original file line number Diff line number Diff line change
Expand Up @@ -2033,9 +2033,11 @@ func (m providerTUIModel) viewOfficialTab(s *strings.Builder) {

for i, p := range m.providers {
isCursor := i == m.officialIdx
s.WriteString(listCursorPrefix(isCursor) + renderListName(p.DisplayName, isCursor))
s.WriteString(listCursorPrefix(isCursor))
s.WriteString(renderListName(p.DisplayName, isCursor))
if activeModel := m.officialProviderActiveModel(p); activeModel != "" {
s.WriteString(" " + tuiDimStyle.Render("("+activeModel+")"))
s.WriteString(" ")
s.WriteString(tuiDimStyle.Render("(" + activeModel + ")"))
}
s.WriteString("\n")
}
Expand All @@ -2059,7 +2061,8 @@ func (m providerTUIModel) viewCustomTab(s *strings.Builder) {
s.WriteString(listCursorPrefixForModel(isCursor, highlight))
s.WriteString(renderModelName(cp.name, isCursor, highlight))
if activeModel != "" {
s.WriteString(" " + tuiDimStyle.Render("("+activeModel+")"))
s.WriteString(" ")
s.WriteString(tuiDimStyle.Render("(" + activeModel + ")"))
}
s.WriteString("\n")
}
Expand All @@ -2071,9 +2074,11 @@ func (m providerTUIModel) viewCustomTab(s *strings.Builder) {
}
addLabel := "+ Add custom provider"
if m.customIdx == addIdx {
s.WriteString(cursor + tuiSelectedItemStyle.Render(addLabel))
s.WriteString(cursor)
s.WriteString(tuiSelectedItemStyle.Render(addLabel))
} else {
s.WriteString(cursor + tuiDimStyle.Render(addLabel))
s.WriteString(cursor)
s.WriteString(tuiDimStyle.Render(addLabel))
}
s.WriteString("\n")

Expand Down Expand Up @@ -2115,39 +2120,58 @@ func (m providerTUIModel) viewCustomProviderForm(s *strings.Builder) {

for _, f := range fields {
if f.active {
s.WriteString(" " + tuiSelectedItemStyle.Render(f.label+":") + "\n")
s.WriteString(" ")
s.WriteString(tuiSelectedItemStyle.Render(f.label + ":"))
s.WriteString("\n")
switch m.cpStep {
case cpStepName:
s.WriteString(" " + m.cpNameInput.View() + "\n")
s.WriteString(" ")
s.WriteString(m.cpNameInput.View())
s.WriteString("\n")
case cpStepProtocol:
for i, proto := range cpProtocols {
if i == m.cpProtocolIdx {
cur := " " + tuiCursorStyle.Render(tuiCursor) + " "
s.WriteString(cur + tuiSelectedItemStyle.Render(proto) + "\n")
s.WriteString(cur)
s.WriteString(tuiSelectedItemStyle.Render(proto))
s.WriteString("\n")
} else {
cur := " "
s.WriteString(cur + tuiItemStyle.Render(proto) + "\n")
s.WriteString(cur)
s.WriteString(tuiItemStyle.Render(proto))
s.WriteString("\n")
}
}
case cpStepBaseURL:
s.WriteString(" " + m.cpURLInput.View() + "\n")
s.WriteString(" ")
s.WriteString(m.cpURLInput.View())
s.WriteString("\n")
case cpStepAPIKey:
s.WriteString(" " + m.apiKeyInput.View() + "\n")
s.WriteString(" ")
s.WriteString(m.apiKeyInput.View())
s.WriteString("\n")
if m.apiKeyMasked && m.apiKeyOriginal != "" {
s.WriteString(tuiDimStyle.Render(" "+savedSecretReplaceHint(m.apiKeyOriginal)) + "\n")
s.WriteString(tuiDimStyle.Render(" " + savedSecretReplaceHint(m.apiKeyOriginal)))
s.WriteString("\n")
}
case cpStepAuthHeader:
s.WriteString(" " + m.cpAuthInput.View() + "\n")
s.WriteString(" ")
s.WriteString(m.cpAuthInput.View())
s.WriteString("\n")
}
} else {
display := f.value
if display == "" && f.label == "Auth Header" {
display = "(Authorization)"
}
if display == "" {
s.WriteString(" " + tuiDimStyle.Render(f.label+":") + "\n")
s.WriteString(" ")
s.WriteString(tuiDimStyle.Render(f.label + ":"))
s.WriteString("\n")
} else {
s.WriteString(" " + tuiDimStyle.Render(f.label+": "+display) + "\n")
s.WriteString(" ")
s.WriteString(tuiDimStyle.Render(f.label + ": " + display))
s.WriteString("\n")
}
}
}
Expand Down Expand Up @@ -2195,39 +2219,58 @@ func (m providerTUIModel) viewManualTab(s *strings.Builder) {

for _, f := range fields {
if f.active {
s.WriteString(" " + tuiSelectedItemStyle.Render(f.label+":") + "\n")
s.WriteString(" ")
s.WriteString(tuiSelectedItemStyle.Render(f.label + ":"))
s.WriteString("\n")
switch m.manualStep {
case manualStepURL:
s.WriteString(" " + m.manualURLInput.View() + "\n")
s.WriteString(" ")
s.WriteString(m.manualURLInput.View())
s.WriteString("\n")
case manualStepProtocol:
for i, proto := range cpProtocols {
if i == m.manualProtocolIdx {
cur := " " + tuiCursorStyle.Render(tuiCursor) + " "
s.WriteString(cur + tuiSelectedItemStyle.Render(proto) + "\n")
s.WriteString(cur)
s.WriteString(tuiSelectedItemStyle.Render(proto))
s.WriteString("\n")
} else {
cur := " "
s.WriteString(cur + tuiItemStyle.Render(proto) + "\n")
s.WriteString(cur)
s.WriteString(tuiItemStyle.Render(proto))
s.WriteString("\n")
}
}
case manualStepModel:
s.WriteString(" " + m.manualModelInput.View() + "\n")
s.WriteString(" ")
s.WriteString(m.manualModelInput.View())
s.WriteString("\n")
case manualStepAuthToken:
s.WriteString(" " + m.manualTokenInput.View() + "\n")
s.WriteString(" ")
s.WriteString(m.manualTokenInput.View())
s.WriteString("\n")
if m.manualTokenMasked && m.manualTokenOriginal != "" {
s.WriteString(tuiDimStyle.Render(" "+savedSecretReplaceHint(m.manualTokenOriginal)) + "\n")
s.WriteString(tuiDimStyle.Render(" " + savedSecretReplaceHint(m.manualTokenOriginal)))
s.WriteString("\n")
}
case manualStepAuthHeader:
s.WriteString(" " + m.manualAuthHeaderInput.View() + "\n")
s.WriteString(" ")
s.WriteString(m.manualAuthHeaderInput.View())
s.WriteString("\n")
}
} else {
display := f.value
if display == "" && f.label == "Auth Header" {
display = "(Authorization)"
}
if display == "" {
s.WriteString(" " + tuiDimStyle.Render(f.label+":") + "\n")
s.WriteString(" ")
s.WriteString(tuiDimStyle.Render(f.label + ":"))
s.WriteString("\n")
} else {
s.WriteString(" " + tuiDimStyle.Render(f.label+": "+display) + "\n")
s.WriteString(" ")
s.WriteString(tuiDimStyle.Render(f.label + ": " + display))
s.WriteString("\n")
}
}
}
Expand Down Expand Up @@ -2264,26 +2307,31 @@ func (m providerTUIModel) viewModel(s *strings.Builder) {
isCursor := m.modelIdx == customIdx
customLabel := "Enter custom model name..."
if isCursor {
s.WriteString(listCursorPrefix(isCursor) + tuiSelectedItemStyle.Render(customLabel))
s.WriteString(listCursorPrefix(isCursor))
s.WriteString(tuiSelectedItemStyle.Render(customLabel))
} else {
s.WriteString(listCursorPrefix(isCursor) + tuiDimStyle.Render(customLabel))
s.WriteString(listCursorPrefix(isCursor))
s.WriteString(tuiDimStyle.Render(customLabel))
}
s.WriteString("\n")

if m.customModel {
s.WriteString("\n")
s.WriteString(" " + m.modelInput.View())
s.WriteString(" ")
s.WriteString(m.modelInput.View())
if m.formError != "" {
s.WriteString("\n")
s.WriteString(" " + tuiErrorStyle.Render(m.formError))
s.WriteString(" ")
s.WriteString(tuiErrorStyle.Render(m.formError))
}
s.WriteString("\n")
}

s.WriteString("\n")

if m.confirmingDeleteModel {
s.WriteString(" " + tuiSelectedItemStyle.Render(fmt.Sprintf("Delete %q? (y/n)", m.deleteModelName)))
s.WriteString(" ")
s.WriteString(tuiSelectedItemStyle.Render(fmt.Sprintf("Delete %q? (y/n)", m.deleteModelName)))
s.WriteString("\n")
s.WriteString(tuiHelpStyle.Render(" y Confirm · n/Esc Cancel"))
} else if m.cursorOnDeletableModel() {
Expand All @@ -2305,7 +2353,8 @@ func (m providerTUIModel) viewAPIKey(s *strings.Builder) {
s.WriteString(tuiTitleStyle.Render(title))
s.WriteString("\n\n")

s.WriteString(" " + m.apiKeyInput.View())
s.WriteString(" ")
s.WriteString(m.apiKeyInput.View())
s.WriteString("\n")

// When an API key is already saved, the input starts masked. Surface a
Expand Down Expand Up @@ -2919,15 +2968,18 @@ func (m modelTUIModel) View() tea.View {
isCursor := m.modelIdx == customIdx
customLabel := "Enter custom model name..."
if isCursor {
s.WriteString(listCursorPrefix(isCursor) + tuiSelectedItemStyle.Render(customLabel))
s.WriteString(listCursorPrefix(isCursor))
s.WriteString(tuiSelectedItemStyle.Render(customLabel))
} else {
s.WriteString(listCursorPrefix(isCursor) + tuiDimStyle.Render(customLabel))
s.WriteString(listCursorPrefix(isCursor))
s.WriteString(tuiDimStyle.Render(customLabel))
}
s.WriteString("\n")

if m.customModel {
s.WriteString("\n")
s.WriteString(" " + m.modelInput.View())
s.WriteString(" ")
s.WriteString(m.modelInput.View())
s.WriteString("\n")
}

Expand All @@ -2940,7 +2992,8 @@ func (m modelTUIModel) View() tea.View {
s.WriteString("\n")

if m.confirmingDeleteModel {
s.WriteString(" " + tuiSelectedItemStyle.Render(fmt.Sprintf("Delete %q? (y/n)", m.deleteModelName)))
s.WriteString(" ")
s.WriteString(tuiSelectedItemStyle.Render(fmt.Sprintf("Delete %q? (y/n)", m.deleteModelName)))
s.WriteString("\n")
s.WriteString(tuiHelpStyle.Render(" y Confirm · n/Esc Cancel"))
} else if m.cursorOnUserAddedModel() {
Expand Down
4 changes: 3 additions & 1 deletion internal/agent/agent.go
Original file line number Diff line number Diff line change
Expand Up @@ -1355,7 +1355,9 @@ func (a *Agent) buildChangeFilesExcept(excludePath string) string {
case d.OldPath != d.NewPath:
status = "RENAMED"
}
sb.WriteString(status + " " + d.NewPath)
sb.WriteString(status)
sb.WriteString(" ")
sb.WriteString(d.NewPath)
if i < len(a.diffs)-1 {
sb.WriteString("\n")
}
Expand Down