wta + Settings: Codex CLI support (history, hooks, auto-upgrade) — issue #80

.gitignore

@@ -308,3 +308,6 @@ profiles.json
 tmpclaude-*
 # Per-issue git worktrees created locally
 .worktree/
+
+# Local-only superpowers plan/spec notes (kept out of source control)
+docs/superpowers/

build/scripts/Verify-AgentHooks.ps1

@@ -2,7 +2,7 @@
 <#
 .SYNOPSIS
     Inspect, install, or remove the wt-agent-hooks bridge for one or all
-    supported agent CLIs (Copilot, Claude, Gemini).
+    supported agent CLIs (Copilot, Claude, Gemini, Codex).
 
 .DESCRIPTION
     Wrapper around `wta hooks status --json` / `wta install-hooks` /
@@ -25,8 +25,8 @@
 
 .PARAMETER CliFilter
     Restrict Uninstall (and the SmokeTest) to one CLI. Defaults to `all`.
-    Has no effect on Check / Install (Install always installs all three;
-    Check always reports all three).
+    Has no effect on Check / Install (Install always installs all four;
+    Check always reports all four).
 
 .PARAMETER SmokeTest
     After Check / Install, fire a no-op prompt at each detected CLI and
@@ -57,7 +57,7 @@ param(
     [string]$Mode = 'Check',
 
     [Parameter()]
-    [ValidateSet('all', 'copilot', 'claude', 'gemini')]
+    [ValidateSet('all', 'copilot', 'claude', 'gemini', 'codex')]
     [string]$CliFilter = 'all',
 
     [Parameter()]
@@ -82,6 +82,7 @@ $script:CliDisplayNames = @{
     copilot = 'Copilot CLI'
     claude  = 'Claude Code'
     gemini  = 'Gemini CLI'
+    codex   = 'Codex CLI'
 }
 
 # ── Helpers ──────────────────────────────────────────────────────────

src/cascadia/TerminalSettingsEditor/AIAgents.xaml

@@ -377,6 +377,42 @@
                                     MinWidth="120" />
                         </Grid>
                     </Border>
+                    <Border Visibility="{x:Bind ViewModel.ShowCodexHookRow, Mode=OneWay}"
+                            BorderThickness="0,1,0,0"
+                            BorderBrush="{ThemeResource CardStrokeColorDefaultBrush}"
+                            Padding="0,16,0,16">
+                        <Grid>
+                            <Grid.ColumnDefinitions>
+                                <ColumnDefinition Width="*" />
+                                <ColumnDefinition Width="Auto" />
+                            </Grid.ColumnDefinitions>
+                            <StackPanel Grid.Column="0" VerticalAlignment="Center" Spacing="2">
+                                <TextBlock Text="Codex CLI" TextWrapping="Wrap" />
+                                <TextBlock Text="{x:Bind ViewModel.CodexHooksSubtitle, Mode=OneWay}"
+                                           Visibility="{x:Bind ViewModel.ShowCodexHooksSubtitle, Mode=OneWay}"
+                                           Style="{StaticResource CaptionTextBlockStyle}"
+                                           Opacity="0.6"
+                                           TextWrapping="Wrap" />
+                                <!--  Codex is the only CLI whose hook commands must be
+                                      individually trusted by the user before they fire.
+                                      Surface the one-line "run /hooks and approve"
+                                      reminder right under the row title so users see it
+                                      both before clicking Install (anticipation) and
+                                      after install (the row only becomes visible once
+                                      Codex has any hook state, which is the moment the
+                                      reminder is most actionable).  -->
+                                <TextBlock x:Uid="AIAgents_CodexTrustHint"
+                                           Style="{StaticResource CaptionTextBlockStyle}"
+                                           Opacity="0.6"
+                                           TextWrapping="Wrap" />
+                            </StackPanel>
+                            <Button Grid.Column="1"
+                                    x:Uid="AIAgents_HooksRemoveButton"
+                                    Click="{x:Bind ViewModel.RemoveCodexHooks}"
+                                    IsEnabled="{x:Bind ViewModel.CanInstallAgentHooks, Mode=OneWay}"
+                                    MinWidth="120" />
+                        </Grid>
+                    </Border>
                 </StackPanel>
             </local:SettingContainer>
 

src/cascadia/TerminalSettingsEditor/AIAgentsViewModel.cpp

@@ -861,49 +861,60 @@ namespace winrt::Microsoft::Terminal::Settings::Editor::implementation
             _copilotCliDetected = false;
             _claudeCliDetected = false;
             _geminiCliDetected = false;
+            _codexCliDetected = false;
             _showCopilotHookRow = false;
             _showClaudeHookRow = false;
             _showGeminiHookRow = false;
+            _showCodexHookRow = false;
             _copilotHooksSubtitle = {};
             _claudeHooksSubtitle = {};
             _geminiHooksSubtitle = {};
+            _codexHooksSubtitle = {};
         }
         else
         {
             const auto* copilot = FindCli(*report, "copilot");
             const auto* claude = FindCli(*report, "claude");
             const auto* gemini = FindCli(*report, "gemini");
+            const auto* codex = FindCli(*report, "codex");
 
             _copilotCliDetected = copilot && copilot->binaryOnPath;
             _claudeCliDetected = claude && claude->binaryOnPath;
             _geminiCliDetected = gemini && gemini->binaryOnPath;
+            _codexCliDetected = codex && codex->binaryOnPath;
 
             const auto hasState = [](const CliStatus* cli) {
                 return cli && (cli->marketplaceRegistered || cli->pluginInstalled);
             };
             _showCopilotHookRow = hasState(copilot);
             _showClaudeHookRow = hasState(claude);
             _showGeminiHookRow = hasState(gemini);
+            _showCodexHookRow = hasState(codex);
 
             _copilotHooksSubtitle = _ComputeHooksSubtitle(copilot);
             _claudeHooksSubtitle = _ComputeHooksSubtitle(claude);
             _geminiHooksSubtitle = _ComputeHooksSubtitle(gemini);
+            _codexHooksSubtitle = _ComputeHooksSubtitle(codex);
         }
 
         _NotifyChanges(L"IsCopilotCliDetected",
                        L"IsClaudeCliDetected",
                        L"IsGeminiCliDetected",
+                       L"IsCodexCliDetected",
                        L"IsAnyAgentCliDetected",
                        L"CanInstallAgentHooks",
                        L"ShowCopilotHookRow",
                        L"ShowClaudeHookRow",
                        L"ShowGeminiHookRow",
+                       L"ShowCodexHookRow",
                        L"CopilotHooksSubtitle",
                        L"ClaudeHooksSubtitle",
                        L"GeminiHooksSubtitle",
+                       L"CodexHooksSubtitle",
                        L"ShowCopilotHooksSubtitle",
                        L"ShowClaudeHooksSubtitle",
-                       L"ShowGeminiHooksSubtitle");
+                       L"ShowGeminiHooksSubtitle",
+                       L"ShowCodexHooksSubtitle");
     }
 
     void AIAgentsViewModel::RefreshAgentHooksStatus()
