Successfully merged main branch with production agent code

Co-authored-by: VAIBHAVSING <[email protected]>

Author: Copilot

apps/agent/Makefile

@@ -1,9 +1,5 @@
 # Makefile for Go Agent Development
-<<<<<<< HEAD
-.PHONY: build clean test lint format dev deps help install-tools
-=======
 .PHONY: build clean test lint format dev deps help install-tools config-dev-aca config-prod-aci config-show config-validate
->>>>>>> 6c208e89cfd9111d6f3217b9f725aebcc95d9627
 
 # Go parameters
 GOCMD=go
@@ -67,8 +63,6 @@ all: deps format lint test build ## Run all checks and build
 
 check: format-check lint test ## Run all checks without building
 
-<<<<<<< HEAD
-=======
 # ============================================================================
 # Azure Configuration Management
 # ============================================================================
@@ -121,5 +115,4 @@ config-validate: ## Validate .env configuration
 		exit 1; \
 	fi
 
->>>>>>> 6c208e89cfd9111d6f3217b9f725aebcc95d9627
 .DEFAULT_GOAL := help

apps/agent/setup-go-tools.sh

@@ -15,11 +15,7 @@ echo "✅ Go $(go version | cut -d' ' -f3) found"
 # Install golangci-lint if not present
 if ! command -v golangci-lint &> /dev/null; then
     echo "📦 Installing golangci-lint..."
-<<<<<<< HEAD
-    curl -sSfL https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh | sh -s -- -b $(go env GOPATH)/bin v1.55.2
-=======
     curl -sSfL https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh | sh -s -- -b $(go env GOPATH)/bin latest
->>>>>>> 6c208e89cfd9111d6f3217b9f725aebcc95d9627
 
     # Add to PATH if needed
     if [[ ":$PATH:" != *":$(go env GOPATH)/bin:"* ]]; then

apps/web/prisma/schema.prisma

@@ -11,18 +11,6 @@ datasource db {
 }
 
 model User {
-<<<<<<< HEAD
-  id            String    @id @default(cuid())
-  name          String?
-  email         String    @unique
-  emailVerified DateTime?
-  image         String?
-  password      String?   // For credentials authentication
-  accounts      Account[]
-  sessions      Session[]
-  // Optional for WebAuthn support
-  Authenticator Authenticator[]
-=======
   id            String          @id @default(cuid())
   name          String?
   email         String          @unique
@@ -36,7 +24,6 @@ model User {
   sshKeys       SSHKey[]
   secrets       Secret[]
   workspaces    Workspace[]
->>>>>>> 6c208e89cfd9111d6f3217b9f725aebcc95d9627
 
   createdAt DateTime @default(now())
   updatedAt DateTime @updatedAt
@@ -96,8 +83,6 @@ model Authenticator {
 
   @@id([userId, credentialID])
 }
-<<<<<<< HEAD
-=======
 
 enum EnvironmentStatus {
   CREATING
@@ -426,4 +411,3 @@ model Backup {
   @@index([startedAt])
   @@map("backups")
 }
->>>>>>> 6c208e89cfd9111d6f3217b9f725aebcc95d9627

apps/web/tailwind.config.js

@@ -1,71 +1,12 @@
 /** @type {import('tailwindcss').Config} */
 export default {
-<<<<<<< HEAD
-    darkMode: ['class'],
-    content: [
-=======
   content: [
->>>>>>> 6c208e89cfd9111d6f3217b9f725aebcc95d9627
     './pages/**/*.{js,ts,jsx,tsx,mdx}',
     './components/**/*.{js,ts,jsx,tsx,mdx}',
     './app/**/*.{js,ts,jsx,tsx,mdx}',
   ],
   theme: {
-<<<<<<< HEAD
-  	extend: {
-  		borderRadius: {
-  			lg: 'var(--radius)',
-  			md: 'calc(var(--radius) - 2px)',
-  			sm: 'calc(var(--radius) - 4px)'
-  		},
-  		colors: {
-  			background: 'hsl(var(--background))',
-  			foreground: 'hsl(var(--foreground))',
-  			card: {
-  				DEFAULT: 'hsl(var(--card))',
-  				foreground: 'hsl(var(--card-foreground))'
-  			},
-  			popover: {
-  				DEFAULT: 'hsl(var(--popover))',
-  				foreground: 'hsl(var(--popover-foreground))'
-  			},
-  			primary: {
-  				DEFAULT: 'hsl(var(--primary))',
-  				foreground: 'hsl(var(--primary-foreground))'
-  			},
-  			secondary: {
-  				DEFAULT: 'hsl(var(--secondary))',
-  				foreground: 'hsl(var(--secondary-foreground))'
-  			},
-  			muted: {
-  				DEFAULT: 'hsl(var(--muted))',
-  				foreground: 'hsl(var(--muted-foreground))'
-  			},
-  			accent: {
-  				DEFAULT: 'hsl(var(--accent))',
-  				foreground: 'hsl(var(--accent-foreground))'
-  			},
-  			destructive: {
-  				DEFAULT: 'hsl(var(--destructive))',
-  				foreground: 'hsl(var(--destructive-foreground))'
-  			},
-  			border: 'hsl(var(--border))',
-  			input: 'hsl(var(--input))',
-  			ring: 'hsl(var(--ring))',
-  			chart: {
-  				'1': 'hsl(var(--chart-1))',
-  				'2': 'hsl(var(--chart-2))',
-  				'3': 'hsl(var(--chart-3))',
-  				'4': 'hsl(var(--chart-4))',
-  				'5': 'hsl(var(--chart-5))'
-  			}
-  		}
-  	}
-  },
-  plugins: [require("tailwindcss-animate")],
-=======
     extend: {},
   },
   plugins: [],
->>>>>>> 6c208e89cfd9111d6f3217b9f725aebcc95d9627
 }