Fix the OpenCode hook row and name the CLIs that fail to install (#636)

* Hide the OpenCode hook row once its hooks are removed

The Agent session tracking list gave OpenCode a different visibility rule
than every other CLI: its row was driven by
ShouldShowDetectedOrConfiguredHookRow (binaryOnPath || hasHookState),
while Copilot, Claude, Gemini and Codex used HasHookState alone.

With the opencode binary on PATH but its hooks uninstalled, the row
therefore stayed behind after a successful removal, showing a Remove
button that CanRemoveOpenCodeHooks kept permanently disabled — a dead
row the user can neither act on nor dismiss, even though
`wta hooks status` correctly reported the hooks as gone.

Drive all five rows from HasHookState so a row disappears when its
hooks are removed. Discoverability is unaffected: installation runs
through the single "Install hooks" button, which already covers every
detected CLI, so a detected-but-uninstalled row carried no action to
begin with.

Drops the now-unused ShouldShowDetectedOrConfiguredHookRow helper, the
_openCodeHooksPresent field, and the CanRemoveOpenCodeHooks projection;
the OpenCode Remove button binds to CanRemoveAgentHooks like the rest.

Validated with a Debug build of Microsoft.Terminal.Settings.Editor
(x64) and AgentHooksStatusTests, 25/25 passing.

Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>

* Name the CLIs that failed to install hooks

Clicking "Install hooks" and having, say, Codex fail produced a single
"Hooks installation failed. Check <log> for details." line. Every other CLI
could have installed fine and the user had no way to tell which one broke,
or that the rest succeeded, short of opening wta-install-hooks.log.

wta already computes the answer. `run_install` folds two independent
failure signals — the spawn errors the install commands reported, and the
post-install status check that catches a command which claimed success but
registered nothing — into a message naming each failing CLI with its
reason. That message only ever reached stderr and the trace log, because
the Settings UI shells out through RunWtaAndWait and sees a bare bool.

Give `wta hooks install` the `--json` treatment `status` and `uninstall`
already have, and consume it:

  * InstallReport / CliInstallResult (schema v1) report per-CLI
    installed / skipped / failed plus the failure reason. Failure wins over
    the status check, so a spawn error with a PREVIOUS plugin still on disk
    stays a failure instead of reading as installed.
  * A CLI that simply isn't on the machine is `skipped`, not `failed` —
    otherwise every uninstalled CLI would be named in the error line.
  * `outcome` is a plain string, so an outcome added later lands as
    "not a failure" rather than failing the whole parse.

On the C++ side the install path now captures output independently of the
exit code — wta prints the report and *then* exits non-zero, so the
existing exit-0-only helper would have discarded exactly the payload we
need. RunWtaCapture returns the combined output plus the exit code, and
RunWtaCaptureStdout is a thin wrapper preserving its old contract.

The summary falls back to the unattributed message whenever the report is
unreadable or blames no particular CLI — a timeout, a crash before the
report was written, or a failure that isn't per-CLI.

Adds AIAgents_HooksInstallationFailedForSummary across all 16 locales.
The CLI names are brand names rendered with the same display names as the
rows above the summary, and stay untranslated.

Validated with the full wta suite (1587 passing), AgentHooksStatusTests
(33 passing), and Debug x64 builds of Microsoft.Terminal.Settings.Editor
and the unit tests. Live check of both paths:
`hooks install --json --cli codex` reports the real marketplace-repoint
failure with its reason and exits 1; `--cli copilot` reports installed and
exits 0.

Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>

* Keep stderr out of the install report parse

Copilot review found a real defect in the previous commit. `wta hooks
install --json` prints its report to stdout and then lets `main()` return
Err, which makes the Rust runtime write

    Error: hooks installation failed for: codex
      codex: codex plugin marketplace add failed: ...

to stderr. RunWtaCapture merged both streams into one pipe, so on exactly
the path the report exists to serve — a failing install — the captured
text was JSON plus that trailer, and depending on flush order possibly the
trailer first. ParseInstallReportJson would fail, the UI would fall back
to the unattributed summary, and naming the failing CLI would never work.

Verified against the real binary: stdout carries 278 bytes of pure JSON,
stderr carries a 200-byte Error block.

RunWtaCapture takes a `mergeStderr` flag (default true, so
RunWtaCaptureStdout and its existing callers are untouched) and the
install path passes false. Non-merged stderr goes to NUL rather than a
second pipe: a second pipe would need its own drain to avoid deadlocking
a chatty child, and every wta subcommand already mirrors its diagnostics
into the wta logs, which is where the summary points the user anyway.

Also from the review: HidesDetectedCliWithoutHooks claimed to guard the
Settings row-visibility decision but only asserted that HasHookState
ignores binaryOnPath, so reintroducing `binaryOnPath || HasHookState(...)`
at the call site would have left it green. Add ShouldShowHookRow as the
single named predicate the five ViewModel call sites share, and assert
the row decision through it — including the partially-installed case,
which must stay visible because it's the state the user most needs to act
on.

Two check-spelling findings: rename the unknown-CLI test fixture off an
invented word, and fix "not an detail".

Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>

* Use unique_hfile for the NUL stderr handle

Copilot review caught a latent handle bug in the previous commit.
CreateFileW signals failure with INVALID_HANDLE_VALUE, but the NUL handle
was held in a wil::unique_handle, whose invalid value is nullptr. A failed
open would therefore have passed `if (!nullHandle)` and been handed to
CreateProcessW as hStdError.

wil::unique_hfile is the type whose invalid value is INVALID_HANDLE_VALUE,
so the existing null check now actually rejects the failure. It's also
what the rest of the repo uses for CreateFileW results (til/io.h,
WindowEmperor.cpp, types/utils.cpp).

Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>

---------

Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>

Author: DDKinger

src/cascadia/TerminalSettingsEditor/AIAgents.xaml

@@ -435,8 +435,8 @@
                         </StackPanel>
                     </Border>
                     <!--  Per-CLI rows surface installed or partial hook state.
-                          OpenCode also appears when its CLI is detected so new
-                          users can see that hook integration is supported.  -->
+                          A row disappears once its hooks are removed, so the
+                          Remove button is never shown with nothing to remove.  -->
                     <Border Visibility="{x:Bind ViewModel.ShowCopilotHookRow, Mode=OneWay}"
                             BorderThickness="0,1,0,0"
                             BorderBrush="{ThemeResource CardStrokeColorDefaultBrush}"
@@ -568,7 +568,7 @@
                             <Button Grid.Column="1"
                                     x:Uid="AIAgents_HooksRemoveButton"
                                     Click="{x:Bind ViewModel.RemoveOpenCodeHooks}"
-                                    IsEnabled="{x:Bind ViewModel.CanRemoveOpenCodeHooks, Mode=OneWay}"
+                                    IsEnabled="{x:Bind ViewModel.CanRemoveAgentHooks, Mode=OneWay}"
                                     MinWidth="120" />
                        </Grid>
                     </Border>

src/cascadia/TerminalSettingsEditor/AIAgentsViewModel.cpp

@@ -1237,7 +1237,6 @@ namespace winrt::Microsoft::Terminal::Settings::Editor::implementation
             _showGeminiHookRow = false;
             _showCodexHookRow = false;
             _showOpenCodeHookRow = false;
-            _openCodeHooksPresent = false;
             _copilotHooksSubtitle = {};
             _claudeHooksSubtitle = {};
             _geminiHooksSubtitle = {};
@@ -1258,12 +1257,11 @@ namespace winrt::Microsoft::Terminal::Settings::Editor::implementation
             _codexCliDetected = codex && codex->binaryOnPath;
             _openCodeCliDetected = openCode && openCode->binaryOnPath;
 
-            _showCopilotHookRow = AgentHooks::HasHookState(copilot);
-            _showClaudeHookRow = AgentHooks::HasHookState(claude);
-            _showGeminiHookRow = AgentHooks::HasHookState(gemini);
-            _showCodexHookRow = AgentHooks::HasHookState(codex);
-            _openCodeHooksPresent = AgentHooks::HasHookState(openCode);
-            _showOpenCodeHookRow = AgentHooks::ShouldShowDetectedOrConfiguredHookRow(openCode);
+            _showCopilotHookRow = AgentHooks::ShouldShowHookRow(copilot);
+            _showClaudeHookRow = AgentHooks::ShouldShowHookRow(claude);
+            _showGeminiHookRow = AgentHooks::ShouldShowHookRow(gemini);
+            _showCodexHookRow = AgentHooks::ShouldShowHookRow(codex);
+            _showOpenCodeHookRow = AgentHooks::ShouldShowHookRow(openCode);
 
             _copilotHooksSubtitle = _ComputeHooksSubtitle(copilot);
             _claudeHooksSubtitle = _ComputeHooksSubtitle(claude);
@@ -1280,7 +1278,6 @@ namespace winrt::Microsoft::Terminal::Settings::Editor::implementation
                        L"IsAnyAgentCliDetected",
                        L"CanInstallAgentHooks",
                        L"CanRemoveAgentHooks",
-                       L"CanRemoveOpenCodeHooks",
                        L"ShowCopilotHookRow",
                        L"ShowClaudeHookRow",
                        L"ShowGeminiHookRow",
@@ -1394,9 +1391,10 @@ namespace winrt::Microsoft::Terminal::Settings::Editor::implementation
         const std::wstring hooksRemovedSummary{ RS_(L"AIAgents_HooksRemovedSummary") };
         const std::wstring hooksInstalledSummary{ RS_(L"AIAgents_HooksInstalledSummary") };
         const auto hooksLogDir = ::IntelligentTerminal::LogDirVersioned();
+        const auto hooksInstallLogPath = (hooksLogDir / L"wta-install-hooks.log").wstring();
         const std::wstring hooksRemovalFailedSummary{ RS_fmt(L"AIAgents_HooksRemovalFailedSummary", hooksLogDir.wstring()) };
         const std::wstring hooksInstallationFailedSummary{
-            RS_fmt(L"AIAgents_HooksInstallationFailedSummary", (hooksLogDir / L"wta-install-hooks.log").wstring())
+            RS_fmt(L"AIAgents_HooksInstallationFailedSummary", hooksInstallLogPath)
         };
         std::wstring summary;
         bool ok = false;
@@ -1408,16 +1406,43 @@ namespace winrt::Microsoft::Terminal::Settings::Editor::implementation
         {
             summary = locateWtaFailedSummary;
         }
-        else
+        else if (isUninstall)
         {
             ok = ::Microsoft::Terminal::WtaProcess::RunWtaAndWait(wtaPath, wtaArgs, 60'000);
+            summary = ok ? hooksRemovedSummary : hooksRemovalFailedSummary;
+        }
+        else
+        {
+            // Ask for the structured report so a failure can name the CLIs
+            // that failed. wta prints it and *then* exits non-zero, so we
+            // capture output independently of the exit code — and keep
+            // stderr out of it, since the failing run also writes an
+            // `Error: ...` line there that would break the JSON parse.
+            const auto run = ::Microsoft::Terminal::WtaProcess::RunWtaCapture(wtaPath,
+                                                                             wtaArgs + L" --json",
+                                                                             60'000,
+                                                                             nullptr,
+                                                                             /* mergeStderr */ false);
+            ok = run.completed && run.exitCode == 0;
             if (ok)
             {
-                summary = isUninstall ? hooksRemovedSummary : hooksInstalledSummary;
+                summary = hooksInstalledSummary;
             }
             else
             {
-                summary = isUninstall ? hooksRemovalFailedSummary : hooksInstallationFailedSummary;
+                // Fall back to the unattributed message whenever the report
+                // is unreadable or blames no particular CLI — a timeout, a
+                // crash before the report was written, or a failure that
+                // isn't per-CLI all land here.
+                summary = hooksInstallationFailedSummary;
+                if (const auto report = ::Microsoft::Terminal::AgentHooks::ParseInstallReportJson(run.output))
+                {
+                    const auto failed = ::Microsoft::Terminal::AgentHooks::FormatFailedCliList(*report);
+                    if (!failed.empty())
+                    {
+                        summary = RS_fmt(L"AIAgents_HooksInstallationFailedForSummary", failed, hooksInstallLogPath);
+                    }
+                }
             }
         }
 

src/cascadia/TerminalSettingsEditor/AIAgentsViewModel.h

@@ -179,9 +179,9 @@ namespace winrt::Microsoft::Terminal::Settings::Editor::implementation
         {
             return _copilotCliDetected || _claudeCliDetected || _geminiCliDetected || _codexCliDetected || _openCodeCliDetected;
         }
-        // Per-CLI "row visible" flags. Existing integrations appear when they
-        // have hook state. OpenCode also appears when its CLI is detected so
-        // users can discover and install the newly supported integration.
+        // Per-CLI "row visible" flags. A CLI's row appears only while it has
+        // hook state (fully or partially installed), so removing hooks makes
+        // the row disappear — uniformly, for every CLI.
         bool ShowCopilotHookRow() const noexcept { return _showCopilotHookRow; }
         bool ShowClaudeHookRow() const noexcept { return _showClaudeHookRow; }
         bool ShowGeminiHookRow() const noexcept { return _showGeminiHookRow; }
@@ -207,10 +207,6 @@ namespace winrt::Microsoft::Terminal::Settings::Editor::implementation
         {
             return !IsAgentSessionHooksPolicyLocked();
         }
-        bool CanRemoveOpenCodeHooks() const noexcept
-        {
-            return _openCodeHooksPresent && !IsAgentSessionHooksPolicyLocked();
-        }
         bool IsInstallingAgentHooks() const noexcept { return _installingAgentHooks; }
         winrt::hstring AgentHooksInstallSummary() const { return _agentHooksInstallSummary; }
         bool HasAgentHooksInstallSummary() const noexcept { return !_agentHooksInstallSummary.empty(); }
@@ -290,13 +286,12 @@ namespace winrt::Microsoft::Terminal::Settings::Editor::implementation
         bool _geminiCliDetected{ false };
         bool _codexCliDetected{ false };
         bool _openCodeCliDetected{ false };
-        // Row visibility. OpenCode additionally appears when its CLI is detected.
+        // Row visibility — a CLI's row shows only while it has hook state.
         bool _showCopilotHookRow{ false };
         bool _showClaudeHookRow{ false };
         bool _showGeminiHookRow{ false };
         bool _showCodexHookRow{ false };
         bool _showOpenCodeHookRow{ false };
-        bool _openCodeHooksPresent{ false };
         // Subtitle text per CLI; empty for fully-installed CLIs.
         winrt::hstring _copilotHooksSubtitle;
         winrt::hstring _claudeHooksSubtitle;

src/cascadia/TerminalSettingsEditor/AIAgentsViewModel.idl

@@ -157,7 +157,6 @@ namespace Microsoft.Terminal.Settings.Editor
         Boolean ShowOpenCodeHooksSubtitle { get; };
         Boolean CanInstallAgentHooks { get; };
         Boolean CanRemoveAgentHooks { get; };
-        Boolean CanRemoveOpenCodeHooks { get; };
         Boolean IsInstallingAgentHooks { get; };
         String AgentHooksInstallSummary { get; };
         // True iff AgentHooksInstallSummary is non-empty — gates the

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

@@ -2914,6 +2914,10 @@
     <value>Hooks-Installation fehlgeschlagen. Überprüfen Sie {0} auf Details.</value>
     <comment>Failure summary shown when installing agent session tracking hooks fails. {Locked="Hooks","{0}"} {0} is replaced with the package-aware, versioned wta-install-hooks.log path at runtime.</comment>
   </data>
+  <data name="AIAgents_HooksInstallationFailedForSummary" xml:space="preserve">
+    <value>Hooks-Installation für {0} fehlgeschlagen. Überprüfen Sie {1} auf Details.</value>
+    <comment>Failure summary shown when installing agent session tracking hooks fails for specific CLIs. {Locked="Hooks","{0}","{1}"} {0} is replaced with a comma-separated list of CLI names (brand names, never translated); {1} is replaced with the package-aware, versioned wta-install-hooks.log path at runtime.</comment>
+  </data>
   <data name="AIAgents_AutoErrorDetectionTitle.Text" xml:space="preserve">
     <value>Automatische Fehlererkennung</value>
   </data>

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

@@ -3035,6 +3035,10 @@ In this context, "agent" refers to an AI agent (e.g. Copilot, Claude, Gemini), n
     <value>Hooks installation failed. Check {0} for details.</value>
     <comment>Failure summary shown when installing agent session tracking hooks fails. {Locked="Hooks","{0}"} {0} is replaced with the package-aware, versioned wta-install-hooks.log path at runtime.</comment>
   </data>
+  <data name="AIAgents_HooksInstallationFailedForSummary" xml:space="preserve">
+    <value>Hooks installation failed for {0}. Check {1} for details.</value>
+    <comment>Failure summary shown when installing agent session tracking hooks fails for specific CLIs. {Locked="Hooks","{0}","{1}"} {0} is replaced with a comma-separated list of CLI names (brand names, never translated); {1} is replaced with the package-aware, versioned wta-install-hooks.log path at runtime.</comment>
+  </data>
   <data name="AIAgents_CustomModels.Header" xml:space="preserve">
     <value>BYOK (bring your own key) providers</value>
     <comment>Section header for user-configured model providers. {Locked="BYOK"}</comment>

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

@@ -2914,6 +2914,10 @@
     <value>Error de instalación de Hooks. Consulte {0} para obtener detalles.</value>
     <comment>Failure summary shown when installing agent session tracking hooks fails. {Locked="Hooks","{0}"} {0} is replaced with the package-aware, versioned wta-install-hooks.log path at runtime.</comment>
   </data>
+  <data name="AIAgents_HooksInstallationFailedForSummary" xml:space="preserve">
+    <value>Error de instalación de Hooks para {0}. Consulte {1} para obtener detalles.</value>
+    <comment>Failure summary shown when installing agent session tracking hooks fails for specific CLIs. {Locked="Hooks","{0}","{1}"} {0} is replaced with a comma-separated list of CLI names (brand names, never translated); {1} is replaced with the package-aware, versioned wta-install-hooks.log path at runtime.</comment>
+  </data>
   <data name="AIAgents_AutoErrorDetectionTitle.Text" xml:space="preserve">
     <value>Detección automática de errores</value>
   </data>

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

@@ -2915,6 +2915,10 @@
     <value>Échec de l’installation Hooks. Consultez {0} pour plus de détails.</value>
     <comment>Failure summary shown when installing agent session tracking hooks fails. {Locked="Hooks","{0}"} {0} is replaced with the package-aware, versioned wta-install-hooks.log path at runtime.</comment>
   </data>
+  <data name="AIAgents_HooksInstallationFailedForSummary" xml:space="preserve">
+    <value>Échec de l’installation Hooks pour {0}. Consultez {1} pour plus de détails.</value>
+    <comment>Failure summary shown when installing agent session tracking hooks fails for specific CLIs. {Locked="Hooks","{0}","{1}"} {0} is replaced with a comma-separated list of CLI names (brand names, never translated); {1} is replaced with the package-aware, versioned wta-install-hooks.log path at runtime.</comment>
+  </data>
   <data name="AIAgents_AutoErrorDetectionTitle.Text" xml:space="preserve">
     <value>Détection automatique des erreurs</value>
   </data>

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

@@ -2914,6 +2914,10 @@
     <value>Installazione di Hooks non riuscita. Controllare {0} per i dettagli.</value>
     <comment>Failure summary shown when installing agent session tracking hooks fails. {Locked="Hooks","{0}"} {0} is replaced with the package-aware, versioned wta-install-hooks.log path at runtime.</comment>
   </data>
+  <data name="AIAgents_HooksInstallationFailedForSummary" xml:space="preserve">
+    <value>Installazione di Hooks per {0} non riuscita. Controllare {1} per i dettagli.</value>
+    <comment>Failure summary shown when installing agent session tracking hooks fails for specific CLIs. {Locked="Hooks","{0}","{1}"} {0} is replaced with a comma-separated list of CLI names (brand names, never translated); {1} is replaced with the package-aware, versioned wta-install-hooks.log path at runtime.</comment>
+  </data>
   <data name="AIAgents_AutoErrorDetectionTitle.Text" xml:space="preserve">
     <value>Rilevamento automatico degli errori</value>
   </data>

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

@@ -2914,6 +2914,10 @@
     <value>Hooks のインストールに失敗しました。詳細については {0} を確認してください。</value>
     <comment>Failure summary shown when installing agent session tracking hooks fails. {Locked="Hooks","{0}"} {0} is replaced with the package-aware, versioned wta-install-hooks.log path at runtime.</comment>
   </data>
+  <data name="AIAgents_HooksInstallationFailedForSummary" xml:space="preserve">
+    <value>{0} の Hooks のインストールに失敗しました。詳細については {1} を確認してください。</value>
+    <comment>Failure summary shown when installing agent session tracking hooks fails for specific CLIs. {Locked="Hooks","{0}","{1}"} {0} is replaced with a comma-separated list of CLI names (brand names, never translated); {1} is replaced with the package-aware, versioned wta-install-hooks.log path at runtime.</comment>
+  </data>
   <data name="AIAgents_AutoErrorDetectionTitle.Text" xml:space="preserve">
     <value>エラーの自動検出</value>
   </data>