@@ -969,6 +980,15 @@ namespace winrt::Microsoft::Terminal::Settings::Editor::implementation
         _RunHooksWtaAsync(L"hooks uninstall --cli gemini");
     }
 
+    void AIAgentsViewModel::RemoveCodexHooks()
+    {
+        if (_installingAgentHooks) return;
+        _installingAgentHooks = true;
+        _agentHooksInstallSummary = RS_(L"AIAgents_HooksRemovingCodexSummary");
+        _NotifyChanges(L"IsInstallingAgentHooks", L"AgentHooksInstallSummary", L"HasAgentHooksInstallSummary");
+        _RunHooksWtaAsync(L"hooks uninstall --cli codex");
+    }
+
     winrt::fire_and_forget AIAgentsViewModel::_RunHooksWtaAsync(std::wstring wtaArgs)
     {
         auto strongThis = get_strong();

src/cascadia/TerminalSettingsEditor/AIAgentsViewModel.h

@@ -126,9 +126,10 @@ namespace winrt::Microsoft::Terminal::Settings::Editor::implementation
         bool IsCopilotCliDetected() const noexcept { return _copilotCliDetected; }
         bool IsClaudeCliDetected() const noexcept { return _claudeCliDetected; }
         bool IsGeminiCliDetected() const noexcept { return _geminiCliDetected; }
+        bool IsCodexCliDetected() const noexcept { return _codexCliDetected; }
         bool IsAnyAgentCliDetected() const noexcept
         {
-            return _copilotCliDetected || _claudeCliDetected || _geminiCliDetected;
+            return _copilotCliDetected || _claudeCliDetected || _geminiCliDetected || _codexCliDetected;
         }
         // Per-CLI "row visible" flags — true when the CLI has any wt-agent-hooks
         // state on disk (marketplace registered OR plugin installed). The
@@ -137,14 +138,17 @@ namespace winrt::Microsoft::Terminal::Settings::Editor::implementation
         bool ShowCopilotHookRow() const noexcept { return _showCopilotHookRow; }
         bool ShowClaudeHookRow() const noexcept { return _showClaudeHookRow; }
         bool ShowGeminiHookRow() const noexcept { return _showGeminiHookRow; }
+        bool ShowCodexHookRow() const noexcept { return _showCodexHookRow; }
         // Detail text shown under the CLI name when state isn't fully
         // installed. Empty for fully-installed CLIs (subtitle is hidden in XAML).
         winrt::hstring CopilotHooksSubtitle() const { return _copilotHooksSubtitle; }
         winrt::hstring ClaudeHooksSubtitle() const { return _claudeHooksSubtitle; }
         winrt::hstring GeminiHooksSubtitle() const { return _geminiHooksSubtitle; }
+        winrt::hstring CodexHooksSubtitle() const { return _codexHooksSubtitle; }
         bool ShowCopilotHooksSubtitle() const noexcept { return !_copilotHooksSubtitle.empty(); }
         bool ShowClaudeHooksSubtitle() const noexcept { return !_claudeHooksSubtitle.empty(); }
         bool ShowGeminiHooksSubtitle() const noexcept { return !_geminiHooksSubtitle.empty(); }
+        bool ShowCodexHooksSubtitle() const noexcept { return !_codexHooksSubtitle.empty(); }
         bool CanInstallAgentHooks() const noexcept
         {
             return IsAnyAgentCliDetected() && !IsAgentSessionHooksPolicyLocked();
@@ -158,6 +162,7 @@ namespace winrt::Microsoft::Terminal::Settings::Editor::implementation
         void RemoveCopilotHooks();
         void RemoveClaudeHooks();
         void RemoveGeminiHooks();
+        void RemoveCodexHooks();
 
     private:
         Model::GlobalAppSettings _GlobalSettings;
@@ -212,15 +217,18 @@ namespace winrt::Microsoft::Terminal::Settings::Editor::implementation
         bool _copilotCliDetected{ false };
         bool _claudeCliDetected{ false };
         bool _geminiCliDetected{ false };
+        bool _codexCliDetected{ false };
         // Row visibility — true when the CLI has any wt-agent-hooks state
         // on disk (marketplace registered OR plugin installed).
         bool _showCopilotHookRow{ false };
         bool _showClaudeHookRow{ false };
         bool _showGeminiHookRow{ false };
+        bool _showCodexHookRow{ false };
         // Subtitle text per CLI; empty for fully-installed CLIs.
         winrt::hstring _copilotHooksSubtitle;
         winrt::hstring _claudeHooksSubtitle;
         winrt::hstring _geminiHooksSubtitle;
+        winrt::hstring _codexHooksSubtitle;
         bool _installingAgentHooks{ false };
         bool _refreshingAgentHooks{ false };
         winrt::hstring _agentHooksInstallSummary;

src/cascadia/TerminalSettingsEditor/AIAgentsViewModel.idl

@@ -113,16 +113,20 @@ namespace Microsoft.Terminal.Settings.Editor
         Boolean IsCopilotCliDetected { get; };
         Boolean IsClaudeCliDetected { get; };
         Boolean IsGeminiCliDetected { get; };
+        Boolean IsCodexCliDetected { get; };
         Boolean IsAnyAgentCliDetected { get; };
         Boolean ShowCopilotHookRow { get; };
         Boolean ShowClaudeHookRow { get; };
         Boolean ShowGeminiHookRow { get; };
+        Boolean ShowCodexHookRow { get; };
         String CopilotHooksSubtitle { get; };
         String ClaudeHooksSubtitle { get; };
         String GeminiHooksSubtitle { get; };
+        String CodexHooksSubtitle { get; };
         Boolean ShowCopilotHooksSubtitle { get; };
         Boolean ShowClaudeHooksSubtitle { get; };
         Boolean ShowGeminiHooksSubtitle { get; };
+        Boolean ShowCodexHooksSubtitle { get; };
         Boolean CanInstallAgentHooks { get; };
         Boolean IsInstallingAgentHooks { get; };
         String AgentHooksInstallSummary { get; };
@@ -135,5 +139,6 @@ namespace Microsoft.Terminal.Settings.Editor
         void RemoveCopilotHooks();
         void RemoveClaudeHooks();
         void RemoveGeminiHooks();
+        void RemoveCodexHooks();
     }
 }

