From b7c0f269109f15331ccd8d4efd23377e5fe69aed Mon Sep 17 00:00:00 2001
From: jif-oai <jif@openai.com>
Date: Tue, 28 Apr 2026 13:06:41 +0200
Subject: [PATCH] feat: fix hinting 2 (#19961)

Fix this:
https://github.com/openai/codex/pull/19805#discussion_r3153265562
---
 codex-rs/core/src/session/multi_agents.rs | 13 +++++++++++--
 1 file changed, 11 insertions(+), 2 deletions(-)

diff --git a/codex-rs/core/src/session/multi_agents.rs b/codex-rs/core/src/session/multi_agents.rs
index c94f89602..2820b5ff5 100644
--- a/codex-rs/core/src/session/multi_agents.rs
+++ b/codex-rs/core/src/session/multi_agents.rs
@@ -1,6 +1,7 @@
 use crate::session::turn_context::TurnContext;
 use codex_features::Feature;
 use codex_protocol::protocol::SessionSource;
+use codex_protocol::protocol::SubAgentSource;
 
 pub(super) fn usage_hint_text<'a>(
     turn_context: &'a TurnContext,
@@ -12,7 +13,15 @@ pub(super) fn usage_hint_text<'a>(
 
     let multi_agent_v2 = &turn_context.config.multi_agent_v2;
     match session_source {
-        SessionSource::SubAgent(_) => multi_agent_v2.subagent_usage_hint_text.as_deref(),
-        _ => multi_agent_v2.root_agent_usage_hint_text.as_deref(),
+        SessionSource::SubAgent(SubAgentSource::ThreadSpawn { .. }) => {
+            multi_agent_v2.subagent_usage_hint_text.as_deref()
+        }
+        SessionSource::Cli
+        | SessionSource::VSCode
+        | SessionSource::Exec
+        | SessionSource::Mcp
+        | SessionSource::Custom(_)
+        | SessionSource::Unknown => multi_agent_v2.root_agent_usage_hint_text.as_deref(),
+        SessionSource::SubAgent(_) => None,
     }
 }