Clarify headless app-server worker naming

Author: willwashburn

crates/broker/src/cli/mod.rs

@@ -25,7 +25,9 @@ enum Commands {
     Init(InitCommand),
     Pty(PtyCommand),
     Headless(HeadlessCommand),
-    AppServer(AppServerCommand),
+    /// Internal: headless worker shim for app-server-backed harnesses.
+    #[command(name = "app-server", hide = true)]
+    HeadlessAppServer(HeadlessAppServerCommand),
     /// Compute MCP injection args and side-effect config file paths for a CLI
     /// without spawning it. Outputs JSON to stdout.
     McpArgs(McpArgsCommand),
@@ -53,7 +55,7 @@ impl Commands {
             Commands::Init(_) => "init",
             Commands::Pty(_) => "pty",
             Commands::Headless(_) => "headless",
-            Commands::AppServer(_) => "app_server",
+            Commands::HeadlessAppServer(_) => "app_server",
             Commands::McpArgs(_) => "mcp_args",
             Commands::Swarm(_) => "swarm",
             Commands::DumpPty(_) => "dump_pty",
@@ -88,8 +90,8 @@ impl Commands {
             }
             Commands::Headless(cmd) => non_empty_name(cmd.agent_name.as_deref())
                 .unwrap_or_else(|| format!("headless-{pid}")),
-            Commands::AppServer(cmd) => non_empty_name(cmd.agent_name.as_deref())
-                .unwrap_or_else(|| format!("app_server-{pid}")),
+            Commands::HeadlessAppServer(cmd) => non_empty_name(cmd.agent_name.as_deref())
+                .unwrap_or_else(|| format!("headless-app-server-{pid}")),
             Commands::Wrap { cli, .. } => format!("wrap-{cli}-{pid}"),
             Commands::McpArgs(_) => format!("mcp_args-{pid}"),
             Commands::DumpPty(cmd) => format!("dump_pty-{}-{}", cmd.name, pid),
@@ -118,7 +120,7 @@ pub(crate) async fn run() -> Result<()> {
         Commands::Init(cmd) => runtime::run_init(cmd, telemetry).await,
         Commands::Pty(cmd) => pty_worker::run_pty_worker(cmd).await,
         Commands::Headless(cmd) => runtime::run_headless_worker(cmd).await,
-        Commands::AppServer(cmd) => runtime::run_app_server_worker(cmd).await,
+        Commands::HeadlessAppServer(cmd) => runtime::run_headless_app_server_worker(cmd).await,
         Commands::McpArgs(cmd) => cli_mcp_args::run_mcp_args(cmd).await,
         Commands::Swarm(args) => swarm::run_swarm(args).await,
         Commands::DumpPty(cmd) => runtime::run_dump_pty(cmd).await,
@@ -277,7 +279,7 @@ pub(crate) struct HeadlessCommand {
 }
 
 #[derive(Debug, clap::Args, Clone)]
-pub(crate) struct AppServerCommand {
+pub(crate) struct HeadlessAppServerCommand {
     #[arg(long)]
     pub(crate) protocol: String,
 

crates/broker/src/runtime/app_server.rs

@@ -10,7 +10,7 @@ struct AppServerAuthConfig {
 
 const APP_SERVER_HTTP_TIMEOUT: Duration = Duration::from_secs(30);
 
-pub(crate) async fn run_app_server_worker(cmd: AppServerCommand) -> Result<()> {
+pub(crate) async fn run_headless_app_server_worker(cmd: HeadlessAppServerCommand) -> Result<()> {
     let protocol = cmd.protocol.trim().to_ascii_lowercase();
     let endpoint = cmd.endpoint.trim().trim_end_matches('/').to_string();
     let session_id = cmd.session_id.clone();

crates/broker/src/runtime/mod.rs

@@ -49,7 +49,9 @@ use crate::{
     },
 };
 
-use crate::cli::{AppServerCommand, DumpPtyCommand, DumpPtyFormat, HeadlessCommand, InitCommand};
+use crate::cli::{
+    DumpPtyCommand, DumpPtyFormat, HeadlessAppServerCommand, HeadlessCommand, InitCommand,
+};
 use crate::worker::{WorkerEvent, WorkerHandle, WorkerRegistry};
 use crate::{broker, listen_api, routing, worker_request};