Merge branch 'main' into stevenmasley/assume_everyone

Emyrk · web-flow · commit 5024171ca0ea · 2025-06-05T13:50:17.000-05:00
diff --git a/provisioner/terraform/modules.go b/provisioner/terraform/modules.go
@@ -103,6 +103,13 @@ func GetModulesArchive(root fs.FS) ([]byte, error) {
 			if !fileMode.IsRegular() && !fileMode.IsDir() {
 				return nil
 			}
+
+			// .git directories are not needed in the archive and only cause
+			// hash differences for identical modules.
+			if fileMode.IsDir() && d.Name() == ".git" {
+				return fs.SkipDir
+			}
+
 			fileInfo, err := d.Info()
 			if err != nil {
 				return xerrors.Errorf("failed to archive module file %q: %w", filePath, err)
diff --git a/site/src/pages/TaskPage/TaskApps.tsx b/site/src/pages/TaskPage/TaskApps.tsx
@@ -33,9 +33,9 @@ export const TaskApps: FC<TaskAppsProps> = ({ task }) => {
 		.filter((a) => !!a && a.slug !== AI_APP_CHAT_SLUG);
 
 	const [activeAppId, setActiveAppId] = useState<string>(() => {
-		const appId = task.workspace.latest_app_status?.app_id;
+		const appId = apps[0]?.id;
 		if (!appId) {
-			throw new Error("No active app found in task");
+			throw new Error("No apps found in task");
 		}
 		return appId;
 	});