src/cascadia/TerminalSettingsEditor/Resources/de-DE/Resources.resw

@@ -2822,6 +2822,14 @@
     <value>Gemini hooks werden entfernt...</value>
     <comment>Status summary shown while removing agent session tracking hooks for Gemini. {Locked="Gemini","hooks"}</comment>
   </data>
+  <data name="AIAgents_HooksRemovingCodexSummary" xml:space="preserve">
+    <value>Codex hooks werden entfernt...</value>
+    <comment>Status summary shown while removing agent session tracking hooks for Codex. {Locked="Codex","hooks"}</comment>
+  </data>
+  <data name="AIAgents_CodexTrustHint.Text" xml:space="preserve">
+    <value>Führen Sie nach der Installation /hooks in Codex aus und genehmigen Sie die neuen Ereignishandler, um ihnen zu vertrauen.</value>
+    <comment>One-line reminder shown under the Codex CLI row in the Agent Hooks section. Codex requires per-command trust before hook handlers run; users must execute /hooks inside Codex and approve. {Locked="/hooks","Codex"}</comment>
+  </data>
   <data name="AIAgents_HooksLocateWtaFailedSummary" xml:space="preserve">
     <value>Fehler: wta.exe konnte nicht gefunden werden</value>
     <comment>Failure summary shown when the Settings UI cannot find the WTA helper executable. {Locked="wta.exe"}</comment>

