feat: add agent env flag to enable/disable project discovery

DanielleMaywood · DanielleMaywood · commit a5ec3c47b85a · 2025-07-22T16:03:12.000Z
diff --git a/agent/agent.go b/agent/agent.go
@@ -339,7 +339,6 @@ func (a *agent) init() {
 	containerAPIOpts := []agentcontainers.Option{
 		agentcontainers.WithExecer(a.execer),
 		agentcontainers.WithCommandEnv(a.sshServer.CommandEnv),
-		agentcontainers.WithProjectDiscovery(true),
 		agentcontainers.WithScriptLogger(func(logSourceID uuid.UUID) agentcontainers.ScriptLogger {
 			return a.logSender.GetScriptLogger(logSourceID)
 		}),
diff --git a/cli/agent.go b/cli/agent.go
@@ -40,22 +40,23 @@ import (
 
 func (r *RootCmd) workspaceAgent() *serpent.Command {
 	var (
-		auth                string
-		logDir              string
-		scriptDataDir       string
-		pprofAddress        string
-		noReap              bool
-		sshMaxTimeout       time.Duration
-		tailnetListenPort   int64
-		prometheusAddress   string
-		debugAddress        string
-		slogHumanPath       string
-		slogJSONPath        string
-		slogStackdriverPath string
-		blockFileTransfer   bool
-		agentHeaderCommand  string
-		agentHeader         []string
-		devcontainers       bool
+		auth                         string
+		logDir                       string
+		scriptDataDir                string
+		pprofAddress                 string
+		noReap                       bool
+		sshMaxTimeout                time.Duration
+		tailnetListenPort            int64
+		prometheusAddress            string
+		debugAddress                 string
+		slogHumanPath                string
+		slogJSONPath                 string
+		slogStackdriverPath          string
+		blockFileTransfer            bool
+		agentHeaderCommand           string
+		agentHeader                  []string
+		devcontainers                bool
+		devcontainerProjectDiscovery bool
 	)
 	cmd := &serpent.Command{
 		Use:   "agent",
@@ -364,6 +365,7 @@ func (r *RootCmd) workspaceAgent() *serpent.Command {
 					Devcontainers:      devcontainers,
 					DevcontainerAPIOptions: []agentcontainers.Option{
 						agentcontainers.WithSubAgentURL(r.agentURL.String()),
+						agentcontainers.WithProjectDiscovery(devcontainerProjectDiscovery),
 					},
 				})
 
@@ -510,6 +512,13 @@ func (r *RootCmd) workspaceAgent() *serpent.Command {
 			Description: "Allow the agent to automatically detect running devcontainers.",
 			Value:       serpent.BoolOf(&devcontainers),
 		},
+		{
+			Flag:        "devcontainers-project-discovery-enable",
+			Default:     "true",
+			Env:         "CODER_AGENT_DEVCONTAINERS_PROJECT_DISCOVERY_ENABLE",
+			Description: "Allow the agent to search the filesystem for devcontainer projects.",
+			Value:       serpent.BoolOf(&devcontainerProjectDiscovery),
+		},
 	}
 
 	return cmd
diff --git a/cli/testdata/coder_agent_--help.golden b/cli/testdata/coder_agent_--help.golden
@@ -36,6 +36,9 @@ OPTIONS:
       --devcontainers-enable bool, $CODER_AGENT_DEVCONTAINERS_ENABLE (default: true)
           Allow the agent to automatically detect running devcontainers.
 
+      --devcontainers-project-discovery-enable bool, $CODER_AGENT_DEVCONTAINERS_PROJECT_DISCOVERY_ENABLE (default: true)
+          Allow the agent to search the filesystem for devcontainer projects.
+
       --log-dir string, $CODER_AGENT_LOG_DIR (default: /tmp)
           Specify the location for the agent log files.
 
