Clarify collaboration-mode semantics in prompts to prevent mode confusion

codex-rs/core/gpt-5.1-codex-max_prompt.md

@@ -25,6 +25,13 @@ When using the planning tool:
 - Do not make single-step plans.
 - When you made a plan, update it after having performed one of the sub-tasks that you shared on the plan.
 
+## Collaboration modes
+
+- Mode-specific behavior is provided through developer instructions, typically wrapped in `<collaboration_mode>...</collaboration_mode>`.
+- Treat the most recent collaboration-mode developer instruction as the active mode.
+- A mode changes only when new developer instructions change it; user requests or tool descriptions do not change mode by themselves.
+- Known mode names are Default and Plan
+
 ## Special user requests
 
 - If the user makes a simple request (such as asking for the time) which you can fulfill by running a terminal command (such as `date`), you should do so.

codex-rs/core/gpt-5.2-codex_prompt.md

@@ -25,6 +25,13 @@ When using the planning tool:
 - Do not make single-step plans.
 - When you made a plan, update it after having performed one of the sub-tasks that you shared on the plan.
 
+## Collaboration modes
+
+- Mode-specific behavior is provided through developer instructions, typically wrapped in `<collaboration_mode>...</collaboration_mode>`.
+- Treat the most recent collaboration-mode developer instruction as the active mode.
+- A mode changes only when new developer instructions change it; user requests or tool descriptions do not change mode by themselves.
+- Known mode names are Default and Plan
+
 ## Special user requests
 
 - If the user makes a simple request (such as asking for the time) which you can fulfill by running a terminal command (such as `date`), you should do so.

codex-rs/core/gpt_5_1_prompt.md

@@ -133,6 +133,13 @@ Example 3:
 
 If you need to write a plan, only write high quality plans, not low quality ones.
 
+## Collaboration modes
+
+- Mode-specific behavior is provided through developer instructions, typically wrapped in `<collaboration_mode>...</collaboration_mode>`.
+- Treat the most recent collaboration-mode developer instruction as the active mode.
+- A mode changes only when new developer instructions change it; user requests or tool descriptions do not change mode by themselves.
+- Known mode names are Default and Plan
+
 ## Task execution
 
 You are a coding agent. You must keep going until the query or task is completely resolved, before ending your turn and yielding back to the user. Persist until the task is fully handled end-to-end within the current turn whenever feasible and persevere even when function calls fail. Only terminate your turn when you are sure that the problem is solved. Autonomously resolve the query to the best of your ability, using the tools available to you, before coming back to the user. Do NOT guess or make up an answer.

codex-rs/core/gpt_5_2_prompt.md

@@ -106,6 +106,13 @@ Example 3:
 
 If you need to write a plan, only write high quality plans, not low quality ones.
 
+## Collaboration modes
+
+- Mode-specific behavior is provided through developer instructions, typically wrapped in `<collaboration_mode>...</collaboration_mode>`.
+- Treat the most recent collaboration-mode developer instruction as the active mode.
+- A mode changes only when new developer instructions change it; user requests or tool descriptions do not change mode by themselves.
+- Known mode names are Default and Plan
+
 ## Task execution
 
 You are a coding agent. You must keep going until the query or task is completely resolved, before ending your turn and yielding back to the user. Persist until the task is fully handled end-to-end within the current turn whenever feasible and persevere even when function calls fail. Only terminate your turn when you are sure that the problem is solved. Autonomously resolve the query to the best of your ability, using the tools available to you, before coming back to the user. Do NOT guess or make up an answer.

codex-rs/core/gpt_5_codex_prompt.md

@@ -25,6 +25,13 @@ When using the planning tool:
 - Do not make single-step plans.
 - When you made a plan, update it after having performed one of the sub-tasks that you shared on the plan.
 
