diff --git a/config/react-compiler-uncompiled-files.txt b/config/react-compiler-uncompiled-files.txt index fcb82cc9f86..f63d32adcde 100644 --- a/config/react-compiler-uncompiled-files.txt +++ b/config/react-compiler-uncompiled-files.txt @@ -28,6 +28,7 @@ src/renderer/src/components/editor/combined-diff/scroll-viewport/combined-diff-s src/renderer/src/components/editor/markdown-preview/search/use-markdown-preview-search-reveal.ts src/renderer/src/components/editor/markdown-preview/viewport/use-markdown-preview-scroll-anchor.ts src/renderer/src/components/github-item-dialog/inspect-pull-request/pr-files-combined-diff-body.tsx +src/renderer/src/components/native-chat/session/options/controls/NativeChatReviewChoices.tsx src/renderer/src/components/native-chat/tools/runs/NativeChatToolRunMembers.tsx src/renderer/src/components/native-chat/tools/runs/use-native-chat-tool-run-window.ts src/renderer/src/components/right-sidebar/file-explorer/panel/FileExplorerVirtualRows.tsx diff --git a/mobile/src/i18n/en-runtime-required.json b/mobile/src/i18n/en-runtime-required.json index 0e32408735c..2f845dbf111 100644 --- a/mobile/src/i18n/en-runtime-required.json +++ b/mobile/src/i18n/en-runtime-required.json @@ -77,8 +77,7 @@ "moreCount_one": "{{count}} more", "moreCount_other": "{{count}} more", "queuedCount_one": "{{count}} queued message", - "queuedCount_other": "{{count}} queued messages", - "foldNeedsAttention": "{{more}}, a message needs attention" + "queuedCount_other": "{{count}} queued messages" }, "subagentGroup": { "ran_one": "Ran {{count}} subagent", diff --git a/mobile/src/i18n/locales/de.json b/mobile/src/i18n/locales/de.json index 28cd19206c7..48579b1b207 100644 --- a/mobile/src/i18n/locales/de.json +++ b/mobile/src/i18n/locales/de.json @@ -2204,7 +2204,9 @@ "waitForBackgroundTasks": "Warten, bis die Hintergrundaufgaben abgeschlossen sind.", "waitForStart": "Warten, bis der Agent vollständig gestartet ist.", "writeFailed": "Orca konnte diese Nachricht nicht an den Agenten übergeben, daher wurde sie nicht gesendet.", - "pluginInputRequired": "{{agent}} wurde angehalten, weil das Plugin „{{plugin}}“ in einem Terminalbereich auf eine Eingabe wartet. Deaktiviere das Plugin für Chatsitzungen oder führe die Aufgabe in einem {{agent}}-Terminal aus." + "pluginInputRequired": "{{agent}} wurde angehalten, weil das Plugin „{{plugin}}“ in einem Terminalbereich auf eine Eingabe wartet. Deaktiviere das Plugin für Chatsitzungen oder führe die Aufgabe in einem {{agent}}-Terminal aus.", + "reviewFailed": "Codex konnte die Prüfung nicht ausführen. Versuche /review erneut.", + "reviewSettingsUnsupported": "Aktualisiere Codex, um mit einem anderen Modell zu prüfen, oder wechsle zurück zu {{detail}}." }, "fileReader": { "copyReviewNotes": "Review-Notizen kopieren", @@ -4230,5 +4232,21 @@ } } } + }, + "nativeChat": { + "review": { + "baseBranch": "Mit einem Basisbranch vergleichen", + "uncommittedChanges": "Nicht committete Änderungen prüfen", + "commit": "Einen Commit prüfen", + "custom": "Eigene Prüfanweisungen", + "loadFailed": "Codex konnte die Prüfziele nicht laden. Versuche /review erneut.", + "instructions": "Prüfanweisungen eingeben", + "searchBranches": "Branches suchen…", + "searchCommits": "Commits suchen…", + "title": "Änderungen prüfen", + "back": "Zurück zu den Prüfzielen", + "run": "Ausführen", + "done": "Fertig" + } } } diff --git a/mobile/src/i18n/locales/en.json b/mobile/src/i18n/locales/en.json index fd4c8278ef6..091a8d778b0 100644 --- a/mobile/src/i18n/locales/en.json +++ b/mobile/src/i18n/locales/en.json @@ -2739,7 +2739,9 @@ "chooseClaudeAccount": "Choose or add one in Claude Accounts settings.", "chooseClaudeAccountThenRunCommand": "Choose or add one in Claude Accounts settings, then run /{{command}} again.", "chooseClaudeAccountThenSend": "Choose or add one in Claude Accounts settings, then send your message again.", - "unconfirmed": "Couldn't confirm whether this was sent. It hasn't been resent." + "unconfirmed": "Couldn't confirm whether this was sent. It hasn't been resent.", + "reviewFailed": "Codex couldn't run the review. Try /review again.", + "reviewSettingsUnsupported": "Update Codex to review with a different model, or switch back to {{detail}}." }, "writeNotice": { "notDoneReadHistory": "This chat's history couldn't be loaded.", @@ -4993,5 +4995,21 @@ "needsWindow": "Couldn’t update. Open Orca on {{desktop}}.", "failed": "Couldn’t update the agent list." } + }, + "nativeChat": { + "review": { + "baseBranch": "Review against a base branch", + "uncommittedChanges": "Review uncommitted changes", + "commit": "Review a commit", + "custom": "Custom review instructions", + "loadFailed": "Codex could not load review targets. Try /review again.", + "instructions": "Enter review instructions", + "searchBranches": "Search branches…", + "searchCommits": "Search commits…", + "title": "Review changes", + "back": "Back to review targets", + "run": "Run", + "done": "Done" + } } } diff --git a/mobile/src/i18n/locales/es.json b/mobile/src/i18n/locales/es.json index 424eff6c507..be56b57e9d1 100644 --- a/mobile/src/i18n/locales/es.json +++ b/mobile/src/i18n/locales/es.json @@ -2272,7 +2272,9 @@ "waitForBackgroundTasks": "Espere a que terminen las tareas en segundo plano.", "waitForStart": "Espere a que el agente termine de iniciarse.", "writeFailed": "Orca no pudo entregar este mensaje al agente, así que no se envió.", - "pluginInputRequired": "{{agent}} se detuvo porque el complemento «{{plugin}}» espera una entrada en un panel de terminal. Desactiva el complemento para las sesiones de chat o ejecuta la tarea en un terminal de {{agent}}." + "pluginInputRequired": "{{agent}} se detuvo porque el complemento «{{plugin}}» espera una entrada en un panel de terminal. Desactiva el complemento para las sesiones de chat o ejecuta la tarea en un terminal de {{agent}}.", + "reviewFailed": "Codex no pudo realizar la revisión. Vuelve a intentar /review.", + "reviewSettingsUnsupported": "Actualiza Codex para revisar con otro modelo o vuelve a {{detail}}." }, "fileReader": { "copyReviewNotes": "Copiar notas de revisión", @@ -4330,5 +4332,21 @@ } } } + }, + "nativeChat": { + "review": { + "baseBranch": "Revisar contra una rama base", + "uncommittedChanges": "Revisar cambios sin confirmar", + "commit": "Revisar un commit", + "custom": "Instrucciones de revisión personalizadas", + "loadFailed": "Codex no pudo cargar los objetivos de revisión. Vuelve a intentar /review.", + "instructions": "Introduce las instrucciones de revisión", + "searchBranches": "Buscar ramas…", + "searchCommits": "Buscar commits…", + "title": "Revisar cambios", + "back": "Volver a los objetivos de revisión", + "run": "Ejecutar", + "done": "Listo" + } } } diff --git a/mobile/src/i18n/locales/fr.json b/mobile/src/i18n/locales/fr.json index 04177b25722..86c524702e4 100644 --- a/mobile/src/i18n/locales/fr.json +++ b/mobile/src/i18n/locales/fr.json @@ -2272,7 +2272,9 @@ "usageLimitWindowWeeklyModel": "hebdomadaire du modèle", "waitForBackgroundTasks": "Attendez la fin des tâches en arrière-plan.", "waitForStart": "Attendez que l'agent ait fini de démarrer.", - "writeFailed": "Orca n'a pas pu transmettre ce message à l'agent, il n'a donc pas été envoyé." + "writeFailed": "Orca n'a pas pu transmettre ce message à l'agent, il n'a donc pas été envoyé.", + "reviewFailed": "Codex n’a pas pu effectuer la revue. Réessayez /review.", + "reviewSettingsUnsupported": "Mettez Codex à jour pour utiliser un autre modèle pour la revue, ou revenez à {{detail}}." }, "fileReader": { "copyReviewNotes": "Copier les notes de revue", @@ -4330,5 +4332,21 @@ } } } + }, + "nativeChat": { + "review": { + "baseBranch": "Comparer à une branche de base", + "uncommittedChanges": "Examiner les modifications non commitées", + "commit": "Examiner un commit", + "custom": "Instructions de revue personnalisées", + "loadFailed": "Codex n’a pas pu charger les cibles de revue. Réessayez /review.", + "instructions": "Saisir les instructions de revue", + "searchBranches": "Rechercher des branches…", + "searchCommits": "Rechercher des commits…", + "title": "Examiner les modifications", + "back": "Revenir aux cibles de revue", + "run": "Exécuter", + "done": "Terminé" + } } } diff --git a/mobile/src/i18n/locales/ja.json b/mobile/src/i18n/locales/ja.json index a808530c675..965bd71f46a 100644 --- a/mobile/src/i18n/locales/ja.json +++ b/mobile/src/i18n/locales/ja.json @@ -2200,7 +2200,9 @@ "waitForBackgroundTasks": "バックグラウンドタスクが終わるまでお待ちください。", "waitForStart": "Agent の起動が終わるまでお待ちください。", "writeFailed": "Orca はこのメッセージを Agent に渡せなかったため、送信されませんでした。", - "pluginInputRequired": "{{agent}} は「{{plugin}}」プラグインがターミナルペインで入力を待っているため停止しました。チャットセッションでプラグインを無効にするか、{{agent}} のターミナルでタスクを実行してください。" + "pluginInputRequired": "{{agent}} は「{{plugin}}」プラグインがターミナルペインで入力を待っているため停止しました。チャットセッションでプラグインを無効にするか、{{agent}} のターミナルでタスクを実行してください。", + "reviewFailed": "Codexはレビューを実行できませんでした。/reviewをもう一度試してください。", + "reviewSettingsUnsupported": "別のモデルでレビューするにはCodexを更新するか、{{detail}}に戻してください。" }, "fileReader": { "copyReviewNotes": "レビューメモをコピー", @@ -4226,5 +4228,21 @@ } } } + }, + "nativeChat": { + "review": { + "baseBranch": "ベースブランチと比較する", + "uncommittedChanges": "未コミットの変更をレビューする", + "commit": "コミットをレビューする", + "custom": "カスタムレビュー指示", + "loadFailed": "Codexはレビュー対象を読み込めませんでした。/reviewをもう一度試してください。", + "instructions": "レビューの指示を入力", + "searchBranches": "ブランチを検索…", + "searchCommits": "コミットを検索…", + "title": "変更をレビュー", + "back": "レビュー対象に戻る", + "run": "実行", + "done": "完了" + } } } diff --git a/mobile/src/i18n/locales/ko.json b/mobile/src/i18n/locales/ko.json index 0ab35071a9e..1e41ac2ff30 100644 --- a/mobile/src/i18n/locales/ko.json +++ b/mobile/src/i18n/locales/ko.json @@ -2200,7 +2200,9 @@ "waitForBackgroundTasks": "백그라운드 작업이 끝날 때까지 기다리세요.", "waitForStart": "에이전트가 시작을 마칠 때까지 기다리세요.", "writeFailed": "Orca가 이 메시지를 에이전트에 전달하지 못해 전송되지 않았습니다.", - "pluginInputRequired": "\"{{plugin}}\" 플러그인이 터미널 창에서 입력을 기다리고 있어 {{agent}}이(가) 중지되었습니다. 채팅 세션에서 플러그인을 비활성화하거나 {{agent}} 터미널에서 작업을 실행하세요." + "pluginInputRequired": "\"{{plugin}}\" 플러그인이 터미널 창에서 입력을 기다리고 있어 {{agent}}이(가) 중지되었습니다. 채팅 세션에서 플러그인을 비활성화하거나 {{agent}} 터미널에서 작업을 실행하세요.", + "reviewFailed": "Codex가 검토를 실행하지 못했습니다. /review를 다시 시도하세요.", + "reviewSettingsUnsupported": "다른 모델로 검토하려면 Codex를 업데이트하거나 {{detail}}로 다시 전환하세요." }, "fileReader": { "copyReviewNotes": "리뷰 메모 복사", @@ -4226,5 +4228,21 @@ } } } + }, + "nativeChat": { + "review": { + "baseBranch": "기준 브랜치와 비교", + "uncommittedChanges": "커밋하지 않은 변경 사항 검토", + "commit": "커밋 검토", + "custom": "사용자 지정 검토 지침", + "loadFailed": "Codex가 검토 대상을 불러오지 못했습니다. /review를 다시 시도하세요.", + "instructions": "검토 지침 입력", + "searchBranches": "브랜치 검색…", + "searchCommits": "커밋 검색…", + "title": "변경 사항 검토", + "back": "검토 대상으로 돌아가기", + "run": "실행", + "done": "완료" + } } } diff --git a/mobile/src/i18n/locales/pt.json b/mobile/src/i18n/locales/pt.json index b6b7ebfb990..10cfdbc8523 100644 --- a/mobile/src/i18n/locales/pt.json +++ b/mobile/src/i18n/locales/pt.json @@ -2640,7 +2640,9 @@ "waitForStart": "Aguarde o agente terminar de iniciar.", "writeFailed": "O Orca não conseguiu repassar esta mensagem ao agente, por isso ela não foi enviada.", "pluginInputRequired": "{{agent}} parou porque o plugin \"{{plugin}}\" está aguardando uma entrada em um painel de terminal. Desative o plugin para sessões de chat ou execute a tarefa em um terminal {{agent}}.", - "unconfirmed": "Não foi possível confirmar se isto foi enviado. Não foi reenviado." + "unconfirmed": "Não foi possível confirmar se isto foi enviado. Não foi reenviado.", + "reviewFailed": "O Codex não conseguiu realizar a revisão. Tente /review novamente.", + "reviewSettingsUnsupported": "Atualize o Codex para revisar com outro modelo ou volte para {{detail}}." }, "fileReader": { "copyReviewNotes": "Copiar notas de revisão", @@ -4918,5 +4920,21 @@ } } } + }, + "nativeChat": { + "review": { + "baseBranch": "Comparar com uma branch base", + "uncommittedChanges": "Revisar alterações sem commit", + "commit": "Revisar um commit", + "custom": "Instruções de revisão personalizadas", + "loadFailed": "O Codex não conseguiu carregar os alvos da revisão. Tente /review novamente.", + "instructions": "Digite as instruções de revisão", + "searchBranches": "Buscar branches…", + "searchCommits": "Buscar commits…", + "title": "Revisar alterações", + "back": "Voltar aos alvos da revisão", + "run": "Executar", + "done": "Concluído" + } } } diff --git a/mobile/src/i18n/locales/ru.json b/mobile/src/i18n/locales/ru.json index ffa4c7b6ea5..bf15319d298 100644 --- a/mobile/src/i18n/locales/ru.json +++ b/mobile/src/i18n/locales/ru.json @@ -2340,7 +2340,9 @@ "waitForBackgroundTasks": "Дождитесь завершения фоновых задач.", "waitForStart": "Дождитесь запуска агента.", "writeFailed": "Orca не смогла передать сообщение агенту, поэтому оно не отправлено.", - "pluginInputRequired": "{{agent}} остановился, потому что плагин «{{plugin}}» ожидает ввода на панели терминала. Отключите плагин для сеансов чата или запустите задачу в терминале {{agent}}." + "pluginInputRequired": "{{agent}} остановился, потому что плагин «{{plugin}}» ожидает ввода на панели терминала. Отключите плагин для сеансов чата или запустите задачу в терминале {{agent}}.", + "reviewFailed": "Codex не удалось выполнить проверку. Повторите /review.", + "reviewSettingsUnsupported": "Обновите Codex, чтобы проверять другой моделью, или вернитесь к {{detail}}." }, "fileReader": { "copyReviewNotes": "Копировать заметки по проверке", @@ -4430,5 +4432,21 @@ } } } + }, + "nativeChat": { + "review": { + "baseBranch": "Сравнить с базовой веткой", + "uncommittedChanges": "Проверить незакоммиченные изменения", + "commit": "Проверить коммит", + "custom": "Свои инструкции для проверки", + "loadFailed": "Codex не удалось загрузить цели проверки. Повторите /review.", + "instructions": "Введите инструкции для проверки", + "searchBranches": "Поиск веток…", + "searchCommits": "Поиск коммитов…", + "title": "Проверить изменения", + "back": "Назад к целям проверки", + "run": "Запустить", + "done": "Готово" + } } } diff --git a/mobile/src/i18n/locales/tr.json b/mobile/src/i18n/locales/tr.json index 0b5b40e2849..e6fa3ebb267 100644 --- a/mobile/src/i18n/locales/tr.json +++ b/mobile/src/i18n/locales/tr.json @@ -2204,7 +2204,9 @@ "waitForBackgroundTasks": "Arka plan görevlerinin tamamlanmasını bekleyin.", "waitForStart": "Ajanın başlatılmasının tamamlanmasını bekleyin.", "writeFailed": "Orca bu mesajı ajana iletemediği için mesaj gönderilmedi.", - "pluginInputRequired": "{{agent}} durdu çünkü \"{{plugin}}\" eklentisi bir terminal bölmesinde girdi bekliyor. Sohbet oturumları için eklentiyi devre dışı bırakın veya görevi bir {{agent}} terminalinde çalıştırın." + "pluginInputRequired": "{{agent}} durdu çünkü \"{{plugin}}\" eklentisi bir terminal bölmesinde girdi bekliyor. Sohbet oturumları için eklentiyi devre dışı bırakın veya görevi bir {{agent}} terminalinde çalıştırın.", + "reviewFailed": "Codex incelemeyi çalıştıramadı. /review komutunu yeniden deneyin.", + "reviewSettingsUnsupported": "Farklı bir modelle incelemek için Codex’i güncelleyin veya {{detail}} modeline geri dönün." }, "fileReader": { "copyReviewNotes": "İnceleme notlarını kopyala", @@ -4230,5 +4232,21 @@ } } } + }, + "nativeChat": { + "review": { + "baseBranch": "Temel dalla karşılaştır", + "uncommittedChanges": "Commit edilmemiş değişiklikleri incele", + "commit": "Bir commit incele", + "custom": "Özel inceleme talimatları", + "loadFailed": "Codex inceleme hedeflerini yükleyemedi. /review komutunu yeniden deneyin.", + "instructions": "İnceleme talimatlarını girin", + "searchBranches": "Dallarda ara…", + "searchCommits": "Commit ara…", + "title": "Değişiklikleri incele", + "back": "İnceleme hedeflerine dön", + "run": "Çalıştır", + "done": "Bitti" + } } } diff --git a/mobile/src/i18n/locales/zh-Hant.json b/mobile/src/i18n/locales/zh-Hant.json index d74a5bcfb1f..fe13bda4c38 100644 --- a/mobile/src/i18n/locales/zh-Hant.json +++ b/mobile/src/i18n/locales/zh-Hant.json @@ -2200,7 +2200,9 @@ "waitForBackgroundTasks": "請等待背景任務完成。", "waitForStart": "請等待代理程式完成啟動。", "writeFailed": "Orca 無法將此訊息交給代理程式,因此訊息未傳送。", - "pluginInputRequired": "{{agent}} 已停止,因為「{{plugin}}」外掛正在終端機窗格中等待輸入。請在聊天工作階段中停用此外掛,或在 {{agent}} 終端機中執行任務。" + "pluginInputRequired": "{{agent}} 已停止,因為「{{plugin}}」外掛正在終端機窗格中等待輸入。請在聊天工作階段中停用此外掛,或在 {{agent}} 終端機中執行任務。", + "reviewFailed": "Codex 無法執行審查。請重試 /review。", + "reviewSettingsUnsupported": "請更新 Codex 以使用其他模型審查,或切換回 {{detail}}。" }, "fileReader": { "copyReviewNotes": "複製審查備註", @@ -4226,5 +4228,21 @@ } } } + }, + "nativeChat": { + "review": { + "baseBranch": "與基礎分支比較", + "uncommittedChanges": "審查未提交的變更", + "commit": "審查一個提交", + "custom": "自訂審查指令", + "loadFailed": "Codex 無法載入審查目標。請重試 /review。", + "instructions": "輸入審查指令", + "searchBranches": "搜尋分支…", + "searchCommits": "搜尋提交…", + "title": "審查變更", + "back": "返回審查目標", + "run": "執行", + "done": "完成" + } } } diff --git a/mobile/src/i18n/locales/zh.json b/mobile/src/i18n/locales/zh.json index cb130226828..9f011a97cd0 100644 --- a/mobile/src/i18n/locales/zh.json +++ b/mobile/src/i18n/locales/zh.json @@ -2206,7 +2206,9 @@ "providerUnavailable": "{{agent}} 因服务繁忙而无法回复。请选择其他模型,或稍等片刻后重新发送。", "providerSafetyStopped": "{{agent}} 在安全检查后停止了此次回复。请检查您的请求后重新发送。", "providerResponseFailed": "{{agent}} 未能完成此回复。打开详情了解更多信息。", - "selectedModel": "所选模型" + "selectedModel": "所选模型", + "reviewFailed": "Codex 无法执行审查。请重试 /review。", + "reviewSettingsUnsupported": "请更新 Codex 以使用其他模型审查,或切换回 {{detail}}。" }, "fileReader": { "copyReviewNotes": "复制评审备注", @@ -4235,5 +4237,21 @@ } } } + }, + "nativeChat": { + "review": { + "baseBranch": "与基础分支比较", + "uncommittedChanges": "审查未提交的更改", + "commit": "审查一个提交", + "custom": "自定义审查指令", + "loadFailed": "Codex 无法加载审查目标。请重试 /review。", + "instructions": "输入审查指令", + "searchBranches": "搜索分支…", + "searchCommits": "搜索提交…", + "title": "审查更改", + "back": "返回审查目标", + "run": "运行", + "done": "完成" + } } } diff --git a/mobile/src/session/native-chat/input/MobileNativeChatReviewMenu.tsx b/mobile/src/session/native-chat/input/MobileNativeChatReviewMenu.tsx index a1c911d5ce4..19a78e78309 100644 --- a/mobile/src/session/native-chat/input/MobileNativeChatReviewMenu.tsx +++ b/mobile/src/session/native-chat/input/MobileNativeChatReviewMenu.tsx @@ -1,3 +1,4 @@ +import { useMobileTranslation } from '../../../i18n/use-mobile-translation' import { useMemo, useState, useSyncExternalStore } from 'react' import { FlatList, View } from 'react-native' import { ChevronLeft } from 'lucide-react-native' @@ -27,6 +28,7 @@ function ReviewPage({ onClose: () => void }): React.JSX.Element { const state = useSyncExternalStore(menu.subscribe, menu.getSnapshot) + const t = useMobileTranslation() const [query, setQuery] = useState('') const choices = useMemo(() => { const terms = query.toLowerCase().split(/\s+/).filter(Boolean) @@ -47,9 +49,12 @@ function ReviewPage({ (state.page === 'custom' ? submit(menu.submit(query)) : onClose()) }} /> @@ -57,7 +62,7 @@ function ReviewPage({ @@ -70,10 +75,10 @@ function ReviewPage({ editable={!state.busy} placeholder={ state.page === 'custom' - ? 'Enter review instructions' + ? t('nativeChat.review.instructions', 'Enter review instructions') : state.page === 'baseBranch' - ? 'Search branches…' - : 'Search commits…' + ? t('nativeChat.review.searchBranches', 'Search branches…') + : t('nativeChat.review.searchCommits', 'Search commits…') } returnKeyType={state.page === 'custom' ? 'send' : 'search'} onSubmitEditing={() => { diff --git a/mobile/src/session/native-chat/input/MobileNativeChatSessionOptionSummaryRows.tsx b/mobile/src/session/native-chat/input/MobileNativeChatSessionOptionSummaryRows.tsx index 5d86e573e74..2fab8a65430 100644 --- a/mobile/src/session/native-chat/input/MobileNativeChatSessionOptionSummaryRows.tsx +++ b/mobile/src/session/native-chat/input/MobileNativeChatSessionOptionSummaryRows.tsx @@ -1,5 +1,4 @@ -import { ListGroup } from '../../../components/list/ListGroup' -import { SectionHeader } from '../../../components/list/ListGroup' +import { ListGroup, SectionHeader } from '../../../components/list/ListGroup' import { useMobileTranslation } from '../../../i18n/use-mobile-translation' import { isReadOnlySessionOptionValue, diff --git a/mobile/src/session/native-chat/input/use-mobile-structured-option-surface.ts b/mobile/src/session/native-chat/input/use-mobile-structured-option-surface.ts index cfd1abc8e8e..1cb76b0d739 100644 --- a/mobile/src/session/native-chat/input/use-mobile-structured-option-surface.ts +++ b/mobile/src/session/native-chat/input/use-mobile-structured-option-surface.ts @@ -1,3 +1,4 @@ +import { translate } from '../../../i18n/mobile-i18n' import * as z from 'zod' import { createNativeChatReviewMenu, @@ -66,6 +67,19 @@ export function useMobileStructuredOptionSurface(args: { } } const menu = createNativeChatReviewMenu({ + copy: { + baseBranch: translate('nativeChat.review.baseBranch', 'Review against a base branch'), + uncommittedChanges: translate( + 'nativeChat.review.uncommittedChanges', + 'Review uncommitted changes' + ), + commit: translate('nativeChat.review.commit', 'Review a commit'), + custom: translate('nativeChat.review.custom', 'Custom review instructions'), + loadFailed: translate( + 'nativeChat.review.loadFailed', + 'Codex could not load review targets. Try /review again.' + ) + }, hasGit, branches: () => (folderBranches ? Promise.resolve(folderBranches) : branches()), commits: async () => diff --git a/src/main/codex/structured/turns/codex-command-turn-claim.test.ts b/src/main/codex/structured/turns/codex-command-turn-claim.test.ts index c004d09e2a9..0451fa6cdca 100644 --- a/src/main/codex/structured/turns/codex-command-turn-claim.test.ts +++ b/src/main/codex/structured/turns/codex-command-turn-claim.test.ts @@ -18,8 +18,10 @@ import type { StructuredAgentSessionSinkAdmission } from '../../../native-chat/agent-session-wire/journal-ingress/structured-agent-session-event-sink' import type { StructuredAgentSessionRevisionJournal } from '../../../native-chat/agent-session-wire/journal-ingress/structured-agent-session-journal-views' -import { createCodexHistoryTranslator } from '../journal/codex-structured-journal-translation' -import { createCodexJournalTranslator } from '../journal/codex-structured-journal-translation' +import { + createCodexHistoryTranslator, + createCodexJournalTranslator +} from '../journal/codex-structured-journal-translation' import type { CodexStructuredSessionEvent } from '../session-lifecycle/codex-structured-session-state' const SESSION = 'session-1' diff --git a/src/main/native-chat/agent-session-wire/operations/structured-agent-session-mutation-plans.ts b/src/main/native-chat/agent-session-wire/operations/structured-agent-session-mutation-plans.ts index ad82551fb77..e3504992239 100644 --- a/src/main/native-chat/agent-session-wire/operations/structured-agent-session-mutation-plans.ts +++ b/src/main/native-chat/agent-session-wire/operations/structured-agent-session-mutation-plans.ts @@ -1,4 +1,3 @@ -import type { AgentSessionConversationCommand } from '../../../../shared/agent-session/agent-session-conversation-command' import type { AgentSessionReviewTarget } from '../../../../shared/agent-session/agent-session-review-target' import type { AgentSessionRecord } from '../../../../shared/agent-session/lifecycle/agent-session-record' // Command receipts prove acceptance; other plans use ledger rows and journal replay. @@ -22,6 +21,7 @@ import type { } from '../../../../shared/agent-session/agent-session-wire' import { agentSessionConversationCommandFields, + type AgentSessionConversationCommand, type AgentSessionConversationCommandResult } from '../../../../shared/agent-session/agent-session-conversation-command' import '../../agent-session-journal/projection/journal-dispatch-doubt-reasons' diff --git a/src/renderer/src/components/native-chat/composer/pickers/use-native-chat-send-classification.ts b/src/renderer/src/components/native-chat/composer/pickers/use-native-chat-send-classification.ts index 46bdf2b6c40..7daff235b01 100644 --- a/src/renderer/src/components/native-chat/composer/pickers/use-native-chat-send-classification.ts +++ b/src/renderer/src/components/native-chat/composer/pickers/use-native-chat-send-classification.ts @@ -22,13 +22,13 @@ export function useNativeChatSendClassification( ) } -export function useNativeChatPickedSkillOrigin(origin: { current: string | null }) { +export function useNativeChatPickedSkillOrigin(originRef: RefObject) { const clearSkillOrigin = useCallback(() => { - origin.current = null - }, [origin]) + originRef.current = null + }, [originRef]) const isPickedSkill = useCallback( - (value: string) => origin.current === (value.split(/\s/, 1)[0] ?? ''), - [origin] + (value: string) => originRef.current === (value.split(/\s/, 1)[0] ?? ''), + [originRef] ) return { clearSkillOrigin, isPickedSkill } } diff --git a/src/renderer/src/components/native-chat/composer/submit/use-native-chat-structured-composer-transport.ts b/src/renderer/src/components/native-chat/composer/submit/use-native-chat-structured-composer-transport.ts index 0af75708c5e..e13b478a9a2 100644 --- a/src/renderer/src/components/native-chat/composer/submit/use-native-chat-structured-composer-transport.ts +++ b/src/renderer/src/components/native-chat/composer/submit/use-native-chat-structured-composer-transport.ts @@ -181,6 +181,22 @@ export function useNativeChatStructuredComposerTransport(args: { } } menu = createNativeChatReviewMenu({ + copy: { + baseBranch: translate( + 'nativeChat.review.baseBranch', + 'Review against a base branch' + ), + uncommittedChanges: translate( + 'nativeChat.review.uncommittedChanges', + 'Review uncommitted changes' + ), + commit: translate('nativeChat.review.commit', 'Review a commit'), + custom: translate('nativeChat.review.custom', 'Custom review instructions'), + loadFailed: translate( + 'nativeChat.review.loadFailed', + 'Codex could not load review targets. Try /review again.' + ) + }, hasGit, branches: () => (folderBranches ? Promise.resolve(folderBranches) : branches()), commits: async () => diff --git a/src/renderer/src/components/native-chat/session/options/controls/NativeChatReviewPicker.tsx b/src/renderer/src/components/native-chat/session/options/controls/NativeChatReviewPicker.tsx index a927cf23c29..e289b902296 100644 --- a/src/renderer/src/components/native-chat/session/options/controls/NativeChatReviewPicker.tsx +++ b/src/renderer/src/components/native-chat/session/options/controls/NativeChatReviewPicker.tsx @@ -1,3 +1,4 @@ +import { useTranslate } from '@/i18n/use-translate' import { useSyncExternalStore } from 'react' import { Button } from '@/components/ui/button' import type { NativeChatReviewMenu } from '../../../../../../../shared/native-chat/input/native-chat-review-menu' @@ -9,6 +10,7 @@ export function ReviewPicker({ menu: NativeChatReviewMenu onClose: () => void }): React.JSX.Element { + const t = useTranslate() const state = useSyncExternalStore(menu.subscribe, menu.getSnapshot) const submit = (run: Promise) => { void run.then((accepted) => { @@ -21,7 +23,7 @@ export function ReviewPicker({ <> {state.page !== 'review' && ( )} submit(menu.submit(text)) } : {}) diff --git a/src/renderer/src/i18n/en-runtime-required.json b/src/renderer/src/i18n/en-runtime-required.json index 425a6f99631..ab82cbfdad4 100644 --- a/src/renderer/src/i18n/en-runtime-required.json +++ b/src/renderer/src/i18n/en-runtime-required.json @@ -1815,6 +1815,8 @@ "providerStartFailed": "{{agent}} stopped before it finished starting.", "providerUnavailable": "{{agent}} couldn't respond because the service is busy. Pick another model, or wait a little and send again.", "queueFull": "Too many messages were waiting for the agent, so this one was not sent.", + "reviewFailed": "Codex couldn't run the review. Try /review again.", + "reviewSettingsUnsupported": "Update Codex to review with a different model, or switch back to {{detail}}.", "runCommandAgain": "Run /{{command}} again.", "runCommandWhenDone": "Run /{{command}} when it's done.", "runtimeNotInstalled": "{{agent}} isn't installed on the computer running this chat. Install it from the chat in a current version of Orca.", @@ -2305,6 +2307,13 @@ "unhide": "Show All", "zoom": "Zoom" }, + "nativeChat": { + "review": { + "back": "Back to review targets", + "done": "Done", + "run": "Run" + } + }, "pet": { "defaultLabels": { "bundle": "Pet bundle", diff --git a/src/renderer/src/i18n/locales/de.json b/src/renderer/src/i18n/locales/de.json index 17bbd3da586..80a36e10c31 100644 --- a/src/renderer/src/i18n/locales/de.json +++ b/src/renderer/src/i18n/locales/de.json @@ -19340,7 +19340,9 @@ "commandAfterAnswer": "Die Frage oder Genehmigungsanfrage des Agenten beantworten und anschließend /{{command}} ausführen.", "pluginInputRequired": "{{agent}} wurde angehalten, weil das Plugin „{{plugin}}“ in einem Terminalbereich auf eine Eingabe wartet. Deaktiviere das Plugin für Chatsitzungen oder führe die Aufgabe in einem {{agent}}-Terminal aus.", "modelUnavailableUpdate": "{{agent}} konnte {{detail}} nicht verwenden. Aktualisiere {{agent}} auf {{minimumVersion}} oder neuer, um es nach einem Neustart beizubehalten, oder wähle ein anderes Modell und sende erneut.", - "modelNotSelected": "Für {{agent}} ist kein Modell ausgewählt. Prüfe die Modellauswahl und die Anmeldung bei {{agent}} und sende erneut." + "modelNotSelected": "Für {{agent}} ist kein Modell ausgewählt. Prüfe die Modellauswahl und die Anmeldung bei {{agent}} und sende erneut.", + "reviewFailed": "Codex konnte die Prüfung nicht ausführen. Versuche /review erneut.", + "reviewSettingsUnsupported": "Aktualisiere Codex, um mit einem anderen Modell zu prüfen, oder wechsle zurück zu {{detail}}." }, "writeNotice": { "notDoneReadHistory": "Der Verlauf dieses Chats konnte nicht geladen werden.", @@ -21669,7 +21671,8 @@ "common": { "retry": "Erneut versuchen", "cancel": "Abbrechen", - "delete": "Löschen" + "delete": "Löschen", + "back": "Zurück" }, "terminal": { "sessionSaveFailure": { @@ -22752,6 +22755,20 @@ "nativeChat": { "math": { "scrollDisplayEquation": "Abgesetzte Gleichung scrollen" + }, + "review": { + "baseBranch": "Mit einem Basisbranch vergleichen", + "uncommittedChanges": "Nicht committete Änderungen prüfen", + "commit": "Einen Commit prüfen", + "custom": "Eigene Prüfanweisungen", + "loadFailed": "Codex konnte die Prüfziele nicht laden. Versuche /review erneut.", + "instructions": "Prüfanweisungen eingeben", + "searchBranches": "Branches suchen…", + "searchCommits": "Commits suchen…", + "title": "Änderungen prüfen", + "back": "Zurück zu den Prüfzielen", + "run": "Ausführen", + "done": "Fertig" } }, "quitAndStopAllSessions": { diff --git a/src/renderer/src/i18n/locales/en.json b/src/renderer/src/i18n/locales/en.json index 1f47132e3bb..12f0c1bc014 100644 --- a/src/renderer/src/i18n/locales/en.json +++ b/src/renderer/src/i18n/locales/en.json @@ -20530,7 +20530,9 @@ "agentNotSignedIn": "Sign in to {{agent}}.", "thenSendAgain": "Then send your message again.", "runCommandWhenDone": "Run /{{command}} when it's done.", - "commandAfterAnswer": "Answer the agent's question or approval, then run /{{command}}." + "commandAfterAnswer": "Answer the agent's question or approval, then run /{{command}}.", + "reviewFailed": "Codex couldn't run the review. Try /review again.", + "reviewSettingsUnsupported": "Update Codex to review with a different model, or switch back to {{detail}}." }, "writeNotice": { "notDoneReadHistory": "This chat's history couldn't be loaded.", @@ -23416,7 +23418,8 @@ "cancel": "Cancel", "unassigned": "Unassigned", "copy": "Copy", - "delete": "Delete" + "delete": "Delete", + "back": "Back" }, "terminal": { "sessionSaveFailure": { @@ -24600,6 +24603,20 @@ "nativeChat": { "math": { "scrollDisplayEquation": "Scroll display equation" + }, + "review": { + "baseBranch": "Review against a base branch", + "uncommittedChanges": "Review uncommitted changes", + "commit": "Review a commit", + "custom": "Custom review instructions", + "loadFailed": "Codex could not load review targets. Try /review again.", + "instructions": "Enter review instructions", + "searchBranches": "Search branches…", + "searchCommits": "Search commits…", + "title": "Review changes", + "back": "Back to review targets", + "run": "Run", + "done": "Done" } }, "quitAndStopAllSessions": { diff --git a/src/renderer/src/i18n/locales/es.json b/src/renderer/src/i18n/locales/es.json index e4aaffd2b81..30a42cc9f10 100644 --- a/src/renderer/src/i18n/locales/es.json +++ b/src/renderer/src/i18n/locales/es.json @@ -19070,7 +19070,9 @@ "commandAfterAnswer": "Responda a la pregunta o aprobación del agente y luego ejecute /{{command}}.", "pluginInputRequired": "{{agent}} se detuvo porque el complemento «{{plugin}}» espera una entrada en un panel de terminal. Desactiva el complemento para las sesiones de chat o ejecuta la tarea en un terminal de {{agent}}.", "modelUnavailableUpdate": "{{agent}} no pudo usar {{detail}}. Actualiza {{agent}} a {{minimumVersion}} o posterior para conservarlo tras un reinicio, o elige otro modelo y vuelve a enviar.", - "modelNotSelected": "{{agent}} no tiene ningún modelo seleccionado. Comprueba la selección del modelo y el inicio de sesión de {{agent}}, y vuelve a enviar." + "modelNotSelected": "{{agent}} no tiene ningún modelo seleccionado. Comprueba la selección del modelo y el inicio de sesión de {{agent}}, y vuelve a enviar.", + "reviewFailed": "Codex no pudo realizar la revisión. Vuelve a intentar /review.", + "reviewSettingsUnsupported": "Actualiza Codex para revisar con otro modelo o vuelve a {{detail}}." }, "writeNotice": { "notDoneReadHistory": "No se pudo cargar el historial de este chat.", @@ -21872,7 +21874,8 @@ "common": { "retry": "Reintentar", "cancel": "Cancelar", - "delete": "Borrar" + "delete": "Borrar", + "back": "Atrás" }, "terminal": { "codexTerminalServerIsolationNotice": { @@ -23265,6 +23268,20 @@ "nativeChat": { "math": { "scrollDisplayEquation": "Desplazar ecuación en bloque" + }, + "review": { + "baseBranch": "Revisar contra una rama base", + "uncommittedChanges": "Revisar cambios sin confirmar", + "commit": "Revisar un commit", + "custom": "Instrucciones de revisión personalizadas", + "loadFailed": "Codex no pudo cargar los objetivos de revisión. Vuelve a intentar /review.", + "instructions": "Introduce las instrucciones de revisión", + "searchBranches": "Buscar ramas…", + "searchCommits": "Buscar commits…", + "title": "Revisar cambios", + "back": "Volver a los objetivos de revisión", + "run": "Ejecutar", + "done": "Listo" } }, "runtime": { diff --git a/src/renderer/src/i18n/locales/fr.json b/src/renderer/src/i18n/locales/fr.json index b29f957389b..5e4f599f855 100644 --- a/src/renderer/src/i18n/locales/fr.json +++ b/src/renderer/src/i18n/locales/fr.json @@ -19343,7 +19343,9 @@ "runCommandWhenDone": "Lancez /{{command}} quand il aura terminé.", "commandAfterAnswer": "Répondez à la question ou à la demande d'approbation de l'agent, puis lancez /{{command}}.", "modelUnavailableUpdate": "{{agent}} n’a pas pu utiliser {{detail}}. Mettez {{agent}} à jour vers {{minimumVersion}} ou une version ultérieure pour le conserver après un redémarrage, ou choisissez un autre modèle et renvoyez.", - "modelNotSelected": "Aucun modèle n’est sélectionné pour {{agent}}. Vérifiez votre sélection de modèle et votre connexion à {{agent}}, puis renvoyez." + "modelNotSelected": "Aucun modèle n’est sélectionné pour {{agent}}. Vérifiez votre sélection de modèle et votre connexion à {{agent}}, puis renvoyez.", + "reviewFailed": "Codex n’a pas pu effectuer la revue. Réessayez /review.", + "reviewSettingsUnsupported": "Mettez Codex à jour pour utiliser un autre modèle pour la revue, ou revenez à {{detail}}." }, "writeNotice": { "notDoneReadHistory": "L'historique de ce chat n'a pas pu être chargé.", @@ -22033,7 +22035,8 @@ "common": { "retry": "Réessayer", "cancel": "Annuler", - "delete": "Supprimer" + "delete": "Supprimer", + "back": "Retour" }, "fileExplorer": { "root": { @@ -23288,6 +23291,20 @@ "nativeChat": { "math": { "scrollDisplayEquation": "Faire défiler l'équation affichée" + }, + "review": { + "baseBranch": "Comparer à une branche de base", + "uncommittedChanges": "Examiner les modifications non commitées", + "commit": "Examiner un commit", + "custom": "Instructions de revue personnalisées", + "loadFailed": "Codex n’a pas pu charger les cibles de revue. Réessayez /review.", + "instructions": "Saisir les instructions de revue", + "searchBranches": "Rechercher des branches…", + "searchCommits": "Rechercher des commits…", + "title": "Examiner les modifications", + "back": "Revenir aux cibles de revue", + "run": "Exécuter", + "done": "Terminé" } }, "runtime": { diff --git a/src/renderer/src/i18n/locales/ja.json b/src/renderer/src/i18n/locales/ja.json index 898ac076569..3e8d3e0f775 100644 --- a/src/renderer/src/i18n/locales/ja.json +++ b/src/renderer/src/i18n/locales/ja.json @@ -18654,7 +18654,9 @@ "commandAfterAnswer": "Agent の質問または承認に回答してから、/{{command}} を実行してください。", "modelUnavailableUpdate": "{{agent}} は {{detail}} を使用できませんでした。再起動後も使い続けるには {{agent}} を {{minimumVersion}} 以降に更新するか、別のモデルを選んで再送信してください。", "modelNotSelected": "{{agent}} のモデルが選択されていません。モデルの選択と {{agent}} へのサインインを確認してから再送信してください。", - "pluginInputRequired": "{{agent}} は「{{plugin}}」プラグインがターミナルペインで入力を待っているため停止しました。チャットセッションでプラグインを無効にするか、{{agent}} のターミナルでタスクを実行してください。" + "pluginInputRequired": "{{agent}} は「{{plugin}}」プラグインがターミナルペインで入力を待っているため停止しました。チャットセッションでプラグインを無効にするか、{{agent}} のターミナルでタスクを実行してください。", + "reviewFailed": "Codexはレビューを実行できませんでした。/reviewをもう一度試してください。", + "reviewSettingsUnsupported": "別のモデルでレビューするにはCodexを更新するか、{{detail}}に戻してください。" }, "writeNotice": { "notDoneReadHistory": "このチャットの履歴を読み込めませんでした。", @@ -21366,7 +21368,8 @@ "common": { "retry": "再試行", "cancel": "キャンセル", - "delete": "削除" + "delete": "削除", + "back": "戻る" }, "fileExplorer": { "root": { @@ -22593,6 +22596,20 @@ "nativeChat": { "math": { "scrollDisplayEquation": "数式ブロックをスクロール" + }, + "review": { + "baseBranch": "ベースブランチと比較する", + "uncommittedChanges": "未コミットの変更をレビューする", + "commit": "コミットをレビューする", + "custom": "カスタムレビュー指示", + "loadFailed": "Codexはレビュー対象を読み込めませんでした。/reviewをもう一度試してください。", + "instructions": "レビューの指示を入力", + "searchBranches": "ブランチを検索…", + "searchCommits": "コミットを検索…", + "title": "変更をレビュー", + "back": "レビュー対象に戻る", + "run": "実行", + "done": "完了" } }, "runtime": { diff --git a/src/renderer/src/i18n/locales/ko.json b/src/renderer/src/i18n/locales/ko.json index 0fe240adf4a..7ab52a3fd99 100644 --- a/src/renderer/src/i18n/locales/ko.json +++ b/src/renderer/src/i18n/locales/ko.json @@ -18651,7 +18651,9 @@ "commandAfterAnswer": "에이전트의 질문 또는 승인에 응답한 다음 /{{command}}을(를) 실행하세요.", "modelUnavailableUpdate": "{{agent}}에서 {{detail}}을(를) 사용할 수 없습니다. 다시 시작한 후에도 사용하려면 {{agent}}을(를) {{minimumVersion}} 이상으로 업데이트하거나 다른 모델을 선택하고 다시 보내세요.", "modelNotSelected": "{{agent}}에 선택된 모델이 없습니다. 모델 선택과 {{agent}} 로그인을 확인한 후 다시 보내세요.", - "pluginInputRequired": "\"{{plugin}}\" 플러그인이 터미널 창에서 입력을 기다리고 있어 {{agent}}이(가) 중지되었습니다. 채팅 세션에서 플러그인을 비활성화하거나 {{agent}} 터미널에서 작업을 실행하세요." + "pluginInputRequired": "\"{{plugin}}\" 플러그인이 터미널 창에서 입력을 기다리고 있어 {{agent}}이(가) 중지되었습니다. 채팅 세션에서 플러그인을 비활성화하거나 {{agent}} 터미널에서 작업을 실행하세요.", + "reviewFailed": "Codex가 검토를 실행하지 못했습니다. /review를 다시 시도하세요.", + "reviewSettingsUnsupported": "다른 모델로 검토하려면 Codex를 업데이트하거나 {{detail}}로 다시 전환하세요." }, "writeNotice": { "notDoneReadHistory": "이 채팅의 기록을 불러오지 못했습니다.", @@ -21358,7 +21360,8 @@ "common": { "retry": "다시 시도", "cancel": "취소", - "delete": "삭제" + "delete": "삭제", + "back": "뒤로" }, "fileExplorer": { "root": { @@ -22585,6 +22588,20 @@ "nativeChat": { "math": { "scrollDisplayEquation": "수식 블록 스크롤" + }, + "review": { + "baseBranch": "기준 브랜치와 비교", + "uncommittedChanges": "커밋하지 않은 변경 사항 검토", + "commit": "커밋 검토", + "custom": "사용자 지정 검토 지침", + "loadFailed": "Codex가 검토 대상을 불러오지 못했습니다. /review를 다시 시도하세요.", + "instructions": "검토 지침 입력", + "searchBranches": "브랜치 검색…", + "searchCommits": "커밋 검색…", + "title": "변경 사항 검토", + "back": "검토 대상으로 돌아가기", + "run": "실행", + "done": "완료" } }, "runtime": { diff --git a/src/renderer/src/i18n/locales/pt.json b/src/renderer/src/i18n/locales/pt.json index a6fecb606e6..406f505a92c 100644 --- a/src/renderer/src/i18n/locales/pt.json +++ b/src/renderer/src/i18n/locales/pt.json @@ -17,7 +17,8 @@ "common": { "retry": "Tentar novamente", "cancel": "Cancelar", - "delete": "Excluir" + "delete": "Excluir", + "back": "Voltar" }, "quickOpen": { "moreMatchesAvailable": "Mais resultados podem estar disponíveis. Refine sua busca para reduzir os resultados.", @@ -21229,7 +21230,9 @@ "modelNotSelected": "{{agent}} não tem nenhum modelo selecionado. Verifique a seleção de modelo e o login do {{agent}} e envie novamente.", "pluginInputRequired": "{{agent}} parou porque o plugin \"{{plugin}}\" está aguardando uma entrada em um painel de terminal. Desative o plugin para sessões de chat ou execute a tarefa em um terminal {{agent}}.", "claudeEffortInvalid": "O nível de esforço do Claude é inválido; selecione low, medium, high, xhigh ou max e envie novamente.", - "unconfirmed": "Não foi possível confirmar se esta mensagem foi enviada. Ela não foi reenviada." + "unconfirmed": "Não foi possível confirmar se esta mensagem foi enviada. Ela não foi reenviada.", + "reviewFailed": "O Codex não conseguiu realizar a revisão. Tente /review novamente.", + "reviewSettingsUnsupported": "Atualize o Codex para revisar com outro modelo ou volte para {{detail}}." }, "writeNotice": { "notDoneReadHistory": "Não foi possível carregar o histórico deste chat.", @@ -23833,6 +23836,20 @@ "nativeChat": { "math": { "scrollDisplayEquation": "Rolar equação em bloco" + }, + "review": { + "baseBranch": "Comparar com uma branch base", + "uncommittedChanges": "Revisar alterações sem commit", + "commit": "Revisar um commit", + "custom": "Instruções de revisão personalizadas", + "loadFailed": "O Codex não conseguiu carregar os alvos da revisão. Tente /review novamente.", + "instructions": "Digite as instruções de revisão", + "searchBranches": "Buscar branches…", + "searchCommits": "Buscar commits…", + "title": "Revisar alterações", + "back": "Voltar aos alvos da revisão", + "run": "Executar", + "done": "Concluído" } }, "runtime": { diff --git a/src/renderer/src/i18n/locales/ru.json b/src/renderer/src/i18n/locales/ru.json index f538f76d6c3..8601b88305d 100644 --- a/src/renderer/src/i18n/locales/ru.json +++ b/src/renderer/src/i18n/locales/ru.json @@ -19901,7 +19901,9 @@ "commandAfterAnswer": "Ответьте на вопрос или запрос разрешения агента, затем выполните /{{command}}.", "modelUnavailableUpdate": "{{agent}} не смог использовать {{detail}}. Обновите {{agent}} до {{minimumVersion}} или новее, чтобы сохранить его после перезапуска, или выберите другую модель и отправьте сообщение снова.", "modelNotSelected": "У {{agent}} не выбрана модель. Проверьте выбор модели и вход в {{agent}}, затем отправьте сообщение снова.", - "pluginInputRequired": "{{agent}} остановился, потому что плагин «{{plugin}}» ожидает ввода на панели терминала. Отключите плагин для сеансов чата или запустите задачу в терминале {{agent}}." + "pluginInputRequired": "{{agent}} остановился, потому что плагин «{{plugin}}» ожидает ввода на панели терминала. Отключите плагин для сеансов чата или запустите задачу в терминале {{agent}}.", + "reviewFailed": "Codex не удалось выполнить проверку. Повторите /review.", + "reviewSettingsUnsupported": "Обновите Codex, чтобы проверять другой моделью, или вернитесь к {{detail}}." }, "writeNotice": { "notDoneReadHistory": "Не удалось загрузить историю этого чата.", @@ -22358,7 +22360,8 @@ "common": { "retry": "Повторить", "cancel": "Отмена", - "delete": "Удалить" + "delete": "Удалить", + "back": "Назад" }, "terminal": { "sessionSaveFailure": { @@ -23316,6 +23319,20 @@ "nativeChat": { "math": { "scrollDisplayEquation": "Прокрутить формулу" + }, + "review": { + "baseBranch": "Сравнить с базовой веткой", + "uncommittedChanges": "Проверить незакоммиченные изменения", + "commit": "Проверить коммит", + "custom": "Свои инструкции для проверки", + "loadFailed": "Codex не удалось загрузить цели проверки. Повторите /review.", + "instructions": "Введите инструкции для проверки", + "searchBranches": "Поиск веток…", + "searchCommits": "Поиск коммитов…", + "title": "Проверить изменения", + "back": "Назад к целям проверки", + "run": "Запустить", + "done": "Готово" } }, "quitAndStopAllSessions": { diff --git a/src/renderer/src/i18n/locales/tr.json b/src/renderer/src/i18n/locales/tr.json index e29d95431e3..9fc435b0c0e 100644 --- a/src/renderer/src/i18n/locales/tr.json +++ b/src/renderer/src/i18n/locales/tr.json @@ -19317,7 +19317,9 @@ "commandAfterAnswer": "Ajanın sorusuna veya onay isteğine yanıt verin, ardından /{{command}} komutunu çalıştırın.", "modelUnavailableUpdate": "{{agent}}, {{detail}} modelini kullanamadı. Yeniden başlatmadan sonra korumak için {{agent}} uygulamasını {{minimumVersion}} veya üzerine güncelleyin ya da başka bir model seçip yeniden gönderin.", "modelNotSelected": "{{agent}} için seçili bir model yok. Model seçimini ve {{agent}} oturumunu kontrol edip yeniden gönderin.", - "pluginInputRequired": "{{agent}} durdu çünkü \"{{plugin}}\" eklentisi bir terminal bölmesinde girdi bekliyor. Sohbet oturumları için eklentiyi devre dışı bırakın veya görevi bir {{agent}} terminalinde çalıştırın." + "pluginInputRequired": "{{agent}} durdu çünkü \"{{plugin}}\" eklentisi bir terminal bölmesinde girdi bekliyor. Sohbet oturumları için eklentiyi devre dışı bırakın veya görevi bir {{agent}} terminalinde çalıştırın.", + "reviewFailed": "Codex incelemeyi çalıştıramadı. /review komutunu yeniden deneyin.", + "reviewSettingsUnsupported": "Farklı bir modelle incelemek için Codex’i güncelleyin veya {{detail}} modeline geri dönün." }, "writeNotice": { "notDoneReadHistory": "Bu sohbetin geçmişi yüklenemedi.", @@ -21639,7 +21641,8 @@ "common": { "retry": "Yeniden dene", "cancel": "İptal", - "delete": "Sil" + "delete": "Sil", + "back": "Geri" }, "terminal": { "sessionSaveFailure": { @@ -22565,6 +22568,20 @@ "nativeChat": { "math": { "scrollDisplayEquation": "Denklemi kaydır" + }, + "review": { + "baseBranch": "Temel dalla karşılaştır", + "uncommittedChanges": "Commit edilmemiş değişiklikleri incele", + "commit": "Bir commit incele", + "custom": "Özel inceleme talimatları", + "loadFailed": "Codex inceleme hedeflerini yükleyemedi. /review komutunu yeniden deneyin.", + "instructions": "İnceleme talimatlarını girin", + "searchBranches": "Dallarda ara…", + "searchCommits": "Commit ara…", + "title": "Değişiklikleri incele", + "back": "İnceleme hedeflerine dön", + "run": "Çalıştır", + "done": "Bitti" } }, "quitAndStopAllSessions": { diff --git a/src/renderer/src/i18n/locales/zh-Hant.json b/src/renderer/src/i18n/locales/zh-Hant.json index 494611889b4..bed24b018a4 100644 --- a/src/renderer/src/i18n/locales/zh-Hant.json +++ b/src/renderer/src/i18n/locales/zh-Hant.json @@ -19079,7 +19079,9 @@ "thenSendAgain": "然後再次傳送訊息。", "runCommandWhenDone": "完成後再執行 /{{command}}。", "commandAfterAnswer": "請先回答代理程式的問題或回應核准要求,然後再執行 /{{command}}。", - "pluginInputRequired": "{{agent}} 已停止,因為「{{plugin}}」外掛正在終端機窗格中等待輸入。請在聊天工作階段中停用此外掛,或在 {{agent}} 終端機中執行任務。" + "pluginInputRequired": "{{agent}} 已停止,因為「{{plugin}}」外掛正在終端機窗格中等待輸入。請在聊天工作階段中停用此外掛,或在 {{agent}} 終端機中執行任務。", + "reviewFailed": "Codex 無法執行審查。請重試 /review。", + "reviewSettingsUnsupported": "請更新 Codex 以使用其他模型審查,或切換回 {{detail}}。" }, "writeNotice": { "notDoneReadHistory": "無法載入此聊天的歷史記錄。", @@ -21345,7 +21347,8 @@ "common": { "retry": "重試", "cancel": "取消", - "delete": "刪除" + "delete": "刪除", + "back": "返回" }, "terminal": { "sessionSaveFailure": { @@ -22260,6 +22263,20 @@ "nativeChat": { "math": { "scrollDisplayEquation": "捲動獨立公式" + }, + "review": { + "baseBranch": "與基礎分支比較", + "uncommittedChanges": "審查未提交的變更", + "commit": "審查一個提交", + "custom": "自訂審查指令", + "loadFailed": "Codex 無法載入審查目標。請重試 /review。", + "instructions": "輸入審查指令", + "searchBranches": "搜尋分支…", + "searchCommits": "搜尋提交…", + "title": "審查變更", + "back": "返回審查目標", + "run": "執行", + "done": "完成" } }, "quitAndStopAllSessions": { diff --git a/src/renderer/src/i18n/locales/zh.json b/src/renderer/src/i18n/locales/zh.json index b3196b946b1..f7e61580428 100644 --- a/src/renderer/src/i18n/locales/zh.json +++ b/src/renderer/src/i18n/locales/zh.json @@ -18918,7 +18918,9 @@ "providerUnavailable": "{{agent}} 因服务繁忙而无法回复。请选择其他模型,或稍等片刻后重新发送。", "providerSafetyStopped": "{{agent}} 在安全检查后停止了此次回复。请检查您的请求后重新发送。", "providerResponseFailed": "{{agent}} 未能完成此回复。打开详情了解更多信息。", - "selectedModel": "所选模型" + "selectedModel": "所选模型", + "reviewFailed": "Codex 无法执行审查。请重试 /review。", + "reviewSettingsUnsupported": "请更新 Codex 以使用其他模型审查,或切换回 {{detail}}。" }, "writeNotice": { "notDoneReadHistory": "无法加载此聊天的历史记录", @@ -21723,7 +21725,8 @@ "retry": "重试", "cancel": "取消", "unassigned": "未分配", - "delete": "删除" + "delete": "删除", + "back": "返回" }, "fileExplorer": { "root": { @@ -22703,6 +22706,20 @@ "nativeChat": { "math": { "scrollDisplayEquation": "滚动显示公式" + }, + "review": { + "baseBranch": "与基础分支比较", + "uncommittedChanges": "审查未提交的更改", + "commit": "审查一个提交", + "custom": "自定义审查指令", + "loadFailed": "Codex 无法加载审查目标。请重试 /review。", + "instructions": "输入审查指令", + "searchBranches": "搜索分支…", + "searchCommits": "搜索提交…", + "title": "审查更改", + "back": "返回审查目标", + "run": "运行", + "done": "完成" } }, "quitAndStopAllSessions": { diff --git a/src/shared/native-chat/input/native-chat-review-menu.ts b/src/shared/native-chat/input/native-chat-review-menu.ts index 4f5f04288f1..539cc5eec33 100644 --- a/src/shared/native-chat/input/native-chat-review-menu.ts +++ b/src/shared/native-chat/input/native-chat-review-menu.ts @@ -16,6 +16,13 @@ type ReviewMenuSnapshot = { /** Menu data is local to one opening; every git query runs on the chat's host. */ export function createNativeChatReviewMenu(input: { hasGit: boolean + copy?: { + baseBranch: string + uncommittedChanges: string + commit: string + custom: string + loadFailed: string + } branches: () => Promise commits: () => Promise<{ id: string; subject: string }[]> run: NativeChatReviewRun @@ -24,12 +31,15 @@ export function createNativeChatReviewMenu(input: { const root: SessionOptionSelectChoice[] = [ ...(input.hasGit ? [ - { value: 'baseBranch', label: 'Review against a base branch' }, - { value: 'uncommittedChanges', label: 'Review uncommitted changes' }, - { value: 'commit', label: 'Review a commit' } + { value: 'baseBranch', label: input.copy?.baseBranch ?? 'Review against a base branch' }, + { + value: 'uncommittedChanges', + label: input.copy?.uncommittedChanges ?? 'Review uncommitted changes' + }, + { value: 'commit', label: input.copy?.commit ?? 'Review a commit' } ] : []), - { value: 'custom', label: 'Custom review instructions' } + { value: 'custom', label: input.copy?.custom ?? 'Custom review instructions' } ] let snapshot: ReviewMenuSnapshot = { page: 'review', choices: root, busy: false } const listeners = new Set<() => void>() @@ -104,7 +114,9 @@ export function createNativeChatReviewMenu(input: { } } catch { if (snapshot === loading) { - input.onError('Codex could not load review targets. Try /review again.') + input.onError( + input.copy?.loadFailed ?? 'Codex could not load review targets. Try /review again.' + ) publish({ page: 'review', choices: root, busy: false }) } }