diff --git a/ToolboxStack/output/toolbox-base/Dockerfile b/ToolboxStack/output/toolbox-base/Dockerfile
index e11090b..135bc85 100644
--- a/ToolboxStack/output/toolbox-base/Dockerfile
+++ b/ToolboxStack/output/toolbox-base/Dockerfile
@@ -123,6 +123,7 @@ RUN chown "${USER_ID}:${GROUP_ID}" /tmp/aqua.yaml \
     && su - "${USERNAME}" -c 'AQUA_GLOBAL_CONFIG=~/.config/aquaproj-aqua/aqua.yaml aqua install'
 
 # Install AI CLI tools via npm using mise to ensure Node.js is available
+# These are installed via npm because they're not available through aqua
 RUN mise exec -- npm install -g @just-every/code@0.4.6 @qwen-code/qwen-code@0.1.1 @google/gemini-cli@0.11.0 @openai/codex@0.50.0 opencode-ai@0.15.29
 
 # Install the same AI CLI tools for the toolbox user so they are available in the container runtime
diff --git a/ToolboxStack/output/toolbox-base/aqua.yaml b/ToolboxStack/output/toolbox-base/aqua.yaml
index 4b241b5..308d7a1 100644
--- a/ToolboxStack/output/toolbox-base/aqua.yaml
+++ b/ToolboxStack/output/toolbox-base/aqua.yaml
@@ -37,3 +37,10 @@ packages:
   
   # Diagram generation
   - name: yuzutech/kroki-cli@0.10.0
+  
+  # AI CLI tools (baked into image)
+  - name: just-every/code@0.4.6
+  - name: QwenLM/qwen-code@0.1.1
+  - name: google-gemini/gemini-cli@0.11.0
+  - name: openai/codex@0.50.0
+  - name: sst/opencode@0.15.29