src/cascadia/TerminalSettingsEditor/Resources/en-US/Resources.resw

@@ -2941,6 +2941,14 @@ In this context, "agent" refers to an AI agent (e.g. Copilot, Claude, Gemini), n
     <value>Removing Gemini hooks...</value>
     <comment>Status summary shown while removing agent session tracking hooks for Gemini. {Locked="Gemini","hooks"}</comment>
   </data>
+  <data name="AIAgents_HooksRemovingCodexSummary" xml:space="preserve">
+    <value>Removing Codex hooks...</value>
+    <comment>Status summary shown while removing agent session tracking hooks for Codex. {Locked="Codex","hooks"}</comment>
+  </data>
+  <data name="AIAgents_CodexTrustHint.Text" xml:space="preserve">
+    <value>After installing, run /hooks in Codex and approve to trust the new event handlers.</value>
+    <comment>One-line reminder shown under the Codex CLI row in the Agent Hooks section. Codex requires per-command trust before hook handlers run; users must execute /hooks inside Codex and approve. {Locked="/hooks","Codex"}</comment>
+  </data>
   <data name="AIAgents_HooksLocateWtaFailedSummary" xml:space="preserve">
     <value>Failed: could not locate wta.exe</value>
     <comment>Failure summary shown when the Settings UI cannot find the WTA helper executable. {Locked="wta.exe"}</comment>

src/cascadia/TerminalSettingsEditor/Resources/es-ES/Resources.resw

@@ -2822,6 +2822,14 @@
     <value>Quitando hooks de Gemini...</value>
     <comment>Status summary shown while removing agent session tracking hooks for Gemini. {Locked="Gemini","hooks"}</comment>
   </data>
+  <data name="AIAgents_HooksRemovingCodexSummary" xml:space="preserve">
+    <value>Quitando hooks de Codex...</value>
+    <comment>Status summary shown while removing agent session tracking hooks for Codex. {Locked="Codex","hooks"}</comment>
+  </data>
+  <data name="AIAgents_CodexTrustHint.Text" xml:space="preserve">
+    <value>Después de instalar, ejecuta /hooks en Codex y aprueba para confiar en los nuevos controladores de eventos.</value>
+    <comment>One-line reminder shown under the Codex CLI row in the Agent Hooks section. Codex requires per-command trust before hook handlers run; users must execute /hooks inside Codex and approve. {Locked="/hooks","Codex"}</comment>
+  </data>
   <data name="AIAgents_HooksLocateWtaFailedSummary" xml:space="preserve">
     <value>Error: no se pudo encontrar wta.exe</value>
     <comment>Failure summary shown when the Settings UI cannot find the WTA helper executable. {Locked="wta.exe"}</comment>