+## Collaboration modes
+
+- Mode-specific behavior is provided through developer instructions, typically wrapped in `<collaboration_mode>...</collaboration_mode>`.
+- Treat the most recent collaboration-mode developer instruction as the active mode.
+- A mode changes only when new developer instructions change it; user requests or tool descriptions do not change mode by themselves.
+- Known mode names are Default and Plan
+
 ## Special user requests
 
 - If the user makes a simple request (such as asking for the time) which you can fulfill by running a terminal command (such as `date`), you should do so.

codex-rs/core/prompt.md

@@ -120,6 +120,13 @@ Example 3:
 
 If you need to write a plan, only write high quality plans, not low quality ones.
 
+## Collaboration modes
+
+- Mode-specific behavior is provided through developer instructions, typically wrapped in `<collaboration_mode>...</collaboration_mode>`.
+- Treat the most recent collaboration-mode developer instruction as the active mode.
+- A mode changes only when new developer instructions change it; user requests or tool descriptions do not change mode by themselves.
+- Known mode names are Default and Plan
+
 ## Task execution
 
 You are a coding agent. Please keep going until the query is completely resolved, before ending your turn and yielding back to the user. Only terminate your turn when you are sure that the problem is solved. Autonomously resolve the query to the best of your ability, using the tools available to you, before coming back to the user. Do NOT guess or make up an answer.

codex-rs/core/prompt_with_apply_patch_instructions.md

@@ -120,6 +120,13 @@ Example 3:
 
 If you need to write a plan, only write high quality plans, not low quality ones.
 
+## Collaboration modes
+
+- Mode-specific behavior is provided through developer instructions, typically wrapped in `<collaboration_mode>...</collaboration_mode>`.
+- Treat the most recent collaboration-mode developer instruction as the active mode.
+- A mode changes only when new developer instructions change it; user requests or tool descriptions do not change mode by themselves.
+- Known mode names are Default and Plan
+
 ## Task execution
 
 You are a coding agent. Please keep going until the query is completely resolved, before ending your turn and yielding back to the user. Only terminate your turn when you are sure that the problem is solved. Autonomously resolve the query to the best of your ability, using the tools available to you, before coming back to the user. Do NOT guess or make up an answer.

codex-rs/core/src/tools/handlers/request_user_input.rs

@@ -56,7 +56,7 @@ pub(crate) fn request_user_input_unavailable_message(mode: ModeKind) -> Option<S
 pub(crate) fn request_user_input_tool_description() -> String {
     let allowed_modes = format_allowed_modes();
     format!(
-        "Request user input for one to three short questions and wait for the response. This tool is only available in {allowed_modes}."
+        "Request user input for one to three short questions and wait for the response. This tool is only available when the active collaboration mode is {allowed_modes}. The active mode is set by developer instructions."
     )
 }
 
@@ -173,7 +173,7 @@ mod tests {
     fn request_user_input_tool_description_mentions_plan_only() {
         assert_eq!(
             request_user_input_tool_description(),
-            "Request user input for one to three short questions and wait for the response. This tool is only available in Plan mode.".to_string()
+            "Request user input for one to three short questions and wait for the response. This tool is only available when the active collaboration mode is Plan mode. The active mode is set by developer instructions.".to_string()
         );
     }
 }

codex-rs/core/templates/model_instructions/gpt-5.2-codex_instructions_template.md

@@ -61,6 +61,13 @@ When using the planning tool:
 - Do not make single-step plans.
 - When you made a plan, update it after having performed one of the sub-tasks that you shared on the plan.
 
+## Collaboration modes
+
+- Mode-specific behavior is provided through developer instructions, typically wrapped in `<collaboration_mode>...</collaboration_mode>`.
+- Treat the most recent collaboration-mode developer instruction as the active mode.
+- A mode changes only when new developer instructions change it; user requests or tool descriptions do not change mode by themselves.
+- Known mode names are Default and Plan
+
 ## Special user requests
 
 - If the user makes a simple request (such as asking for the time) which you can fulfill by running a terminal command (such as `date`), you should do so.