coder · Emyrk · Nov 13, 2025 · Oct 31, 2025 · Nov 13, 2025
diff --git a/coderd/apidoc/docs.go b/coderd/apidoc/docs.go
diff --git a/coderd/apidoc/swagger.json b/coderd/apidoc/swagger.json
diff --git a/coderd/database/dump.sql b/coderd/database/dump.sql
diff --git a/coderd/database/migrations/000397_experimental_terraform_workspaces.down.sql b/coderd/database/migrations/000397_experimental_terraform_workspaces.down.sql
@@ -0,0 +1,26 @@
+DROP VIEW template_with_names;
+-- Drop the column
+ALTER TABLE templates DROP COLUMN use_terraform_workspace_cache;
+
+-- Update the template_with_names view by recreating it.
+CREATE VIEW template_with_names AS
+SELECT
+	templates.*,
+	COALESCE(visible_users.avatar_url, ''::text) AS created_by_avatar_url,
+	COALESCE(visible_users.username, ''::text) AS created_by_username,
+	COALESCE(visible_users.name, ''::text) AS created_by_name,
+	COALESCE(organizations.name, ''::text) AS organization_name,
+	COALESCE(organizations.display_name, ''::text) AS organization_display_name,
+	COALESCE(organizations.icon, ''::text) AS organization_icon
+FROM
+	templates
+		LEFT JOIN
+	visible_users
+	ON
+		templates.created_by = visible_users.id
+		LEFT JOIN
+	organizations
+	ON templates.organization_id = organizations.id
+;
+
+COMMENT ON VIEW template_with_names IS 'Joins in the display name information such as username, avatar, and organization name.';
diff --git a/coderd/database/migrations/000397_experimental_terraform_workspaces.up.sql b/coderd/database/migrations/000397_experimental_terraform_workspaces.up.sql
@@ -0,0 +1,33 @@
+-- Default to `false`. Users will have to manually opt into the terraform workspace cache feature.
+ALTER TABLE templates ADD COLUMN use_terraform_workspace_cache BOOL NOT NULL DEFAULT false;
+
+COMMENT ON COLUMN templates.use_terraform_workspace_cache IS
+	'Determines whether to keep terraform directories cached between runs for workspaces created from this template. '
+		'When enabled, this can significantly speed up the `terraform init` step at the cost of increased disk usage. '
+		'This is an opt-in experience, as it prevents modules from being updated, and therefore is a behavioral difference '
+		'from the default.';
+	;
+
+-- Update the template_with_names view by recreating it.
+DROP VIEW template_with_names;
+CREATE VIEW template_with_names AS
+SELECT
+	templates.*,
+   COALESCE(visible_users.avatar_url, ''::text) AS created_by_avatar_url,
+   COALESCE(visible_users.username, ''::text) AS created_by_username,
+   COALESCE(visible_users.name, ''::text) AS created_by_name,
+   COALESCE(organizations.name, ''::text) AS organization_name,
+   COALESCE(organizations.display_name, ''::text) AS organization_display_name,
+   COALESCE(organizations.icon, ''::text) AS organization_icon
+FROM
+	templates
+		LEFT JOIN
+	visible_users
+	ON
+		templates.created_by = visible_users.id
+		LEFT JOIN
+	organizations
+	ON templates.organization_id = organizations.id
+;
+
+COMMENT ON VIEW template_with_names IS 'Joins in the display name information such as username, avatar, and organization name.';
diff --git a/coderd/database/modelqueries.go b/coderd/database/modelqueries.go
@@ -127,6 +127,7 @@ func (q *sqlQuerier) GetAuthorizedTemplates(ctx context.Context, arg GetTemplate
 			&i.MaxPortSharingLevel,
 			&i.UseClassicParameterFlow,
 			&i.CorsBehavior,
+			&i.UseTerraformWorkspaceCache,
 			&i.CreatedByAvatarURL,
 			&i.CreatedByUsername,
 			&i.CreatedByName,

diff --git a/coderd/database/models.go b/coderd/database/models.go
diff --git a/coderd/database/queries.sql.go b/coderd/database/queries.sql.go
diff --git a/coderd/database/queries/templates.sql b/coderd/database/queries/templates.sql
@@ -173,7 +173,8 @@ SET
 	group_acl = $8,
 	max_port_sharing_level = $9,
 	use_classic_parameter_flow = $10,
-	cors_behavior = $11
+	cors_behavior = $11,
+	use_terraform_workspace_cache = $12
 WHERE
 	id = $1
 ;

diff --git a/coderd/provisionerdserver/provisionerdserver.go b/coderd/provisionerdserver/provisionerdserver.go
@@ -711,7 +711,10 @@ func (s *server) acquireProtoJob(ctx context.Context, job database.ProvisionerJo
 				ExternalAuthProviders:   externalAuthProviders,
 				// If active and experiment is enabled, allow workspace reuse existing TF
 				// workspaces (directories) for a faster startup.
-				ExpReuseTerraformWorkspace: ptr.Ref(activeVersion && s.Experiments.Enabled(codersdk.ExperimentTerraformWorkspace)),
+				ExpReuseTerraformWorkspace: ptr.Ref(s.Experiments.Enabled(codersdk.ExperimentTerraformWorkspace) && // Experiment required
+					template.UseTerraformWorkspaceCache && // Template setting
+					activeVersion, // Only for active versions
+				),
 				Metadata: &sdkproto.Metadata{
 					CoderUrl:                      s.AccessURL.String(),
 					WorkspaceTransition:           transition,