src/cascadia/TerminalSettingsEditor/Resources/fr-FR/Resources.resw

@@ -2823,6 +2823,14 @@
     <value>Suppression des hooks Gemini...</value>
     <comment>Status summary shown while removing agent session tracking hooks for Gemini. {Locked="Gemini","hooks"}</comment>
   </data>
+  <data name="AIAgents_HooksRemovingCodexSummary" xml:space="preserve">
+    <value>Suppression des hooks Codex...</value>
+    <comment>Status summary shown while removing agent session tracking hooks for Codex. {Locked="Codex","hooks"}</comment>
+  </data>
+  <data name="AIAgents_CodexTrustHint.Text" xml:space="preserve">
+    <value>Après l'installation, exécutez /hooks dans Codex et approuvez pour faire confiance aux nouveaux gestionnaires d'événements.</value>
+    <comment>One-line reminder shown under the Codex CLI row in the Agent Hooks section. Codex requires per-command trust before hook handlers run; users must execute /hooks inside Codex and approve. {Locked="/hooks","Codex"}</comment>
+  </data>
   <data name="AIAgents_HooksLocateWtaFailedSummary" xml:space="preserve">
     <value>Échec : impossible de trouver wta.exe</value>
     <comment>Failure summary shown when the Settings UI cannot find the WTA helper executable. {Locked="wta.exe"}</comment>

src/cascadia/TerminalSettingsEditor/Resources/it-IT/Resources.resw

@@ -2822,6 +2822,14 @@
     <value>Rimozione degli hooks Gemini...</value>
     <comment>Status summary shown while removing agent session tracking hooks for Gemini. {Locked="Gemini","hooks"}</comment>
   </data>
+  <data name="AIAgents_HooksRemovingCodexSummary" xml:space="preserve">
+    <value>Rimozione degli hooks Codex...</value>
+    <comment>Status summary shown while removing agent session tracking hooks for Codex. {Locked="Codex","hooks"}</comment>
+  </data>
+  <data name="AIAgents_CodexTrustHint.Text" xml:space="preserve">
+    <value>Dopo l'installazione, esegui /hooks in Codex e approva per considerare attendibili i nuovi gestori di eventi.</value>
+    <comment>One-line reminder shown under the Codex CLI row in the Agent Hooks section. Codex requires per-command trust before hook handlers run; users must execute /hooks inside Codex and approve. {Locked="/hooks","Codex"}</comment>
+  </data>
   <data name="AIAgents_HooksLocateWtaFailedSummary" xml:space="preserve">
     <value>Operazione non riuscita: impossibile trovare wta.exe</value>
     <comment>Failure summary shown when the Settings UI cannot find the WTA helper executable. {Locked="wta.exe"}</comment>

src/cascadia/TerminalSettingsEditor/Resources/ja-JP/Resources.resw

@@ -2822,6 +2822,14 @@
     <value>Gemini hooks を削除しています...</value>
     <comment>Status summary shown while removing agent session tracking hooks for Gemini. {Locked="Gemini","hooks"}</comment>
   </data>
+  <data name="AIAgents_HooksRemovingCodexSummary" xml:space="preserve">
+    <value>Codex hooks を削除しています...</value>
+    <comment>Status summary shown while removing agent session tracking hooks for Codex. {Locked="Codex","hooks"}</comment>
+  </data>
+  <data name="AIAgents_CodexTrustHint.Text" xml:space="preserve">
+    <value>インストール後、Codex で /hooks を実行し、承認して新しいイベント ハンドラーを信頼してください。</value>
+    <comment>One-line reminder shown under the Codex CLI row in the Agent Hooks section. Codex requires per-command trust before hook handlers run; users must execute /hooks inside Codex and approve. {Locked="/hooks","Codex"}</comment>
+  </data>
   <data name="AIAgents_HooksLocateWtaFailedSummary" xml:space="preserve">
     <value>失敗: wta.exe が見つかりませんでした</value>
     <comment>Failure summary shown when the Settings UI cannot find the WTA helper executable. {Locked="wta.exe"}</comment>