diff --git a/.claude/agents/ad-run-agent.md b/.claude/agents/ad-run-agent.md
index a1d534eb2c35..8663bf0167bc 100644
--- a/.claude/agents/ad-run-agent.md
+++ b/.claude/agents/ad-run-agent.md
@@ -1,11 +1,11 @@
 ---
 name: ad-run-agent
-description: Run AutoDeploy build and run command for a given model using gpu-shell
-tools: Read, Grep, Glob, Bash, Write, Edit, gpu-shell
+description: Run AutoDeploy build and run command for a given model
+tools: Read, Grep, Glob, Bash, Write, Edit
 model: sonnet
 ---
 
-Run a model with AutoDeploy using gpu-shell. If you are not given the model-id and a short description of the run, ask the user/caller first.
+Run a model with AutoDeploy. If you are not given the model-id and a short description of the run, ask the user/caller first.
 
 ## Prerequisites — Model Registry Entry
 
@@ -43,7 +43,7 @@ Look up the model in `examples/auto_deploy/model_registry/models.yaml` and find
 
 **Step 2 — Check GPU availability via `nvidia-smi`:**
 
-Run via gpu-shell:
+Run via Bash:
 ```bash
 nvidia-smi --query-gpu=index,memory.used,utilization.gpu --format=csv,noheader,nounits
 ```
@@ -57,7 +57,7 @@ A GPU is considered **free** if its memory usage is below ~1000 MiB and utilizat
 
 ### 1. Run the AD build and run command
 
-Execute via gpu-shell since it requires GPU access:
+Execute via Bash:
 ```bash
 CUDA_VISIBLE_DEVICES=<SELECTED_GPUS> AD_DUMP_GRAPHS_DIR=<AD_DUMP_GRAPHS_DIR> \
   python examples/auto_deploy/build_and_run_ad.py \
@@ -120,4 +120,4 @@ Then append the first entry.
 - Always ask for the run description from the caller before starting.
 - Before running, verify the model has a valid entry in `examples/auto_deploy/model_registry/models.yaml`. If missing, create one.
 - If it failed, show the relevant error and suggest next steps.
-- Remember to use your own tools — Read, Grep, Glob, Bash, Write, Edit, gpu-shell
+- Remember to use your own tools — Read, Grep, Glob, Bash, Write, Edit
diff --git a/.codex/agents/ad_debug_agent.toml b/.codex/agents/ad_debug_agent.toml
index cf2b00321dc0..1502b35d0082 100644
--- a/.codex/agents/ad_debug_agent.toml
+++ b/.codex/agents/ad_debug_agent.toml
@@ -39,5 +39,5 @@ Common pitfalls:
 - HF safetensors weights may not match what the AD custom modeling code expects. Verify load hooks and inspect the safetensors index json when relevant.
 - Custom model module hierarchies may differ from the checkpoint hierarchy. In that case, update the AD custom modeling code to match the expected hierarchy.
 
-Use your own tools to read files, search, edit, and run shell commands. If GPU access is required, use the available execution path in this environment rather than assuming a separate gpu-shell tool exists.
+Use your own tools to read files, search, edit, and run shell commands.
 """
diff --git a/.codex/agents/ad_run_agent.toml b/.codex/agents/ad_run_agent.toml
index 635bdaed8129..1c4d841859fc 100644
--- a/.codex/agents/ad_run_agent.toml
+++ b/.codex/agents/ad_run_agent.toml
@@ -64,5 +64,5 @@ If the worklog does not exist, create it with this header first:
 
 Notes:
 - If the run fails, show the relevant error and suggest next steps.
-- Use the available shell execution path in this environment for GPU-capable commands rather than assuming a separate gpu-shell tool exists.
+- Use the standard shell execution path for GPU-capable commands.
 """