diff --git a/docs/superpowers/plans/2026-05-29-codex-hooks-slice-b.md b/docs/superpowers/plans/2026-05-29-codex-hooks-slice-b.md
index 5fa3cdcea..dad299d74 100644
--- a/docs/superpowers/plans/2026-05-29-codex-hooks-slice-b.md
+++ b/docs/superpowers/plans/2026-05-29-codex-hooks-slice-b.md
@@ -10,7 +10,7 @@
 
 **Reference spec:** `docs/superpowers/specs/2026-05-29-codex-hooks-slice-b-design.md`
 
-**Worktree:** `C:\yuazha\GitRepo\intelligent-terminal\.worktree\codex-session` (branch `dev/yuazha/codex-session`, PR #98).
+**Worktree:** `C:\<user>\GitRepo\intelligent-terminal\.worktree\codex-session` (branch `dev/<user>/codex-session`, PR #98).
 
 ---
 
@@ -48,7 +48,7 @@ The bundle files (Task 2) are created early so later Rust tests can stat real pa
 
 ```powershell
 $env:RUSTUP_TOOLCHAIN="stable"
-cd C:\yuazha\GitRepo\intelligent-terminal\.worktree\codex-session
+cd C:\<user>\GitRepo\intelligent-terminal\.worktree\codex-session
 cargo test --manifest-path tools/wta/Cargo.toml
 ```
 
@@ -1234,7 +1234,7 @@ git commit -m "feat(settings): add Codex CLI row to AI Agents page`n`nCo-authore
 
 ```powershell
 $env:RUSTUP_TOOLCHAIN="stable"
-cd C:\yuazha\GitRepo\intelligent-terminal\.worktree\codex-session
+cd C:\<user>\GitRepo\intelligent-terminal\.worktree\codex-session
 cargo test --manifest-path tools/wta/Cargo.toml
 ```
 
diff --git a/docs/superpowers/specs/2026-05-29-codex-hooks-slice-b-design.md b/docs/superpowers/specs/2026-05-29-codex-hooks-slice-b-design.md
index d98f7ac72..5688d8f81 100644
--- a/docs/superpowers/specs/2026-05-29-codex-hooks-slice-b-design.md
+++ b/docs/superpowers/specs/2026-05-29-codex-hooks-slice-b-design.md
@@ -1,7 +1,7 @@
 # Codex hooks — slice B design
 
 **Date:** 2026-05-29
-**Branch:** `dev/yuazha/codex-session`
+**Branch:** `dev/<user>/codex-session`
 **Builds on:** slice A (read-only Codex session discovery, merged into PR #98)
 **Successor:** slice C (l10n, docs, ut_app fixtures, ACP `loadSession`)
 
@@ -50,7 +50,7 @@ Both commands run with stdin closed and 30-second timeout. Output captured to tr
 #### `status_for_codex(home)`
 
 **Primary path** (CLI on PATH):
-- `codex plugin marketplace list` → text-parse columns `MARKETPLACE  ROOT`, look for row whose name == `wt-local`. Set `marketplace_registered` and `marketplace_path` from the `ROOT` column. Compute `marketplace_path_valid` by stat'ing the path (`directory` exists check, same logic as Claude/Copilot).
+- `codex plugin marketplace list` → text-parse columns `MARKETPLACE  ROOT`, look for row whose name == `wt-local`. Set `marketplace_registered` and `marketplace_path` from the `ROOT` column. Compute `marketplace_path_valid` by running stat on the path (`directory` exists check, same logic as Claude/Copilot).
 - `codex plugin list` → text-parse for a row whose `PLUGIN` column == `wt-agent-hooks`. Set `plugin_installed`. Codex has no enable/disable distinction in `plugin list` output → `plugin_enabled := plugin_installed`.
 
 **Filesystem fallback** (CLI not on PATH or commands fail):
diff --git a/src/cascadia/TerminalSettingsEditor/Resources/de-DE/Resources.resw b/src/cascadia/TerminalSettingsEditor/Resources/de-DE/Resources.resw
index 2aaad80ea..54294574d 100644
--- a/src/cascadia/TerminalSettingsEditor/Resources/de-DE/Resources.resw
+++ b/src/cascadia/TerminalSettingsEditor/Resources/de-DE/Resources.resw
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <root>
   <!-- 
     Microsoft ResX Schema 
@@ -2822,6 +2822,10 @@
     <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>Removing Codex hooks...</value>
+    <comment>Status summary shown while removing agent session tracking hooks for Codex. {Locked="Codex","hooks"}</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>
diff --git a/src/cascadia/TerminalSettingsEditor/Resources/es-ES/Resources.resw b/src/cascadia/TerminalSettingsEditor/Resources/es-ES/Resources.resw
index dad9ee6e0..3257ad7c1 100644
--- a/src/cascadia/TerminalSettingsEditor/Resources/es-ES/Resources.resw
+++ b/src/cascadia/TerminalSettingsEditor/Resources/es-ES/Resources.resw
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <root>
   <!-- 
     Microsoft ResX Schema 
@@ -2822,6 +2822,10 @@
     <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>Removing Codex hooks...</value>
+    <comment>Status summary shown while removing agent session tracking hooks for Codex. {Locked="Codex","hooks"}</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>
diff --git a/src/cascadia/TerminalSettingsEditor/Resources/fr-FR/Resources.resw b/src/cascadia/TerminalSettingsEditor/Resources/fr-FR/Resources.resw
index 4eccff2fa..ebce71336 100644
--- a/src/cascadia/TerminalSettingsEditor/Resources/fr-FR/Resources.resw
+++ b/src/cascadia/TerminalSettingsEditor/Resources/fr-FR/Resources.resw
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <root>
   <!-- 
     Microsoft ResX Schema 
@@ -2823,6 +2823,10 @@
     <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>Removing Codex hooks...</value>
+    <comment>Status summary shown while removing agent session tracking hooks for Codex. {Locked="Codex","hooks"}</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>
diff --git a/src/cascadia/TerminalSettingsEditor/Resources/it-IT/Resources.resw b/src/cascadia/TerminalSettingsEditor/Resources/it-IT/Resources.resw
index c6f057bd9..a3f00e0f4 100644
--- a/src/cascadia/TerminalSettingsEditor/Resources/it-IT/Resources.resw
+++ b/src/cascadia/TerminalSettingsEditor/Resources/it-IT/Resources.resw
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <root>
   <!-- 
     Microsoft ResX Schema 
@@ -2822,6 +2822,10 @@
     <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>Removing Codex hooks...</value>
+    <comment>Status summary shown while removing agent session tracking hooks for Codex. {Locked="Codex","hooks"}</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>
diff --git a/src/cascadia/TerminalSettingsEditor/Resources/ja-JP/Resources.resw b/src/cascadia/TerminalSettingsEditor/Resources/ja-JP/Resources.resw
index da9a40057..3d53ba43e 100644
--- a/src/cascadia/TerminalSettingsEditor/Resources/ja-JP/Resources.resw
+++ b/src/cascadia/TerminalSettingsEditor/Resources/ja-JP/Resources.resw
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <root>
   <!-- 
     Microsoft ResX Schema 
@@ -2822,6 +2822,10 @@
     <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>Removing Codex hooks...</value>
+    <comment>Status summary shown while removing agent session tracking hooks for Codex. {Locked="Codex","hooks"}</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>
diff --git a/src/cascadia/TerminalSettingsEditor/Resources/ko-KR/Resources.resw b/src/cascadia/TerminalSettingsEditor/Resources/ko-KR/Resources.resw
index 7a90d8ccd..4f21d97d8 100644
--- a/src/cascadia/TerminalSettingsEditor/Resources/ko-KR/Resources.resw
+++ b/src/cascadia/TerminalSettingsEditor/Resources/ko-KR/Resources.resw
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <root>
   <!-- 
     Microsoft ResX Schema 
@@ -2900,6 +2900,10 @@
     <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>Removing Codex hooks...</value>
+    <comment>Status summary shown while removing agent session tracking hooks for Codex. {Locked="Codex","hooks"}</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>
diff --git a/src/cascadia/TerminalSettingsEditor/Resources/pt-BR/Resources.resw b/src/cascadia/TerminalSettingsEditor/Resources/pt-BR/Resources.resw
index f6ed2d4bb..2cb8415ca 100644
--- a/src/cascadia/TerminalSettingsEditor/Resources/pt-BR/Resources.resw
+++ b/src/cascadia/TerminalSettingsEditor/Resources/pt-BR/Resources.resw
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <root>
   <!-- 
     Microsoft ResX Schema 
@@ -2877,6 +2877,10 @@
     <value>Removendo hooks do 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>Removing Codex hooks...</value>
+    <comment>Status summary shown while removing agent session tracking hooks for Codex. {Locked="Codex","hooks"}</comment>
+  </data>
   <data name="AIAgents_HooksLocateWtaFailedSummary" xml:space="preserve">
     <value>Falha: não foi possível localizar wta.exe</value>
     <comment>Failure summary shown when the Settings UI cannot find the WTA helper executable. {Locked="wta.exe"}</comment>
diff --git a/src/cascadia/TerminalSettingsEditor/Resources/qps-ploc/Resources.resw b/src/cascadia/TerminalSettingsEditor/Resources/qps-ploc/Resources.resw
index 6771d7506..f4b926829 100644
--- a/src/cascadia/TerminalSettingsEditor/Resources/qps-ploc/Resources.resw
+++ b/src/cascadia/TerminalSettingsEditor/Resources/qps-ploc/Resources.resw
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <root>
   <!-- 
     Microsoft ResX Schema 
@@ -2807,6 +2807,10 @@
     <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_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>
diff --git a/src/cascadia/TerminalSettingsEditor/Resources/qps-ploca/Resources.resw b/src/cascadia/TerminalSettingsEditor/Resources/qps-ploca/Resources.resw
index 6771d7506..f4b926829 100644
--- a/src/cascadia/TerminalSettingsEditor/Resources/qps-ploca/Resources.resw
+++ b/src/cascadia/TerminalSettingsEditor/Resources/qps-ploca/Resources.resw
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <root>
   <!-- 
     Microsoft ResX Schema 
@@ -2807,6 +2807,10 @@
     <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_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>
diff --git a/src/cascadia/TerminalSettingsEditor/Resources/qps-plocm/Resources.resw b/src/cascadia/TerminalSettingsEditor/Resources/qps-plocm/Resources.resw
index 6771d7506..f4b926829 100644
--- a/src/cascadia/TerminalSettingsEditor/Resources/qps-plocm/Resources.resw
+++ b/src/cascadia/TerminalSettingsEditor/Resources/qps-plocm/Resources.resw
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <root>
   <!-- 
     Microsoft ResX Schema 
@@ -2807,6 +2807,10 @@
     <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_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>
diff --git a/src/cascadia/TerminalSettingsEditor/Resources/ru-RU/Resources.resw b/src/cascadia/TerminalSettingsEditor/Resources/ru-RU/Resources.resw
index 907cd04b8..b3091d8d9 100644
--- a/src/cascadia/TerminalSettingsEditor/Resources/ru-RU/Resources.resw
+++ b/src/cascadia/TerminalSettingsEditor/Resources/ru-RU/Resources.resw
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <root>
   <!-- 
     Microsoft ResX Schema 
@@ -2877,6 +2877,10 @@
     <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>Removing Codex hooks...</value>
+    <comment>Status summary shown while removing agent session tracking hooks for Codex. {Locked="Codex","hooks"}</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>
diff --git a/src/cascadia/TerminalSettingsEditor/Resources/sr-Cyrl-RS/Resources.resw b/src/cascadia/TerminalSettingsEditor/Resources/sr-Cyrl-RS/Resources.resw
index a08a08e1d..531a71ac9 100644
--- a/src/cascadia/TerminalSettingsEditor/Resources/sr-Cyrl-RS/Resources.resw
+++ b/src/cascadia/TerminalSettingsEditor/Resources/sr-Cyrl-RS/Resources.resw
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <root>
   <!-- 
     Microsoft ResX Schema 
@@ -2898,6 +2898,10 @@
     <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>Removing Codex hooks...</value>
+    <comment>Status summary shown while removing agent session tracking hooks for Codex. {Locked="Codex","hooks"}</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>
diff --git a/src/cascadia/TerminalSettingsEditor/Resources/uk-UA/Resources.resw b/src/cascadia/TerminalSettingsEditor/Resources/uk-UA/Resources.resw
index 568203d78..366a6dc57 100644
--- a/src/cascadia/TerminalSettingsEditor/Resources/uk-UA/Resources.resw
+++ b/src/cascadia/TerminalSettingsEditor/Resources/uk-UA/Resources.resw
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <root>
   <!-- 
     Microsoft ResX Schema 
@@ -2544,6 +2544,10 @@
     <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>Removing Codex hooks...</value>
+    <comment>Status summary shown while removing agent session tracking hooks for Codex. {Locked="Codex","hooks"}</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>
diff --git a/src/cascadia/TerminalSettingsEditor/Resources/zh-CN/Resources.resw b/src/cascadia/TerminalSettingsEditor/Resources/zh-CN/Resources.resw
index 8269f6c51..eb532a32c 100644
--- a/src/cascadia/TerminalSettingsEditor/Resources/zh-CN/Resources.resw
+++ b/src/cascadia/TerminalSettingsEditor/Resources/zh-CN/Resources.resw
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <root>
   <!-- 
     Microsoft ResX Schema 
@@ -2899,6 +2899,10 @@
     <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>Removing Codex hooks...</value>
+    <comment>Status summary shown while removing agent session tracking hooks for Codex. {Locked="Codex","hooks"}</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>
diff --git a/src/cascadia/TerminalSettingsEditor/Resources/zh-TW/Resources.resw b/src/cascadia/TerminalSettingsEditor/Resources/zh-TW/Resources.resw
index da8ec36d1..9ab139b0e 100644
--- a/src/cascadia/TerminalSettingsEditor/Resources/zh-TW/Resources.resw
+++ b/src/cascadia/TerminalSettingsEditor/Resources/zh-TW/Resources.resw
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <root>
   <!-- 
     Microsoft ResX Schema 
@@ -2822,6 +2822,10 @@
     <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>Removing Codex hooks...</value>
+    <comment>Status summary shown while removing agent session tracking hooks for Codex. {Locked="Codex","hooks"}</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>
diff --git a/tools/wta/src/agent_hooks_installer.rs b/tools/wta/src/agent_hooks_installer.rs
index 3a0bc7566..6e9261897 100644
--- a/tools/wta/src/agent_hooks_installer.rs
+++ b/tools/wta/src/agent_hooks_installer.rs
@@ -1487,7 +1487,7 @@ fn parse_gemini_extensions_list_json(stdout: &str) -> Option<PluginPresence> {
 /// exists, and `root_path` is the remainder of that row trimmed.
 fn parse_codex_marketplace_list(stdout: &str) -> (bool, Option<String>) {
     for line in stdout.lines() {
-       let line = line.trim_end();
+       let line = line.trim();
        // Skip header and blank lines.
        if line.is_empty() || line.starts_with("MARKETPLACE") {
            continue;
@@ -1537,10 +1537,11 @@ fn parse_codex_plugin_list(stdout: &str) -> bool {
        if rest.is_empty() {
            return false;
        }
-       // Status column starts here. "not installed" → not installed.
-       // Any "installed*" status (installed / installed, enabled /
-       // installed, disabled) counts as installed.
-       return rest[0] != "not";
+       // Status column starts here. Only an "installed*" status
+       // (installed / installed, enabled / installed, disabled)
+       // counts as installed — "not installed", "available", and
+       // any other status mean the plugin is not active.
+       return rest[0].starts_with("installed");
     }
     false
 }
@@ -2410,10 +2411,11 @@ fn paths_equivalent(a: &Path, b: &Path) -> bool {
 }
 
 // ---------------------------------------------------------------------------
-// ---------------------------------------------------------------------------
-// Codex placeholders — replaced by Tasks 7 and 8 with real implementations.
-// They are correct as "not installed" responses so runtime behavior stays
-// safe between slice-B Rust commits.
+// Codex status: CLI-parse path (`codex plugin marketplace list` +
+// `codex plugin list`) with a filesystem fallback when the binary
+// isn't on PATH. Both helpers default to a safe "not installed"
+// response on any IO / parse failure so runtime behavior stays
+// conservative.
 // ---------------------------------------------------------------------------
 
 fn codex_status(on_path: bool, bin_path: Option<String>, home: Option<&Path>) -> CliStatus {
diff --git a/tools/wta/src/history_loader.rs b/tools/wta/src/history_loader.rs
index 0faac0b12..5e2ae74db 100644
--- a/tools/wta/src/history_loader.rs
+++ b/tools/wta/src/history_loader.rs
@@ -730,7 +730,7 @@ fn read_codex_session_meta(path: &Path) -> Option<CodexSessionMeta> {
     Some(CodexSessionMeta {
         id:        payload.get("id")?.as_str()?.to_string(),
         cwd:       PathBuf::from(payload.get("cwd")?.as_str()?),
-        timestamp: ts_str.and_then(parse_iso_to_systemtime),
+        timestamp: ts_str.and_then(parse_iso_to_system_time),
     })
 }
 
@@ -851,9 +851,14 @@ fn find_codex_rollout_by_id(home: &Path, id: &str) -> Option<PathBuf> {
 }
 
 /// Parse a subset of ISO 8601 timestamps into `SystemTime`.
-/// Handles: `YYYY-MM-DDTHH:MM:SSZ` and `YYYY-MM-DDTHH:MM:SS.fffZ`
-/// (the shapes Codex session_meta emits).
-fn parse_iso_to_systemtime(s: &str) -> Option<SystemTime> {
+///
+/// Handles the UTC shapes Codex `session_meta` emits
+/// (`YYYY-MM-DDTHH:MM:SSZ` and `YYYY-MM-DDTHH:MM:SS.fffZ`) plus the
+/// numeric colon-separated offset variants (`±HH:MM`), e.g.
+/// `2026-05-27T10:53:09+08:00`.
+/// Returns `None` for any out-of-range / overflowing / malformed input
+/// (never panics).
+fn parse_iso_to_system_time(s: &str) -> Option<SystemTime> {
     let s = s.trim();
     
     // Detect and parse timezone offset (+HH:MM or -HH:MM, or Z for UTC)
@@ -869,6 +874,11 @@ fn parse_iso_to_systemtime(s: &str) -> Option<SystemTime> {
                 if hm.len() == 5 && hm.chars().nth(2) == Some(':') {
                     let hh: i32 = hm.get(..2)?.parse().ok()?;
                     let mm: i32 = hm.get(3..)?.parse().ok()?;
+                    // Reject out-of-range offsets (e.g. `+99:99`) so they
+                    // don't silently skew the timestamp.
+                    if !(0..=23).contains(&hh) || !(0..=59).contains(&mm) {
+                        return None;
+                    }
                     let total_seconds = hh * 3600 + mm * 60;
                     if offset_part.starts_with('-') { -total_seconds } else { total_seconds }
                 } else {
@@ -905,8 +915,10 @@ fn parse_iso_to_systemtime(s: &str) -> Option<SystemTime> {
     let min: u64 = time_iter.next()?.parse().ok()?;
     let sec: u64 = time_iter.next()?.parse().ok()?;
 
-    // Pre-1970 underflow check
-    if year < 1970 {
+    // Pre-1970 underflow check, and bound the year so the day/seconds
+    // arithmetic below cannot overflow u64 (the documented subset of
+    // ISO 8601 only needs 4-digit years anyway).
+    if year < 1970 || year > 9999 {
         return None;
     }
 
@@ -950,7 +962,9 @@ fn parse_iso_to_systemtime(s: &str) -> Option<SystemTime> {
     if secs < 0 {
         return None;
     }
-    Some(SystemTime::UNIX_EPOCH + std::time::Duration::from_secs(secs as u64))
+    // `checked_add` so malformed / far-future timestamps fail closed
+    // (return `None`) instead of panicking on overflow.
+    SystemTime::UNIX_EPOCH.checked_add(std::time::Duration::from_secs(secs as u64))
 }
 
 // ─── Helpers ────────────────────────────────────────────────────────────
@@ -2413,48 +2427,48 @@ mod tests {
     #[test]
     fn parse_iso_handles_positive_offset() {
         // 2026-05-27T10:53:09+08:00 is 2026-05-27T02:53:09Z
-        let t1 = parse_iso_to_systemtime("2026-05-27T10:53:09+08:00").unwrap();
-        let t2 = parse_iso_to_systemtime("2026-05-27T02:53:09Z").unwrap();
+        let t1 = parse_iso_to_system_time("2026-05-27T10:53:09+08:00").unwrap();
+        let t2 = parse_iso_to_system_time("2026-05-27T02:53:09Z").unwrap();
         assert_eq!(t1, t2);
     }
 
     #[test]
     fn parse_iso_handles_negative_offset() {
         // 2026-05-27T02:53:09-05:00 is 2026-05-27T07:53:09Z
-        let t1 = parse_iso_to_systemtime("2026-05-27T02:53:09-05:00").unwrap();
-        let t2 = parse_iso_to_systemtime("2026-05-27T07:53:09Z").unwrap();
+        let t1 = parse_iso_to_system_time("2026-05-27T02:53:09-05:00").unwrap();
+        let t2 = parse_iso_to_system_time("2026-05-27T07:53:09Z").unwrap();
         assert_eq!(t1, t2);
     }
 
     #[test]
     fn parse_iso_rejects_pre_1970_years() {
-        assert!(parse_iso_to_systemtime("1969-12-31T23:59:59Z").is_none());
+        assert!(parse_iso_to_system_time("1969-12-31T23:59:59Z").is_none());
     }
 
     #[test]
     fn parse_iso_rejects_invalid_month() {
-        assert!(parse_iso_to_systemtime("2026-13-01T00:00:00Z").is_none());
-        assert!(parse_iso_to_systemtime("2026-00-01T00:00:00Z").is_none());
+        assert!(parse_iso_to_system_time("2026-13-01T00:00:00Z").is_none());
+        assert!(parse_iso_to_system_time("2026-00-01T00:00:00Z").is_none());
     }
 
     #[test]
     fn parse_iso_rejects_invalid_day_for_month() {
-        assert!(parse_iso_to_systemtime("2026-02-30T00:00:00Z").is_none());
-        assert!(parse_iso_to_systemtime("2026-05-32T00:00:00Z").is_none());
-        assert!(parse_iso_to_systemtime("2026-04-31T00:00:00Z").is_none()); // April has 30
+        assert!(parse_iso_to_system_time("2026-02-30T00:00:00Z").is_none());
+        assert!(parse_iso_to_system_time("2026-05-32T00:00:00Z").is_none());
+        assert!(parse_iso_to_system_time("2026-04-31T00:00:00Z").is_none()); // April has 30
     }
 
     #[test]
     fn parse_iso_rejects_invalid_time_components() {
-        assert!(parse_iso_to_systemtime("2026-05-28T25:30:00Z").is_none());
-        assert!(parse_iso_to_systemtime("2026-05-28T10:60:00Z").is_none());
-        assert!(parse_iso_to_systemtime("2026-05-28T10:30:60Z").is_none());
+        assert!(parse_iso_to_system_time("2026-05-28T25:30:00Z").is_none());
+        assert!(parse_iso_to_system_time("2026-05-28T10:60:00Z").is_none());
+        assert!(parse_iso_to_system_time("2026-05-28T10:30:60Z").is_none());
     }
 
     #[test]
-    fn parse_iso_accepts_feb_29_leap_year() {
+    fn parse_iso_accepts_february_29_leap_year() {
         // 2024 IS a leap year; 2023 is not.
-        assert!(parse_iso_to_systemtime("2024-02-29T00:00:00Z").is_some());
-        assert!(parse_iso_to_systemtime("2023-02-29T00:00:00Z").is_none());
+        assert!(parse_iso_to_system_time("2024-02-29T00:00:00Z").is_some());
+        assert!(parse_iso_to_system_time("2023-02-29T00:00:00Z").is_none());
     }
 }
diff --git a/tools/wta/src/session_registry.rs b/tools/wta/src/session_registry.rs
index de972f231..4cac411a7 100644
--- a/tools/wta/src/session_registry.rs
+++ b/tools/wta/src/session_registry.rs
@@ -2186,14 +2186,14 @@ mod tests {
         let cli = CliSource::from_agent_id("codex")
             .expect("from_agent_id('codex') must yield Some(Codex)");
         let event = SessionEvent::SessionStarted {
-            key: "codex-fanin-test".to_string(),
+            key: "codex-fan-in-test".to_string(),
             cli_source: cli.clone(),
             pane_session_id: "p1".to_string(),
             cwd: PathBuf::from(r#"C:\x"#),
             title: "fan-in test".to_string(),
         };
         reg.apply_event(event).await;
-        let row = reg.lookup(&acp::SessionId::new("codex-fanin-test")).await.expect("row inserted");
+        let row = reg.lookup(&acp::SessionId::new("codex-fan-in-test")).await.expect("row inserted");
         assert_eq!(row.cli_source, Some(CliSource::Codex));
     }
 
diff --git a/tools/wta/wt-agent-hooks/codex/plugins/wt-agent-hooks/hooks/send-event.ps1 b/tools/wta/wt-agent-hooks/codex/plugins/wt-agent-hooks/hooks/send-event.ps1
index 3e7b62a5d..830f677f6 100644
--- a/tools/wta/wt-agent-hooks/codex/plugins/wt-agent-hooks/hooks/send-event.ps1
+++ b/tools/wta/wt-agent-hooks/codex/plugins/wt-agent-hooks/hooks/send-event.ps1
@@ -1,11 +1,11 @@
 # send-event.ps1 — Telemetry hook for WTA agent session tracking.
 #
 # ── EXIT-CODE CONTRACT ──────────────────────────────────────────────────
-# This script MUST exit 0 unconditionally. It is wired to Claude / Copilot
+# This script MUST exit 0 unconditionally. It is wired to Codex
 # PreToolUse, UserPromptSubmit, Stop, SubagentStop, and other lifecycle
 # events where a non-zero exit has *semantic* consequences:
 #   * Exit 2  → blocks the tool call / erases the user prompt /
-#               forces Claude to keep going past Stop
+#               forces Codex to keep going past Stop
 #   * Other   → shows "<hook> hook error" + first line of stderr in the
 #               transcript on every fire
 # Two guarantees defend the contract:
@@ -24,10 +24,12 @@
 #
 # ── CLI-source identification ───────────────────────────────────────────
 # The installer hard-codes which CLI invokes this script via the
-# `-CliSource` parameter (claude / copilot / gemini). That is the
-# ONLY reliable signal — env-var heuristics are unreliable because
-# Copilot CLI inherits Claude's plugin shape and sets CLAUDE_PLUGIN_ROOT,
-# making it indistinguishable from a real Claude run by env vars alone.
+# `-CliSource` parameter (claude / codex / copilot / gemini). This
+# bundle is the Codex variant and passes `-CliSource codex` from
+# `hooks.json`. That parameter is the ONLY reliable signal — env-var
+# heuristics are unreliable because Copilot CLI inherits Claude's
+# plugin shape and sets CLAUDE_PLUGIN_ROOT, making it indistinguishable
+# from a real Claude run by env vars alone.
 param(
     [string]$EventType = "agent.hook",
     [string]$CliSource = ""