From 142f84b82c59f5557e9436d1a09534c07e56cb10 Mon Sep 17 00:00:00 2001
From: Waishnav <86405648+Waishnav@users.noreply.github.com>
Date: Thu, 10 Sep 2026 16:13:50 +0530
Subject: [PATCH] fix(cli): clarify subagent setup language

---
 README.md     |  6 +++++-
 docs/setup.md | 10 ++++++++--
 src/cli.ts    |  9 ++++++---
 3 files changed, 19 insertions(+), 6 deletions(-)

diff --git a/README.md b/README.md
index fed1d204..d307e707 100644
--- a/README.md
+++ b/README.md
@@ -83,7 +83,11 @@ npx @waishnav/devspace init
 During setup, DevSpace asks for:
 
 - where you will use it: ChatGPT, Coding Agents, or both
-- which Coding Agents DevSpace may use
+- which agents DevSpace may use as subagents
+
+The first choice is where you invoke DevSpace from. The subagent choice is
+separate: ChatGPT or another coding agent can delegate work through DevSpace to
+the agents you select there.
 
 If you select ChatGPT, setup also asks which local project folders it may open
 and for your public HTTPS base URL from Cloudflare Tunnel, ngrok, Pinggy,
diff --git a/docs/setup.md b/docs/setup.md
index 9d1f7e97..3cbc968a 100644
--- a/docs/setup.md
+++ b/docs/setup.md
@@ -27,6 +27,8 @@ The setup flow asks one question at a time.
 
 First choose where you will use DevSpace: ChatGPT, Coding Agents, or both.
 DevSpace uses that answer to skip setup that does not apply to you.
+This selects where you invoke DevSpace from. It does not control which agents
+DevSpace may run for delegated work.
 
 ### Project roots
 
@@ -52,12 +54,16 @@ commands use the current Git project, or the current directory outside a
 repository, with the authority of your local shell. MCP workspace operations
 remain limited to the roots configured for ChatGPT.
 
-### Coding Agents
+### Subagents
 
-Setup detects supported Coding Agents and asks which ones DevSpace may use.
+Setup detects supported agents and asks which ones DevSpace may use as
+subagents. ChatGPT or another coding agent can delegate work through DevSpace
+to the agents selected here.
 These choices are stored as provider objects under `subagents` in
 `~/.devspace/config.jsonc`.
 
+### Coding Agents
+
 If you selected Coding Agents, setup prints:
 
 ```bash
diff --git a/src/cli.ts b/src/cli.ts
index 418350d8..3037f65e 100644
--- a/src/cli.ts
+++ b/src/cli.ts
@@ -159,7 +159,7 @@ async function runInit({ force }: { force: boolean }): Promise<void> {
     prompts.intro("DevSpace setup");
 
     const destinationAnswer = await prompts.multiselect({
-      message: "Where will you use DevSpace?",
+      message: "Where do you want to use DevSpace?",
       options: [
         {
           value: "chatgpt",
@@ -231,8 +231,11 @@ async function runInit({ force }: { force: boolean }): Promise<void> {
       : availability
           .filter((provider) => provider.available)
           .map((provider) => provider.name);
+    prompts.log.info(
+      "DevSpace can delegate work to these agents from ChatGPT or another coding agent.",
+    );
     const providerAnswer = await prompts.multiselect({
-      message: "Which Coding Agents should be available?",
+      message: "Which agents can DevSpace use as subagents?",
       options: availability.map((provider) => ({
         value: provider.name,
         label: provider.name,
@@ -268,7 +271,7 @@ async function runInit({ force }: { force: boolean }): Promise<void> {
 
     const lines = [
       ...(allowedRoots ? [`Project folders: ${allowedRoots.join(", ")}`] : []),
-      `Coding Agents: ${selectedProviders.join(", ")}`,
+      `Subagents: ${selectedProviders.join(", ")}`,
       ...(publicBaseUrl ? [`ChatGPT connection URL: ${publicBaseUrl}/mcp`] : []),
     ];
     prompts.note(lines.join("\n"), "DevSpace is ready");