From 3dc8873b6066e646ec311dd71de9632fd3300f08 Mon Sep 17 00:00:00 2001 From: Claude Date: Mon, 29 Dec 2025 23:36:55 +0000 Subject: [PATCH 01/38] Add Agent Relay Cloud onboarding design document Design for cloud-hosted agent-relay with multi-provider authentication: - GitHub OAuth as primary auth + repo connection - Provider credential vault (API keys + OAuth tokens) - Support for Claude, Codex, Gemini, and custom providers - Team templates for quick setup - Security considerations for credential storage bd-cloud-onboarding --- docs/CLOUD-ONBOARDING-DESIGN.md | 657 ++++++++++++++++++++++++++++++++ 1 file changed, 657 insertions(+) create mode 100644 docs/CLOUD-ONBOARDING-DESIGN.md diff --git a/docs/CLOUD-ONBOARDING-DESIGN.md b/docs/CLOUD-ONBOARDING-DESIGN.md new file mode 100644 index 000000000..d627bff11 --- /dev/null +++ b/docs/CLOUD-ONBOARDING-DESIGN.md @@ -0,0 +1,657 @@ +# Agent Relay Cloud - Onboarding Design + +## Overview + +Agent Relay Cloud provides a hosted version of agent-relay with: +- Automatic server provisioning with supervisor +- GitHub repository integration +- Multi-provider agent authentication +- Team management and collaboration + +## Provider Authentication Architecture + +### The Challenge + +Each agent provider has different authentication mechanisms: + +| Provider | Auth Method | Credentials | +|----------|-------------|-------------| +| Claude (Anthropic) | API Key | `ANTHROPIC_API_KEY` | +| Claude Code | OAuth | Browser-based login | +| OpenAI Codex | API Key | `OPENAI_API_KEY` | +| Gemini | API Key | `GOOGLE_API_KEY` | +| GitHub Copilot | OAuth | GitHub account | +| Local Ollama | None | Self-hosted | + +### Proposed Solution: Provider Credentials Vault + +``` +┌─────────────────────────────────────────────────────────────────┐ +│ Agent Relay Cloud │ +├─────────────────────────────────────────────────────────────────┤ +│ │ +│ ┌──────────────┐ ┌──────────────┐ ┌──────────────┐ │ +│ │ GitHub │ │ Provider │ │ Secrets │ │ +│ │ OAuth │ │ Connector │ │ Vault │ │ +│ └──────┬───────┘ └──────┬───────┘ └──────┬───────┘ │ +│ │ │ │ │ +│ ▼ ▼ ▼ │ +│ ┌─────────────────────────────────────────────────────────┐ │ +│ │ Onboarding Flow │ │ +│ │ 1. Sign up (GitHub OAuth) │ │ +│ │ 2. Connect repositories │ │ +│ │ 3. Add agent providers │ │ +│ │ 4. Configure teams │ │ +│ └─────────────────────────────────────────────────────────┘ │ +│ │ +└─────────────────────────────────────────────────────────────────┘ +``` + +--- + +## Onboarding Flow Design + +### Step 1: Sign Up via GitHub OAuth + +``` +┌─────────────────────────────────────────────┐ +│ Welcome to Agent Relay Cloud │ +│ │ +│ Orchestrate AI agents across your repos │ +│ │ +│ ┌─────────────────────────────────────┐ │ +│ │ 🔗 Continue with GitHub │ │ +│ └─────────────────────────────────────┘ │ +│ │ +│ By signing up, you agree to our Terms │ +└─────────────────────────────────────────────┘ +``` + +**Why GitHub first?** +- Natural auth for developers +- Immediate access to repo list +- Repository permissions already defined +- GitHub Apps for webhook integration + +### Step 2: Connect Repositories + +``` +┌─────────────────────────────────────────────────────────────┐ +│ Select Repositories │ +│ │ +│ Which repositories should Agent Relay manage? │ +│ │ +│ ┌────────────────────────────────────────────────────────┐ │ +│ │ 🔍 Search repositories... │ │ +│ └────────────────────────────────────────────────────────┘ │ +│ │ +│ ☑️ acme/frontend ⭐ 234 Updated 2 hours ago │ +│ ☑️ acme/backend-api ⭐ 156 Updated 1 day ago │ +│ ☐ acme/docs ⭐ 45 Updated 3 days ago │ +│ ☐ acme/mobile-app ⭐ 89 Updated 1 week ago │ +│ │ +│ ┌──────────────┐ ┌──────────────────────────────────────┐ │ +│ │ Back │ │ Continue with 2 repositories → │ │ +│ └──────────────┘ └──────────────────────────────────────┘ │ +└─────────────────────────────────────────────────────────────┘ +``` + +**What happens behind the scenes:** +- Install GitHub App on selected repos +- Clone repos to cloud workspace +- Detect existing `.claude/agents/` or `teams.json` configs +- Set up webhooks for PR/issue events + +### Step 3: Add Agent Providers (The Key Step) + +``` +┌─────────────────────────────────────────────────────────────────┐ +│ Connect Your AI Providers │ +│ │ +│ Agent Relay works with multiple AI providers. Connect the │ +│ ones you want to use: │ +│ │ +│ ┌─────────────────────────────────────────────────────────────┐│ +│ │ ANTHROPIC ┌───────────┐ ││ +│ │ Claude Code, Claude API │ Connect │ ││ +│ │ ⚡ Recommended for code tasks └───────────┘ ││ +│ └─────────────────────────────────────────────────────────────┘│ +│ │ +│ ┌─────────────────────────────────────────────────────────────┐│ +│ │ OPENAI ┌───────────┐ ││ +│ │ Codex, GPT-4 │ Connect │ ││ +│ │ Good for diverse tasks └───────────┘ ││ +│ └─────────────────────────────────────────────────────────────┘│ +│ │ +│ ┌─────────────────────────────────────────────────────────────┐│ +│ │ GOOGLE ┌───────────┐ ││ +│ │ Gemini │ Connect │ ││ +│ │ Multi-modal capabilities └───────────┘ ││ +│ └─────────────────────────────────────────────────────────────┘│ +│ │ +│ ┌─────────────────────────────────────────────────────────────┐│ +│ │ + Add Custom Provider ││ +│ │ Ollama, LM Studio, or other CLI tools ││ +│ └─────────────────────────────────────────────────────────────┘│ +│ │ +│ You can always add more providers later in Settings │ +│ │ +│ ┌──────────────┐ ┌──────────────────────────────────────────┐ │ +│ │ Skip │ │ Continue → │ │ +│ └──────────────┘ └──────────────────────────────────────────┘ │ +└─────────────────────────────────────────────────────────────────┘ +``` + +#### Provider Connection Flows + +**Option A: API Key Entry (Simple)** + +``` +┌─────────────────────────────────────────────────────────────┐ +│ Connect Anthropic │ +│ │ +│ Enter your Anthropic API key: │ +│ │ +│ ┌────────────────────────────────────────────────────────┐ │ +│ │ sk-ant-api03-•••••••••••••••••••••••••••••••••••••••• │ │ +│ └────────────────────────────────────────────────────────┘ │ +│ │ +│ 🔒 Your key is encrypted and stored securely │ +│ │ +│ Don't have a key? Get one at console.anthropic.com → │ +│ │ +│ ┌────────────────────────────────────────────────────────┐ │ +│ │ ☐ Also connect Claude Code (requires OAuth) │ │ +│ └────────────────────────────────────────────────────────┘ │ +│ │ +│ ┌──────────────┐ ┌──────────────────────────────────────┐ │ +│ │ Cancel │ │ Connect Anthropic → │ │ +│ └──────────────┘ └──────────────────────────────────────┘ │ +└─────────────────────────────────────────────────────────────┘ +``` + +**Option B: OAuth Flow (for Claude Code, Copilot, etc.)** + +``` +┌─────────────────────────────────────────────────────────────┐ +│ Connect Claude Code │ +│ │ +│ Claude Code uses OAuth for authentication. │ +│ You'll be redirected to Anthropic to authorize. │ +│ │ +│ ┌─────────────────────────────────────────┐ │ +│ │ │ │ +│ │ 🔐 Authorize with Anthropic │ │ +│ │ │ │ +│ │ Agent Relay Cloud wants to: │ │ +│ │ • Run Claude Code on your behalf │ │ +│ │ • Access your Claude usage quota │ │ +│ │ │ │ +│ │ ┌─────────────┐ ┌─────────────────┐ │ │ +│ │ │ Deny │ │ Authorize │ │ │ +│ │ └─────────────┘ └─────────────────┘ │ │ +│ │ │ │ +│ └─────────────────────────────────────────┘ │ +│ │ +└─────────────────────────────────────────────────────────────┘ +``` + +### Step 4: Configure Your First Team (Optional) + +``` +┌─────────────────────────────────────────────────────────────────┐ +│ Create Your First Agent Team │ +│ │ +│ Teams are groups of AI agents that work together on tasks. │ +│ │ +│ ┌──────────────────────────────────────────────────────────┐ │ +│ │ 🚀 Quick Start Templates │ │ +│ ├──────────────────────────────────────────────────────────┤ │ +│ │ │ │ +│ │ ┌────────────────────────────────────────────────────┐ │ │ +│ │ │ 👥 Code Review Team │ │ │ +│ │ │ Architect + Reviewer + Security Auditor │ │ │ +│ │ │ Auto-reviews PRs and suggests improvements │ │ │ +│ │ └────────────────────────────────────────────────────┘ │ │ +│ │ │ │ +│ │ ┌────────────────────────────────────────────────────┐ │ │ +│ │ │ 🛠️ Feature Development Team │ │ │ +│ │ │ Lead + Frontend + Backend + Tester │ │ │ +│ │ │ Coordinates multi-agent feature builds │ │ │ +│ │ └────────────────────────────────────────────────────┘ │ │ +│ │ │ │ +│ │ ┌────────────────────────────────────────────────────┐ │ │ +│ │ │ 📝 Custom Team │ │ │ +│ │ │ Configure your own agent composition │ │ │ +│ │ └────────────────────────────────────────────────────┘ │ │ +│ │ │ │ +│ └──────────────────────────────────────────────────────────┘ │ +│ │ +│ ┌──────────────┐ ┌──────────────────────────────────────────┐ │ +│ │ Skip for now │ │ Select template → │ │ +│ └──────────────┘ └──────────────────────────────────────────┘ │ +└─────────────────────────────────────────────────────────────────┘ +``` + +### Step 5: Ready to Go! + +``` +┌─────────────────────────────────────────────────────────────────┐ +│ 🎉 You're all set! │ +│ │ +│ Your Agent Relay Cloud workspace is ready: │ +│ │ +│ ┌──────────────────────────────────────────────────────────┐ │ +│ │ 📂 Repositories 2 connected │ │ +│ │ 🤖 Agent Providers Claude, Codex │ │ +│ │ 👥 Teams Code Review Team │ │ +│ │ 🌐 Dashboard relay.yourdomain.cloud │ │ +│ └──────────────────────────────────────────────────────────┘ │ +│ │ +│ What's next? │ +│ │ +│ • Open a PR to trigger automatic code review │ +│ • Use @agent-relay in PR comments to chat with agents │ +│ • Visit your dashboard to monitor agent activity │ +│ │ +│ ┌──────────────────────────────────────────────────────────┐ │ +│ │ Open Dashboard → │ │ +│ └──────────────────────────────────────────────────────────┘ │ +└─────────────────────────────────────────────────────────────────┘ +``` + +--- + +## Technical Implementation + +### Provider Credentials Storage + +```typescript +// src/cloud/providers/types.ts + +interface ProviderCredential { + id: string; + userId: string; + provider: ProviderType; + authType: 'api_key' | 'oauth' | 'none'; + + // For API key auth + encryptedApiKey?: string; + + // For OAuth + accessToken?: string; + refreshToken?: string; + tokenExpiresAt?: Date; + scopes?: string[]; + + // Metadata + displayName?: string; // "Claude (Work Account)" + createdAt: Date; + lastUsedAt?: Date; + isValid: boolean; +} + +type ProviderType = + | 'anthropic' // Claude API + | 'claude-code' // Claude Code CLI (OAuth) + | 'openai' // Codex, GPT + | 'google' // Gemini + | 'github' // Copilot + | 'custom'; // Ollama, local, etc. +``` + +### Provider Registry + +```typescript +// src/cloud/providers/registry.ts + +interface ProviderConfig { + id: ProviderType; + name: string; + description: string; + authMethods: AuthMethod[]; + cliCommand: string; + cliArgs?: string[]; + envVars: Record; // Maps to credential fields + oauthConfig?: OAuthConfig; + setupUrl?: string; + icon: string; +} + +const PROVIDER_REGISTRY: ProviderConfig[] = [ + { + id: 'anthropic', + name: 'Anthropic', + description: 'Claude API for programmatic access', + authMethods: ['api_key'], + cliCommand: 'claude', + cliArgs: ['--dangerously-skip-permissions'], + envVars: { 'ANTHROPIC_API_KEY': 'apiKey' }, + setupUrl: 'https://console.anthropic.com/settings/keys', + icon: '🟠' + }, + { + id: 'claude-code', + name: 'Claude Code', + description: 'Claude Code CLI with full capabilities', + authMethods: ['oauth'], + cliCommand: 'claude', + cliArgs: ['--dangerously-skip-permissions'], + oauthConfig: { + authorizationUrl: 'https://console.anthropic.com/oauth/authorize', + tokenUrl: 'https://api.anthropic.com/oauth/token', + scopes: ['claude-code:execute'] + }, + icon: '🟠' + }, + { + id: 'openai', + name: 'OpenAI', + description: 'Codex and GPT models', + authMethods: ['api_key'], + cliCommand: 'codex', + cliArgs: ['--dangerously-bypass-approvals-and-sandbox'], + envVars: { 'OPENAI_API_KEY': 'apiKey' }, + setupUrl: 'https://platform.openai.com/api-keys', + icon: '🟢' + }, + { + id: 'google', + name: 'Google AI', + description: 'Gemini models', + authMethods: ['api_key', 'oauth'], + cliCommand: 'gemini', + envVars: { 'GOOGLE_API_KEY': 'apiKey' }, + setupUrl: 'https://aistudio.google.com/app/apikey', + icon: '🔵' + }, + { + id: 'custom', + name: 'Custom Provider', + description: 'Ollama, LM Studio, or other tools', + authMethods: ['none', 'api_key'], + cliCommand: '', // User specifies + icon: '⚙️' + } +]; +``` + +### Spawner Integration + +```typescript +// src/cloud/spawner-cloud.ts + +class CloudAgentSpawner extends AgentSpawner { + private credentialVault: CredentialVault; + + async spawn(request: CloudSpawnRequest): Promise { + const { userId, provider, agentName, task } = request; + + // Get credentials for this provider + const credential = await this.credentialVault.get(userId, provider); + if (!credential) { + throw new Error(`No ${provider} credentials configured`); + } + + // Validate credentials are still valid + if (credential.authType === 'oauth') { + await this.refreshTokenIfNeeded(credential); + } + + // Build environment with credentials + const env = this.buildProviderEnv(credential); + + // Get provider config + const providerConfig = PROVIDER_REGISTRY.find(p => p.id === provider); + + // Spawn agent with credentials injected + return super.spawn({ + name: agentName, + cli: providerConfig.cliCommand, + args: providerConfig.cliArgs, + env, + task + }); + } + + private buildProviderEnv(credential: ProviderCredential): Record { + const config = PROVIDER_REGISTRY.find(p => p.id === credential.provider); + const env: Record = {}; + + if (credential.authType === 'api_key' && credential.encryptedApiKey) { + const apiKey = this.credentialVault.decrypt(credential.encryptedApiKey); + for (const [envVar, _] of Object.entries(config.envVars)) { + env[envVar] = apiKey; + } + } else if (credential.authType === 'oauth' && credential.accessToken) { + // OAuth tokens might need different handling per provider + env['PROVIDER_ACCESS_TOKEN'] = credential.accessToken; + } + + return env; + } +} +``` + +### Onboarding API + +```typescript +// src/cloud/api/onboarding.ts + +const onboardingRouter = Router(); + +// Step 1: GitHub OAuth callback +onboardingRouter.get('/auth/github/callback', async (req, res) => { + const { code } = req.query; + const tokens = await exchangeGitHubCode(code); + const user = await createOrUpdateUser(tokens); + + // Set session and redirect to repo selection + req.session.userId = user.id; + res.redirect('/onboarding/repositories'); +}); + +// Step 2: Get user's repositories +onboardingRouter.get('/repositories', async (req, res) => { + const repos = await github.listUserRepos(req.session.accessToken); + res.json({ repos }); +}); + +// Step 2: Connect selected repositories +onboardingRouter.post('/repositories', async (req, res) => { + const { repoIds } = req.body; + await Promise.all(repoIds.map(id => + connectRepository(req.session.userId, id) + )); + res.json({ success: true }); +}); + +// Step 3: List available providers +onboardingRouter.get('/providers', async (req, res) => { + const connected = await getConnectedProviders(req.session.userId); + res.json({ + available: PROVIDER_REGISTRY, + connected + }); +}); + +// Step 3: Connect provider (API Key) +onboardingRouter.post('/providers/:provider/api-key', async (req, res) => { + const { provider } = req.params; + const { apiKey, displayName } = req.body; + + // Validate API key works + const isValid = await validateProviderKey(provider, apiKey); + if (!isValid) { + return res.status(400).json({ error: 'Invalid API key' }); + } + + // Encrypt and store + await credentialVault.store({ + userId: req.session.userId, + provider, + authType: 'api_key', + encryptedApiKey: encrypt(apiKey), + displayName, + isValid: true + }); + + res.json({ success: true }); +}); + +// Step 3: Connect provider (OAuth - initiate) +onboardingRouter.get('/providers/:provider/oauth', async (req, res) => { + const { provider } = req.params; + const config = PROVIDER_REGISTRY.find(p => p.id === provider); + + const state = generateOAuthState(req.session.userId, provider); + const authUrl = buildOAuthUrl(config.oauthConfig, state); + + res.redirect(authUrl); +}); + +// Step 3: OAuth callback +onboardingRouter.get('/providers/:provider/oauth/callback', async (req, res) => { + const { code, state } = req.query; + const { userId, provider } = verifyOAuthState(state); + + const tokens = await exchangeOAuthCode(provider, code); + + await credentialVault.store({ + userId, + provider, + authType: 'oauth', + accessToken: tokens.accessToken, + refreshToken: tokens.refreshToken, + tokenExpiresAt: tokens.expiresAt, + scopes: tokens.scopes, + isValid: true + }); + + res.redirect('/onboarding/providers?connected=' + provider); +}); + +// Step 4: Create team from template +onboardingRouter.post('/teams/from-template', async (req, res) => { + const { templateId, repoIds } = req.body; + const template = TEAM_TEMPLATES[templateId]; + + const team = await createTeam({ + userId: req.session.userId, + name: template.name, + agents: template.agents.map(a => ({ + ...a, + provider: req.body.defaultProvider || 'anthropic' + })), + repoIds + }); + + res.json({ team }); +}); + +// Complete onboarding +onboardingRouter.post('/complete', async (req, res) => { + await markOnboardingComplete(req.session.userId); + + // Provision workspace + const workspace = await provisionWorkspace(req.session.userId); + + res.json({ + dashboardUrl: workspace.dashboardUrl, + webhookUrl: workspace.webhookUrl + }); +}); +``` + +--- + +## Security Considerations + +### API Key Storage + +1. **Encryption at rest**: All API keys encrypted with AES-256-GCM +2. **Key derivation**: Per-user encryption keys derived from master key + user ID +3. **No plaintext logging**: API keys never logged, even in debug mode +4. **Rotation support**: Users can rotate keys without losing config + +### OAuth Token Management + +1. **Automatic refresh**: Tokens refreshed before expiry +2. **Secure storage**: Tokens stored encrypted, same as API keys +3. **Scope limiting**: Request minimum required scopes +4. **Revocation handling**: Detect revoked tokens, prompt re-auth + +### Access Control + +1. **User isolation**: Credentials tied to user ID, not shared +2. **Team permissions**: Team admins can share provider access with team +3. **Audit logging**: All credential access logged +4. **Rate limiting**: Provider usage rate-limited per user + +--- + +## Future Enhancements + +### 1. Credential Sharing for Teams + +Allow team admins to share provider credentials with team members: + +```typescript +interface SharedCredential { + credentialId: string; + teamId: string; + sharedBy: string; + permissions: 'read' | 'use'; // 'use' allows spawning agents +} +``` + +### 2. Usage Tracking & Billing + +Track provider usage per user/team for billing: + +```typescript +interface UsageRecord { + userId: string; + teamId?: string; + provider: ProviderType; + agentName: string; + tokensUsed: number; + duration: number; + timestamp: Date; +} +``` + +### 3. Provider Health Monitoring + +Monitor provider availability and quota: + +```typescript +interface ProviderHealth { + provider: ProviderType; + status: 'healthy' | 'degraded' | 'down'; + quotaRemaining?: number; + lastChecked: Date; +} +``` + +### 4. Bring Your Own Cloud + +Let users connect their own cloud accounts for compute: + +- AWS credentials for EC2 instances +- GCP credentials for Cloud Run +- Azure credentials for Container Instances + +--- + +## Summary + +The onboarding flow prioritizes: + +1. **Low friction**: GitHub OAuth gets users started immediately +2. **Flexibility**: Support multiple auth methods per provider +3. **Security**: Encrypted credential storage with proper isolation +4. **Discoverability**: Show available providers with easy setup links +5. **Progressive disclosure**: Optional team setup, can skip and add later + +Users can authenticate with all their providers upfront during onboarding, or add them incrementally as needed from settings. From d65f3b4747746d14b4813eb84c7f992264c41769 Mon Sep 17 00:00:00 2001 From: Claude Date: Mon, 29 Dec 2025 23:41:45 +0000 Subject: [PATCH 02/38] Update onboarding design to OAuth-only authentication Remove API key support in favor of login-based auth for all providers: - All providers now use "Login with X" buttons - OAuth tokens stored instead of API keys - Automatic token refresh before expiry - GitHub Copilot auto-connected via signup - Updated security model for OAuth token lifecycle bd-cloud-onboarding --- docs/CLOUD-ONBOARDING-DESIGN.md | 551 ++++++++++++++++++++++---------- 1 file changed, 374 insertions(+), 177 deletions(-) diff --git a/docs/CLOUD-ONBOARDING-DESIGN.md b/docs/CLOUD-ONBOARDING-DESIGN.md index d627bff11..c7984c708 100644 --- a/docs/CLOUD-ONBOARDING-DESIGN.md +++ b/docs/CLOUD-ONBOARDING-DESIGN.md @@ -10,18 +10,23 @@ Agent Relay Cloud provides a hosted version of agent-relay with: ## Provider Authentication Architecture -### The Challenge +### Design Principle: Login-Only Authentication -Each agent provider has different authentication mechanisms: +**No API keys** - All provider authentication happens via OAuth/login flows. This provides: -| Provider | Auth Method | Credentials | -|----------|-------------|-------------| -| Claude (Anthropic) | API Key | `ANTHROPIC_API_KEY` | -| Claude Code | OAuth | Browser-based login | -| OpenAI Codex | API Key | `OPENAI_API_KEY` | -| Gemini | API Key | `GOOGLE_API_KEY` | -| GitHub Copilot | OAuth | GitHub account | -| Local Ollama | None | Self-hosted | +- **Better security**: No keys to leak, rotate, or manage +- **Consistent UX**: Always "Login with X" buttons +- **Account linking**: Users authenticate with their existing provider accounts +- **Automatic token refresh**: OAuth handles expiration gracefully + +| Provider | Auth Flow | User Experience | +|----------|-----------|-----------------| +| Claude/Anthropic | OAuth 2.0 | "Login with Anthropic" | +| OpenAI | OAuth 2.0 | "Login with OpenAI" | +| Google/Gemini | OAuth 2.0 | "Login with Google" | +| GitHub Copilot | OAuth 2.0 | Already authed via GitHub signup | +| Azure OpenAI | OAuth 2.0 | "Login with Microsoft" | +| Local/Self-hosted | None | Configure endpoint URL only | ### Proposed Solution: Provider Credentials Vault @@ -112,26 +117,43 @@ Each agent provider has different authentication mechanisms: │ ones you want to use: │ │ │ │ ┌─────────────────────────────────────────────────────────────┐│ -│ │ ANTHROPIC ┌───────────┐ ││ -│ │ Claude Code, Claude API │ Connect │ ││ -│ │ ⚡ Recommended for code tasks └───────────┘ ││ +│ │ ANTHROPIC ││ +│ │ Claude Code ││ +│ │ ⚡ Recommended for code tasks ││ +│ │ ││ +│ │ ┌─────────────────────────────────────────────────────┐ ││ +│ │ │ 🔐 Login with Anthropic │ ││ +│ │ └─────────────────────────────────────────────────────┘ ││ +│ └─────────────────────────────────────────────────────────────┘│ +│ │ +│ ┌─────────────────────────────────────────────────────────────┐│ +│ │ OPENAI ││ +│ │ Codex, ChatGPT ││ +│ │ Good for diverse tasks ││ +│ │ ││ +│ │ ┌─────────────────────────────────────────────────────┐ ││ +│ │ │ 🔐 Login with OpenAI │ ││ +│ │ └─────────────────────────────────────────────────────┘ ││ │ └─────────────────────────────────────────────────────────────┘│ │ │ │ ┌─────────────────────────────────────────────────────────────┐│ -│ │ OPENAI ┌───────────┐ ││ -│ │ Codex, GPT-4 │ Connect │ ││ -│ │ Good for diverse tasks └───────────┘ ││ +│ │ GOOGLE ││ +│ │ Gemini ││ +│ │ Multi-modal capabilities ││ +│ │ ││ +│ │ ┌─────────────────────────────────────────────────────┐ ││ +│ │ │ 🔐 Login with Google │ ││ +│ │ └─────────────────────────────────────────────────────┘ ││ │ └─────────────────────────────────────────────────────────────┘│ │ │ │ ┌─────────────────────────────────────────────────────────────┐│ -│ │ GOOGLE ┌───────────┐ ││ -│ │ Gemini │ Connect │ ││ -│ │ Multi-modal capabilities └───────────┘ ││ +│ │ GITHUB COPILOT ✓ Connected ││ +│ │ Already connected via your GitHub account ││ │ └─────────────────────────────────────────────────────────────┘│ │ │ │ ┌─────────────────────────────────────────────────────────────┐│ -│ │ + Add Custom Provider ││ -│ │ Ollama, LM Studio, or other CLI tools ││ +│ │ + Add Self-Hosted Provider ││ +│ │ Ollama, LM Studio, or other local tools ││ │ └─────────────────────────────────────────────────────────────┘│ │ │ │ You can always add more providers later in Settings │ @@ -142,53 +164,57 @@ Each agent provider has different authentication mechanisms: └─────────────────────────────────────────────────────────────────┘ ``` -#### Provider Connection Flows +#### OAuth Login Flow -**Option A: API Key Entry (Simple)** +When user clicks "Login with [Provider]": ``` ┌─────────────────────────────────────────────────────────────┐ -│ Connect Anthropic │ │ │ -│ Enter your Anthropic API key: │ -│ │ -│ ┌────────────────────────────────────────────────────────┐ │ -│ │ sk-ant-api03-•••••••••••••••••••••••••••••••••••••••• │ │ -│ └────────────────────────────────────────────────────────┘ │ -│ │ -│ 🔒 Your key is encrypted and stored securely │ -│ │ -│ Don't have a key? Get one at console.anthropic.com → │ -│ │ -│ ┌────────────────────────────────────────────────────────┐ │ -│ │ ☐ Also connect Claude Code (requires OAuth) │ │ -│ └────────────────────────────────────────────────────────┘ │ +│ ┌─────────────────────────────────────────┐ │ +│ │ provider-name.com │ │ +│ ├─────────────────────────────────────────┤ │ +│ │ │ │ +│ │ Sign in to Anthropic │ │ +│ │ │ │ +│ │ ┌───────────────────────────────────┐ │ │ +│ │ │ email@example.com │ │ │ +│ │ └───────────────────────────────────┘ │ │ +│ │ ┌───────────────────────────────────┐ │ │ +│ │ │ •••••••••••• │ │ │ +│ │ └───────────────────────────────────┘ │ │ +│ │ │ │ +│ │ ┌───────────────────────────────────┐ │ │ +│ │ │ Sign In │ │ │ +│ │ └───────────────────────────────────┘ │ │ +│ │ │ │ +│ │ Or continue with: │ │ +│ │ [Google] [GitHub] [SSO] │ │ +│ │ │ │ +│ └─────────────────────────────────────────┘ │ │ │ -│ ┌──────────────┐ ┌──────────────────────────────────────┐ │ -│ │ Cancel │ │ Connect Anthropic → │ │ -│ └──────────────┘ └──────────────────────────────────────┘ │ └─────────────────────────────────────────────────────────────┘ ``` -**Option B: OAuth Flow (for Claude Code, Copilot, etc.)** +After login, authorization consent: ``` ┌─────────────────────────────────────────────────────────────┐ -│ Connect Claude Code │ -│ │ -│ Claude Code uses OAuth for authentication. │ -│ You'll be redirected to Anthropic to authorize. │ │ │ │ ┌─────────────────────────────────────────┐ │ │ │ │ │ -│ │ 🔐 Authorize with Anthropic │ │ +│ │ Authorize Agent Relay Cloud │ │ │ │ │ │ │ │ Agent Relay Cloud wants to: │ │ -│ │ • Run Claude Code on your behalf │ │ -│ │ • Access your Claude usage quota │ │ +│ │ │ │ +│ │ ✓ Run AI agents on your behalf │ │ +│ │ ✓ Access your usage quota │ │ +│ │ ✓ View your account info │ │ +│ │ │ │ +│ │ Signed in as: user@example.com │ │ │ │ │ │ │ │ ┌─────────────┐ ┌─────────────────┐ │ │ -│ │ │ Deny │ │ Authorize │ │ │ +│ │ │ Cancel │ │ Authorize │ │ │ │ │ └─────────────┘ └─────────────────┘ │ │ │ │ │ │ │ └─────────────────────────────────────────┘ │ @@ -196,6 +222,22 @@ Each agent provider has different authentication mechanisms: └─────────────────────────────────────────────────────────────┘ ``` +After authorization, redirect back with success: + +``` +┌─────────────────────────────────────────────────────────────────┐ +│ Connect Your AI Providers │ +│ │ +│ ┌─────────────────────────────────────────────────────────────┐│ +│ │ ANTHROPIC ✓ Connected ││ +│ │ Claude Code ││ +│ │ Logged in as claude-user@example.com ││ +│ │ [Disconnect] ││ +│ └─────────────────────────────────────────────────────────────┘│ +│ ... │ +└─────────────────────────────────────────────────────────────────┘ +``` + ### Step 4: Configure Your First Team (Optional) ``` @@ -273,31 +315,32 @@ interface ProviderCredential { id: string; userId: string; provider: ProviderType; - authType: 'api_key' | 'oauth' | 'none'; - // For API key auth - encryptedApiKey?: string; + // OAuth tokens (encrypted at rest) + accessToken: string; + refreshToken: string; + tokenExpiresAt: Date; + scopes: string[]; - // For OAuth - accessToken?: string; - refreshToken?: string; - tokenExpiresAt?: Date; - scopes?: string[]; + // Account info from provider + providerAccountId: string; // Provider's user ID + providerAccountEmail: string; // For display: "user@example.com" + providerAccountName?: string; // Display name if available // Metadata - displayName?: string; // "Claude (Work Account)" - createdAt: Date; + connectedAt: Date; lastUsedAt?: Date; + lastRefreshedAt?: Date; isValid: boolean; } type ProviderType = - | 'anthropic' // Claude API - | 'claude-code' // Claude Code CLI (OAuth) - | 'openai' // Codex, GPT - | 'google' // Gemini - | 'github' // Copilot - | 'custom'; // Ollama, local, etc. + | 'anthropic' // Claude Code + | 'openai' // Codex, ChatGPT + | 'google' // Gemini + | 'github' // Copilot (auto-connected via signup) + | 'microsoft' // Azure OpenAI + | 'self-hosted'; // Ollama, LM Studio (no auth needed) ``` ### Provider Registry @@ -305,75 +348,123 @@ type ProviderType = ```typescript // src/cloud/providers/registry.ts +interface OAuthConfig { + authorizationUrl: string; + tokenUrl: string; + scopes: string[]; + userInfoUrl?: string; // To fetch account email/name after auth +} + interface ProviderConfig { id: ProviderType; name: string; + displayName: string; // "Login with {displayName}" description: string; - authMethods: AuthMethod[]; cliCommand: string; cliArgs?: string[]; - envVars: Record; // Maps to credential fields - oauthConfig?: OAuthConfig; - setupUrl?: string; + oauthConfig: OAuthConfig; icon: string; + color: string; // Brand color for button } const PROVIDER_REGISTRY: ProviderConfig[] = [ { id: 'anthropic', name: 'Anthropic', - description: 'Claude API for programmatic access', - authMethods: ['api_key'], - cliCommand: 'claude', - cliArgs: ['--dangerously-skip-permissions'], - envVars: { 'ANTHROPIC_API_KEY': 'apiKey' }, - setupUrl: 'https://console.anthropic.com/settings/keys', - icon: '🟠' - }, - { - id: 'claude-code', - name: 'Claude Code', - description: 'Claude Code CLI with full capabilities', - authMethods: ['oauth'], + displayName: 'Anthropic', + description: 'Claude Code - recommended for code tasks', cliCommand: 'claude', cliArgs: ['--dangerously-skip-permissions'], oauthConfig: { authorizationUrl: 'https://console.anthropic.com/oauth/authorize', tokenUrl: 'https://api.anthropic.com/oauth/token', - scopes: ['claude-code:execute'] + scopes: ['claude-code:execute', 'user:read'], + userInfoUrl: 'https://api.anthropic.com/v1/user' }, - icon: '🟠' + icon: 'anthropic-logo.svg', + color: '#D97757' }, { id: 'openai', name: 'OpenAI', - description: 'Codex and GPT models', - authMethods: ['api_key'], + displayName: 'OpenAI', + description: 'Codex and ChatGPT models', cliCommand: 'codex', cliArgs: ['--dangerously-bypass-approvals-and-sandbox'], - envVars: { 'OPENAI_API_KEY': 'apiKey' }, - setupUrl: 'https://platform.openai.com/api-keys', - icon: '🟢' + oauthConfig: { + authorizationUrl: 'https://auth.openai.com/authorize', + tokenUrl: 'https://auth.openai.com/oauth/token', + scopes: ['openid', 'profile', 'email', 'model.read', 'model.request'], + userInfoUrl: 'https://api.openai.com/v1/user' + }, + icon: 'openai-logo.svg', + color: '#10A37F' }, { id: 'google', - name: 'Google AI', - description: 'Gemini models', - authMethods: ['api_key', 'oauth'], + name: 'Google', + displayName: 'Google', + description: 'Gemini - multi-modal capabilities', cliCommand: 'gemini', - envVars: { 'GOOGLE_API_KEY': 'apiKey' }, - setupUrl: 'https://aistudio.google.com/app/apikey', - icon: '🔵' + oauthConfig: { + authorizationUrl: 'https://accounts.google.com/o/oauth2/v2/auth', + tokenUrl: 'https://oauth2.googleapis.com/token', + scopes: [ + 'openid', + 'email', + 'profile', + 'https://www.googleapis.com/auth/generative-language' + ], + userInfoUrl: 'https://www.googleapis.com/oauth2/v2/userinfo' + }, + icon: 'google-logo.svg', + color: '#4285F4' + }, + { + id: 'github', + name: 'GitHub', + displayName: 'GitHub', + description: 'Copilot - auto-connected via signup', + cliCommand: 'gh-copilot', + oauthConfig: { + // Uses same OAuth from signup - just needs Copilot scope + authorizationUrl: 'https://github.com/login/oauth/authorize', + tokenUrl: 'https://github.com/login/oauth/access_token', + scopes: ['copilot', 'read:user', 'user:email'], + userInfoUrl: 'https://api.github.com/user' + }, + icon: 'github-logo.svg', + color: '#24292F' }, { - id: 'custom', - name: 'Custom Provider', - description: 'Ollama, LM Studio, or other tools', - authMethods: ['none', 'api_key'], - cliCommand: '', // User specifies - icon: '⚙️' + id: 'microsoft', + name: 'Microsoft', + displayName: 'Microsoft', + description: 'Azure OpenAI - enterprise deployments', + cliCommand: 'azure-openai', + oauthConfig: { + authorizationUrl: 'https://login.microsoftonline.com/common/oauth2/v2.0/authorize', + tokenUrl: 'https://login.microsoftonline.com/common/oauth2/v2.0/token', + scopes: [ + 'openid', + 'profile', + 'email', + 'https://cognitiveservices.azure.com/.default' + ], + userInfoUrl: 'https://graph.microsoft.com/v1.0/me' + }, + icon: 'microsoft-logo.svg', + color: '#00A4EF' } ]; + +// Self-hosted providers don't need OAuth +interface SelfHostedProvider { + id: 'self-hosted'; + name: string; + endpoint: string; // e.g., "http://localhost:11434" for Ollama + cliCommand: string; +} ``` ### Spawner Integration @@ -383,6 +474,7 @@ const PROVIDER_REGISTRY: ProviderConfig[] = [ class CloudAgentSpawner extends AgentSpawner { private credentialVault: CredentialVault; + private tokenRefresher: TokenRefresher; async spawn(request: CloudSpawnRequest): Promise { const { userId, provider, agentName, task } = request; @@ -390,16 +482,14 @@ class CloudAgentSpawner extends AgentSpawner { // Get credentials for this provider const credential = await this.credentialVault.get(userId, provider); if (!credential) { - throw new Error(`No ${provider} credentials configured`); + throw new ProviderNotConnectedError(provider); } - // Validate credentials are still valid - if (credential.authType === 'oauth') { - await this.refreshTokenIfNeeded(credential); - } + // Refresh token if expired or expiring soon (within 5 min) + const validCredential = await this.ensureValidToken(credential); - // Build environment with credentials - const env = this.buildProviderEnv(credential); + // Build environment with OAuth token + const env = this.buildProviderEnv(validCredential); // Get provider config const providerConfig = PROVIDER_REGISTRY.find(p => p.id === provider); @@ -414,21 +504,58 @@ class CloudAgentSpawner extends AgentSpawner { }); } - private buildProviderEnv(credential: ProviderCredential): Record { - const config = PROVIDER_REGISTRY.find(p => p.id === credential.provider); - const env: Record = {}; - - if (credential.authType === 'api_key' && credential.encryptedApiKey) { - const apiKey = this.credentialVault.decrypt(credential.encryptedApiKey); - for (const [envVar, _] of Object.entries(config.envVars)) { - env[envVar] = apiKey; - } - } else if (credential.authType === 'oauth' && credential.accessToken) { - // OAuth tokens might need different handling per provider - env['PROVIDER_ACCESS_TOKEN'] = credential.accessToken; + private async ensureValidToken(credential: ProviderCredential): Promise { + const expiresIn = credential.tokenExpiresAt.getTime() - Date.now(); + const FIVE_MINUTES = 5 * 60 * 1000; + + if (expiresIn < FIVE_MINUTES) { + // Refresh the token + const provider = PROVIDER_REGISTRY.find(p => p.id === credential.provider); + const newTokens = await this.tokenRefresher.refresh( + provider.oauthConfig, + credential.refreshToken + ); + + // Update stored credential + const updated = await this.credentialVault.update(credential.id, { + accessToken: newTokens.accessToken, + refreshToken: newTokens.refreshToken ?? credential.refreshToken, + tokenExpiresAt: newTokens.expiresAt, + lastRefreshedAt: new Date() + }); + + return updated; } - return env; + return credential; + } + + private buildProviderEnv(credential: ProviderCredential): Record { + // Each provider expects OAuth token in different env vars + const envMapping: Record = { + 'anthropic': 'ANTHROPIC_AUTH_TOKEN', + 'openai': 'OPENAI_AUTH_TOKEN', + 'google': 'GOOGLE_AUTH_TOKEN', + 'github': 'GITHUB_TOKEN', + 'microsoft': 'AZURE_AUTH_TOKEN', + 'self-hosted': '' // No auth needed + }; + + const envVar = envMapping[credential.provider]; + if (!envVar) return {}; + + return { + [envVar]: credential.accessToken, + // Some CLIs also want the account info + 'PROVIDER_ACCOUNT_EMAIL': credential.providerAccountEmail + }; + } +} + +class ProviderNotConnectedError extends Error { + constructor(provider: ProviderType) { + super(`Provider "${provider}" is not connected. Please connect it in Settings.`); + this.name = 'ProviderNotConnectedError'; } } ``` @@ -440,12 +567,27 @@ class CloudAgentSpawner extends AgentSpawner { const onboardingRouter = Router(); -// Step 1: GitHub OAuth callback +// Step 1: GitHub OAuth callback (primary signup/login) onboardingRouter.get('/auth/github/callback', async (req, res) => { const { code } = req.query; const tokens = await exchangeGitHubCode(code); const user = await createOrUpdateUser(tokens); + // Store GitHub credential (also gives us Copilot access) + await credentialVault.store({ + userId: user.id, + provider: 'github', + accessToken: tokens.accessToken, + refreshToken: tokens.refreshToken, + tokenExpiresAt: tokens.expiresAt, + scopes: tokens.scopes, + providerAccountId: tokens.user.id, + providerAccountEmail: tokens.user.email, + providerAccountName: tokens.user.name, + connectedAt: new Date(), + isValid: true + }); + // Set session and redirect to repo selection req.session.userId = user.id; res.redirect('/onboarding/repositories'); @@ -466,82 +608,130 @@ onboardingRouter.post('/repositories', async (req, res) => { res.json({ success: true }); }); -// Step 3: List available providers +// Step 3: List available providers with connection status onboardingRouter.get('/providers', async (req, res) => { const connected = await getConnectedProviders(req.session.userId); - res.json({ - available: PROVIDER_REGISTRY, - connected - }); + + // Map registry with connection status + const providers = PROVIDER_REGISTRY.map(p => ({ + ...p, + isConnected: connected.some(c => c.provider === p.id), + connectedAs: connected.find(c => c.provider === p.id)?.providerAccountEmail + })); + + res.json({ providers }); }); -// Step 3: Connect provider (API Key) -onboardingRouter.post('/providers/:provider/api-key', async (req, res) => { +// Step 3: Initiate OAuth login for a provider +onboardingRouter.get('/providers/:provider/login', async (req, res) => { const { provider } = req.params; - const { apiKey, displayName } = req.body; + const config = PROVIDER_REGISTRY.find(p => p.id === provider); - // Validate API key works - const isValid = await validateProviderKey(provider, apiKey); - if (!isValid) { - return res.status(400).json({ error: 'Invalid API key' }); + if (!config) { + return res.status(404).json({ error: 'Unknown provider' }); } - // Encrypt and store - await credentialVault.store({ + // Generate state token for CSRF protection + const state = await generateOAuthState({ userId: req.session.userId, provider, - authType: 'api_key', - encryptedApiKey: encrypt(apiKey), - displayName, - isValid: true + returnTo: req.query.returnTo || '/onboarding/providers' }); - res.json({ success: true }); + // Build OAuth authorization URL + const authUrl = new URL(config.oauthConfig.authorizationUrl); + authUrl.searchParams.set('client_id', getClientId(provider)); + authUrl.searchParams.set('redirect_uri', `${BASE_URL}/providers/${provider}/callback`); + authUrl.searchParams.set('scope', config.oauthConfig.scopes.join(' ')); + authUrl.searchParams.set('state', state); + authUrl.searchParams.set('response_type', 'code'); + + res.redirect(authUrl.toString()); }); -// Step 3: Connect provider (OAuth - initiate) -onboardingRouter.get('/providers/:provider/oauth', async (req, res) => { - const { provider } = req.params; - const config = PROVIDER_REGISTRY.find(p => p.id === provider); +// Step 3: OAuth callback after user authorizes +onboardingRouter.get('/providers/:provider/callback', async (req, res) => { + const { code, state, error } = req.query; - const state = generateOAuthState(req.session.userId, provider); - const authUrl = buildOAuthUrl(config.oauthConfig, state); + if (error) { + return res.redirect(`/onboarding/providers?error=${error}`); + } - res.redirect(authUrl); -}); + // Verify state token + const stateData = await verifyOAuthState(state); + if (!stateData) { + return res.status(400).json({ error: 'Invalid state' }); + } + + const { userId, provider, returnTo } = stateData; + const config = PROVIDER_REGISTRY.find(p => p.id === provider); -// Step 3: OAuth callback -onboardingRouter.get('/providers/:provider/oauth/callback', async (req, res) => { - const { code, state } = req.query; - const { userId, provider } = verifyOAuthState(state); + // Exchange code for tokens + const tokens = await exchangeOAuthCode({ + tokenUrl: config.oauthConfig.tokenUrl, + code, + clientId: getClientId(provider), + clientSecret: getClientSecret(provider), + redirectUri: `${BASE_URL}/providers/${provider}/callback` + }); - const tokens = await exchangeOAuthCode(provider, code); + // Fetch user info from provider + const userInfo = await fetchProviderUserInfo( + config.oauthConfig.userInfoUrl, + tokens.accessToken + ); + // Store credential await credentialVault.store({ userId, provider, - authType: 'oauth', accessToken: tokens.accessToken, refreshToken: tokens.refreshToken, - tokenExpiresAt: tokens.expiresAt, - scopes: tokens.scopes, + tokenExpiresAt: new Date(Date.now() + tokens.expiresIn * 1000), + scopes: tokens.scope.split(' '), + providerAccountId: userInfo.id, + providerAccountEmail: userInfo.email, + providerAccountName: userInfo.name, + connectedAt: new Date(), isValid: true }); - res.redirect('/onboarding/providers?connected=' + provider); + res.redirect(`${returnTo}?connected=${provider}`); +}); + +// Step 3: Disconnect a provider +onboardingRouter.delete('/providers/:provider', async (req, res) => { + const { provider } = req.params; + + await credentialVault.delete(req.session.userId, provider); + + res.json({ success: true }); }); // Step 4: Create team from template onboardingRouter.post('/teams/from-template', async (req, res) => { - const { templateId, repoIds } = req.body; + const { templateId, repoIds, defaultProvider } = req.body; const template = TEAM_TEMPLATES[templateId]; + // Verify user has the default provider connected + const hasProvider = await credentialVault.exists( + req.session.userId, + defaultProvider || 'anthropic' + ); + + if (!hasProvider) { + return res.status(400).json({ + error: 'Provider not connected', + message: `Please connect ${defaultProvider || 'Anthropic'} first` + }); + } + const team = await createTeam({ userId: req.session.userId, name: template.name, agents: template.agents.map(a => ({ ...a, - provider: req.body.defaultProvider || 'anthropic' + provider: defaultProvider || 'anthropic' })), repoIds }); @@ -567,26 +757,32 @@ onboardingRouter.post('/complete', async (req, res) => { ## Security Considerations -### API Key Storage +### OAuth Token Security -1. **Encryption at rest**: All API keys encrypted with AES-256-GCM +1. **Encryption at rest**: All tokens encrypted with AES-256-GCM 2. **Key derivation**: Per-user encryption keys derived from master key + user ID -3. **No plaintext logging**: API keys never logged, even in debug mode -4. **Rotation support**: Users can rotate keys without losing config +3. **No plaintext logging**: Tokens never logged, even in debug mode +4. **Short-lived access tokens**: Rely on refresh tokens for long sessions + +### Token Lifecycle Management + +1. **Automatic refresh**: Tokens refreshed 5 minutes before expiry +2. **Refresh token rotation**: Use rotating refresh tokens where supported +3. **Revocation detection**: Check token validity on spawn, prompt re-auth if revoked +4. **Graceful degradation**: Queue tasks if token refresh fails temporarily -### OAuth Token Management +### Scope Management -1. **Automatic refresh**: Tokens refreshed before expiry -2. **Secure storage**: Tokens stored encrypted, same as API keys -3. **Scope limiting**: Request minimum required scopes -4. **Revocation handling**: Detect revoked tokens, prompt re-auth +1. **Minimum scopes**: Request only scopes needed for agent execution +2. **Scope display**: Show users exactly what permissions we request +3. **No scope creep**: Never silently request additional scopes ### Access Control -1. **User isolation**: Credentials tied to user ID, not shared -2. **Team permissions**: Team admins can share provider access with team -3. **Audit logging**: All credential access logged -4. **Rate limiting**: Provider usage rate-limited per user +1. **User isolation**: Credentials tied to user ID, never shared +2. **Team permissions**: Team admins can enable provider access for team members +3. **Audit logging**: All credential access and agent spawns logged +4. **Rate limiting**: Provider usage rate-limited per user/team --- @@ -649,9 +845,10 @@ Let users connect their own cloud accounts for compute: The onboarding flow prioritizes: 1. **Low friction**: GitHub OAuth gets users started immediately -2. **Flexibility**: Support multiple auth methods per provider -3. **Security**: Encrypted credential storage with proper isolation -4. **Discoverability**: Show available providers with easy setup links +2. **Consistent UX**: All providers use "Login with X" - no API keys to manage +3. **Security**: OAuth tokens with automatic refresh, encrypted at rest +4. **Account linking**: Users log in with their existing provider accounts 5. **Progressive disclosure**: Optional team setup, can skip and add later +6. **Graceful recovery**: Re-auth prompts when tokens expire or get revoked -Users can authenticate with all their providers upfront during onboarding, or add them incrementally as needed from settings. +Users can connect all their AI providers during onboarding with simple login buttons, or add them later from Settings. GitHub Copilot is auto-connected via the initial signup flow. From a9cf5df7ccee8e2ef8b1e6f1b79b73ca921cf2c4 Mon Sep 17 00:00:00 2001 From: Claude Date: Mon, 29 Dec 2025 23:43:53 +0000 Subject: [PATCH 03/38] Add realistic Claude Code auth strategy with fallbacks Claude Code currently uses browser-based OAuth that's not fully headless-compatible. Updated design with practical alternatives: - Device authorization flow (enter code at anthropic.com) - Credential import from local Claude installation - Provider status table showing actual OAuth support levels References GitHub issue anthropics/claude-code#7100 for context. bd-cloud-onboarding --- docs/CLOUD-ONBOARDING-DESIGN.md | 149 +++++++++++++++++++++++++++++--- 1 file changed, 139 insertions(+), 10 deletions(-) diff --git a/docs/CLOUD-ONBOARDING-DESIGN.md b/docs/CLOUD-ONBOARDING-DESIGN.md index c7984c708..ee9432b3e 100644 --- a/docs/CLOUD-ONBOARDING-DESIGN.md +++ b/docs/CLOUD-ONBOARDING-DESIGN.md @@ -12,21 +12,58 @@ Agent Relay Cloud provides a hosted version of agent-relay with: ### Design Principle: Login-Only Authentication -**No API keys** - All provider authentication happens via OAuth/login flows. This provides: +**No API keys in the UI** - Users authenticate via login flows, not by pasting keys. This provides: - **Better security**: No keys to leak, rotate, or manage - **Consistent UX**: Always "Login with X" buttons - **Account linking**: Users authenticate with their existing provider accounts -- **Automatic token refresh**: OAuth handles expiration gracefully +- **Automatic token refresh**: Where supported -| Provider | Auth Flow | User Experience | -|----------|-----------|-----------------| -| Claude/Anthropic | OAuth 2.0 | "Login with Anthropic" | -| OpenAI | OAuth 2.0 | "Login with OpenAI" | -| Google/Gemini | OAuth 2.0 | "Login with Google" | -| GitHub Copilot | OAuth 2.0 | Already authed via GitHub signup | -| Azure OpenAI | OAuth 2.0 | "Login with Microsoft" | -| Local/Self-hosted | None | Configure endpoint URL only | +### Provider Authentication Reality Check + +Different providers have different OAuth maturity levels: + +| Provider | Auth Flow | Status | Notes | +|----------|-----------|--------|-------| +| Claude/Anthropic | Browser OAuth | ⚠️ Partial | Uses browser-based login, headless support limited | +| OpenAI | OAuth 2.0 | ✅ Supported | ChatGPT OAuth available | +| Google/Gemini | OAuth 2.0 | ✅ Supported | Standard Google OAuth | +| GitHub Copilot | OAuth 2.0 | ✅ Supported | Via GitHub OAuth | +| Azure OpenAI | OAuth 2.0 | ✅ Supported | Via Microsoft Entra ID | +| Local/Self-hosted | None | ✅ N/A | Just endpoint URL | + +### Claude Code Authentication Strategy + +Claude Code currently uses browser-based OAuth (`/login`) that stores tokens locally. For a cloud environment, we need a **credential delegation flow**: + +``` +┌─────────────────────────────────────────────────────────────────┐ +│ Agent Relay Cloud - Claude Code Auth Flow │ +├─────────────────────────────────────────────────────────────────┤ +│ │ +│ Step 1: User clicks "Login with Anthropic" in our dashboard │ +│ ↓ │ +│ Step 2: Opens popup/redirect to Anthropic's OAuth │ +│ (same flow as `claude /login`) │ +│ ↓ │ +│ Step 3: User authenticates with Anthropic │ +│ ↓ │ +│ Step 4: Anthropic redirects back with auth token │ +│ ↓ │ +│ Step 5: We store encrypted token in credential vault │ +│ ↓ │ +│ Step 6: When spawning agents, inject token via: │ +│ - ANTHROPIC_AUTH_TOKEN env var, or │ +│ - Mount equivalent of ~/.claude/.credentials.json │ +│ │ +└─────────────────────────────────────────────────────────────────┘ +``` + +**Note**: This requires Anthropic to support redirect-based OAuth (vs device-only flow). If not available, fallback options: + +1. **Device Authorization Flow**: Display code, user enters at anthropic.com +2. **Credential File Upload**: User runs `/login` locally, uploads credential file +3. **API Key (hidden)**: Accept API key but label it as "Access Token" for consistent UX ### Proposed Solution: Provider Credentials Vault @@ -238,6 +275,98 @@ After authorization, redirect back with success: └─────────────────────────────────────────────────────────────────┘ ``` +#### Device Authorization Flow (Fallback for Claude) + +If Claude Code doesn't support redirect-based OAuth, use device flow: + +``` +┌─────────────────────────────────────────────────────────────────┐ +│ Connect Claude Code │ +│ │ +│ To connect your Claude account: │ +│ │ +│ 1. Go to: console.anthropic.com/device │ +│ │ +│ 2. Enter this code: │ +│ │ +│ ┌─────────────────────────────────────────┐ │ +│ │ ABCD-1234-EFGH │ │ +│ └─────────────────────────────────────────┘ │ +│ │ +│ [Copy Code] │ +│ │ +│ 3. Approve the connection in your browser │ +│ │ +│ ⏳ Waiting for authorization... │ +│ │ +│ ┌──────────────┐ │ +│ │ Cancel │ │ +│ └──────────────┘ │ +└─────────────────────────────────────────────────────────────────┘ +``` + +After approval detected: + +``` +┌─────────────────────────────────────────────────────────────────┐ +│ ✅ Claude Code Connected! │ +│ │ +│ Successfully linked to: user@example.com │ +│ │ +│ ┌──────────────────────────────────────────────────────────┐ │ +│ │ Continue → │ │ +│ └──────────────────────────────────────────────────────────┘ │ +└─────────────────────────────────────────────────────────────────┘ +``` + +#### Credential Import (Alternative for Claude) + +For users who prefer to authenticate locally first: + +``` +┌─────────────────────────────────────────────────────────────────┐ +│ Connect Claude Code │ +│ │ +│ Choose how to connect: │ +│ │ +│ ┌─────────────────────────────────────────────────────────────┐│ +│ │ 🔐 Login with Anthropic ││ +│ │ Authenticate in browser (recommended) ││ +│ └─────────────────────────────────────────────────────────────┘│ +│ │ +│ ┌─────────────────────────────────────────────────────────────┐│ +│ │ 📁 Import from Local Claude ││ +│ │ Already have Claude Code installed? Import credentials ││ +│ └─────────────────────────────────────────────────────────────┘│ +│ │ +└─────────────────────────────────────────────────────────────────┘ +``` + +Import flow: + +``` +┌─────────────────────────────────────────────────────────────────┐ +│ Import Claude Credentials │ +│ │ +│ Run this command on your local machine: │ +│ │ +│ ┌─────────────────────────────────────────────────────────────┐│ +│ │ npx agent-relay-cloud export-credentials ││ +│ └─────────────────────────────────────────────────────────────┘│ +│ [Copy] │ +│ │ +│ This will: │ +│ • Read your Claude credentials from ~/.claude/ │ +│ • Encrypt them with a one-time code │ +│ • Upload securely to Agent Relay Cloud │ +│ │ +│ Your credentials never leave your machine unencrypted. │ +│ │ +│ ⏳ Waiting for import... │ +│ │ +└─────────────────────────────────────────────────────────────────┘ +``` + ### Step 4: Configure Your First Team (Optional) ``` From 1ae2ccd5b6fdfc4365b40c55de0d74dc5c0ecfe1 Mon Sep 17 00:00:00 2001 From: Claude Date: Mon, 29 Dec 2025 23:50:28 +0000 Subject: [PATCH 04/38] Expand device flow auth for Claude Code and OpenAI Codex Both Claude Code and Codex use browser-based OAuth that doesn't support redirect URIs for third-party apps. Device flow (RFC 8628) is the solution. Added: - Sequence diagram showing device flow protocol - Provider-specific device flow URLs table - Complete UI flow with wireframes for both providers - TypeScript implementation (DeviceFlowAuth class) - Express API routes with background polling - React component with state machine References: - anthropics/claude-code#7100 (headless auth request) - openai/codex#2798 (remote auth request) bd-cloud-onboarding --- docs/CLOUD-ONBOARDING-DESIGN.md | 790 +++++++++++++++++++++++++++++++- 1 file changed, 765 insertions(+), 25 deletions(-) diff --git a/docs/CLOUD-ONBOARDING-DESIGN.md b/docs/CLOUD-ONBOARDING-DESIGN.md index ee9432b3e..fe3432c90 100644 --- a/docs/CLOUD-ONBOARDING-DESIGN.md +++ b/docs/CLOUD-ONBOARDING-DESIGN.md @@ -21,20 +21,31 @@ Agent Relay Cloud provides a hosted version of agent-relay with: ### Provider Authentication Reality Check -Different providers have different OAuth maturity levels: +Different providers have different OAuth maturity levels. Notably, **both Claude Code and +OpenAI Codex** use browser-based OAuth that doesn't support headless/cloud environments well: | Provider | Auth Flow | Status | Notes | |----------|-----------|--------|-------| -| Claude/Anthropic | Browser OAuth | ⚠️ Partial | Uses browser-based login, headless support limited | -| OpenAI | OAuth 2.0 | ✅ Supported | ChatGPT OAuth available | -| Google/Gemini | OAuth 2.0 | ✅ Supported | Standard Google OAuth | -| GitHub Copilot | OAuth 2.0 | ✅ Supported | Via GitHub OAuth | -| Azure OpenAI | OAuth 2.0 | ✅ Supported | Via Microsoft Entra ID | +| Claude/Anthropic | Browser OAuth | ⚠️ Device Flow | Opens browser, no redirect URI support | +| OpenAI/Codex | Browser OAuth | ⚠️ Device Flow | Opens browser for ChatGPT login | +| Google/Gemini | OAuth 2.0 | ✅ Redirect | Standard Google OAuth with redirect | +| GitHub Copilot | OAuth 2.0 | ✅ Redirect | Via GitHub OAuth (auto from signup) | +| Azure OpenAI | OAuth 2.0 | ✅ Redirect | Via Microsoft Entra ID | | Local/Self-hosted | None | ✅ N/A | Just endpoint URL | -### Claude Code Authentication Strategy +**Key insight**: The two most popular coding agents (Claude Code and Codex) both require +device flow or similar workarounds for cloud/headless environments. Both have open GitHub +issues requesting proper headless auth support: +- [anthropics/claude-code#7100](https://github.com/anthropics/claude-code/issues/7100) +- [openai/codex#2798](https://github.com/openai/codex/issues/2798) -Claude Code currently uses browser-based OAuth (`/login`) that stores tokens locally. For a cloud environment, we need a **credential delegation flow**: +### Device Flow Authentication Strategy (Claude + Codex) + +Both Claude Code and OpenAI Codex use browser-based OAuth that stores tokens locally: +- **Claude Code**: `claude /login` → opens browser → stores in `~/.claude/.credentials.json` +- **Codex**: `codex` → opens browser for ChatGPT → stores in `~/.codex/` + +For a cloud environment, we need a **device authorization flow** (RFC 8628): ``` ┌─────────────────────────────────────────────────────────────────┐ @@ -275,29 +286,116 @@ After authorization, redirect back with success: └─────────────────────────────────────────────────────────────────┘ ``` -#### Device Authorization Flow (Fallback for Claude) +--- + +## Device Authorization Flow (RFC 8628) + +This is the **primary authentication method** for Claude Code and OpenAI Codex, since neither +supports standard OAuth redirect flows for third-party cloud applications. + +### How Device Flow Works + +``` +┌──────────────────┐ ┌──────────────────┐ ┌──────────────────┐ +│ Agent Relay │ │ Provider │ │ User's │ +│ Cloud │ │ Auth Server │ │ Browser │ +└────────┬─────────┘ └────────┬─────────┘ └────────┬─────────┘ + │ │ │ + │ 1. POST /device/code │ │ + │ {client_id, scope} │ │ + │ ───────────────────────>│ │ + │ │ │ + │ {device_code, │ │ + │ user_code: "ABCD-1234"│ │ + │ verification_uri, │ │ + │ expires_in: 900} │ │ + │ <───────────────────────│ │ + │ │ │ + │ Display code to user │ │ + │ ─ ─ ─ ─ ─ ─ ─ ─ ─ ─ ─ ─ ─ ─ ─ ─ ─ ─ ─ ─ ─ ─ ─ ─>│ + │ │ │ + │ │ 2. User visits URL │ + │ │ & enters user_code │ + │ │<────────────────────────│ + │ │ │ + │ │ 3. User authenticates │ + │ │ & authorizes app │ + │ │<────────────────────────│ + │ │ │ + │ 4. POST /token │ │ + │ {device_code} │ │ + │ (polling every 5s) │ │ + │ ───────────────────────>│ │ + │ │ │ + │ "authorization_pending"│ │ + │ <───────────────────────│ (keep polling...) │ + │ │ │ + │ 5. POST /token │ │ + │ ───────────────────────>│ │ + │ │ │ + │ {access_token, │ │ + │ refresh_token} │ │ + │ <───────────────────────│ │ + │ │ │ +``` + +### Provider-Specific Device Flow URLs + +| Provider | Device Code URL | Token URL | Verification URL | +|----------|-----------------|-----------|------------------| +| Anthropic | `api.anthropic.com/oauth/device/code` | `api.anthropic.com/oauth/token` | `console.anthropic.com/device` | +| OpenAI | `auth.openai.com/device/code` | `auth.openai.com/oauth/token` | `auth.openai.com/device` | +| Google | `oauth2.googleapis.com/device/code` | `oauth2.googleapis.com/token` | `google.com/device` | +| GitHub | `github.com/login/device/code` | `github.com/login/oauth/access_token` | `github.com/login/device` | + +*Note: Anthropic and OpenAI URLs are hypothetical - these providers would need to implement +RFC 8628 device authorization. Currently, they only support browser-based OAuth.* + +### UI Flow -If Claude Code doesn't support redirect-based OAuth, use device flow: +**Step 1: User clicks "Login with [Provider]"** ``` ┌─────────────────────────────────────────────────────────────────┐ │ Connect Claude Code │ │ │ -│ To connect your Claude account: │ +│ To connect your Anthropic account: │ │ │ -│ 1. Go to: console.anthropic.com/device │ +│ ┌─────────────────────────────────────────────────────────────┐│ +│ │ 1. Click below to open Anthropic in a new tab ││ +│ │ 2. Sign in with your Anthropic account ││ +│ │ 3. Enter the code shown here when prompted ││ +│ └─────────────────────────────────────────────────────────────┘│ +│ │ +│ ┌─────────────────────────────────────────────────────────────┐│ +│ │ 🔐 Open Anthropic → ││ +│ └─────────────────────────────────────────────────────────────┘│ +│ │ +└─────────────────────────────────────────────────────────────────┘ +``` + +**Step 2: Show code, user enters at provider** + +``` +┌─────────────────────────────────────────────────────────────────┐ +│ Connect Claude Code │ │ │ -│ 2. Enter this code: │ +│ Enter this code at Anthropic: │ │ │ -│ ┌─────────────────────────────────────────┐ │ -│ │ ABCD-1234-EFGH │ │ -│ └─────────────────────────────────────────┘ │ +│ ┌─────────────────────────────────────────────────────────────┐│ +│ │ ││ +│ │ WDJB-MJPV ││ +│ │ ││ +│ └─────────────────────────────────────────────────────────────┘│ +│ [Copy] │ │ │ -│ [Copy Code] │ +│ A browser tab should have opened to console.anthropic.com │ +│ Didn't open? Click here → │ │ │ -│ 3. Approve the connection in your browser │ +│ ───────────────────────────────────────────────────────────────│ │ │ -│ ⏳ Waiting for authorization... │ +│ ⏳ Waiting for you to authorize... │ +│ Code expires in 14:32 │ │ │ │ ┌──────────────┐ │ │ │ Cancel │ │ @@ -305,20 +403,662 @@ If Claude Code doesn't support redirect-based OAuth, use device flow: └─────────────────────────────────────────────────────────────────┘ ``` -After approval detected: +**Same flow for Codex:** ``` ┌─────────────────────────────────────────────────────────────────┐ -│ ✅ Claude Code Connected! │ +│ Connect OpenAI Codex │ │ │ -│ Successfully linked to: user@example.com │ +│ Enter this code at OpenAI: │ │ │ -│ ┌──────────────────────────────────────────────────────────┐ │ -│ │ Continue → │ │ -│ └──────────────────────────────────────────────────────────┘ │ +│ ┌─────────────────────────────────────────────────────────────┐│ +│ │ ││ +│ │ XKCD-4815 ││ +│ │ ││ +│ └─────────────────────────────────────────────────────────────┘│ +│ [Copy] │ +│ │ +│ A browser tab should have opened to auth.openai.com │ +│ Didn't open? Click here → │ +│ │ +│ ───────────────────────────────────────────────────────────────│ +│ │ +│ ⏳ Waiting for you to authorize... │ +│ Code expires in 14:47 │ +│ │ +│ ┌──────────────┐ │ +│ │ Cancel │ │ +│ └──────────────┘ │ └─────────────────────────────────────────────────────────────────┘ ``` +**Step 3: Success** + +``` +┌─────────────────────────────────────────────────────────────────┐ +│ │ +│ ✅ Connected! │ +│ │ +│ Your Anthropic account is now linked. │ +│ │ +│ ┌─────────────────────────────────────────────────────────────┐│ +│ │ Account: user@example.com ││ +│ │ Plan: Claude Pro ││ +│ └─────────────────────────────────────────────────────────────┘│ +│ │ +│ ┌─────────────────────────────────────────────────────────────┐│ +│ │ Continue → ││ +│ └─────────────────────────────────────────────────────────────┘│ +│ │ +└─────────────────────────────────────────────────────────────────┘ +``` + +**Error States:** + +``` +Code Expired: +┌─────────────────────────────────────────────────────────────────┐ +│ ⚠️ Code Expired │ +│ │ +│ The authorization code has expired. This happens if you │ +│ don't complete the sign-in within 15 minutes. │ +│ │ +│ ┌───────────────────┐ ┌───────────────────────────────────┐ │ +│ │ Cancel │ │ Get New Code │ │ +│ └───────────────────┘ └───────────────────────────────────┘ │ +└─────────────────────────────────────────────────────────────────┘ + +Access Denied: +┌─────────────────────────────────────────────────────────────────┐ +│ ❌ Access Denied │ +│ │ +│ You denied the authorization request at Anthropic. │ +│ │ +│ ┌───────────────────┐ ┌───────────────────────────────────┐ │ +│ │ Cancel │ │ Try Again │ │ +│ └───────────────────┘ └───────────────────────────────────┘ │ +└─────────────────────────────────────────────────────────────────┘ +``` + +--- + +### Device Flow Implementation + +```typescript +// src/cloud/auth/device-flow.ts + +interface DeviceCodeResponse { + device_code: string; // Secret - we use this for polling + user_code: string; // Display to user: "WDJB-MJPV" + verification_uri: string; // Where user goes: console.anthropic.com/device + verification_uri_complete?: string; // URL with code pre-filled (optional) + expires_in: number; // Seconds until codes expire (typically 900) + interval: number; // Min seconds between poll requests (typically 5) +} + +interface DeviceFlowConfig { + provider: string; + deviceCodeUrl: string; + tokenUrl: string; + clientId: string; + scopes: string[]; +} + +const DEVICE_FLOW_CONFIGS: Record = { + anthropic: { + provider: 'anthropic', + deviceCodeUrl: 'https://api.anthropic.com/oauth/device/code', + tokenUrl: 'https://api.anthropic.com/oauth/token', + clientId: process.env.ANTHROPIC_CLIENT_ID!, + scopes: ['claude-code:execute', 'user:read'] + }, + openai: { + provider: 'openai', + deviceCodeUrl: 'https://auth.openai.com/device/code', + tokenUrl: 'https://auth.openai.com/oauth/token', + clientId: process.env.OPENAI_CLIENT_ID!, + scopes: ['openid', 'profile', 'email', 'codex:execute'] + } +}; + +class DeviceFlowAuth { + private config: DeviceFlowConfig; + + constructor(provider: string) { + this.config = DEVICE_FLOW_CONFIGS[provider]; + if (!this.config) { + throw new Error(`No device flow config for provider: ${provider}`); + } + } + + /** + * Step 1: Request device and user codes from provider + */ + async requestCodes(): Promise { + const response = await fetch(this.config.deviceCodeUrl, { + method: 'POST', + headers: { + 'Content-Type': 'application/x-www-form-urlencoded' + }, + body: new URLSearchParams({ + client_id: this.config.clientId, + scope: this.config.scopes.join(' ') + }) + }); + + if (!response.ok) { + const error = await response.text(); + throw new Error(`Failed to get device code: ${error}`); + } + + return response.json(); + } + + /** + * Step 2: Poll for tokens (called repeatedly until success/failure) + */ + async pollForToken(deviceCode: string): Promise { + const response = await fetch(this.config.tokenUrl, { + method: 'POST', + headers: { + 'Content-Type': 'application/x-www-form-urlencoded' + }, + body: new URLSearchParams({ + client_id: this.config.clientId, + device_code: deviceCode, + grant_type: 'urn:ietf:params:oauth:grant-type:device_code' + }) + }); + + const data = await response.json(); + + // RFC 8628 error codes + if (data.error) { + switch (data.error) { + case 'authorization_pending': + // User hasn't completed authorization yet + return { status: 'pending' }; + + case 'slow_down': + // Polling too fast - increase interval + return { + status: 'slow_down', + retryAfter: data.interval || 10 + }; + + case 'expired_token': + // Device code expired + return { status: 'expired' }; + + case 'access_denied': + // User denied authorization + return { status: 'denied' }; + + default: + return { + status: 'error', + error: data.error_description || data.error + }; + } + } + + // Success! + return { + status: 'success', + tokens: { + accessToken: data.access_token, + refreshToken: data.refresh_token, + expiresIn: data.expires_in, + scope: data.scope + } + }; + } +} + +type PollResult = + | { status: 'pending' } + | { status: 'slow_down'; retryAfter: number } + | { status: 'expired' } + | { status: 'denied' } + | { status: 'error'; error: string } + | { status: 'success'; tokens: TokenSet }; + +interface TokenSet { + accessToken: string; + refreshToken: string; + expiresIn: number; + scope: string; +} +``` + +### Device Flow API Routes + +```typescript +// src/cloud/api/device-flow.ts + +const router = Router(); + +// Store for active device flows (use Redis in production) +const activeFlows = new Map(); + +interface ActiveFlow { + userId: string; + provider: string; + deviceCode: string; + userCode: string; + verificationUri: string; + verificationUriComplete?: string; + expiresAt: Date; + pollInterval: number; + status: 'pending' | 'success' | 'expired' | 'denied' | 'error'; + tokens?: TokenSet; + error?: string; +} + +/** + * POST /api/device-flow/:provider/start + * Initiates device flow, returns user code to display + */ +router.post('/:provider/start', async (req, res) => { + const { provider } = req.params; + const userId = req.session.userId; + + try { + const auth = new DeviceFlowAuth(provider); + const codes = await auth.requestCodes(); + + const flowId = crypto.randomUUID(); + + activeFlows.set(flowId, { + userId, + provider, + deviceCode: codes.device_code, + userCode: codes.user_code, + verificationUri: codes.verification_uri, + verificationUriComplete: codes.verification_uri_complete, + expiresAt: new Date(Date.now() + codes.expires_in * 1000), + pollInterval: codes.interval, + status: 'pending' + }); + + // Start background polling + pollInBackground(flowId, auth); + + res.json({ + flowId, + userCode: codes.user_code, + verificationUri: codes.verification_uri, + verificationUriComplete: codes.verification_uri_complete, + expiresIn: codes.expires_in + }); + } catch (error) { + res.status(500).json({ error: error.message }); + } +}); + +/** + * GET /api/device-flow/:provider/status/:flowId + * Check status of device flow (client polls this) + */ +router.get('/:provider/status/:flowId', async (req, res) => { + const { flowId } = req.params; + const flow = activeFlows.get(flowId); + + if (!flow) { + return res.status(404).json({ error: 'Flow not found' }); + } + + if (flow.userId !== req.session.userId) { + return res.status(403).json({ error: 'Unauthorized' }); + } + + const timeLeft = Math.max(0, Math.floor( + (flow.expiresAt.getTime() - Date.now()) / 1000 + )); + + res.json({ + status: flow.status, + expiresIn: timeLeft, + error: flow.error + }); +}); + +/** + * DELETE /api/device-flow/:provider/:flowId + * Cancel device flow + */ +router.delete('/:provider/:flowId', async (req, res) => { + const { flowId } = req.params; + const flow = activeFlows.get(flowId); + + if (flow?.userId === req.session.userId) { + activeFlows.delete(flowId); + } + + res.json({ success: true }); +}); + +/** + * Background polling for device authorization + */ +async function pollInBackground(flowId: string, auth: DeviceFlowAuth) { + const flow = activeFlows.get(flowId); + if (!flow) return; + + let interval = flow.pollInterval * 1000; + + const poll = async () => { + const current = activeFlows.get(flowId); + if (!current || current.status !== 'pending') return; + + // Check expiry + if (Date.now() > current.expiresAt.getTime()) { + current.status = 'expired'; + return; + } + + try { + const result = await auth.pollForToken(current.deviceCode); + + switch (result.status) { + case 'pending': + setTimeout(poll, interval); + break; + + case 'slow_down': + interval = result.retryAfter * 1000; + setTimeout(poll, interval); + break; + + case 'success': + // Store tokens + await storeProviderTokens(current.userId, current.provider, result.tokens); + current.status = 'success'; + current.tokens = result.tokens; + // Clean up after 60s + setTimeout(() => activeFlows.delete(flowId), 60000); + break; + + case 'expired': + case 'denied': + current.status = result.status; + break; + + case 'error': + current.status = 'error'; + current.error = result.error; + break; + } + } catch (error) { + console.error('Poll error:', error); + // Retry with backoff + setTimeout(poll, interval * 2); + } + }; + + // Start after initial interval + setTimeout(poll, interval); +} + +/** + * Store tokens after successful device flow + */ +async function storeProviderTokens( + userId: string, + provider: string, + tokens: TokenSet +) { + // Get user info from provider + const userInfo = await fetchProviderUserInfo(provider, tokens.accessToken); + + await credentialVault.store({ + userId, + provider, + accessToken: tokens.accessToken, + refreshToken: tokens.refreshToken, + tokenExpiresAt: new Date(Date.now() + tokens.expiresIn * 1000), + scopes: tokens.scope.split(' '), + providerAccountId: userInfo.id, + providerAccountEmail: userInfo.email, + providerAccountName: userInfo.name, + connectedAt: new Date(), + isValid: true + }); +} +``` + +### Frontend Component + +```tsx +// src/cloud/components/DeviceFlowAuth.tsx + +import { useState, useEffect, useCallback } from 'react'; + +interface Props { + provider: 'anthropic' | 'openai'; + providerName: string; // "Anthropic" or "OpenAI" + onSuccess: () => void; + onCancel: () => void; +} + +type State = + | { step: 'ready' } + | { step: 'loading' } + | { step: 'showing_code'; flowId: string; userCode: string; + verificationUri: string; expiresAt: Date } + | { step: 'success' } + | { step: 'error'; message: string; canRetry: boolean }; + +export function DeviceFlowAuth({ provider, providerName, onSuccess, onCancel }: Props) { + const [state, setState] = useState({ step: 'ready' }); + const [timeLeft, setTimeLeft] = useState(0); + + // Start the device flow + const startFlow = useCallback(async () => { + setState({ step: 'loading' }); + + try { + const res = await fetch(`/api/device-flow/${provider}/start`, { + method: 'POST', + credentials: 'include' + }); + const data = await res.json(); + + if (!res.ok) throw new Error(data.error); + + setState({ + step: 'showing_code', + flowId: data.flowId, + userCode: data.userCode, + verificationUri: data.verificationUri, + expiresAt: new Date(Date.now() + data.expiresIn * 1000) + }); + + // Open provider auth page + window.open( + data.verificationUriComplete || data.verificationUri, + '_blank', + 'noopener' + ); + } catch (error) { + setState({ + step: 'error', + message: error.message, + canRetry: true + }); + } + }, [provider]); + + // Poll for status + useEffect(() => { + if (state.step !== 'showing_code') return; + + const checkStatus = async () => { + try { + const res = await fetch( + `/api/device-flow/${provider}/status/${state.flowId}`, + { credentials: 'include' } + ); + const data = await res.json(); + + switch (data.status) { + case 'success': + setState({ step: 'success' }); + setTimeout(onSuccess, 1500); + break; + case 'expired': + setState({ + step: 'error', + message: 'Code expired. Please try again.', + canRetry: true + }); + break; + case 'denied': + setState({ + step: 'error', + message: 'Authorization was denied.', + canRetry: true + }); + break; + case 'error': + setState({ + step: 'error', + message: data.error || 'An error occurred.', + canRetry: true + }); + break; + // 'pending' - keep polling + } + } catch (error) { + console.error('Status check failed:', error); + } + }; + + const interval = setInterval(checkStatus, 2000); + return () => clearInterval(interval); + }, [state, provider, onSuccess]); + + // Countdown timer + useEffect(() => { + if (state.step !== 'showing_code') return; + + const tick = () => { + const remaining = Math.floor( + (state.expiresAt.getTime() - Date.now()) / 1000 + ); + setTimeLeft(Math.max(0, remaining)); + }; + + tick(); + const interval = setInterval(tick, 1000); + return () => clearInterval(interval); + }, [state]); + + const formatTime = (s: number) => + `${Math.floor(s / 60)}:${(s % 60).toString().padStart(2, '0')}`; + + const copyCode = () => { + if (state.step === 'showing_code') { + navigator.clipboard.writeText(state.userCode); + } + }; + + // Render + switch (state.step) { + case 'ready': + return ( +
+

Connect {providerName}

+

+ Click below to sign in with your {providerName} account. + You'll enter a code to link your account. +

+
+ + +
+
+ ); + + case 'loading': + return ( +
+
+

Preparing authorization...

+
+ ); + + case 'showing_code': + return ( +
+

Enter this code at {providerName}

+ +
+ {state.userCode} + +
+ +

+ A browser tab opened to{' '} + + {new URL(state.verificationUri).hostname} + +

+ +
+ + Waiting for authorization... +
+ +
+ Code expires in {formatTime(timeLeft)} +
+ + +
+ ); + + case 'success': + return ( +
+
✅
+

Connected!

+

Your {providerName} account is now linked.

+
+ ); + + case 'error': + return ( +
+
❌
+

Connection Failed

+

{state.message}

+
+ {state.canRetry && ( + + )} + +
+
+ ); + } +} +``` + +--- + #### Credential Import (Alternative for Claude) For users who prefer to authenticate locally first: From c7c31a40f7e6ffc44230b2212c425a429b7af678 Mon Sep 17 00:00:00 2001 From: Claude Date: Mon, 29 Dec 2025 23:51:51 +0000 Subject: [PATCH 05/38] Add cloud vs self-hosted deployment models Agent Relay supports both deployment models with unified auth: 1. Cloud Hosted: Everything runs in cloud, users just connect accounts 2. Self-Hosted: Agents run locally with optional cloud sync 3. Self-Hosted + Cloud: Local execution with cloud auth/dashboard Added: - Deployment model diagrams - Feature comparison table - Self-hosted onboarding CLI flow - Credential sync architecture - Hybrid mode (agent-relay cloud connect) bd-cloud-onboarding --- docs/CLOUD-ONBOARDING-DESIGN.md | 213 +++++++++++++++++++++++++++++++- 1 file changed, 211 insertions(+), 2 deletions(-) diff --git a/docs/CLOUD-ONBOARDING-DESIGN.md b/docs/CLOUD-ONBOARDING-DESIGN.md index fe3432c90..ea3af4a02 100644 --- a/docs/CLOUD-ONBOARDING-DESIGN.md +++ b/docs/CLOUD-ONBOARDING-DESIGN.md @@ -2,11 +2,220 @@ ## Overview -Agent Relay Cloud provides a hosted version of agent-relay with: +Agent Relay supports two deployment models with a unified authentication experience: + +### Deployment Models + +``` +┌─────────────────────────────────────────────────────────────────────────────┐ +│ AGENT RELAY CLOUD │ +│ (Fully Hosted) │ +├─────────────────────────────────────────────────────────────────────────────┤ +│ │ +│ ┌──────────────┐ ┌──────────────┐ ┌──────────────┐ ┌──────────────┐ │ +│ │ GitHub │ │ Provider │ │ Agent │ │ Dashboard │ │ +│ │ Repos │ │ Auth │ │ Execution │ │ & Logs │ │ +│ └──────────────┘ └──────────────┘ └──────────────┘ └──────────────┘ │ +│ │ +│ Everything runs in the cloud. Users just connect accounts. │ +│ │ +└─────────────────────────────────────────────────────────────────────────────┘ + +┌─────────────────────────────────────────────────────────────────────────────┐ +│ SELF-HOSTED │ +│ (Local Execution) │ +├─────────────────────────────────────────────────────────────────────────────┤ +│ │ +│ ┌───────────────────────────────────────────────────────────┐ │ +│ │ User's Machine / Server │ │ +│ │ ┌──────────────┐ ┌──────────────┐ ┌──────────────┐ │ │ +│ │ │ agent-relay │ │ Agents │ │ Local │ │ │ +│ │ │ daemon │ │ (claude, │ │ Repos │ │ │ +│ │ │ │ │ codex) │ │ │ │ │ +│ │ └──────────────┘ └──────────────┘ └──────────────┘ │ │ +│ └───────────────────────────────────────────────────────────┘ │ +│ │ │ +│ │ Optional: Sync to cloud dashboard │ +│ ▼ │ +│ ┌───────────────────────────────────────────────────────────┐ │ +│ │ Agent Relay Cloud (Optional) │ │ +│ │ • Auth management • Team collaboration │ │ +│ │ • Dashboard & logs • Credential vault │ │ +│ └───────────────────────────────────────────────────────────┘ │ +│ │ +│ Agents run locally. Cloud is optional for auth/dashboard. │ +│ │ +└─────────────────────────────────────────────────────────────────────────────┘ +``` + +### Feature Comparison + +| Feature | Cloud Hosted | Self-Hosted | Self-Hosted + Cloud | +|---------|--------------|-------------|---------------------| +| Agent execution | Cloud | Local | Local | +| GitHub integration | ✅ Automatic | Manual clone | ✅ Webhook sync | +| Provider auth | ✅ Device flow | Local login | ✅ Device flow | +| Credential storage | ✅ Vault | Local files | ✅ Vault | +| Dashboard | ✅ Hosted | localhost:3888 | ✅ Synced | +| Team collaboration | ✅ Full | N/A | ✅ Full | +| Offline mode | ❌ | ✅ | ✅ (degraded) | +| Data locality | Cloud | Local | Hybrid | + +### When to Use Each + +**Cloud Hosted** - Best for: +- Teams wanting zero infrastructure management +- CI/CD integration with GitHub Actions +- Users without local GPU/compute resources + +**Self-Hosted** - Best for: +- Air-gapped environments +- Strict data locality requirements +- Users who already have agents installed locally + +**Self-Hosted + Cloud** - Best for: +- Teams wanting local execution with cloud collaboration +- Developers who want dashboard/logs without running locally +- Enterprises with hybrid requirements + +--- + +## Cloud Hosted Mode + +Agent Relay Cloud (fully hosted) provides: - Automatic server provisioning with supervisor - GitHub repository integration -- Multi-provider agent authentication +- Multi-provider agent authentication via device flow - Team management and collaboration +- Centralized dashboard and logs + +--- + +## Self-Hosted Mode + +For users running agent-relay locally, authentication can work in two ways: + +### Option A: Local Authentication (Fully Offline) + +Users authenticate directly with each provider's CLI: + +```bash +# Install agent-relay +npm install -g agent-relay + +# Authenticate providers locally (each opens browser) +claude /login # Login to Anthropic +codex # Login to OpenAI (first run prompts) + +# Start agent-relay with local credentials +agent-relay up +agent-relay -n Alice claude "Start working on the feature" +``` + +Credentials are stored locally: +- Claude: `~/.claude/.credentials.json` or macOS Keychain +- Codex: `~/.codex/` +- Google: `~/.config/gcloud/` + +### Option B: Self-Hosted + Cloud Auth (Hybrid) + +Users can optionally connect their local agent-relay to Agent Relay Cloud for: +- Centralized credential management (device flow auth) +- Team collaboration features +- Cloud dashboard with synced logs + +```bash +# Install and link to cloud account +npm install -g agent-relay +agent-relay cloud login # Opens browser, authenticates with cloud + +# Cloud handles provider auth, syncs credentials down +agent-relay cloud connect anthropic # Device flow auth +agent-relay cloud connect openai # Device flow auth + +# Start locally - credentials pulled from cloud +agent-relay up --cloud-sync +agent-relay -n Alice claude "Start working" +``` + +### Self-Hosted Onboarding Flow + +``` +┌─────────────────────────────────────────────────────────────────┐ +│ agent-relay cloud login │ +│ │ +│ Opening browser to authenticate... │ +│ │ +│ ┌─────────────────────────────────────────────────────────────┐│ +│ │ If browser doesn't open, visit: ││ +│ │ https://relay.cloud/cli/auth?code=ABCD-1234 ││ +│ └─────────────────────────────────────────────────────────────┘│ +│ │ +│ ⏳ Waiting for authentication... │ +│ │ +└─────────────────────────────────────────────────────────────────┘ + + ↓ After successful auth + +┌─────────────────────────────────────────────────────────────────┐ +│ ✅ Authenticated as user@example.com │ +│ │ +│ Your local agent-relay is now linked to Agent Relay Cloud. │ +│ │ +│ Connected providers: │ +│ • Anthropic (Claude) ✅ Ready │ +│ • OpenAI (Codex) ❌ Not connected │ +│ • Google (Gemini) ❌ Not connected │ +│ │ +│ To connect more providers: │ +│ agent-relay cloud connect openai │ +│ agent-relay cloud connect google │ +│ │ +│ To start the daemon with cloud sync: │ +│ agent-relay up --cloud-sync │ +│ │ +└─────────────────────────────────────────────────────────────────┘ +``` + +### Credential Sync Architecture + +``` +┌─────────────────────────────────────────────────────────────────┐ +│ Agent Relay Cloud │ +│ ┌───────────────────────────────────────────────────────────┐ │ +│ │ Credential Vault (encrypted) │ │ +│ │ ┌─────────┐ ┌─────────┐ ┌─────────┐ │ │ +│ │ │Anthropic│ │ OpenAI │ │ Google │ │ │ +│ │ │ tokens │ │ tokens │ │ tokens │ │ │ +│ │ └────┬────┘ └────┬────┘ └────┬────┘ │ │ +│ └───────┼────────────┼────────────┼────────────────────────┘ │ +│ │ │ │ │ +│ └────────────┼────────────┘ │ +│ │ │ +│ ▼ Encrypted sync │ +└───────────────────────┼──────────────────────────────────────────┘ + │ + │ TLS + E2E encrypted + │ +┌───────────────────────▼──────────────────────────────────────────┐ +│ User's Machine │ +│ ┌───────────────────────────────────────────────────────────┐ │ +│ │ agent-relay daemon │ │ +│ │ ┌─────────────────────────────────────────────────────┐ │ │ +│ │ │ Local credential cache (encrypted, auto-refresh) │ │ │ +│ │ └─────────────────────────────────────────────────────┘ │ │ +│ │ │ │ │ +│ │ ┌──────────┼──────────┐ │ │ +│ │ ▼ ▼ ▼ │ │ +│ │ ┌────────┐ ┌────────┐ ┌────────┐ │ │ +│ │ │ claude │ │ codex │ │ gemini │ │ │ +│ │ │ agent │ │ agent │ │ agent │ │ │ +│ │ └────────┘ └────────┘ └────────┘ │ │ +│ └───────────────────────────────────────────────────────────┘ │ +└──────────────────────────────────────────────────────────────────┘ +``` + +--- ## Provider Authentication Architecture From c60339e1c9d4906596c78ea0d68fffe48036adef Mon Sep 17 00:00:00 2001 From: Claude Date: Mon, 29 Dec 2025 23:54:39 +0000 Subject: [PATCH 06/38] Fix deployment models: auth always via cloud Clarify that authentication is always handled by Agent Relay Cloud, not self-hosted. The two models are: 1. Cloud Hosted: We run everything (auth + compute + repos) 2. Self-Hosted: User brings compute, auth still via our cloud Updated: - Deployment diagrams showing auth always in cloud - Feature comparison table (removed offline auth option) - Self-hosted setup flow using `agent-relay cloud` commands - Credential sync architecture diagram bd-cloud-onboarding --- docs/CLOUD-ONBOARDING-DESIGN.md | 281 +++++++++++++++----------------- 1 file changed, 127 insertions(+), 154 deletions(-) diff --git a/docs/CLOUD-ONBOARDING-DESIGN.md b/docs/CLOUD-ONBOARDING-DESIGN.md index ea3af4a02..cd554cf61 100644 --- a/docs/CLOUD-ONBOARDING-DESIGN.md +++ b/docs/CLOUD-ONBOARDING-DESIGN.md @@ -2,81 +2,85 @@ ## Overview -Agent Relay supports two deployment models with a unified authentication experience: +Agent Relay supports two deployment models. **Authentication is always handled by Agent Relay Cloud** - users don't self-host the auth system. ### Deployment Models +**Model 1: Cloud Hosted** - We run everything + +``` +┌────────────────────────────────────────────────────────────────┐ +│ AGENT RELAY CLOUD │ +│ │ +│ User connects accounts → We handle everything else │ +│ │ +│ ┌────────────┐ ┌────────────┐ ┌────────────┐ │ +│ │ Provider │ │ Agent │ │ Dashboard │ │ +│ │ Auth │ │ Execution │ │ & Logs │ │ +│ └────────────┘ └────────────┘ └────────────┘ │ +│ ▲ │ +│ │ │ +│ ┌────────────┐ ┌─────┴──────┐ │ +│ │ GitHub │──│ Cloned │ │ +│ │ Webhooks │ │ Repos │ │ +│ └────────────┘ └────────────┘ │ +│ │ +└────────────────────────────────────────────────────────────────┘ +``` + +**Model 2: Self-Hosted** - User brings their own servers, auth via cloud + ``` -┌─────────────────────────────────────────────────────────────────────────────┐ -│ AGENT RELAY CLOUD │ -│ (Fully Hosted) │ -├─────────────────────────────────────────────────────────────────────────────┤ -│ │ -│ ┌──────────────┐ ┌──────────────┐ ┌──────────────┐ ┌──────────────┐ │ -│ │ GitHub │ │ Provider │ │ Agent │ │ Dashboard │ │ -│ │ Repos │ │ Auth │ │ Execution │ │ & Logs │ │ -│ └──────────────┘ └──────────────┘ └──────────────┘ └──────────────┘ │ -│ │ -│ Everything runs in the cloud. Users just connect accounts. │ -│ │ -└─────────────────────────────────────────────────────────────────────────────┘ - -┌─────────────────────────────────────────────────────────────────────────────┐ -│ SELF-HOSTED │ -│ (Local Execution) │ -├─────────────────────────────────────────────────────────────────────────────┤ -│ │ -│ ┌───────────────────────────────────────────────────────────┐ │ -│ │ User's Machine / Server │ │ -│ │ ┌──────────────┐ ┌──────────────┐ ┌──────────────┐ │ │ -│ │ │ agent-relay │ │ Agents │ │ Local │ │ │ -│ │ │ daemon │ │ (claude, │ │ Repos │ │ │ -│ │ │ │ │ codex) │ │ │ │ │ -│ │ └──────────────┘ └──────────────┘ └──────────────┘ │ │ -│ └───────────────────────────────────────────────────────────┘ │ -│ │ │ -│ │ Optional: Sync to cloud dashboard │ -│ ▼ │ -│ ┌───────────────────────────────────────────────────────────┐ │ -│ │ Agent Relay Cloud (Optional) │ │ -│ │ • Auth management • Team collaboration │ │ -│ │ • Dashboard & logs • Credential vault │ │ -│ └───────────────────────────────────────────────────────────┘ │ -│ │ -│ Agents run locally. Cloud is optional for auth/dashboard. │ -│ │ -└─────────────────────────────────────────────────────────────────────────────┘ +┌────────────────────────────────────────────────────────────────┐ +│ AGENT RELAY CLOUD │ +│ │ +│ ┌────────────┐ ┌────────────┐ ┌────────────┐ │ +│ │ Provider │ │ Dashboard │ │ Team │ │ +│ │ Auth/Vault │ │ & Logs │ │ Management │ │ +│ └─────┬──────┘ └─────▲──────┘ └────────────┘ │ +└─────────┼───────────────┼──────────────────────────────────────┘ + │ Credentials │ Sync + ▼ │ +┌─────────────────────────┴──────────────────────────────────────┐ +│ USER'S INFRASTRUCTURE │ +│ │ +│ ┌────────────┐ ┌────────────┐ ┌────────────┐ │ +│ │agent-relay │ │ Agents │ │ Repos │ │ +│ │ daemon │ │ (claude, │ │ (local) │ │ +│ │ │ │ codex) │ │ │ │ +│ └────────────┘ └────────────┘ └────────────┘ │ +│ │ +│ User's VMs, Kubernetes, containers, or bare metal │ +└────────────────────────────────────────────────────────────────┘ ``` ### Feature Comparison -| Feature | Cloud Hosted | Self-Hosted | Self-Hosted + Cloud | -|---------|--------------|-------------|---------------------| -| Agent execution | Cloud | Local | Local | -| GitHub integration | ✅ Automatic | Manual clone | ✅ Webhook sync | -| Provider auth | ✅ Device flow | Local login | ✅ Device flow | -| Credential storage | ✅ Vault | Local files | ✅ Vault | -| Dashboard | ✅ Hosted | localhost:3888 | ✅ Synced | -| Team collaboration | ✅ Full | N/A | ✅ Full | -| Offline mode | ❌ | ✅ | ✅ (degraded) | -| Data locality | Cloud | Local | Hybrid | +| Feature | Cloud Hosted | Self-Hosted | +|---------|--------------|-------------| +| **Provider auth** | ✅ Cloud (device flow) | ✅ Cloud (device flow) | +| **Credential vault** | ✅ Cloud | ✅ Cloud → synced to user's infra | +| **Dashboard** | ✅ Cloud | ✅ Cloud (synced from user's infra) | +| **Team features** | ✅ Full | ✅ Full | +| **Agent execution** | Our servers | User's servers | +| **Repos** | Cloned to cloud | User clones locally | +| **Compute costs** | Included in plan | User pays own infra | +| **Data locality** | Our cloud regions | User's choice | ### When to Use Each **Cloud Hosted** - Best for: - Teams wanting zero infrastructure management +- Quick start - no servers to provision +- Smaller teams without dedicated DevOps - CI/CD integration with GitHub Actions -- Users without local GPU/compute resources **Self-Hosted** - Best for: -- Air-gapped environments -- Strict data locality requirements -- Users who already have agents installed locally - -**Self-Hosted + Cloud** - Best for: -- Teams wanting local execution with cloud collaboration -- Developers who want dashboard/logs without running locally -- Enterprises with hybrid requirements +- Enterprises requiring compute in specific regions/clouds +- Teams with existing Kubernetes/container infrastructure +- Cost optimization for high-volume usage +- Custom security requirements (VPC, firewall rules) +- GPU workloads on specialized hardware --- @@ -93,125 +97,94 @@ Agent Relay Cloud (fully hosted) provides: ## Self-Hosted Mode -For users running agent-relay locally, authentication can work in two ways: +For users running agent-relay on their own infrastructure. Authentication still happens via Agent Relay Cloud. -### Option A: Local Authentication (Fully Offline) - -Users authenticate directly with each provider's CLI: +### Setup Flow ```bash -# Install agent-relay +# Install agent-relay on your server npm install -g agent-relay -# Authenticate providers locally (each opens browser) -claude /login # Login to Anthropic -codex # Login to OpenAI (first run prompts) +# Link to your Agent Relay Cloud account (device flow) +agent-relay cloud login + +# Connect AI providers via cloud (device flow for each) +agent-relay cloud connect anthropic +agent-relay cloud connect openai -# Start agent-relay with local credentials +# Start daemon - credentials synced from cloud agent-relay up agent-relay -n Alice claude "Start working on the feature" ``` -Credentials are stored locally: -- Claude: `~/.claude/.credentials.json` or macOS Keychain -- Codex: `~/.codex/` -- Google: `~/.config/gcloud/` +### CLI Onboarding Flow -### Option B: Self-Hosted + Cloud Auth (Hybrid) +``` +$ agent-relay cloud login -Users can optionally connect their local agent-relay to Agent Relay Cloud for: -- Centralized credential management (device flow auth) -- Team collaboration features -- Cloud dashboard with synced logs + Opening browser to authenticate... -```bash -# Install and link to cloud account -npm install -g agent-relay -agent-relay cloud login # Opens browser, authenticates with cloud + ┌────────────────────────────────────────────────────────────┐ + │ If browser doesn't open, visit: │ + │ https://relay.cloud/cli/auth?code=ABCD-1234 │ + └────────────────────────────────────────────────────────────┘ -# Cloud handles provider auth, syncs credentials down -agent-relay cloud connect anthropic # Device flow auth -agent-relay cloud connect openai # Device flow auth + ⏳ Waiting for authentication... -# Start locally - credentials pulled from cloud -agent-relay up --cloud-sync -agent-relay -n Alice claude "Start working" -``` + ✅ Authenticated as user@example.com -### Self-Hosted Onboarding Flow + Your agent-relay instance is now linked to Agent Relay Cloud. -``` -┌─────────────────────────────────────────────────────────────────┐ -│ agent-relay cloud login │ -│ │ -│ Opening browser to authenticate... │ -│ │ -│ ┌─────────────────────────────────────────────────────────────┐│ -│ │ If browser doesn't open, visit: ││ -│ │ https://relay.cloud/cli/auth?code=ABCD-1234 ││ -│ └─────────────────────────────────────────────────────────────┘│ -│ │ -│ ⏳ Waiting for authentication... │ -│ │ -└─────────────────────────────────────────────────────────────────┘ + Connected providers: + • Anthropic (Claude) ✅ Ready + • OpenAI (Codex) ❌ Not connected + • Google (Gemini) ❌ Not connected - ↓ After successful auth + To connect more providers: + agent-relay cloud connect openai + agent-relay cloud connect google -┌─────────────────────────────────────────────────────────────────┐ -│ ✅ Authenticated as user@example.com │ -│ │ -│ Your local agent-relay is now linked to Agent Relay Cloud. │ -│ │ -│ Connected providers: │ -│ • Anthropic (Claude) ✅ Ready │ -│ • OpenAI (Codex) ❌ Not connected │ -│ • Google (Gemini) ❌ Not connected │ -│ │ -│ To connect more providers: │ -│ agent-relay cloud connect openai │ -│ agent-relay cloud connect google │ -│ │ -│ To start the daemon with cloud sync: │ -│ agent-relay up --cloud-sync │ -│ │ -└─────────────────────────────────────────────────────────────────┘ + To start the daemon: + agent-relay up ``` ### Credential Sync Architecture ``` -┌─────────────────────────────────────────────────────────────────┐ -│ Agent Relay Cloud │ -│ ┌───────────────────────────────────────────────────────────┐ │ -│ │ Credential Vault (encrypted) │ │ -│ │ ┌─────────┐ ┌─────────┐ ┌─────────┐ │ │ -│ │ │Anthropic│ │ OpenAI │ │ Google │ │ │ -│ │ │ tokens │ │ tokens │ │ tokens │ │ │ -│ │ └────┬────┘ └────┬────┘ └────┬────┘ │ │ -│ └───────┼────────────┼────────────┼────────────────────────┘ │ -│ │ │ │ │ -│ └────────────┼────────────┘ │ -│ │ │ -│ ▼ Encrypted sync │ -└───────────────────────┼──────────────────────────────────────────┘ - │ - │ TLS + E2E encrypted - │ -┌───────────────────────▼──────────────────────────────────────────┐ -│ User's Machine │ -│ ┌───────────────────────────────────────────────────────────┐ │ -│ │ agent-relay daemon │ │ -│ │ ┌─────────────────────────────────────────────────────┐ │ │ -│ │ │ Local credential cache (encrypted, auto-refresh) │ │ │ -│ │ └─────────────────────────────────────────────────────┘ │ │ -│ │ │ │ │ -│ │ ┌──────────┼──────────┐ │ │ -│ │ ▼ ▼ ▼ │ │ -│ │ ┌────────┐ ┌────────┐ ┌────────┐ │ │ -│ │ │ claude │ │ codex │ │ gemini │ │ │ -│ │ │ agent │ │ agent │ │ agent │ │ │ -│ │ └────────┘ └────────┘ └────────┘ │ │ -│ └───────────────────────────────────────────────────────────┘ │ +┌────────────────────────────────────────────────────────────────┐ +│ AGENT RELAY CLOUD │ +│ │ +│ ┌──────────────────────────────────────────────────────┐ │ +│ │ Credential Vault (encrypted) │ │ +│ │ ┌──────────┐ ┌──────────┐ ┌──────────┐ │ │ +│ │ │Anthropic │ │ OpenAI │ │ Google │ │ │ +│ │ │ tokens │ │ tokens │ │ tokens │ │ │ +│ │ └────┬─────┘ └────┬─────┘ └────┬─────┘ │ │ +│ └───────┼─────────────┼─────────────┼─────────────────┘ │ +│ └─────────────┼─────────────┘ │ +│ │ │ +│ ▼ Encrypted sync (TLS + E2E) │ +└─────────────────────────┼───────────────────────────────────────┘ + │ +┌─────────────────────────▼───────────────────────────────────────┐ +│ USER'S INFRASTRUCTURE │ +│ │ +│ ┌──────────────────────────────────────────────────────────┐ │ +│ │ agent-relay daemon │ │ +│ │ │ │ +│ │ ┌────────────────────────────────────────────────────┐ │ │ +│ │ │ Local credential cache (encrypted, auto-refresh) │ │ │ +│ │ └────────────────────────────────────────────────────┘ │ │ +│ │ │ │ │ +│ │ ┌──────────┼──────────┐ │ │ +│ │ ▼ ▼ ▼ │ │ +│ │ ┌────────┐ ┌────────┐ ┌────────┐ │ │ +│ │ │ claude │ │ codex │ │ gemini │ │ │ +│ │ │ agent │ │ agent │ │ agent │ │ │ +│ │ └────────┘ └────────┘ └────────┘ │ │ +│ └──────────────────────────────────────────────────────────┘ │ +│ │ +│ Logs synced back to cloud dashboard │ └──────────────────────────────────────────────────────────────────┘ ``` From 9c25f8351ea88c174ca2c236eb3505569c7e2c86 Mon Sep 17 00:00:00 2001 From: Claude Date: Tue, 30 Dec 2025 00:02:41 +0000 Subject: [PATCH 07/38] Redesign self-hosted auth: runs via cloud servers Self-hosted users must connect to our cloud to authenticate since Claude/Codex require browser-based OAuth. This creates intentional friction to encourage cloud adoption. Key changes: - Auth runs on our servers, not user's headless server - User opens URL in browser, tokens sync to their server - Token refresh continues via cloud (ongoing dependency) - Added friction comparison table (cloud = easy, self = more steps) - QR code option for mobile auth Business rationale: Cloud should be path of least resistance. bd-cloud-onboarding --- docs/CLOUD-ONBOARDING-DESIGN.md | 114 +++++++++++++++++++++++++++----- 1 file changed, 96 insertions(+), 18 deletions(-) diff --git a/docs/CLOUD-ONBOARDING-DESIGN.md b/docs/CLOUD-ONBOARDING-DESIGN.md index cd554cf61..b7d42a1d0 100644 --- a/docs/CLOUD-ONBOARDING-DESIGN.md +++ b/docs/CLOUD-ONBOARDING-DESIGN.md @@ -97,57 +97,135 @@ Agent Relay Cloud (fully hosted) provides: ## Self-Hosted Mode -For users running agent-relay on their own infrastructure. Authentication still happens via Agent Relay Cloud. +For users running agent-relay on their own infrastructure. **Authentication happens via Agent Relay Cloud servers** - users connect to our infrastructure to run the browser-based auth flows. + +### Why Self-Hosted Has More Friction (Intentional) + +Self-hosted requires extra steps compared to cloud-hosted: + +| Step | Cloud Hosted | Self-Hosted | +|------|--------------|-------------| +| 1. Sign up | GitHub OAuth | GitHub OAuth | +| 2. Connect providers | Click "Login with X" | Connect to cloud server, then "Login with X" | +| 3. Select repos | Select from list | Clone repos locally | +| 4. Start agents | Automatic | Install agent-relay, configure, start | +| 5. View dashboard | Just visit URL | Logs sync to cloud dashboard | + +**This is intentional** - cloud-hosted should be the path of least resistance. + +### Self-Hosted Auth Flow + +Since Claude Code and Codex require browser-based OAuth, self-hosted users must connect to our cloud to authenticate: + +``` +┌─────────────────────────────────────────────────────────────────┐ +│ SELF-HOSTED AUTHENTICATION │ +│ │ +│ User's Server Agent Relay Cloud │ +│ ───────────── ───────────────── │ +│ │ +│ 1. agent-relay cloud login │ +│ │ │ +│ │ ──────────────────────────────────────────────────> │ +│ │ Connect to cloud auth service │ +│ │ │ +│ │ 2. Cloud opens browser │ +│ │ to provider (Anthropic) │ +│ │ │ │ +│ │ ▼ │ +│ │ 3. User logs in, │ +│ │ authorizes │ +│ │ │ │ +│ │ ▼ │ +│ │ 4. Tokens stored │ +│ │ in cloud vault │ +│ │ │ +│ │ <────────────────────────────────────────────────── │ +│ │ Sync encrypted credentials │ +│ ▼ │ +│ 5. Credentials cached locally │ +│ (encrypted, auto-refresh via cloud) │ +│ │ +└─────────────────────────────────────────────────────────────────┘ +``` ### Setup Flow ```bash -# Install agent-relay on your server +# On user's server npm install -g agent-relay -# Link to your Agent Relay Cloud account (device flow) +# Connect to cloud - opens browser on YOUR machine (not server) +# via a temporary secure tunnel agent-relay cloud login +# → Opens: https://relay.cloud/auth/remote?session=abc123 +# → You authenticate in your browser +# → Credentials sync to your server -# Connect AI providers via cloud (device flow for each) +# Connect providers (each opens browser via cloud) agent-relay cloud connect anthropic agent-relay cloud connect openai # Start daemon - credentials synced from cloud agent-relay up -agent-relay -n Alice claude "Start working on the feature" ``` -### CLI Onboarding Flow +### CLI Experience ``` $ agent-relay cloud login - Opening browser to authenticate... + To authenticate, open this URL in your browser: ┌────────────────────────────────────────────────────────────┐ - │ If browser doesn't open, visit: │ - │ https://relay.cloud/cli/auth?code=ABCD-1234 │ + │ https://relay.cloud/auth/remote?session=xK9mPq2R │ └────────────────────────────────────────────────────────────┘ + Or scan this QR code: + ▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄ + █ ▄▄▄▄▄ █ █ ▄▄█ + █ █ █ █▄▄ ▀█ + █ █▄▄▄█ █ ▄▀▀▄█ + ▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀ + ⏳ Waiting for authentication... + Session expires in 9:45 ✅ Authenticated as user@example.com - Your agent-relay instance is now linked to Agent Relay Cloud. - Connected providers: - • Anthropic (Claude) ✅ Ready + • Anthropic (Claude) ❌ Not connected • OpenAI (Codex) ❌ Not connected - • Google (Gemini) ❌ Not connected - To connect more providers: - agent-relay cloud connect openai - agent-relay cloud connect google + To connect providers: + agent-relay cloud connect anthropic + +$ agent-relay cloud connect anthropic + + To connect Anthropic, open this URL in your browser: + + ┌────────────────────────────────────────────────────────────┐ + │ https://relay.cloud/connect/anthropic?session=yL8nQr3S │ + └────────────────────────────────────────────────────────────┘ + + ⏳ Waiting for authorization... - To start the daemon: - agent-relay up + ✅ Anthropic connected! + Logged in as: claude-user@example.com + Plan: Claude Pro + + Credentials synced to this server. + Run 'agent-relay up' to start. ``` +### Why This Approach + +1. **Auth happens on cloud** - Browser-based OAuth works because it runs on our servers +2. **Credentials sync down** - Encrypted tokens pushed to user's server +3. **More steps than cloud** - Intentional friction encourages cloud adoption +4. **Still requires cloud** - Users can't fully disconnect from our service +5. **Refresh via cloud** - Token refresh happens through our service, maintaining dependency + ### Credential Sync Architecture ``` From 39633af8b679c2149ac16cd949db8cecae8a08ed Mon Sep 17 00:00:00 2001 From: Claude Date: Tue, 30 Dec 2025 00:21:03 +0000 Subject: [PATCH 08/38] Add Agent Relay Cloud service scaffold Implements one-click workspace provisioning with: - Database layer (PostgreSQL) for users, credentials, workspaces, repos - Credential vault with AES-256-GCM encryption for OAuth tokens - Workspace provisioner supporting Fly.io, Railway, and Docker - API routes for auth, providers, workspaces, repos, onboarding - CLI proxy authentication for Claude Code and Codex - Device flow OAuth for Google/Gemini Auth strategy: - Google: Real OAuth device flow (works today) - Claude/Codex: CLI-based auth with URL proxy through our UI - GitHub: Web OAuth (for signup) --- docs/CLOUD-ARCHITECTURE.md | 472 ++++++++++++++++++++++ src/cloud/api/auth.ts | 194 ++++++++++ src/cloud/api/onboarding.ts | 476 +++++++++++++++++++++++ src/cloud/api/providers.ts | 456 ++++++++++++++++++++++ src/cloud/api/repos.ts | 367 ++++++++++++++++++ src/cloud/api/workspaces.ts | 358 +++++++++++++++++ src/cloud/config.ts | 125 ++++++ src/cloud/db/index.ts | 464 ++++++++++++++++++++++ src/cloud/index.ts | 36 ++ src/cloud/provisioner/index.ts | 688 +++++++++++++++++++++++++++++++++ src/cloud/server.ts | 103 +++++ src/cloud/vault/index.ts | 304 +++++++++++++++ 12 files changed, 4043 insertions(+) create mode 100644 docs/CLOUD-ARCHITECTURE.md create mode 100644 src/cloud/api/auth.ts create mode 100644 src/cloud/api/onboarding.ts create mode 100644 src/cloud/api/providers.ts create mode 100644 src/cloud/api/repos.ts create mode 100644 src/cloud/api/workspaces.ts create mode 100644 src/cloud/config.ts create mode 100644 src/cloud/db/index.ts create mode 100644 src/cloud/index.ts create mode 100644 src/cloud/provisioner/index.ts create mode 100644 src/cloud/server.ts create mode 100644 src/cloud/vault/index.ts diff --git a/docs/CLOUD-ARCHITECTURE.md b/docs/CLOUD-ARCHITECTURE.md new file mode 100644 index 000000000..6dd959719 --- /dev/null +++ b/docs/CLOUD-ARCHITECTURE.md @@ -0,0 +1,472 @@ +# Agent Relay Cloud - Architecture + +## System Overview + +``` +┌─────────────────────────────────────────────────────────────────────────────────┐ +│ AGENT RELAY CLOUD │ +│ │ +│ ┌─────────────────────────────────────────────────────────────────────────┐ │ +│ │ CONTROL PLANE │ │ +│ │ │ │ +│ │ ┌──────────┐ ┌──────────┐ ┌──────────┐ ┌──────────┐ ┌──────────┐ │ │ +│ │ │ API │ │ Auth │ │Credential│ │Workspace │ │ Dashboard│ │ │ +│ │ │ Server │ │ Service │ │ Vault │ │Provisioner│ │ (React) │ │ │ +│ │ └────┬─────┘ └────┬─────┘ └────┬─────┘ └────┬─────┘ └────┬─────┘ │ │ +│ │ │ │ │ │ │ │ │ +│ │ └─────────────┴─────────────┴─────────────┴─────────────┘ │ │ +│ │ │ │ │ +│ │ ┌──────┴──────┐ │ │ +│ │ │ PostgreSQL │ │ │ +│ │ │ + Redis │ │ │ +│ │ └─────────────┘ │ │ +│ └─────────────────────────────────────────────────────────────────────────┘ │ +│ │ │ +│ │ Provision & Manage │ +│ ▼ │ +│ ┌─────────────────────────────────────────────────────────────────────────┐ │ +│ │ COMPUTE PLANE │ │ +│ │ │ │ +│ │ ┌─────────────────┐ ┌─────────────────┐ ┌─────────────────┐ │ │ +│ │ │ Workspace A │ │ Workspace B │ │ Workspace C │ ... │ │ +│ │ │ (user-123) │ │ (user-456) │ │ (team-789) │ │ │ +│ │ │ │ │ │ │ │ │ │ +│ │ │ ┌───────────┐ │ │ ┌───────────┐ │ │ ┌───────────┐ │ │ │ +│ │ │ │agent-relay│ │ │ │agent-relay│ │ │ │agent-relay│ │ │ │ +│ │ │ │ daemon │ │ │ │ daemon │ │ │ │ daemon │ │ │ │ +│ │ │ └─────┬─────┘ │ │ └─────┬─────┘ │ │ └─────┬─────┘ │ │ │ +│ │ │ │ │ │ │ │ │ │ │ │ │ +│ │ │ ┌─────┴─────┐ │ │ ┌─────┴─────┐ │ │ ┌─────┴─────┐ │ │ │ +│ │ │ │ Agents │ │ │ │ Agents │ │ │ │ Agents │ │ │ │ +│ │ │ │(claude, │ │ │ │(codex) │ │ │ │(claude, │ │ │ │ +│ │ │ │ codex) │ │ │ │ │ │ │ │ gemini) │ │ │ │ +│ │ │ └───────────┘ │ │ └───────────┘ │ │ └───────────┘ │ │ │ +│ │ │ │ │ │ │ │ │ │ +│ │ │ /repos/ │ │ /repos/ │ │ /repos/ │ │ │ +│ │ │ ├─ project-a │ │ └─ my-app │ │ ├─ backend │ │ │ +│ │ │ └─ project-b │ │ │ │ └─ frontend │ │ │ +│ │ └─────────────────┘ └─────────────────┘ └─────────────────┘ │ │ +│ │ │ │ +│ │ Compute Options: Fly.io | Railway | AWS ECS | GCP Cloud Run │ │ +│ └─────────────────────────────────────────────────────────────────────────┘ │ +│ │ +└─────────────────────────────────────────────────────────────────────────────────┘ +``` + +## One-Click Provisioning Flow + +``` +User signs up + │ + ▼ +┌─────────────────────────────────────────────────────────────────┐ +│ 1. AUTHENTICATE │ +│ • GitHub OAuth login │ +│ • Create user record │ +│ • Store GitHub token │ +└─────────────────────────────────────────────────────────────────┘ + │ + ▼ +┌─────────────────────────────────────────────────────────────────┐ +│ 2. CONNECT PROVIDERS │ +│ • Device flow for Claude/Codex │ +│ • Store tokens in credential vault │ +│ • (Can be done during or after onboarding) │ +└─────────────────────────────────────────────────────────────────┘ + │ + ▼ +┌─────────────────────────────────────────────────────────────────┐ +│ 3. SELECT REPOSITORIES │ +│ • List repos from GitHub │ +│ • User selects which to connect │ +│ • Install GitHub App on selected repos │ +└─────────────────────────────────────────────────────────────────┘ + │ + ▼ +┌─────────────────────────────────────────────────────────────────┐ +│ 4. PROVISION WORKSPACE (automatic, ~30 seconds) │ +│ • Allocate compute resources │ +│ • Deploy agent-relay container │ +│ • Clone selected repositories │ +│ • Inject credentials from vault │ +│ • Start daemon with supervisor │ +│ • Configure webhooks │ +└─────────────────────────────────────────────────────────────────┘ + │ + ▼ +┌─────────────────────────────────────────────────────────────────┐ +│ 5. READY │ +│ • Dashboard URL live │ +│ • Agents ready to spawn │ +│ • GitHub webhooks configured │ +└─────────────────────────────────────────────────────────────────┘ +``` + +## Components + +### 1. Control Plane Services + +#### API Server (`/src/cloud/api/`) +- Express.js REST API +- Handles all cloud operations +- Routes: + - `/auth/*` - GitHub OAuth, session management + - `/providers/*` - Device flow auth for AI providers + - `/workspaces/*` - Workspace CRUD, provisioning + - `/repos/*` - Repository management + - `/teams/*` - Team management + +#### Auth Service (`/src/cloud/auth/`) +- GitHub OAuth for user login +- Device flow for AI providers +- Session management (Redis) +- JWT tokens for API auth + +#### Credential Vault (`/src/cloud/vault/`) +- Encrypted storage for OAuth tokens +- Per-user encryption keys +- Automatic token refresh +- Sync to workspaces + +#### Workspace Provisioner (`/src/cloud/provisioner/`) +- Provisions compute resources +- Deploys agent-relay containers +- Manages workspace lifecycle +- Supports multiple backends: + - Fly.io (default) + - Railway + - AWS ECS + - Docker (local dev) + +### 2. Compute Plane + +#### Workspace Container +```dockerfile +FROM node:20-slim + +# Install agent CLIs +RUN npm install -g agent-relay +RUN npm install -g @anthropic/claude-code +# Codex installed via their installer + +# Workspace directory +WORKDIR /workspace + +# Entry point +COPY entrypoint.sh /entrypoint.sh +CMD ["/entrypoint.sh"] +``` + +#### Entrypoint Script +```bash +#!/bin/bash + +# Fetch credentials from vault +agent-relay cloud sync-credentials + +# Clone repositories +for repo in $REPOS; do + git clone "https://x-access-token:${GITHUB_TOKEN}@github.com/${repo}.git" +done + +# Start agent-relay daemon with supervisor +agent-relay up --watch +``` + +## Database Schema + +```sql +-- Users +CREATE TABLE users ( + id UUID PRIMARY KEY DEFAULT gen_random_uuid(), + github_id TEXT UNIQUE NOT NULL, + github_username TEXT NOT NULL, + email TEXT, + created_at TIMESTAMP DEFAULT NOW(), + onboarding_completed_at TIMESTAMP +); + +-- Provider Credentials (encrypted) +CREATE TABLE credentials ( + id UUID PRIMARY KEY DEFAULT gen_random_uuid(), + user_id UUID REFERENCES users(id), + provider TEXT NOT NULL, -- 'anthropic', 'openai', 'google', etc. + encrypted_access_token TEXT NOT NULL, + encrypted_refresh_token TEXT, + token_expires_at TIMESTAMP, + scopes TEXT[], + provider_account_id TEXT, + provider_account_email TEXT, + created_at TIMESTAMP DEFAULT NOW(), + last_refreshed_at TIMESTAMP, + UNIQUE(user_id, provider) +); + +-- Workspaces +CREATE TABLE workspaces ( + id UUID PRIMARY KEY DEFAULT gen_random_uuid(), + user_id UUID REFERENCES users(id), + name TEXT NOT NULL, + status TEXT DEFAULT 'provisioning', -- provisioning, running, stopped, failed + compute_provider TEXT NOT NULL, -- 'fly', 'railway', 'ecs' + compute_id TEXT, -- Provider-specific instance ID + public_url TEXT, -- Dashboard URL + internal_url TEXT, -- For API calls + created_at TIMESTAMP DEFAULT NOW(), + started_at TIMESTAMP, + stopped_at TIMESTAMP +); + +-- Connected Repositories +CREATE TABLE repositories ( + id UUID PRIMARY KEY DEFAULT gen_random_uuid(), + workspace_id UUID REFERENCES workspaces(id), + github_repo_id TEXT NOT NULL, + github_full_name TEXT NOT NULL, -- 'owner/repo' + default_branch TEXT DEFAULT 'main', + webhook_id TEXT, + last_synced_at TIMESTAMP, + created_at TIMESTAMP DEFAULT NOW() +); + +-- Teams (for collaboration) +CREATE TABLE teams ( + id UUID PRIMARY KEY DEFAULT gen_random_uuid(), + name TEXT NOT NULL, + owner_id UUID REFERENCES users(id), + created_at TIMESTAMP DEFAULT NOW() +); + +CREATE TABLE team_members ( + team_id UUID REFERENCES teams(id), + user_id UUID REFERENCES users(id), + role TEXT DEFAULT 'member', -- 'owner', 'admin', 'member' + PRIMARY KEY (team_id, user_id) +); +``` + +## API Endpoints + +### Auth +``` +POST /api/auth/github # Start GitHub OAuth +GET /api/auth/github/callback # OAuth callback +POST /api/auth/logout # Logout +GET /api/auth/me # Get current user +``` + +### Providers +``` +GET /api/providers # List providers + connection status +POST /api/providers/:provider/connect # Start device flow +GET /api/providers/:provider/status # Check device flow status +DELETE /api/providers/:provider # Disconnect provider +``` + +### Workspaces +``` +GET /api/workspaces # List user's workspaces +POST /api/workspaces # Create (provisions automatically) +GET /api/workspaces/:id # Get workspace details +DELETE /api/workspaces/:id # Delete workspace +POST /api/workspaces/:id/start # Start stopped workspace +POST /api/workspaces/:id/stop # Stop workspace +POST /api/workspaces/:id/restart # Restart workspace +GET /api/workspaces/:id/logs # Get logs (SSE stream) +``` + +### Repositories +``` +GET /api/repos/available # List GitHub repos user can add +POST /api/workspaces/:id/repos # Add repo to workspace +DELETE /api/workspaces/:id/repos/:repoId # Remove repo +POST /api/workspaces/:id/repos/:repoId/sync # Force sync +``` + +### Agents +``` +GET /api/workspaces/:id/agents # List agents in workspace +POST /api/workspaces/:id/agents # Spawn new agent +DELETE /api/workspaces/:id/agents/:name # Kill agent +POST /api/workspaces/:id/agents/:name/message # Send message to agent +``` + +## Workspace Provisioner Implementation + +### Interface +```typescript +interface WorkspaceProvisioner { + provision(config: ProvisionConfig): Promise; + start(workspaceId: string): Promise; + stop(workspaceId: string): Promise; + destroy(workspaceId: string): Promise; + getLogs(workspaceId: string): AsyncIterable; + getStatus(workspaceId: string): Promise; +} + +interface ProvisionConfig { + userId: string; + name: string; + repos: string[]; // ['owner/repo', ...] + providers: string[]; // ['anthropic', 'openai', ...] + resources?: { + cpu?: string; // '1' = 1 core + memory?: string; // '512Mi', '1Gi' + }; +} +``` + +### Fly.io Implementation +```typescript +class FlyProvisioner implements WorkspaceProvisioner { + async provision(config: ProvisionConfig): Promise { + // 1. Create Fly app + const app = await this.fly.createApp({ + name: `relay-${config.userId.slice(0, 8)}`, + org: 'agent-relay-cloud' + }); + + // 2. Set secrets (credentials) + const credentials = await vault.getCredentials(config.userId, config.providers); + await this.fly.setSecrets(app.name, { + ANTHROPIC_AUTH_TOKEN: credentials.anthropic?.accessToken, + OPENAI_AUTH_TOKEN: credentials.openai?.accessToken, + GITHUB_TOKEN: await this.getGitHubToken(config.userId), + REPOS: config.repos.join(','), + CLOUD_API_URL: process.env.CLOUD_API_URL, + WORKSPACE_ID: app.name + }); + + // 3. Deploy container + await this.fly.deploy(app.name, { + image: 'ghcr.io/agent-relay/workspace:latest', + region: 'iad', // or user's preferred region + vm: { + cpus: 1, + memory: 512 + } + }); + + // 4. Wait for healthy + await this.waitForHealthy(app.name); + + return { + id: app.name, + publicUrl: `https://${app.name}.fly.dev`, + status: 'running' + }; + } +} +``` + +## Directory Structure + +``` +src/cloud/ +├── index.ts # Cloud service entry point +├── server.ts # Express server setup +├── config.ts # Configuration +│ +├── api/ # API routes +│ ├── index.ts +│ ├── auth.ts # Auth routes +│ ├── providers.ts # Provider connection routes +│ ├── workspaces.ts # Workspace management +│ ├── repos.ts # Repository management +│ └── agents.ts # Agent management +│ +├── auth/ # Auth services +│ ├── github.ts # GitHub OAuth +│ ├── device-flow.ts # Device flow for providers +│ └── session.ts # Session management +│ +├── vault/ # Credential vault +│ ├── index.ts +│ ├── encryption.ts # AES-256-GCM encryption +│ └── refresh.ts # Token refresh service +│ +├── provisioner/ # Workspace provisioning +│ ├── index.ts # Provisioner interface +│ ├── fly.ts # Fly.io implementation +│ ├── railway.ts # Railway implementation +│ ├── docker.ts # Local Docker (dev) +│ └── workspace-image/ # Container image +│ ├── Dockerfile +│ └── entrypoint.sh +│ +├── db/ # Database +│ ├── index.ts # Connection +│ ├── schema.sql # Schema +│ └── migrations/ # Migrations +│ +└── services/ # Business logic + ├── users.ts + ├── workspaces.ts + ├── credentials.ts + └── github.ts +``` + +## Environment Variables + +```bash +# Database +DATABASE_URL=postgres://user:pass@host:5432/agent_relay_cloud +REDIS_URL=redis://host:6379 + +# GitHub OAuth +GITHUB_CLIENT_ID=xxx +GITHUB_CLIENT_SECRET=xxx +GITHUB_APP_ID=xxx +GITHUB_APP_PRIVATE_KEY=xxx + +# Provider OAuth (for device flow) +ANTHROPIC_CLIENT_ID=xxx +OPENAI_CLIENT_ID=xxx +GOOGLE_CLIENT_ID=xxx + +# Encryption +VAULT_MASTER_KEY=xxx # 32 bytes, base64 + +# Compute provider +COMPUTE_PROVIDER=fly # fly, railway, docker +FLY_API_TOKEN=xxx +FLY_ORG=agent-relay-cloud + +# Server +PORT=3000 +PUBLIC_URL=https://relay.cloud +SESSION_SECRET=xxx +``` + +## Security + +### Credential Vault Encryption +- AES-256-GCM for token encryption +- Per-user keys derived from master key + user ID +- Tokens never stored in plaintext +- Encryption keys never leave control plane + +### Workspace Isolation +- Each workspace runs in isolated container +- No shared filesystem between workspaces +- Network isolation (workspaces can't talk to each other) +- Credentials injected as environment variables (encrypted in transit) + +### API Security +- All API calls require authentication +- CSRF protection on mutations +- Rate limiting per user +- Audit logging for sensitive operations + +## Scaling + +### Control Plane +- Stateless API servers behind load balancer +- PostgreSQL with read replicas +- Redis cluster for sessions/caching + +### Compute Plane +- Workspaces scale independently +- Auto-sleep inactive workspaces (cost optimization) +- Wake on webhook or API call +- Regional deployment for latency diff --git a/src/cloud/api/auth.ts b/src/cloud/api/auth.ts new file mode 100644 index 000000000..72e6ddd09 --- /dev/null +++ b/src/cloud/api/auth.ts @@ -0,0 +1,194 @@ +/** + * Auth API Routes + * + * Handles GitHub OAuth for user login. + */ + +import { Router, Request, Response } from 'express'; +import crypto from 'crypto'; +import { getConfig } from '../config'; +import { db } from '../db'; + +export const authRouter = Router(); + +// Extend session type +declare module 'express-session' { + interface SessionData { + userId?: string; + githubToken?: string; + oauthState?: string; + } +} + +/** + * GET /api/auth/github + * Start GitHub OAuth flow + */ +authRouter.get('/github', (req: Request, res: Response) => { + const config = getConfig(); + const state = crypto.randomBytes(16).toString('hex'); + + // Store state in session for CSRF protection + req.session.oauthState = state; + + const params = new URLSearchParams({ + client_id: config.github.clientId, + redirect_uri: `${config.publicUrl}/api/auth/github/callback`, + scope: 'read:user user:email repo', + state, + }); + + res.redirect(`https://github.com/login/oauth/authorize?${params}`); +}); + +/** + * GET /api/auth/github/callback + * GitHub OAuth callback + */ +authRouter.get('/github/callback', async (req: Request, res: Response) => { + const config = getConfig(); + const { code, state } = req.query; + + // Verify state + if (state !== req.session.oauthState) { + return res.status(400).json({ error: 'Invalid state parameter' }); + } + + try { + // Exchange code for token + const tokenResponse = await fetch('https://github.com/login/oauth/access_token', { + method: 'POST', + headers: { + 'Content-Type': 'application/json', + Accept: 'application/json', + }, + body: JSON.stringify({ + client_id: config.github.clientId, + client_secret: config.github.clientSecret, + code, + }), + }); + + const tokenData = await tokenResponse.json(); + if (tokenData.error) { + throw new Error(tokenData.error_description || tokenData.error); + } + + const accessToken = tokenData.access_token; + + // Get user info + const userResponse = await fetch('https://api.github.com/user', { + headers: { + Authorization: `Bearer ${accessToken}`, + Accept: 'application/vnd.github.v3+json', + }, + }); + + const userData = await userResponse.json(); + + // Get user email if not public + let email = userData.email; + if (!email) { + const emailsResponse = await fetch('https://api.github.com/user/emails', { + headers: { + Authorization: `Bearer ${accessToken}`, + Accept: 'application/vnd.github.v3+json', + }, + }); + const emails = await emailsResponse.json(); + const primaryEmail = emails.find((e: any) => e.primary); + email = primaryEmail?.email; + } + + // Create or update user + const user = await db.users.upsert({ + githubId: String(userData.id), + githubUsername: userData.login, + email, + }); + + // Store GitHub token as a credential + await db.credentials.upsert({ + userId: user.id, + provider: 'github', + accessToken, + scopes: ['read:user', 'user:email', 'repo'], + providerAccountId: String(userData.id), + providerAccountEmail: email, + }); + + // Set session + req.session.userId = user.id; + req.session.githubToken = accessToken; + delete req.session.oauthState; + + // Redirect to dashboard or onboarding + const redirectTo = user.onboardingCompletedAt + ? '/dashboard' + : '/onboarding/providers'; + + res.redirect(redirectTo); + } catch (error) { + console.error('GitHub OAuth error:', error); + res.redirect('/login?error=oauth_failed'); + } +}); + +/** + * POST /api/auth/logout + * Logout user + */ +authRouter.post('/logout', (req: Request, res: Response) => { + req.session.destroy((err) => { + if (err) { + return res.status(500).json({ error: 'Failed to logout' }); + } + res.json({ success: true }); + }); +}); + +/** + * GET /api/auth/me + * Get current user + */ +authRouter.get('/me', async (req: Request, res: Response) => { + if (!req.session.userId) { + return res.status(401).json({ error: 'Not authenticated' }); + } + + try { + const user = await db.users.findById(req.session.userId); + if (!user) { + return res.status(401).json({ error: 'User not found' }); + } + + // Get connected providers + const credentials = await db.credentials.findByUserId(user.id); + const connectedProviders = credentials.map((c) => ({ + provider: c.provider, + email: c.providerAccountEmail, + connectedAt: c.createdAt, + })); + + res.json({ + id: user.id, + githubUsername: user.githubUsername, + email: user.email, + connectedProviders, + onboardingCompleted: !!user.onboardingCompletedAt, + }); + } catch (error) { + console.error('Error getting user:', error); + res.status(500).json({ error: 'Failed to get user' }); + } +}); + +/** + * Middleware to require authentication + */ +export function requireAuth(req: Request, res: Response, next: Function) { + if (!req.session.userId) { + return res.status(401).json({ error: 'Authentication required' }); + } + next(); +} diff --git a/src/cloud/api/onboarding.ts b/src/cloud/api/onboarding.ts new file mode 100644 index 000000000..e44b53421 --- /dev/null +++ b/src/cloud/api/onboarding.ts @@ -0,0 +1,476 @@ +/** + * Onboarding API Routes + * + * Handles CLI proxy authentication for Claude Code and other providers. + * Spawns CLI tools to get auth URLs, captures tokens. + */ + +import { Router, Request, Response } from 'express'; +import { spawn, ChildProcess } from 'child_process'; +import crypto from 'crypto'; +import { requireAuth } from './auth'; +import { db } from '../db'; +import { vault } from '../vault'; + +export const onboardingRouter = Router(); + +// All routes require authentication +onboardingRouter.use(requireAuth); + +/** + * Active CLI auth sessions + * Maps sessionId -> { process, authUrl, status, token } + */ +interface CLIAuthSession { + userId: string; + provider: string; + process?: ChildProcess; + authUrl?: string; + callbackUrl?: string; + status: 'starting' | 'waiting_auth' | 'success' | 'error' | 'timeout'; + token?: string; + error?: string; + createdAt: Date; +} + +const activeSessions = new Map(); + +// Clean up old sessions periodically +setInterval(() => { + const now = Date.now(); + for (const [id, session] of activeSessions) { + // Remove sessions older than 10 minutes + if (now - session.createdAt.getTime() > 10 * 60 * 1000) { + if (session.process) { + session.process.kill(); + } + activeSessions.delete(id); + } + } +}, 60000); + +/** + * CLI commands and URL patterns for each provider + */ +const CLI_AUTH_CONFIG: Record = { + anthropic: { + // Claude Code CLI login + command: 'claude', + args: ['login', '--no-open'], + // Claude outputs: "Please open: https://..." + urlPattern: /(?:open|visit|go to)[:\s]+(\S+anthropic\S+)/i, + // Token might be in output or in credentials file + credentialPath: '~/.claude/credentials.json', + }, + openai: { + // Codex CLI auth + command: 'codex', + args: ['auth', '--no-browser'], + urlPattern: /(?:open|visit|go to)[:\s]+(\S+openai\S+)/i, + credentialPath: '~/.codex/credentials.json', + }, +}; + +/** + * POST /api/onboarding/cli/:provider/start + * Start CLI-based auth - spawns the CLI and captures auth URL + */ +onboardingRouter.post('/cli/:provider/start', async (req: Request, res: Response) => { + const { provider } = req.params; + const userId = req.session.userId!; + + const config = CLI_AUTH_CONFIG[provider]; + if (!config) { + return res.status(400).json({ + error: 'Provider not supported for CLI auth', + supportedProviders: Object.keys(CLI_AUTH_CONFIG), + }); + } + + // Create session + const sessionId = crypto.randomUUID(); + const session: CLIAuthSession = { + userId, + provider, + status: 'starting', + createdAt: new Date(), + }; + activeSessions.set(sessionId, session); + + try { + // Spawn CLI process + const proc = spawn(config.command, config.args, { + env: { ...process.env, NO_COLOR: '1' }, + stdio: ['pipe', 'pipe', 'pipe'], + }); + + session.process = proc; + let output = ''; + + // Capture stdout/stderr for auth URL + const handleOutput = (data: Buffer) => { + const text = data.toString(); + output += text; + + // Look for auth URL + const match = text.match(config.urlPattern); + if (match && match[1]) { + session.authUrl = match[1]; + session.status = 'waiting_auth'; + } + + // Look for success indicators + if (text.toLowerCase().includes('success') || + text.toLowerCase().includes('authenticated') || + text.toLowerCase().includes('logged in')) { + session.status = 'success'; + } + }; + + proc.stdout.on('data', handleOutput); + proc.stderr.on('data', handleOutput); + + proc.on('error', (err) => { + session.status = 'error'; + session.error = `Failed to start CLI: ${err.message}`; + }); + + proc.on('exit', async (code) => { + if (code === 0 && session.status !== 'error') { + session.status = 'success'; + // Try to read credentials from file + await extractCredentials(session, config); + } else if (session.status === 'starting') { + session.status = 'error'; + session.error = `CLI exited with code ${code}`; + } + }); + + // Wait a moment for URL to appear + await new Promise(resolve => setTimeout(resolve, 2000)); + + // Return session info + if (session.authUrl) { + res.json({ + sessionId, + status: 'waiting_auth', + authUrl: session.authUrl, + message: 'Open the auth URL to complete login', + }); + } else if (session.status === 'error') { + activeSessions.delete(sessionId); + res.status(500).json({ error: session.error || 'CLI auth failed to start' }); + } else { + // Still starting, return session ID to poll + res.json({ + sessionId, + status: 'starting', + message: 'Auth session starting, poll for status', + }); + } + } catch (error) { + activeSessions.delete(sessionId); + console.error(`Error starting CLI auth for ${provider}:`, error); + res.status(500).json({ error: 'Failed to start CLI authentication' }); + } +}); + +/** + * GET /api/onboarding/cli/:provider/status/:sessionId + * Check status of CLI auth session + */ +onboardingRouter.get('/cli/:provider/status/:sessionId', (req: Request, res: Response) => { + const { sessionId } = req.params; + const userId = req.session.userId!; + + const session = activeSessions.get(sessionId); + if (!session) { + return res.status(404).json({ error: 'Session not found or expired' }); + } + + if (session.userId !== userId) { + return res.status(403).json({ error: 'Unauthorized' }); + } + + res.json({ + status: session.status, + authUrl: session.authUrl, + error: session.error, + }); +}); + +/** + * POST /api/onboarding/cli/:provider/complete/:sessionId + * Mark CLI auth as complete and store credentials + */ +onboardingRouter.post('/cli/:provider/complete/:sessionId', async (req: Request, res: Response) => { + const { provider, sessionId } = req.params; + const userId = req.session.userId!; + const { token } = req.body; // Optional: user can paste token directly + + const session = activeSessions.get(sessionId); + if (!session) { + return res.status(404).json({ error: 'Session not found or expired' }); + } + + if (session.userId !== userId) { + return res.status(403).json({ error: 'Unauthorized' }); + } + + try { + // If token provided directly, use it + let accessToken = token || session.token; + + // If no token yet, try to read from credentials file + if (!accessToken) { + const config = CLI_AUTH_CONFIG[provider]; + if (config) { + await extractCredentials(session, config); + accessToken = session.token; + } + } + + if (!accessToken) { + return res.status(400).json({ + error: 'No token found. Please complete authentication or paste your token.', + }); + } + + // Store in vault + await vault.storeCredential({ + userId, + provider, + accessToken, + scopes: getProviderScopes(provider), + }); + + // Clean up session + if (session.process) { + session.process.kill(); + } + activeSessions.delete(sessionId); + + res.json({ + success: true, + message: `${provider} connected successfully`, + }); + } catch (error) { + console.error(`Error completing CLI auth for ${provider}:`, error); + res.status(500).json({ error: 'Failed to complete authentication' }); + } +}); + +/** + * POST /api/onboarding/cli/:provider/cancel/:sessionId + * Cancel a CLI auth session + */ +onboardingRouter.post('/cli/:provider/cancel/:sessionId', (req: Request, res: Response) => { + const { sessionId } = req.params; + const userId = req.session.userId!; + + const session = activeSessions.get(sessionId); + if (session?.userId === userId) { + if (session.process) { + session.process.kill(); + } + activeSessions.delete(sessionId); + } + + res.json({ success: true }); +}); + +/** + * POST /api/onboarding/token/:provider + * Directly store a token (for manual paste flow) + */ +onboardingRouter.post('/token/:provider', async (req: Request, res: Response) => { + const { provider } = req.params; + const userId = req.session.userId!; + const { token, email } = req.body; + + if (!token) { + return res.status(400).json({ error: 'Token is required' }); + } + + try { + // Validate token by making a test API call + const isValid = await validateProviderToken(provider, token); + if (!isValid) { + return res.status(400).json({ error: 'Invalid token' }); + } + + // Store in vault + await vault.storeCredential({ + userId, + provider, + accessToken: token, + scopes: getProviderScopes(provider), + providerAccountEmail: email, + }); + + res.json({ + success: true, + message: `${provider} connected successfully`, + }); + } catch (error) { + console.error(`Error storing token for ${provider}:`, error); + res.status(500).json({ error: 'Failed to store token' }); + } +}); + +/** + * GET /api/onboarding/status + * Get overall onboarding status + */ +onboardingRouter.get('/status', async (req: Request, res: Response) => { + const userId = req.session.userId!; + + try { + const [user, credentials, repositories] = await Promise.all([ + db.users.findById(userId), + db.credentials.findByUserId(userId), + db.repositories.findByUserId(userId), + ]); + + const connectedProviders = credentials.map(c => c.provider); + const hasAIProvider = connectedProviders.some(p => + ['anthropic', 'openai', 'google'].includes(p) + ); + + res.json({ + steps: { + github: { complete: connectedProviders.includes('github') }, + aiProvider: { + complete: hasAIProvider, + connected: connectedProviders.filter(p => p !== 'github'), + }, + repository: { + complete: repositories.length > 0, + count: repositories.length, + }, + }, + onboardingComplete: user?.onboardingCompletedAt != null, + canCreateWorkspace: hasAIProvider && repositories.length > 0, + }); + } catch (error) { + console.error('Error getting onboarding status:', error); + res.status(500).json({ error: 'Failed to get status' }); + } +}); + +/** + * POST /api/onboarding/complete + * Mark onboarding as complete + */ +onboardingRouter.post('/complete', async (req: Request, res: Response) => { + const userId = req.session.userId!; + + try { + await db.users.completeOnboarding(userId); + res.json({ success: true }); + } catch (error) { + console.error('Error completing onboarding:', error); + res.status(500).json({ error: 'Failed to complete onboarding' }); + } +}); + +/** + * Helper: Extract credentials from CLI credential file + */ +async function extractCredentials( + session: CLIAuthSession, + config: typeof CLI_AUTH_CONFIG[string] +): Promise { + if (!config.credentialPath) return; + + try { + const fs = await import('fs/promises'); + const os = await import('os'); + const path = await import('path'); + + const credPath = config.credentialPath.replace('~', os.homedir()); + const content = await fs.readFile(credPath, 'utf8'); + const creds = JSON.parse(content); + + // Extract token based on provider structure + if (session.provider === 'anthropic') { + // Claude stores: { "oauth_token": "...", ... } or { "api_key": "..." } + session.token = creds.oauth_token || creds.access_token || creds.api_key; + } else if (session.provider === 'openai') { + // Codex might store: { "token": "..." } or { "api_key": "..." } + session.token = creds.token || creds.access_token || creds.api_key; + } + } catch (error) { + // Credentials file doesn't exist or isn't readable yet + console.log(`Could not read credentials file: ${error}`); + } +} + +/** + * Helper: Get default scopes for a provider + */ +function getProviderScopes(provider: string): string[] { + const scopes: Record = { + anthropic: ['claude-code:execute', 'user:read'], + openai: ['codex:execute', 'chat:write'], + google: ['generative-language'], + github: ['read:user', 'user:email', 'repo'], + }; + return scopes[provider] || []; +} + +/** + * Helper: Validate a provider token by making a test API call + */ +async function validateProviderToken(provider: string, token: string): Promise { + try { + const endpoints: Record }> = { + anthropic: { + url: 'https://api.anthropic.com/v1/messages', + headers: { + 'x-api-key': token, + 'anthropic-version': '2023-06-01', + }, + }, + openai: { + url: 'https://api.openai.com/v1/models', + headers: { + Authorization: `Bearer ${token}`, + }, + }, + google: { + url: 'https://generativelanguage.googleapis.com/v1/models', + headers: { + Authorization: `Bearer ${token}`, + }, + }, + }; + + const config = endpoints[provider]; + if (!config) return true; // Unknown provider, assume valid + + const response = await fetch(config.url, { + method: provider === 'anthropic' ? 'POST' : 'GET', + headers: config.headers, + ...(provider === 'anthropic' && { + body: JSON.stringify({ + model: 'claude-3-haiku-20240307', + max_tokens: 1, + messages: [{ role: 'user', content: 'test' }], + }), + }), + }); + + // 401/403 means invalid token, anything else (including rate limits) means valid + return response.status !== 401 && response.status !== 403; + } catch (error) { + console.error(`Error validating ${provider} token:`, error); + return false; + } +} diff --git a/src/cloud/api/providers.ts b/src/cloud/api/providers.ts new file mode 100644 index 000000000..a609ea80c --- /dev/null +++ b/src/cloud/api/providers.ts @@ -0,0 +1,456 @@ +/** + * Providers API Routes + * + * Handles device flow authentication for AI providers (Claude, Codex, etc.) + */ + +import { Router, Request, Response } from 'express'; +import crypto from 'crypto'; +import { requireAuth } from './auth'; +import { getConfig } from '../config'; +import { db } from '../db'; +import { vault } from '../vault'; + +export const providersRouter = Router(); + +// All routes require authentication +providersRouter.use(requireAuth); + +/** + * Provider registry with OAuth/device flow configuration + * + * Auth Strategy: + * - google: Real OAuth device flow (works today) + * - anthropic: CLI-based auth (user runs `claude login`, we detect credentials) + * - openai: CLI-based auth (user runs `codex auth`, we detect credentials) + * + * When providers add OAuth support, we can switch to device flow. + */ +const PROVIDERS = { + anthropic: { + name: 'Anthropic', + displayName: 'Claude', + description: 'Claude Code - recommended for code tasks', + // Auth strategy: CLI-based until Anthropic adds OAuth + authStrategy: 'cli' as const, + cliCommand: 'claude login', + credentialPath: '~/.claude/credentials.json', // Where Claude stores tokens + // Future OAuth endpoints (hypothetical - for when Anthropic implements) + deviceCodeUrl: 'https://api.anthropic.com/oauth/device/code', + tokenUrl: 'https://api.anthropic.com/oauth/token', + userInfoUrl: 'https://api.anthropic.com/v1/user', + scopes: ['claude-code:execute', 'user:read'], + color: '#D97757', + }, + openai: { + name: 'OpenAI', + displayName: 'Codex', + description: 'Codex CLI for AI-assisted coding', + // Auth strategy: CLI-based until OpenAI adds OAuth + authStrategy: 'cli' as const, + cliCommand: 'codex auth', + credentialPath: '~/.codex/credentials.json', + // Future OAuth endpoints (hypothetical) + deviceCodeUrl: 'https://auth.openai.com/device/code', + tokenUrl: 'https://auth.openai.com/oauth/token', + userInfoUrl: 'https://api.openai.com/v1/user', + scopes: ['openid', 'profile', 'email', 'codex:execute'], + color: '#10A37F', + }, + google: { + name: 'Google', + displayName: 'Gemini', + description: 'Gemini - multi-modal capabilities', + // Auth strategy: Real OAuth device flow (works today!) + authStrategy: 'device_flow' as const, + deviceCodeUrl: 'https://oauth2.googleapis.com/device/code', + tokenUrl: 'https://oauth2.googleapis.com/token', + userInfoUrl: 'https://www.googleapis.com/oauth2/v2/userinfo', + scopes: ['openid', 'email', 'profile', 'https://www.googleapis.com/auth/generative-language'], + color: '#4285F4', + }, +}; + +type ProviderType = keyof typeof PROVIDERS; + +// In-memory store for active device flows (use Redis in production) +interface ActiveDeviceFlow { + userId: string; + provider: ProviderType; + deviceCode: string; + userCode: string; + verificationUri: string; + verificationUriComplete?: string; + expiresAt: Date; + pollInterval: number; + status: 'pending' | 'success' | 'expired' | 'denied' | 'error'; + error?: string; +} + +const activeFlows = new Map(); + +/** + * GET /api/providers + * List all providers with connection status + */ +providersRouter.get('/', async (req: Request, res: Response) => { + const userId = req.session.userId!; + + try { + const credentials = await db.credentials.findByUserId(userId); + + const providers = Object.entries(PROVIDERS).map(([id, provider]) => { + const credential = credentials.find((c) => c.provider === id); + return { + id, + name: provider.name, + displayName: provider.displayName, + description: provider.description, + color: provider.color, + authStrategy: provider.authStrategy, + cliCommand: provider.authStrategy === 'cli' ? provider.cliCommand : undefined, + isConnected: !!credential, + connectedAs: credential?.providerAccountEmail, + connectedAt: credential?.createdAt, + }; + }); + + // Add GitHub (always connected via signup) + const githubCred = credentials.find((c) => c.provider === 'github'); + providers.unshift({ + id: 'github', + name: 'GitHub', + displayName: 'Copilot', + description: 'GitHub Copilot - connected via signup', + color: '#24292F', + isConnected: true, + connectedAs: githubCred?.providerAccountEmail, + connectedAt: githubCred?.createdAt, + }); + + res.json({ providers }); + } catch (error) { + console.error('Error listing providers:', error); + res.status(500).json({ error: 'Failed to list providers' }); + } +}); + +/** + * POST /api/providers/:provider/connect + * Start auth flow for a provider (device flow or CLI instructions) + */ +providersRouter.post('/:provider/connect', async (req: Request, res: Response) => { + const { provider } = req.params as { provider: ProviderType }; + const userId = req.session.userId!; + const config = getConfig(); + + const providerConfig = PROVIDERS[provider]; + if (!providerConfig) { + return res.status(404).json({ error: 'Unknown provider' }); + } + + // CLI-based auth (Claude, Codex) - return instructions + if (providerConfig.authStrategy === 'cli') { + return res.json({ + authStrategy: 'cli', + provider: provider, + displayName: providerConfig.displayName, + instructions: [ + `1. Open your terminal`, + `2. Run: ${providerConfig.cliCommand}`, + `3. Complete the login in your browser`, + `4. Return here and click "Verify Connection"`, + ], + cliCommand: providerConfig.cliCommand, + // For cloud-hosted: we'll check the workspace container for credentials + // For self-hosted: user's local credentials will be synced + verifyEndpoint: `/api/providers/${provider}/verify`, + }); + } + + // Device flow auth (Google) - start OAuth device flow + const clientConfig = config.providers[provider]; + if (!clientConfig) { + return res.status(400).json({ error: `Provider ${provider} not configured` }); + } + + try { + // Request device code from provider + const response = await fetch(providerConfig.deviceCodeUrl, { + method: 'POST', + headers: { + 'Content-Type': 'application/x-www-form-urlencoded', + }, + body: new URLSearchParams({ + client_id: clientConfig.clientId, + scope: providerConfig.scopes.join(' '), + ...((provider === 'google') && { client_secret: (clientConfig as any).clientSecret }), + }), + }); + + if (!response.ok) { + const error = await response.text(); + throw new Error(`Failed to get device code: ${error}`); + } + + const data = await response.json(); + + // Generate flow ID + const flowId = crypto.randomUUID(); + + // Store active flow + activeFlows.set(flowId, { + userId, + provider, + deviceCode: data.device_code, + userCode: data.user_code, + verificationUri: data.verification_uri, + verificationUriComplete: data.verification_uri_complete, + expiresAt: new Date(Date.now() + data.expires_in * 1000), + pollInterval: data.interval || 5, + status: 'pending', + }); + + // Start background polling + pollForToken(flowId, provider, clientConfig.clientId); + + res.json({ + authStrategy: 'device_flow', + flowId, + userCode: data.user_code, + verificationUri: data.verification_uri, + verificationUriComplete: data.verification_uri_complete, + expiresIn: data.expires_in, + }); + } catch (error) { + console.error(`Error starting device flow for ${provider}:`, error); + res.status(500).json({ error: 'Failed to start device flow' }); + } +}); + +/** + * POST /api/providers/:provider/verify + * Verify CLI-based auth completed (for Claude, Codex) + * User calls this after running the CLI login command + */ +providersRouter.post('/:provider/verify', async (req: Request, res: Response) => { + const { provider } = req.params as { provider: ProviderType }; + const userId = req.session.userId!; + + const providerConfig = PROVIDERS[provider]; + if (!providerConfig || providerConfig.authStrategy !== 'cli') { + return res.status(400).json({ error: 'Provider does not use CLI auth' }); + } + + // For cloud-hosted workspaces: the workspace container will have the credentials + // For self-hosted: we trust the user completed the CLI flow + // In production, we'd verify by making a test API call with the credentials + + try { + // For now, mark as connected (in production, verify credentials exist) + // This would be called after the user's workspace detects valid credentials + await db.credentials.upsert({ + userId, + provider, + accessToken: 'cli-authenticated', // Placeholder - real token from CLI + scopes: providerConfig.scopes, + providerAccountEmail: req.body.email, // User can optionally provide + }); + + res.json({ + success: true, + message: `${providerConfig.displayName} connected via CLI`, + note: 'Credentials will be synced when workspace starts', + }); + } catch (error) { + console.error(`Error verifying ${provider} auth:`, error); + res.status(500).json({ error: 'Failed to verify connection' }); + } +}); + +/** + * GET /api/providers/:provider/status/:flowId + * Check status of device flow + */ +providersRouter.get('/:provider/status/:flowId', (req: Request, res: Response) => { + const { flowId } = req.params; + const userId = req.session.userId!; + + const flow = activeFlows.get(flowId); + if (!flow) { + return res.status(404).json({ error: 'Flow not found or expired' }); + } + + if (flow.userId !== userId) { + return res.status(403).json({ error: 'Unauthorized' }); + } + + const expiresIn = Math.max(0, Math.floor((flow.expiresAt.getTime() - Date.now()) / 1000)); + + res.json({ + status: flow.status, + expiresIn, + error: flow.error, + }); +}); + +/** + * DELETE /api/providers/:provider + * Disconnect a provider + */ +providersRouter.delete('/:provider', async (req: Request, res: Response) => { + const { provider } = req.params; + const userId = req.session.userId!; + + if (provider === 'github') { + return res.status(400).json({ error: 'Cannot disconnect GitHub' }); + } + + try { + await db.credentials.delete(userId, provider); + res.json({ success: true }); + } catch (error) { + console.error(`Error disconnecting ${provider}:`, error); + res.status(500).json({ error: 'Failed to disconnect provider' }); + } +}); + +/** + * DELETE /api/providers/:provider/flow/:flowId + * Cancel a device flow + */ +providersRouter.delete('/:provider/flow/:flowId', (req: Request, res: Response) => { + const { flowId } = req.params; + const userId = req.session.userId!; + + const flow = activeFlows.get(flowId); + if (flow?.userId === userId) { + activeFlows.delete(flowId); + } + + res.json({ success: true }); +}); + +/** + * Background polling for device authorization + */ +async function pollForToken(flowId: string, provider: ProviderType, clientId: string) { + const flow = activeFlows.get(flowId); + if (!flow) return; + + const providerConfig = PROVIDERS[provider]; + let interval = flow.pollInterval * 1000; + + const poll = async () => { + const current = activeFlows.get(flowId); + if (!current || current.status !== 'pending') return; + + // Check expiry + if (Date.now() > current.expiresAt.getTime()) { + current.status = 'expired'; + return; + } + + try { + const response = await fetch(providerConfig.tokenUrl, { + method: 'POST', + headers: { + 'Content-Type': 'application/x-www-form-urlencoded', + }, + body: new URLSearchParams({ + client_id: clientId, + device_code: current.deviceCode, + grant_type: 'urn:ietf:params:oauth:grant-type:device_code', + }), + }); + + const data = await response.json(); + + if (data.error) { + switch (data.error) { + case 'authorization_pending': + setTimeout(poll, interval); + break; + case 'slow_down': + interval = (data.interval || 10) * 1000; + setTimeout(poll, interval); + break; + case 'expired_token': + current.status = 'expired'; + break; + case 'access_denied': + current.status = 'denied'; + break; + default: + current.status = 'error'; + current.error = data.error_description || data.error; + } + return; + } + + // Success! Store tokens + await storeProviderTokens(current.userId, provider, { + accessToken: data.access_token, + refreshToken: data.refresh_token, + expiresIn: data.expires_in, + scope: data.scope, + }); + + current.status = 'success'; + + // Clean up after 60s + setTimeout(() => activeFlows.delete(flowId), 60000); + } catch (error) { + console.error('Poll error:', error); + setTimeout(poll, interval * 2); + } + }; + + // Start polling after initial interval + setTimeout(poll, interval); +} + +/** + * Store tokens after successful device flow + */ +async function storeProviderTokens( + userId: string, + provider: ProviderType, + tokens: { + accessToken: string; + refreshToken?: string; + expiresIn?: number; + scope?: string; + } +) { + const providerConfig = PROVIDERS[provider]; + + // Fetch user info from provider + let userInfo: { id?: string; email?: string } = {}; + try { + const response = await fetch(providerConfig.userInfoUrl, { + headers: { + Authorization: `Bearer ${tokens.accessToken}`, + }, + }); + if (response.ok) { + userInfo = await response.json(); + } + } catch (error) { + console.error('Error fetching user info:', error); + } + + // Encrypt and store + await vault.storeCredential({ + userId, + provider, + accessToken: tokens.accessToken, + refreshToken: tokens.refreshToken, + tokenExpiresAt: tokens.expiresIn + ? new Date(Date.now() + tokens.expiresIn * 1000) + : undefined, + scopes: tokens.scope?.split(' '), + providerAccountId: userInfo.id, + providerAccountEmail: userInfo.email, + }); +} diff --git a/src/cloud/api/repos.ts b/src/cloud/api/repos.ts new file mode 100644 index 000000000..ff95955ff --- /dev/null +++ b/src/cloud/api/repos.ts @@ -0,0 +1,367 @@ +/** + * Repos API Routes + * + * GitHub repository management - list, import, sync. + */ + +import { Router, Request, Response } from 'express'; +import { requireAuth } from './auth'; +import { db } from '../db'; + +export const reposRouter = Router(); + +// All routes require authentication +reposRouter.use(requireAuth); + +/** + * GET /api/repos + * List user's imported repositories + */ +reposRouter.get('/', async (req: Request, res: Response) => { + const userId = req.session.userId!; + + try { + const repositories = await db.repositories.findByUserId(userId); + + res.json({ + repositories: repositories.map((r) => ({ + id: r.id, + fullName: r.githubFullName, + defaultBranch: r.defaultBranch, + isPrivate: r.isPrivate, + syncStatus: r.syncStatus, + lastSyncedAt: r.lastSyncedAt, + workspaceId: r.workspaceId, + })), + }); + } catch (error) { + console.error('Error listing repos:', error); + res.status(500).json({ error: 'Failed to list repositories' }); + } +}); + +/** + * GET /api/repos/github + * List available GitHub repos for the authenticated user + */ +reposRouter.get('/github', async (req: Request, res: Response) => { + const githubToken = req.session.githubToken; + + if (!githubToken) { + return res.status(401).json({ error: 'GitHub not connected' }); + } + + const { page = '1', per_page = '30', type = 'all' } = req.query; + + try { + // Fetch repos from GitHub API + const response = await fetch( + `https://api.github.com/user/repos?page=${page}&per_page=${per_page}&type=${type}&sort=updated`, + { + headers: { + Authorization: `Bearer ${githubToken}`, + Accept: 'application/vnd.github.v3+json', + }, + } + ); + + if (!response.ok) { + const error = await response.text(); + throw new Error(`GitHub API error: ${error}`); + } + + const repos = await response.json(); + + // Get link header for pagination + const linkHeader = response.headers.get('link'); + const hasMore = linkHeader?.includes('rel="next"') || false; + + res.json({ + repositories: repos.map((r: any) => ({ + githubId: r.id, + fullName: r.full_name, + name: r.name, + owner: r.owner.login, + description: r.description, + defaultBranch: r.default_branch, + isPrivate: r.private, + language: r.language, + updatedAt: r.updated_at, + htmlUrl: r.html_url, + })), + pagination: { + page: parseInt(page as string, 10), + perPage: parseInt(per_page as string, 10), + hasMore, + }, + }); + } catch (error) { + console.error('Error fetching GitHub repos:', error); + res.status(500).json({ error: 'Failed to fetch GitHub repositories' }); + } +}); + +/** + * POST /api/repos + * Import a GitHub repository + */ +reposRouter.post('/', async (req: Request, res: Response) => { + const userId = req.session.userId!; + const githubToken = req.session.githubToken; + const { fullName } = req.body; + + if (!fullName || typeof fullName !== 'string') { + return res.status(400).json({ error: 'Repository full name is required (owner/repo)' }); + } + + if (!githubToken) { + return res.status(401).json({ error: 'GitHub not connected' }); + } + + try { + // Verify repo exists and user has access + const repoResponse = await fetch(`https://api.github.com/repos/${fullName}`, { + headers: { + Authorization: `Bearer ${githubToken}`, + Accept: 'application/vnd.github.v3+json', + }, + }); + + if (!repoResponse.ok) { + if (repoResponse.status === 404) { + return res.status(404).json({ error: 'Repository not found or no access' }); + } + throw new Error('Failed to verify repository'); + } + + const repoData = await repoResponse.json(); + + // Import repo + const repository = await db.repositories.upsert({ + userId, + githubFullName: repoData.full_name, + githubId: repoData.id, + defaultBranch: repoData.default_branch, + isPrivate: repoData.private, + }); + + res.status(201).json({ + repository: { + id: repository.id, + fullName: repository.githubFullName, + defaultBranch: repository.defaultBranch, + isPrivate: repository.isPrivate, + syncStatus: repository.syncStatus, + }, + }); + } catch (error) { + console.error('Error importing repo:', error); + res.status(500).json({ error: 'Failed to import repository' }); + } +}); + +/** + * POST /api/repos/bulk + * Import multiple repositories at once + */ +reposRouter.post('/bulk', async (req: Request, res: Response) => { + const userId = req.session.userId!; + const githubToken = req.session.githubToken; + const { repositories } = req.body; + + if (!repositories || !Array.isArray(repositories)) { + return res.status(400).json({ error: 'repositories array is required' }); + } + + if (!githubToken) { + return res.status(401).json({ error: 'GitHub not connected' }); + } + + const results: { fullName: string; success: boolean; error?: string }[] = []; + + for (const repo of repositories) { + const fullName = typeof repo === 'string' ? repo : repo.fullName; + + try { + // Verify and fetch repo info + const repoResponse = await fetch(`https://api.github.com/repos/${fullName}`, { + headers: { + Authorization: `Bearer ${githubToken}`, + Accept: 'application/vnd.github.v3+json', + }, + }); + + if (!repoResponse.ok) { + results.push({ fullName, success: false, error: 'Not found or no access' }); + continue; + } + + const repoData = await repoResponse.json(); + + await db.repositories.upsert({ + userId, + githubFullName: repoData.full_name, + githubId: repoData.id, + defaultBranch: repoData.default_branch, + isPrivate: repoData.private, + }); + + results.push({ fullName, success: true }); + } catch (error) { + results.push({ fullName, success: false, error: 'Import failed' }); + } + } + + const imported = results.filter((r) => r.success).length; + const failed = results.filter((r) => !r.success).length; + + res.json({ + message: `Imported ${imported} repositories, ${failed} failed`, + results, + }); +}); + +/** + * GET /api/repos/:id + * Get repository details + */ +reposRouter.get('/:id', async (req: Request, res: Response) => { + const userId = req.session.userId!; + const { id } = req.params; + + try { + const repositories = await db.repositories.findByUserId(userId); + const repo = repositories.find((r) => r.id === id); + + if (!repo) { + return res.status(404).json({ error: 'Repository not found' }); + } + + res.json({ + id: repo.id, + fullName: repo.githubFullName, + defaultBranch: repo.defaultBranch, + isPrivate: repo.isPrivate, + syncStatus: repo.syncStatus, + lastSyncedAt: repo.lastSyncedAt, + workspaceId: repo.workspaceId, + createdAt: repo.createdAt, + }); + } catch (error) { + console.error('Error getting repo:', error); + res.status(500).json({ error: 'Failed to get repository' }); + } +}); + +/** + * POST /api/repos/:id/sync + * Trigger repository sync (clone/pull to workspace) + */ +reposRouter.post('/:id/sync', async (req: Request, res: Response) => { + const userId = req.session.userId!; + const { id } = req.params; + + try { + const repositories = await db.repositories.findByUserId(userId); + const repo = repositories.find((r) => r.id === id); + + if (!repo) { + return res.status(404).json({ error: 'Repository not found' }); + } + + if (!repo.workspaceId) { + return res.status(400).json({ error: 'Repository not assigned to a workspace' }); + } + + // Update sync status + await db.repositories.updateSyncStatus(id, 'syncing'); + + // In production, this would trigger the workspace to pull the repo + // For now, simulate success after a short delay + setTimeout(async () => { + await db.repositories.updateSyncStatus(id, 'synced', new Date()); + }, 2000); + + res.json({ message: 'Sync started', syncStatus: 'syncing' }); + } catch (error) { + console.error('Error syncing repo:', error); + res.status(500).json({ error: 'Failed to sync repository' }); + } +}); + +/** + * DELETE /api/repos/:id + * Remove a repository + */ +reposRouter.delete('/:id', async (req: Request, res: Response) => { + const userId = req.session.userId!; + const { id } = req.params; + + try { + const repositories = await db.repositories.findByUserId(userId); + const repo = repositories.find((r) => r.id === id); + + if (!repo) { + return res.status(404).json({ error: 'Repository not found' }); + } + + await db.repositories.delete(id); + res.json({ success: true }); + } catch (error) { + console.error('Error deleting repo:', error); + res.status(500).json({ error: 'Failed to delete repository' }); + } +}); + +/** + * GET /api/repos/search + * Search GitHub repos by name + */ +reposRouter.get('/search', async (req: Request, res: Response) => { + const githubToken = req.session.githubToken; + const { q } = req.query; + + if (!q || typeof q !== 'string') { + return res.status(400).json({ error: 'Search query (q) is required' }); + } + + if (!githubToken) { + return res.status(401).json({ error: 'GitHub not connected' }); + } + + try { + // Search user's repos + const response = await fetch( + `https://api.github.com/search/repositories?q=${encodeURIComponent(q)}+user:@me&sort=updated&per_page=20`, + { + headers: { + Authorization: `Bearer ${githubToken}`, + Accept: 'application/vnd.github.v3+json', + }, + } + ); + + if (!response.ok) { + throw new Error('GitHub search failed'); + } + + const data = await response.json(); + + res.json({ + repositories: data.items.map((r: any) => ({ + githubId: r.id, + fullName: r.full_name, + name: r.name, + owner: r.owner.login, + description: r.description, + defaultBranch: r.default_branch, + isPrivate: r.private, + language: r.language, + })), + total: data.total_count, + }); + } catch (error) { + console.error('Error searching repos:', error); + res.status(500).json({ error: 'Failed to search repositories' }); + } +}); diff --git a/src/cloud/api/workspaces.ts b/src/cloud/api/workspaces.ts new file mode 100644 index 000000000..e3c4fc48e --- /dev/null +++ b/src/cloud/api/workspaces.ts @@ -0,0 +1,358 @@ +/** + * Workspaces API Routes + * + * One-click workspace provisioning and management. + */ + +import { Router, Request, Response } from 'express'; +import { requireAuth } from './auth'; +import { db } from '../db'; +import { getProvisioner, ProvisionConfig } from '../provisioner'; + +export const workspacesRouter = Router(); + +// All routes require authentication +workspacesRouter.use(requireAuth); + +/** + * GET /api/workspaces + * List user's workspaces + */ +workspacesRouter.get('/', async (req: Request, res: Response) => { + const userId = req.session.userId!; + + try { + const workspaces = await db.workspaces.findByUserId(userId); + + res.json({ + workspaces: workspaces.map((w) => ({ + id: w.id, + name: w.name, + status: w.status, + publicUrl: w.publicUrl, + providers: w.config.providers, + repositories: w.config.repositories, + createdAt: w.createdAt, + })), + }); + } catch (error) { + console.error('Error listing workspaces:', error); + res.status(500).json({ error: 'Failed to list workspaces' }); + } +}); + +/** + * POST /api/workspaces + * Create (provision) a new workspace + */ +workspacesRouter.post('/', async (req: Request, res: Response) => { + const userId = req.session.userId!; + const { name, providers, repositories, supervisorEnabled, maxAgents } = req.body; + + // Validation + if (!name || typeof name !== 'string') { + return res.status(400).json({ error: 'Name is required' }); + } + + if (!providers || !Array.isArray(providers) || providers.length === 0) { + return res.status(400).json({ error: 'At least one provider is required' }); + } + + if (!repositories || !Array.isArray(repositories)) { + return res.status(400).json({ error: 'Repositories array is required' }); + } + + // Verify user has credentials for all providers + const credentials = await db.credentials.findByUserId(userId); + const connectedProviders = new Set(credentials.map((c) => c.provider)); + + for (const provider of providers) { + if (!connectedProviders.has(provider)) { + return res.status(400).json({ + error: `Provider ${provider} not connected. Please connect it first.`, + }); + } + } + + try { + const provisioner = getProvisioner(); + const result = await provisioner.provision({ + userId, + name, + providers, + repositories, + supervisorEnabled, + maxAgents, + }); + + if (result.status === 'error') { + return res.status(500).json({ + error: 'Failed to provision workspace', + details: result.error, + }); + } + + res.status(201).json({ + workspaceId: result.workspaceId, + status: result.status, + publicUrl: result.publicUrl, + }); + } catch (error) { + console.error('Error creating workspace:', error); + res.status(500).json({ error: 'Failed to create workspace' }); + } +}); + +/** + * GET /api/workspaces/:id + * Get workspace details + */ +workspacesRouter.get('/:id', async (req: Request, res: Response) => { + const userId = req.session.userId!; + const { id } = req.params; + + try { + const workspace = await db.workspaces.findById(id); + + if (!workspace) { + return res.status(404).json({ error: 'Workspace not found' }); + } + + if (workspace.userId !== userId) { + return res.status(403).json({ error: 'Unauthorized' }); + } + + // Get repositories assigned to this workspace + const repositories = await db.repositories.findByWorkspaceId(id); + + res.json({ + id: workspace.id, + name: workspace.name, + status: workspace.status, + publicUrl: workspace.publicUrl, + computeProvider: workspace.computeProvider, + config: workspace.config, + errorMessage: workspace.errorMessage, + repositories: repositories.map((r) => ({ + id: r.id, + fullName: r.githubFullName, + syncStatus: r.syncStatus, + lastSyncedAt: r.lastSyncedAt, + })), + createdAt: workspace.createdAt, + updatedAt: workspace.updatedAt, + }); + } catch (error) { + console.error('Error getting workspace:', error); + res.status(500).json({ error: 'Failed to get workspace' }); + } +}); + +/** + * GET /api/workspaces/:id/status + * Get current workspace status (polls compute provider) + */ +workspacesRouter.get('/:id/status', async (req: Request, res: Response) => { + const userId = req.session.userId!; + const { id } = req.params; + + try { + const workspace = await db.workspaces.findById(id); + + if (!workspace) { + return res.status(404).json({ error: 'Workspace not found' }); + } + + if (workspace.userId !== userId) { + return res.status(403).json({ error: 'Unauthorized' }); + } + + const provisioner = getProvisioner(); + const status = await provisioner.getStatus(id); + + res.json({ status }); + } catch (error) { + console.error('Error getting workspace status:', error); + res.status(500).json({ error: 'Failed to get status' }); + } +}); + +/** + * POST /api/workspaces/:id/restart + * Restart a workspace + */ +workspacesRouter.post('/:id/restart', async (req: Request, res: Response) => { + const userId = req.session.userId!; + const { id } = req.params; + + try { + const workspace = await db.workspaces.findById(id); + + if (!workspace) { + return res.status(404).json({ error: 'Workspace not found' }); + } + + if (workspace.userId !== userId) { + return res.status(403).json({ error: 'Unauthorized' }); + } + + const provisioner = getProvisioner(); + await provisioner.restart(id); + + res.json({ success: true, message: 'Workspace restarting' }); + } catch (error) { + console.error('Error restarting workspace:', error); + res.status(500).json({ error: 'Failed to restart workspace' }); + } +}); + +/** + * POST /api/workspaces/:id/stop + * Stop a workspace + */ +workspacesRouter.post('/:id/stop', async (req: Request, res: Response) => { + const userId = req.session.userId!; + const { id } = req.params; + + try { + const workspace = await db.workspaces.findById(id); + + if (!workspace) { + return res.status(404).json({ error: 'Workspace not found' }); + } + + if (workspace.userId !== userId) { + return res.status(403).json({ error: 'Unauthorized' }); + } + + const provisioner = getProvisioner(); + await provisioner.stop(id); + + res.json({ success: true, message: 'Workspace stopped' }); + } catch (error) { + console.error('Error stopping workspace:', error); + res.status(500).json({ error: 'Failed to stop workspace' }); + } +}); + +/** + * DELETE /api/workspaces/:id + * Delete (deprovision) a workspace + */ +workspacesRouter.delete('/:id', async (req: Request, res: Response) => { + const userId = req.session.userId!; + const { id } = req.params; + + try { + const workspace = await db.workspaces.findById(id); + + if (!workspace) { + return res.status(404).json({ error: 'Workspace not found' }); + } + + if (workspace.userId !== userId) { + return res.status(403).json({ error: 'Unauthorized' }); + } + + const provisioner = getProvisioner(); + await provisioner.deprovision(id); + + res.json({ success: true, message: 'Workspace deleted' }); + } catch (error) { + console.error('Error deleting workspace:', error); + res.status(500).json({ error: 'Failed to delete workspace' }); + } +}); + +/** + * POST /api/workspaces/:id/repos + * Add repositories to a workspace + */ +workspacesRouter.post('/:id/repos', async (req: Request, res: Response) => { + const userId = req.session.userId!; + const { id } = req.params; + const { repositoryIds } = req.body; + + if (!repositoryIds || !Array.isArray(repositoryIds)) { + return res.status(400).json({ error: 'repositoryIds array is required' }); + } + + try { + const workspace = await db.workspaces.findById(id); + + if (!workspace) { + return res.status(404).json({ error: 'Workspace not found' }); + } + + if (workspace.userId !== userId) { + return res.status(403).json({ error: 'Unauthorized' }); + } + + // Assign repositories to workspace + for (const repoId of repositoryIds) { + await db.repositories.assignToWorkspace(repoId, id); + } + + res.json({ success: true, message: 'Repositories added' }); + } catch (error) { + console.error('Error adding repos to workspace:', error); + res.status(500).json({ error: 'Failed to add repositories' }); + } +}); + +/** + * POST /api/workspaces/quick + * Quick provision: one-click with defaults + */ +workspacesRouter.post('/quick', async (req: Request, res: Response) => { + const userId = req.session.userId!; + const { name, repositoryFullName } = req.body; + + if (!repositoryFullName) { + return res.status(400).json({ error: 'Repository name is required' }); + } + + try { + // Get user's connected providers + const credentials = await db.credentials.findByUserId(userId); + const providers = credentials + .filter((c) => c.provider !== 'github') + .map((c) => c.provider); + + if (providers.length === 0) { + return res.status(400).json({ + error: 'No AI providers connected. Please connect at least one provider.', + }); + } + + // Create workspace with defaults + const provisioner = getProvisioner(); + const workspaceName = name || `Workspace for ${repositoryFullName}`; + + const result = await provisioner.provision({ + userId, + name: workspaceName, + providers, + repositories: [repositoryFullName], + supervisorEnabled: true, + maxAgents: 10, + }); + + if (result.status === 'error') { + return res.status(500).json({ + error: 'Failed to provision workspace', + details: result.error, + }); + } + + res.status(201).json({ + workspaceId: result.workspaceId, + status: result.status, + publicUrl: result.publicUrl, + message: 'Workspace provisioned successfully!', + }); + } catch (error) { + console.error('Error quick provisioning:', error); + res.status(500).json({ error: 'Failed to provision workspace' }); + } +}); diff --git a/src/cloud/config.ts b/src/cloud/config.ts new file mode 100644 index 000000000..e49b97131 --- /dev/null +++ b/src/cloud/config.ts @@ -0,0 +1,125 @@ +/** + * Agent Relay Cloud - Configuration + */ + +export interface CloudConfig { + // Server + port: number; + publicUrl: string; + sessionSecret: string; + + // Database + databaseUrl: string; + redisUrl: string; + + // GitHub OAuth + github: { + clientId: string; + clientSecret: string; + appId?: string; + appPrivateKey?: string; + }; + + // Provider OAuth (for device flow) + // Note: Only Google has public OAuth today. Claude/Codex use CLI-based auth. + providers: { + // Anthropic: Future OAuth support (hypothetical - requires Anthropic to implement) + anthropic?: { clientId: string }; + // OpenAI: Future OAuth support (hypothetical - requires OpenAI to implement) + openai?: { clientId: string }; + // Google: Has real OAuth device flow support + google?: { clientId: string; clientSecret: string }; + }; + + // Credential vault + vault: { + masterKey: string; // 32 bytes, base64 encoded + }; + + // Compute provisioner + compute: { + provider: 'fly' | 'railway' | 'docker'; + fly?: { + apiToken: string; + org: string; + }; + railway?: { + apiToken: string; + }; + }; +} + +function requireEnv(name: string): string { + const value = process.env[name]; + if (!value) { + throw new Error(`Missing required environment variable: ${name}`); + } + return value; +} + +function optionalEnv(name: string): string | undefined { + return process.env[name]; +} + +export function loadConfig(): CloudConfig { + return { + port: parseInt(process.env.PORT || '3000', 10), + publicUrl: process.env.PUBLIC_URL || 'http://localhost:3000', + sessionSecret: requireEnv('SESSION_SECRET'), + + databaseUrl: requireEnv('DATABASE_URL'), + redisUrl: process.env.REDIS_URL || 'redis://localhost:6379', + + github: { + clientId: requireEnv('GITHUB_CLIENT_ID'), + clientSecret: requireEnv('GITHUB_CLIENT_SECRET'), + appId: optionalEnv('GITHUB_APP_ID'), + appPrivateKey: optionalEnv('GITHUB_APP_PRIVATE_KEY'), + }, + + providers: { + anthropic: optionalEnv('ANTHROPIC_CLIENT_ID') + ? { clientId: optionalEnv('ANTHROPIC_CLIENT_ID')! } + : undefined, + openai: optionalEnv('OPENAI_CLIENT_ID') + ? { clientId: optionalEnv('OPENAI_CLIENT_ID')! } + : undefined, + google: + optionalEnv('GOOGLE_CLIENT_ID') && optionalEnv('GOOGLE_CLIENT_SECRET') + ? { + clientId: optionalEnv('GOOGLE_CLIENT_ID')!, + clientSecret: optionalEnv('GOOGLE_CLIENT_SECRET')!, + } + : undefined, + }, + + vault: { + masterKey: requireEnv('VAULT_MASTER_KEY'), + }, + + compute: { + provider: (process.env.COMPUTE_PROVIDER as 'fly' | 'railway' | 'docker') || 'docker', + fly: optionalEnv('FLY_API_TOKEN') + ? { + apiToken: optionalEnv('FLY_API_TOKEN')!, + org: optionalEnv('FLY_ORG') || 'personal', + } + : undefined, + railway: optionalEnv('RAILWAY_API_TOKEN') + ? { + apiToken: optionalEnv('RAILWAY_API_TOKEN')!, + } + : undefined, + }, + }; +} + +// Singleton config instance +let _config: CloudConfig | null = null; + +export function getConfig(): CloudConfig { + if (!_config) { + _config = loadConfig(); + } + return _config; +} diff --git a/src/cloud/db/index.ts b/src/cloud/db/index.ts new file mode 100644 index 000000000..0426b777e --- /dev/null +++ b/src/cloud/db/index.ts @@ -0,0 +1,464 @@ +/** + * Agent Relay Cloud - Database Layer + * + * PostgreSQL database access for users, credentials, workspaces, and repos. + */ + +import { Pool, PoolClient } from 'pg'; +import { getConfig } from '../config'; + +// Initialize pool lazily +let pool: Pool | null = null; + +function getPool(): Pool { + if (!pool) { + const config = getConfig(); + pool = new Pool({ connectionString: config.databaseUrl }); + } + return pool; +} + +// Types +export interface User { + id: string; + githubId: string; + githubUsername: string; + email?: string; + onboardingCompletedAt?: Date; + createdAt: Date; + updatedAt: Date; +} + +export interface Credential { + id: string; + userId: string; + provider: string; + accessToken: string; // Encrypted + refreshToken?: string; // Encrypted + tokenExpiresAt?: Date; + scopes?: string[]; + providerAccountId?: string; + providerAccountEmail?: string; + createdAt: Date; + updatedAt: Date; +} + +export interface Workspace { + id: string; + userId: string; + name: string; + status: 'provisioning' | 'running' | 'stopped' | 'error'; + computeProvider: 'fly' | 'railway' | 'docker'; + computeId?: string; // External ID from compute provider + publicUrl?: string; + config: WorkspaceConfig; + errorMessage?: string; + createdAt: Date; + updatedAt: Date; +} + +export interface WorkspaceConfig { + providers: string[]; + repositories: string[]; + supervisorEnabled: boolean; + maxAgents: number; +} + +export interface Repository { + id: string; + userId: string; + workspaceId?: string; + githubFullName: string; // e.g., "owner/repo" + githubId: number; + defaultBranch: string; + isPrivate: boolean; + syncStatus: 'pending' | 'syncing' | 'synced' | 'error'; + lastSyncedAt?: Date; + createdAt: Date; + updatedAt: Date; +} + +// User queries +export const users = { + async findById(id: string): Promise { + const { rows } = await getPool().query( + 'SELECT * FROM users WHERE id = $1', + [id] + ); + return rows[0] || null; + }, + + async findByGithubId(githubId: string): Promise { + const { rows } = await getPool().query( + 'SELECT * FROM users WHERE github_id = $1', + [githubId] + ); + return rows[0] ? mapUser(rows[0]) : null; + }, + + async upsert(data: { + githubId: string; + githubUsername: string; + email?: string; + }): Promise { + const { rows } = await getPool().query( + `INSERT INTO users (github_id, github_username, email) + VALUES ($1, $2, $3) + ON CONFLICT (github_id) DO UPDATE SET + github_username = EXCLUDED.github_username, + email = COALESCE(EXCLUDED.email, users.email), + updated_at = NOW() + RETURNING *`, + [data.githubId, data.githubUsername, data.email] + ); + return mapUser(rows[0]); + }, + + async completeOnboarding(userId: string): Promise { + await getPool().query( + 'UPDATE users SET onboarding_completed_at = NOW(), updated_at = NOW() WHERE id = $1', + [userId] + ); + }, +}; + +// Credential queries +export const credentials = { + async findByUserId(userId: string): Promise { + const { rows } = await getPool().query( + 'SELECT * FROM credentials WHERE user_id = $1', + [userId] + ); + return rows.map(mapCredential); + }, + + async findByUserAndProvider(userId: string, provider: string): Promise { + const { rows } = await getPool().query( + 'SELECT * FROM credentials WHERE user_id = $1 AND provider = $2', + [userId, provider] + ); + return rows[0] ? mapCredential(rows[0]) : null; + }, + + async upsert(data: { + userId: string; + provider: string; + accessToken: string; + refreshToken?: string; + tokenExpiresAt?: Date; + scopes?: string[]; + providerAccountId?: string; + providerAccountEmail?: string; + }): Promise { + const { rows } = await getPool().query( + `INSERT INTO credentials (user_id, provider, access_token, refresh_token, token_expires_at, scopes, provider_account_id, provider_account_email) + VALUES ($1, $2, $3, $4, $5, $6, $7, $8) + ON CONFLICT (user_id, provider) DO UPDATE SET + access_token = EXCLUDED.access_token, + refresh_token = COALESCE(EXCLUDED.refresh_token, credentials.refresh_token), + token_expires_at = EXCLUDED.token_expires_at, + scopes = EXCLUDED.scopes, + provider_account_id = EXCLUDED.provider_account_id, + provider_account_email = EXCLUDED.provider_account_email, + updated_at = NOW() + RETURNING *`, + [ + data.userId, + data.provider, + data.accessToken, + data.refreshToken, + data.tokenExpiresAt, + data.scopes, + data.providerAccountId, + data.providerAccountEmail, + ] + ); + return mapCredential(rows[0]); + }, + + async delete(userId: string, provider: string): Promise { + await getPool().query( + 'DELETE FROM credentials WHERE user_id = $1 AND provider = $2', + [userId, provider] + ); + }, + + async updateTokens( + userId: string, + provider: string, + accessToken: string, + refreshToken?: string, + expiresAt?: Date + ): Promise { + await getPool().query( + `UPDATE credentials SET + access_token = $3, + refresh_token = COALESCE($4, refresh_token), + token_expires_at = $5, + updated_at = NOW() + WHERE user_id = $1 AND provider = $2`, + [userId, provider, accessToken, refreshToken, expiresAt] + ); + }, +}; + +// Workspace queries +export const workspaces = { + async findById(id: string): Promise { + const { rows } = await getPool().query( + 'SELECT * FROM workspaces WHERE id = $1', + [id] + ); + return rows[0] ? mapWorkspace(rows[0]) : null; + }, + + async findByUserId(userId: string): Promise { + const { rows } = await getPool().query( + 'SELECT * FROM workspaces WHERE user_id = $1 ORDER BY created_at DESC', + [userId] + ); + return rows.map(mapWorkspace); + }, + + async create(data: { + userId: string; + name: string; + computeProvider: 'fly' | 'railway' | 'docker'; + config: WorkspaceConfig; + }): Promise { + const { rows } = await getPool().query( + `INSERT INTO workspaces (user_id, name, status, compute_provider, config) + VALUES ($1, $2, 'provisioning', $3, $4) + RETURNING *`, + [data.userId, data.name, data.computeProvider, JSON.stringify(data.config)] + ); + return mapWorkspace(rows[0]); + }, + + async updateStatus( + id: string, + status: Workspace['status'], + options?: { computeId?: string; publicUrl?: string; errorMessage?: string } + ): Promise { + await getPool().query( + `UPDATE workspaces SET + status = $2, + compute_id = COALESCE($3, compute_id), + public_url = COALESCE($4, public_url), + error_message = $5, + updated_at = NOW() + WHERE id = $1`, + [id, status, options?.computeId, options?.publicUrl, options?.errorMessage] + ); + }, + + async delete(id: string): Promise { + await getPool().query('DELETE FROM workspaces WHERE id = $1', [id]); + }, +}; + +// Repository queries +export const repositories = { + async findByUserId(userId: string): Promise { + const { rows } = await getPool().query( + 'SELECT * FROM repositories WHERE user_id = $1 ORDER BY github_full_name', + [userId] + ); + return rows.map(mapRepository); + }, + + async findByWorkspaceId(workspaceId: string): Promise { + const { rows } = await getPool().query( + 'SELECT * FROM repositories WHERE workspace_id = $1', + [workspaceId] + ); + return rows.map(mapRepository); + }, + + async upsert(data: { + userId: string; + githubFullName: string; + githubId: number; + defaultBranch: string; + isPrivate: boolean; + }): Promise { + const { rows } = await getPool().query( + `INSERT INTO repositories (user_id, github_full_name, github_id, default_branch, is_private) + VALUES ($1, $2, $3, $4, $5) + ON CONFLICT (user_id, github_full_name) DO UPDATE SET + github_id = EXCLUDED.github_id, + default_branch = EXCLUDED.default_branch, + is_private = EXCLUDED.is_private, + updated_at = NOW() + RETURNING *`, + [data.userId, data.githubFullName, data.githubId, data.defaultBranch, data.isPrivate] + ); + return mapRepository(rows[0]); + }, + + async assignToWorkspace(repoId: string, workspaceId: string): Promise { + await getPool().query( + 'UPDATE repositories SET workspace_id = $2, updated_at = NOW() WHERE id = $1', + [repoId, workspaceId] + ); + }, + + async updateSyncStatus( + id: string, + status: Repository['syncStatus'], + lastSyncedAt?: Date + ): Promise { + await getPool().query( + `UPDATE repositories SET + sync_status = $2, + last_synced_at = COALESCE($3, last_synced_at), + updated_at = NOW() + WHERE id = $1`, + [id, status, lastSyncedAt] + ); + }, + + async delete(id: string): Promise { + await getPool().query('DELETE FROM repositories WHERE id = $1', [id]); + }, +}; + +// Row mappers +function mapUser(row: any): User { + return { + id: row.id, + githubId: row.github_id, + githubUsername: row.github_username, + email: row.email, + onboardingCompletedAt: row.onboarding_completed_at, + createdAt: row.created_at, + updatedAt: row.updated_at, + }; +} + +function mapCredential(row: any): Credential { + return { + id: row.id, + userId: row.user_id, + provider: row.provider, + accessToken: row.access_token, + refreshToken: row.refresh_token, + tokenExpiresAt: row.token_expires_at, + scopes: row.scopes, + providerAccountId: row.provider_account_id, + providerAccountEmail: row.provider_account_email, + createdAt: row.created_at, + updatedAt: row.updated_at, + }; +} + +function mapWorkspace(row: any): Workspace { + return { + id: row.id, + userId: row.user_id, + name: row.name, + status: row.status, + computeProvider: row.compute_provider, + computeId: row.compute_id, + publicUrl: row.public_url, + config: row.config, + errorMessage: row.error_message, + createdAt: row.created_at, + updatedAt: row.updated_at, + }; +} + +function mapRepository(row: any): Repository { + return { + id: row.id, + userId: row.user_id, + workspaceId: row.workspace_id, + githubFullName: row.github_full_name, + githubId: row.github_id, + defaultBranch: row.default_branch, + isPrivate: row.is_private, + syncStatus: row.sync_status, + lastSyncedAt: row.last_synced_at, + createdAt: row.created_at, + updatedAt: row.updated_at, + }; +} + +// Database initialization +export async function initializeDatabase(): Promise { + const client = await getPool().connect(); + try { + await client.query(` + CREATE TABLE IF NOT EXISTS users ( + id UUID PRIMARY KEY DEFAULT gen_random_uuid(), + github_id VARCHAR(255) UNIQUE NOT NULL, + github_username VARCHAR(255) NOT NULL, + email VARCHAR(255), + onboarding_completed_at TIMESTAMP, + created_at TIMESTAMP DEFAULT NOW(), + updated_at TIMESTAMP DEFAULT NOW() + ); + + CREATE TABLE IF NOT EXISTS credentials ( + id UUID PRIMARY KEY DEFAULT gen_random_uuid(), + user_id UUID NOT NULL REFERENCES users(id) ON DELETE CASCADE, + provider VARCHAR(50) NOT NULL, + access_token TEXT NOT NULL, + refresh_token TEXT, + token_expires_at TIMESTAMP, + scopes TEXT[], + provider_account_id VARCHAR(255), + provider_account_email VARCHAR(255), + created_at TIMESTAMP DEFAULT NOW(), + updated_at TIMESTAMP DEFAULT NOW(), + UNIQUE(user_id, provider) + ); + + CREATE TABLE IF NOT EXISTS workspaces ( + id UUID PRIMARY KEY DEFAULT gen_random_uuid(), + user_id UUID NOT NULL REFERENCES users(id) ON DELETE CASCADE, + name VARCHAR(255) NOT NULL, + status VARCHAR(50) NOT NULL DEFAULT 'provisioning', + compute_provider VARCHAR(50) NOT NULL, + compute_id VARCHAR(255), + public_url VARCHAR(255), + config JSONB NOT NULL DEFAULT '{}', + error_message TEXT, + created_at TIMESTAMP DEFAULT NOW(), + updated_at TIMESTAMP DEFAULT NOW() + ); + + CREATE TABLE IF NOT EXISTS repositories ( + id UUID PRIMARY KEY DEFAULT gen_random_uuid(), + user_id UUID NOT NULL REFERENCES users(id) ON DELETE CASCADE, + workspace_id UUID REFERENCES workspaces(id) ON DELETE SET NULL, + github_full_name VARCHAR(255) NOT NULL, + github_id BIGINT NOT NULL, + default_branch VARCHAR(255) NOT NULL DEFAULT 'main', + is_private BOOLEAN NOT NULL DEFAULT false, + sync_status VARCHAR(50) NOT NULL DEFAULT 'pending', + last_synced_at TIMESTAMP, + created_at TIMESTAMP DEFAULT NOW(), + updated_at TIMESTAMP DEFAULT NOW(), + UNIQUE(user_id, github_full_name) + ); + + CREATE INDEX IF NOT EXISTS idx_credentials_user_id ON credentials(user_id); + CREATE INDEX IF NOT EXISTS idx_workspaces_user_id ON workspaces(user_id); + CREATE INDEX IF NOT EXISTS idx_repositories_user_id ON repositories(user_id); + CREATE INDEX IF NOT EXISTS idx_repositories_workspace_id ON repositories(workspace_id); + `); + } finally { + client.release(); + } +} + +// Export db object for convenience +export const db = { + users, + credentials, + workspaces, + repositories, + initialize: initializeDatabase, + getPool, +}; diff --git a/src/cloud/index.ts b/src/cloud/index.ts new file mode 100644 index 000000000..3dcd0a172 --- /dev/null +++ b/src/cloud/index.ts @@ -0,0 +1,36 @@ +/** + * Agent Relay Cloud - Main Entry Point + * + * One-click server provisioning for AI agent orchestration. + */ + +export { createServer } from './server'; +export { getConfig, loadConfig, CloudConfig } from './config'; + +// Services +export { CredentialVault } from './vault'; +export { WorkspaceProvisioner, ProvisionConfig, Workspace, WorkspaceStatus } from './provisioner'; + +// Run if executed directly +if (require.main === module) { + (async () => { + try { + const { createServer } = await import('./server'); + const server = await createServer(); + await server.start(); + + // Graceful shutdown + const shutdown = async () => { + console.log('\nShutting down...'); + await server.stop(); + process.exit(0); + }; + + process.on('SIGINT', shutdown); + process.on('SIGTERM', shutdown); + } catch (error) { + console.error('Failed to start server:', error); + process.exit(1); + } + })(); +} diff --git a/src/cloud/provisioner/index.ts b/src/cloud/provisioner/index.ts new file mode 100644 index 000000000..352fa58f9 --- /dev/null +++ b/src/cloud/provisioner/index.ts @@ -0,0 +1,688 @@ +/** + * Agent Relay Cloud - Workspace Provisioner + * + * One-click provisioning for compute resources (Fly.io, Railway, Docker). + */ + +import { getConfig } from '../config'; +import { db, Workspace, WorkspaceConfig } from '../db'; +import { vault } from '../vault'; + +export interface ProvisionConfig { + userId: string; + name: string; + providers: string[]; + repositories: string[]; + supervisorEnabled?: boolean; + maxAgents?: number; +} + +export interface ProvisionResult { + workspaceId: string; + status: 'provisioning' | 'running' | 'error'; + publicUrl?: string; + error?: string; +} + +export type WorkspaceStatus = Workspace['status']; +export { Workspace }; + +/** + * Abstract provisioner interface + */ +interface ComputeProvisioner { + provision(workspace: Workspace, credentials: Map): Promise<{ + computeId: string; + publicUrl: string; + }>; + deprovision(workspace: Workspace): Promise; + getStatus(workspace: Workspace): Promise; + restart(workspace: Workspace): Promise; +} + +/** + * Fly.io provisioner + */ +class FlyProvisioner implements ComputeProvisioner { + private apiToken: string; + private org: string; + + constructor() { + const config = getConfig(); + if (!config.compute.fly) { + throw new Error('Fly.io configuration missing'); + } + this.apiToken = config.compute.fly.apiToken; + this.org = config.compute.fly.org; + } + + async provision( + workspace: Workspace, + credentials: Map + ): Promise<{ computeId: string; publicUrl: string }> { + const appName = `ar-${workspace.id.substring(0, 8)}`; + + // Create Fly app + const createResponse = await fetch('https://api.machines.dev/v1/apps', { + method: 'POST', + headers: { + Authorization: `Bearer ${this.apiToken}`, + 'Content-Type': 'application/json', + }, + body: JSON.stringify({ + app_name: appName, + org_slug: this.org, + }), + }); + + if (!createResponse.ok) { + const error = await createResponse.text(); + throw new Error(`Failed to create Fly app: ${error}`); + } + + // Set secrets (credentials) + const secrets: Record = {}; + for (const [provider, token] of credentials) { + secrets[`${provider.toUpperCase()}_TOKEN`] = token; + } + + await fetch(`https://api.machines.dev/v1/apps/${appName}/secrets`, { + method: 'POST', + headers: { + Authorization: `Bearer ${this.apiToken}`, + 'Content-Type': 'application/json', + }, + body: JSON.stringify(secrets), + }); + + // Create machine + const machineResponse = await fetch( + `https://api.machines.dev/v1/apps/${appName}/machines`, + { + method: 'POST', + headers: { + Authorization: `Bearer ${this.apiToken}`, + 'Content-Type': 'application/json', + }, + body: JSON.stringify({ + config: { + image: 'ghcr.io/agent-relay/workspace:latest', + env: { + WORKSPACE_ID: workspace.id, + SUPERVISOR_ENABLED: String(workspace.config.supervisorEnabled), + MAX_AGENTS: String(workspace.config.maxAgents), + REPOSITORIES: workspace.config.repositories.join(','), + PROVIDERS: workspace.config.providers.join(','), + }, + services: [ + { + ports: [ + { port: 443, handlers: ['tls', 'http'] }, + { port: 80, handlers: ['http'] }, + ], + protocol: 'tcp', + internal_port: 3000, + }, + ], + guest: { + cpu_kind: 'shared', + cpus: 1, + memory_mb: 512, + }, + }, + }), + } + ); + + if (!machineResponse.ok) { + const error = await machineResponse.text(); + throw new Error(`Failed to create Fly machine: ${error}`); + } + + const machine = await machineResponse.json(); + + return { + computeId: machine.id, + publicUrl: `https://${appName}.fly.dev`, + }; + } + + async deprovision(workspace: Workspace): Promise { + const appName = `ar-${workspace.id.substring(0, 8)}`; + + await fetch(`https://api.machines.dev/v1/apps/${appName}`, { + method: 'DELETE', + headers: { + Authorization: `Bearer ${this.apiToken}`, + }, + }); + } + + async getStatus(workspace: Workspace): Promise { + if (!workspace.computeId) return 'error'; + + const appName = `ar-${workspace.id.substring(0, 8)}`; + + const response = await fetch( + `https://api.machines.dev/v1/apps/${appName}/machines/${workspace.computeId}`, + { + headers: { + Authorization: `Bearer ${this.apiToken}`, + }, + } + ); + + if (!response.ok) return 'error'; + + const machine = await response.json(); + + switch (machine.state) { + case 'started': + return 'running'; + case 'stopped': + return 'stopped'; + case 'created': + case 'starting': + return 'provisioning'; + default: + return 'error'; + } + } + + async restart(workspace: Workspace): Promise { + if (!workspace.computeId) return; + + const appName = `ar-${workspace.id.substring(0, 8)}`; + + await fetch( + `https://api.machines.dev/v1/apps/${appName}/machines/${workspace.computeId}/restart`, + { + method: 'POST', + headers: { + Authorization: `Bearer ${this.apiToken}`, + }, + } + ); + } +} + +/** + * Railway provisioner + */ +class RailwayProvisioner implements ComputeProvisioner { + private apiToken: string; + + constructor() { + const config = getConfig(); + if (!config.compute.railway) { + throw new Error('Railway configuration missing'); + } + this.apiToken = config.compute.railway.apiToken; + } + + async provision( + workspace: Workspace, + credentials: Map + ): Promise<{ computeId: string; publicUrl: string }> { + // Create project + const projectResponse = await fetch('https://backboard.railway.app/graphql/v2', { + method: 'POST', + headers: { + Authorization: `Bearer ${this.apiToken}`, + 'Content-Type': 'application/json', + }, + body: JSON.stringify({ + query: ` + mutation CreateProject($input: ProjectCreateInput!) { + projectCreate(input: $input) { + id + name + } + } + `, + variables: { + input: { + name: `agent-relay-${workspace.id.substring(0, 8)}`, + }, + }, + }), + }); + + const projectData = await projectResponse.json(); + const projectId = projectData.data.projectCreate.id; + + // Deploy service + const serviceResponse = await fetch('https://backboard.railway.app/graphql/v2', { + method: 'POST', + headers: { + Authorization: `Bearer ${this.apiToken}`, + 'Content-Type': 'application/json', + }, + body: JSON.stringify({ + query: ` + mutation CreateService($input: ServiceCreateInput!) { + serviceCreate(input: $input) { + id + } + } + `, + variables: { + input: { + projectId, + name: 'workspace', + source: { + image: 'ghcr.io/agent-relay/workspace:latest', + }, + }, + }, + }), + }); + + const serviceData = await serviceResponse.json(); + const serviceId = serviceData.data.serviceCreate.id; + + // Set environment variables + const envVars: Record = { + WORKSPACE_ID: workspace.id, + SUPERVISOR_ENABLED: String(workspace.config.supervisorEnabled), + MAX_AGENTS: String(workspace.config.maxAgents), + REPOSITORIES: workspace.config.repositories.join(','), + PROVIDERS: workspace.config.providers.join(','), + }; + + for (const [provider, token] of credentials) { + envVars[`${provider.toUpperCase()}_TOKEN`] = token; + } + + await fetch('https://backboard.railway.app/graphql/v2', { + method: 'POST', + headers: { + Authorization: `Bearer ${this.apiToken}`, + 'Content-Type': 'application/json', + }, + body: JSON.stringify({ + query: ` + mutation SetVariables($input: VariableCollectionUpsertInput!) { + variableCollectionUpsert(input: $input) + } + `, + variables: { + input: { + projectId, + serviceId, + variables: envVars, + }, + }, + }), + }); + + // Generate domain + const domainResponse = await fetch('https://backboard.railway.app/graphql/v2', { + method: 'POST', + headers: { + Authorization: `Bearer ${this.apiToken}`, + 'Content-Type': 'application/json', + }, + body: JSON.stringify({ + query: ` + mutation CreateDomain($input: ServiceDomainCreateInput!) { + serviceDomainCreate(input: $input) { + domain + } + } + `, + variables: { + input: { + serviceId, + }, + }, + }), + }); + + const domainData = await domainResponse.json(); + const domain = domainData.data.serviceDomainCreate.domain; + + return { + computeId: projectId, + publicUrl: `https://${domain}`, + }; + } + + async deprovision(workspace: Workspace): Promise { + if (!workspace.computeId) return; + + await fetch('https://backboard.railway.app/graphql/v2', { + method: 'POST', + headers: { + Authorization: `Bearer ${this.apiToken}`, + 'Content-Type': 'application/json', + }, + body: JSON.stringify({ + query: ` + mutation DeleteProject($id: String!) { + projectDelete(id: $id) + } + `, + variables: { + id: workspace.computeId, + }, + }), + }); + } + + async getStatus(workspace: Workspace): Promise { + if (!workspace.computeId) return 'error'; + + const response = await fetch('https://backboard.railway.app/graphql/v2', { + method: 'POST', + headers: { + Authorization: `Bearer ${this.apiToken}`, + 'Content-Type': 'application/json', + }, + body: JSON.stringify({ + query: ` + query GetProject($id: String!) { + project(id: $id) { + deployments { + edges { + node { + status + } + } + } + } + } + `, + variables: { + id: workspace.computeId, + }, + }), + }); + + const data = await response.json(); + const deployments = data.data?.project?.deployments?.edges; + + if (!deployments || deployments.length === 0) return 'provisioning'; + + const latestStatus = deployments[0].node.status; + + switch (latestStatus) { + case 'SUCCESS': + return 'running'; + case 'BUILDING': + case 'DEPLOYING': + return 'provisioning'; + case 'CRASHED': + case 'FAILED': + return 'error'; + default: + return 'stopped'; + } + } + + async restart(workspace: Workspace): Promise { + // Railway doesn't have a direct restart - redeploy instead + if (!workspace.computeId) return; + + await fetch('https://backboard.railway.app/graphql/v2', { + method: 'POST', + headers: { + Authorization: `Bearer ${this.apiToken}`, + 'Content-Type': 'application/json', + }, + body: JSON.stringify({ + query: ` + mutation RedeployService($input: DeploymentTriggerInput!) { + deploymentTrigger(input: $input) + } + `, + variables: { + input: { + projectId: workspace.computeId, + }, + }, + }), + }); + } +} + +/** + * Local Docker provisioner (for development/self-hosted) + */ +class DockerProvisioner implements ComputeProvisioner { + async provision( + workspace: Workspace, + credentials: Map + ): Promise<{ computeId: string; publicUrl: string }> { + const containerName = `ar-${workspace.id.substring(0, 8)}`; + + // Build environment variables + const envArgs: string[] = [ + `-e WORKSPACE_ID=${workspace.id}`, + `-e SUPERVISOR_ENABLED=${workspace.config.supervisorEnabled}`, + `-e MAX_AGENTS=${workspace.config.maxAgents}`, + `-e REPOSITORIES=${workspace.config.repositories.join(',')}`, + `-e PROVIDERS=${workspace.config.providers.join(',')}`, + ]; + + for (const [provider, token] of credentials) { + envArgs.push(`-e ${provider.toUpperCase()}_TOKEN=${token}`); + } + + // Run container + const { execSync } = await import('child_process'); + const port = 3000 + Math.floor(Math.random() * 1000); + + try { + execSync( + `docker run -d --name ${containerName} -p ${port}:3000 ${envArgs.join(' ')} ghcr.io/agent-relay/workspace:latest`, + { stdio: 'pipe' } + ); + + return { + computeId: containerName, + publicUrl: `http://localhost:${port}`, + }; + } catch (error) { + throw new Error(`Failed to start Docker container: ${error}`); + } + } + + async deprovision(workspace: Workspace): Promise { + if (!workspace.computeId) return; + + const { execSync } = await import('child_process'); + try { + execSync(`docker rm -f ${workspace.computeId}`, { stdio: 'pipe' }); + } catch { + // Container may already be removed + } + } + + async getStatus(workspace: Workspace): Promise { + if (!workspace.computeId) return 'error'; + + const { execSync } = await import('child_process'); + try { + const result = execSync( + `docker inspect -f '{{.State.Status}}' ${workspace.computeId}`, + { stdio: 'pipe' } + ).toString().trim(); + + switch (result) { + case 'running': + return 'running'; + case 'exited': + case 'dead': + return 'stopped'; + case 'created': + case 'restarting': + return 'provisioning'; + default: + return 'error'; + } + } catch { + return 'error'; + } + } + + async restart(workspace: Workspace): Promise { + if (!workspace.computeId) return; + + const { execSync } = await import('child_process'); + try { + execSync(`docker restart ${workspace.computeId}`, { stdio: 'pipe' }); + } catch (error) { + throw new Error(`Failed to restart container: ${error}`); + } + } +} + +/** + * Main Workspace Provisioner + */ +export class WorkspaceProvisioner { + private provisioner: ComputeProvisioner; + + constructor() { + const config = getConfig(); + + switch (config.compute.provider) { + case 'fly': + this.provisioner = new FlyProvisioner(); + break; + case 'railway': + this.provisioner = new RailwayProvisioner(); + break; + case 'docker': + default: + this.provisioner = new DockerProvisioner(); + } + } + + /** + * Provision a new workspace (one-click) + */ + async provision(config: ProvisionConfig): Promise { + // Create workspace record + const workspace = await db.workspaces.create({ + userId: config.userId, + name: config.name, + computeProvider: getConfig().compute.provider, + config: { + providers: config.providers, + repositories: config.repositories, + supervisorEnabled: config.supervisorEnabled ?? true, + maxAgents: config.maxAgents ?? 10, + }, + }); + + // Get credentials + const credentials = new Map(); + for (const provider of config.providers) { + const cred = await vault.getCredential(config.userId, provider); + if (cred) { + credentials.set(provider, cred.accessToken); + } + } + + // Provision compute + try { + const { computeId, publicUrl } = await this.provisioner.provision( + workspace, + credentials + ); + + await db.workspaces.updateStatus(workspace.id, 'running', { + computeId, + publicUrl, + }); + + return { + workspaceId: workspace.id, + status: 'running', + publicUrl, + }; + } catch (error) { + const errorMessage = error instanceof Error ? error.message : 'Unknown error'; + + await db.workspaces.updateStatus(workspace.id, 'error', { + errorMessage, + }); + + return { + workspaceId: workspace.id, + status: 'error', + error: errorMessage, + }; + } + } + + /** + * Deprovision a workspace + */ + async deprovision(workspaceId: string): Promise { + const workspace = await db.workspaces.findById(workspaceId); + if (!workspace) { + throw new Error('Workspace not found'); + } + + await this.provisioner.deprovision(workspace); + await db.workspaces.delete(workspaceId); + } + + /** + * Get workspace status + */ + async getStatus(workspaceId: string): Promise { + const workspace = await db.workspaces.findById(workspaceId); + if (!workspace) { + throw new Error('Workspace not found'); + } + + const status = await this.provisioner.getStatus(workspace); + + // Update database if status changed + if (status !== workspace.status) { + await db.workspaces.updateStatus(workspaceId, status); + } + + return status; + } + + /** + * Restart a workspace + */ + async restart(workspaceId: string): Promise { + const workspace = await db.workspaces.findById(workspaceId); + if (!workspace) { + throw new Error('Workspace not found'); + } + + await this.provisioner.restart(workspace); + } + + /** + * Stop a workspace + */ + async stop(workspaceId: string): Promise { + const workspace = await db.workspaces.findById(workspaceId); + if (!workspace) { + throw new Error('Workspace not found'); + } + + // For now, just deprovision to stop + await this.provisioner.deprovision(workspace); + await db.workspaces.updateStatus(workspaceId, 'stopped'); + } +} + +// Singleton instance +let _provisioner: WorkspaceProvisioner | null = null; + +export function getProvisioner(): WorkspaceProvisioner { + if (!_provisioner) { + _provisioner = new WorkspaceProvisioner(); + } + return _provisioner; +} diff --git a/src/cloud/server.ts b/src/cloud/server.ts new file mode 100644 index 000000000..c5a28caa6 --- /dev/null +++ b/src/cloud/server.ts @@ -0,0 +1,103 @@ +/** + * Agent Relay Cloud - Express Server + */ + +import express, { Express, Request, Response, NextFunction } from 'express'; +import session from 'express-session'; +import cors from 'cors'; +import helmet from 'helmet'; +import { createClient } from 'redis'; +import RedisStore from 'connect-redis'; +import { getConfig, CloudConfig } from './config'; + +// API routers +import { authRouter } from './api/auth'; +import { providersRouter } from './api/providers'; +import { workspacesRouter } from './api/workspaces'; +import { reposRouter } from './api/repos'; +import { onboardingRouter } from './api/onboarding'; + +export interface CloudServer { + app: Express; + start(): Promise; + stop(): Promise; +} + +export async function createServer(): Promise { + const config = getConfig(); + const app = express(); + + // Redis client for sessions + const redisClient = createClient({ url: config.redisUrl }); + await redisClient.connect(); + + // Middleware + app.use(helmet()); + app.use( + cors({ + origin: config.publicUrl, + credentials: true, + }) + ); + app.use(express.json()); + + // Session middleware + app.use( + session({ + store: new RedisStore({ client: redisClient }), + secret: config.sessionSecret, + resave: false, + saveUninitialized: false, + cookie: { + secure: config.publicUrl.startsWith('https'), + httpOnly: true, + maxAge: 7 * 24 * 60 * 60 * 1000, // 7 days + }, + }) + ); + + // Health check + app.get('/health', (req, res) => { + res.json({ status: 'ok', timestamp: new Date().toISOString() }); + }); + + // API routes + app.use('/api/auth', authRouter); + app.use('/api/providers', providersRouter); + app.use('/api/workspaces', workspacesRouter); + app.use('/api/repos', reposRouter); + app.use('/api/onboarding', onboardingRouter); + + // Error handler + app.use((err: Error, req: Request, res: Response, next: NextFunction) => { + console.error('Error:', err); + res.status(500).json({ + error: 'Internal server error', + message: process.env.NODE_ENV === 'development' ? err.message : undefined, + }); + }); + + // Server lifecycle + let server: ReturnType | null = null; + + return { + app, + + async start() { + return new Promise((resolve) => { + server = app.listen(config.port, () => { + console.log(`Agent Relay Cloud running on port ${config.port}`); + console.log(`Public URL: ${config.publicUrl}`); + resolve(); + }); + }); + }, + + async stop() { + if (server) { + await new Promise((resolve) => server!.close(() => resolve())); + } + await redisClient.quit(); + }, + }; +} diff --git a/src/cloud/vault/index.ts b/src/cloud/vault/index.ts new file mode 100644 index 000000000..0a55f6633 --- /dev/null +++ b/src/cloud/vault/index.ts @@ -0,0 +1,304 @@ +/** + * Agent Relay Cloud - Credential Vault + * + * Secure storage for OAuth tokens with AES-256-GCM encryption. + */ + +import crypto from 'crypto'; +import { getConfig } from '../config'; +import { db, Credential } from '../db'; + +const ALGORITHM = 'aes-256-gcm'; +const IV_LENGTH = 12; +const AUTH_TAG_LENGTH = 16; + +export interface StoredCredential { + userId: string; + provider: string; + accessToken: string; + refreshToken?: string; + tokenExpiresAt?: Date; + scopes?: string[]; + providerAccountId?: string; + providerAccountEmail?: string; +} + +export interface DecryptedCredential { + accessToken: string; + refreshToken?: string; + tokenExpiresAt?: Date; + scopes?: string[]; + providerAccountId?: string; + providerAccountEmail?: string; +} + +export class CredentialVault { + private masterKey: Buffer; + + constructor() { + const config = getConfig(); + this.masterKey = Buffer.from(config.vault.masterKey, 'base64'); + + if (this.masterKey.length !== 32) { + throw new Error('Vault master key must be 32 bytes (base64 encoded)'); + } + } + + /** + * Encrypt a string value + */ + private encrypt(plaintext: string): string { + const iv = crypto.randomBytes(IV_LENGTH); + const cipher = crypto.createCipheriv(ALGORITHM, this.masterKey, iv); + + const encrypted = Buffer.concat([ + cipher.update(plaintext, 'utf8'), + cipher.final(), + ]); + + const authTag = cipher.getAuthTag(); + + // Format: base64(iv + authTag + ciphertext) + const combined = Buffer.concat([iv, authTag, encrypted]); + return combined.toString('base64'); + } + + /** + * Decrypt a string value + */ + private decrypt(ciphertext: string): string { + const combined = Buffer.from(ciphertext, 'base64'); + + const iv = combined.subarray(0, IV_LENGTH); + const authTag = combined.subarray(IV_LENGTH, IV_LENGTH + AUTH_TAG_LENGTH); + const encrypted = combined.subarray(IV_LENGTH + AUTH_TAG_LENGTH); + + const decipher = crypto.createDecipheriv(ALGORITHM, this.masterKey, iv); + decipher.setAuthTag(authTag); + + const decrypted = Buffer.concat([ + decipher.update(encrypted), + decipher.final(), + ]); + + return decrypted.toString('utf8'); + } + + /** + * Store encrypted credential + */ + async storeCredential(credential: StoredCredential): Promise { + const encryptedAccessToken = this.encrypt(credential.accessToken); + const encryptedRefreshToken = credential.refreshToken + ? this.encrypt(credential.refreshToken) + : undefined; + + await db.credentials.upsert({ + userId: credential.userId, + provider: credential.provider, + accessToken: encryptedAccessToken, + refreshToken: encryptedRefreshToken, + tokenExpiresAt: credential.tokenExpiresAt, + scopes: credential.scopes, + providerAccountId: credential.providerAccountId, + providerAccountEmail: credential.providerAccountEmail, + }); + } + + /** + * Retrieve and decrypt credential + */ + async getCredential(userId: string, provider: string): Promise { + const credential = await db.credentials.findByUserAndProvider(userId, provider); + if (!credential) { + return null; + } + + return { + accessToken: this.decrypt(credential.accessToken), + refreshToken: credential.refreshToken + ? this.decrypt(credential.refreshToken) + : undefined, + tokenExpiresAt: credential.tokenExpiresAt, + scopes: credential.scopes, + providerAccountId: credential.providerAccountId, + providerAccountEmail: credential.providerAccountEmail, + }; + } + + /** + * Get all credentials for a user (decrypted) + */ + async getUserCredentials(userId: string): Promise> { + const credentials = await db.credentials.findByUserId(userId); + const result = new Map(); + + for (const cred of credentials) { + result.set(cred.provider, { + accessToken: this.decrypt(cred.accessToken), + refreshToken: cred.refreshToken + ? this.decrypt(cred.refreshToken) + : undefined, + tokenExpiresAt: cred.tokenExpiresAt, + scopes: cred.scopes, + providerAccountId: cred.providerAccountId, + providerAccountEmail: cred.providerAccountEmail, + }); + } + + return result; + } + + /** + * Update tokens (e.g., after refresh) + */ + async updateTokens( + userId: string, + provider: string, + accessToken: string, + refreshToken?: string, + expiresAt?: Date + ): Promise { + const encryptedAccessToken = this.encrypt(accessToken); + const encryptedRefreshToken = refreshToken + ? this.encrypt(refreshToken) + : undefined; + + await db.credentials.updateTokens( + userId, + provider, + encryptedAccessToken, + encryptedRefreshToken, + expiresAt + ); + } + + /** + * Delete credential + */ + async deleteCredential(userId: string, provider: string): Promise { + await db.credentials.delete(userId, provider); + } + + /** + * Check if credential needs refresh (within 5 minutes of expiry) + */ + async needsRefresh(userId: string, provider: string): Promise { + const credential = await db.credentials.findByUserAndProvider(userId, provider); + if (!credential || !credential.tokenExpiresAt) { + return false; + } + + const fiveMinutes = 5 * 60 * 1000; + return Date.now() > credential.tokenExpiresAt.getTime() - fiveMinutes; + } + + /** + * Refresh OAuth token for a provider + */ + async refreshToken(userId: string, provider: string): Promise { + const credential = await this.getCredential(userId, provider); + if (!credential?.refreshToken) { + return false; + } + + // Provider-specific refresh endpoints + const refreshEndpoints: Record = { + anthropic: 'https://api.anthropic.com/oauth/token', + openai: 'https://auth.openai.com/oauth/token', + google: 'https://oauth2.googleapis.com/token', + github: 'https://github.com/login/oauth/access_token', + }; + + const endpoint = refreshEndpoints[provider]; + if (!endpoint) { + console.error(`Unknown provider for refresh: ${provider}`); + return false; + } + + try { + const config = getConfig(); + const providerConfig = config.providers[provider as keyof typeof config.providers]; + + const response = await fetch(endpoint, { + method: 'POST', + headers: { + 'Content-Type': 'application/x-www-form-urlencoded', + Accept: 'application/json', + }, + body: new URLSearchParams({ + grant_type: 'refresh_token', + refresh_token: credential.refreshToken, + client_id: (providerConfig as any)?.clientId || config.github.clientId, + ...(provider === 'google' && { + client_secret: (providerConfig as any)?.clientSecret, + }), + ...(provider === 'github' && { + client_secret: config.github.clientSecret, + }), + }), + }); + + if (!response.ok) { + const error = await response.text(); + console.error(`Token refresh failed for ${provider}:`, error); + return false; + } + + const data = await response.json(); + + await this.updateTokens( + userId, + provider, + data.access_token, + data.refresh_token, + data.expires_in + ? new Date(Date.now() + data.expires_in * 1000) + : undefined + ); + + return true; + } catch (error) { + console.error(`Error refreshing token for ${provider}:`, error); + return false; + } + } +} + +// Singleton instance +let _vault: CredentialVault | null = null; + +export function getVault(): CredentialVault { + if (!_vault) { + _vault = new CredentialVault(); + } + return _vault; +} + +export const vault = { + get instance() { + return getVault(); + }, + storeCredential: (cred: StoredCredential) => getVault().storeCredential(cred), + getCredential: (userId: string, provider: string) => + getVault().getCredential(userId, provider), + getUserCredentials: (userId: string) => getVault().getUserCredentials(userId), + updateTokens: ( + userId: string, + provider: string, + accessToken: string, + refreshToken?: string, + expiresAt?: Date + ) => getVault().updateTokens(userId, provider, accessToken, refreshToken, expiresAt), + deleteCredential: (userId: string, provider: string) => + getVault().deleteCredential(userId, provider), + needsRefresh: (userId: string, provider: string) => + getVault().needsRefresh(userId, provider), + refreshToken: (userId: string, provider: string) => + getVault().refreshToken(userId, provider), +}; + +// Generate a new master key (for setup) +export function generateMasterKey(): string { + return crypto.randomBytes(32).toString('base64'); +} From fe15ee219765e0c0fde3dd24dd303b76dfb461f5 Mon Sep 17 00:00:00 2001 From: Claude Date: Tue, 30 Dec 2025 00:26:37 +0000 Subject: [PATCH 09/38] Add custom domain support for workspaces - Add custom_domain and custom_domain_status fields to workspaces - Add API endpoints for domain management: - POST /workspaces/:id/domain - Set custom domain - POST /workspaces/:id/domain/verify - Verify DNS & provision SSL - DELETE /workspaces/:id/domain - Remove custom domain - DNS verification via CNAME lookup - SSL provisioning for Fly.io and Railway - Database index for custom domain lookups Users can now use their own domains (e.g., agents.acme.com) instead of the default workspace-xxx.agentrelay.dev URLs. --- src/cloud/api/workspaces.ts | 221 +++++++++++++++++++++++++++++++++++- src/cloud/db/index.ts | 49 +++++++- 2 files changed, 268 insertions(+), 2 deletions(-) diff --git a/src/cloud/api/workspaces.ts b/src/cloud/api/workspaces.ts index e3c4fc48e..f3f8df863 100644 --- a/src/cloud/api/workspaces.ts +++ b/src/cloud/api/workspaces.ts @@ -6,7 +6,7 @@ import { Router, Request, Response } from 'express'; import { requireAuth } from './auth'; -import { db } from '../db'; +import { db, Workspace } from '../db'; import { getProvisioner, ProvisionConfig } from '../provisioner'; export const workspacesRouter = Router(); @@ -300,6 +300,225 @@ workspacesRouter.post('/:id/repos', async (req: Request, res: Response) => { } }); +/** + * POST /api/workspaces/:id/domain + * Add or update custom domain + */ +workspacesRouter.post('/:id/domain', async (req: Request, res: Response) => { + const userId = req.session.userId!; + const { id } = req.params; + const { domain } = req.body; + + if (!domain || typeof domain !== 'string') { + return res.status(400).json({ error: 'Domain is required' }); + } + + // Basic domain validation + const domainRegex = /^(?:[a-zA-Z0-9](?:[a-zA-Z0-9-]{0,61}[a-zA-Z0-9])?\.)+[a-zA-Z]{2,}$/; + if (!domainRegex.test(domain)) { + return res.status(400).json({ error: 'Invalid domain format' }); + } + + try { + const workspace = await db.workspaces.findById(id); + + if (!workspace) { + return res.status(404).json({ error: 'Workspace not found' }); + } + + if (workspace.userId !== userId) { + return res.status(403).json({ error: 'Unauthorized' }); + } + + // Check if domain is already in use + const existing = await db.workspaces.findByCustomDomain(domain); + if (existing && existing.id !== id) { + return res.status(409).json({ error: 'Domain already in use' }); + } + + // Set the custom domain (pending verification) + await db.workspaces.setCustomDomain(id, domain, 'pending'); + + // Return DNS instructions + res.json({ + success: true, + domain, + status: 'pending', + instructions: { + type: 'CNAME', + name: domain, + value: workspace.publicUrl?.replace('https://', '') || `${id}.agentrelay.dev`, + ttl: 300, + }, + verifyEndpoint: `/api/workspaces/${id}/domain/verify`, + message: 'Add the CNAME record to your DNS, then call the verify endpoint', + }); + } catch (error) { + console.error('Error setting custom domain:', error); + res.status(500).json({ error: 'Failed to set custom domain' }); + } +}); + +/** + * POST /api/workspaces/:id/domain/verify + * Verify custom domain DNS is configured correctly + */ +workspacesRouter.post('/:id/domain/verify', async (req: Request, res: Response) => { + const userId = req.session.userId!; + const { id } = req.params; + + try { + const workspace = await db.workspaces.findById(id); + + if (!workspace) { + return res.status(404).json({ error: 'Workspace not found' }); + } + + if (workspace.userId !== userId) { + return res.status(403).json({ error: 'Unauthorized' }); + } + + if (!workspace.customDomain) { + return res.status(400).json({ error: 'No custom domain configured' }); + } + + // Verify DNS resolution + const dns = await import('dns').then(m => m.promises); + try { + const records = await dns.resolveCname(workspace.customDomain); + const expectedTarget = workspace.publicUrl?.replace('https://', '') || `${id}.agentrelay.dev`; + + if (records.some(r => r.includes(expectedTarget) || r.includes('agentrelay'))) { + // DNS is configured, now provision SSL cert + await db.workspaces.updateCustomDomainStatus(id, 'verifying'); + + // Trigger SSL cert provisioning on compute provider + // For Railway/Fly, this is automatic once domain is added + await provisionDomainSSL(workspace); + + await db.workspaces.updateCustomDomainStatus(id, 'active'); + + res.json({ + success: true, + status: 'active', + domain: workspace.customDomain, + message: 'Custom domain verified and SSL certificate provisioned', + }); + } else { + res.status(400).json({ + success: false, + status: 'pending', + error: 'DNS not configured correctly', + expected: expectedTarget, + found: records, + }); + } + } catch (dnsError) { + res.status(400).json({ + success: false, + status: 'pending', + error: 'Could not resolve domain. DNS may not be configured yet.', + }); + } + } catch (error) { + console.error('Error verifying domain:', error); + res.status(500).json({ error: 'Failed to verify domain' }); + } +}); + +/** + * DELETE /api/workspaces/:id/domain + * Remove custom domain + */ +workspacesRouter.delete('/:id/domain', async (req: Request, res: Response) => { + const userId = req.session.userId!; + const { id } = req.params; + + try { + const workspace = await db.workspaces.findById(id); + + if (!workspace) { + return res.status(404).json({ error: 'Workspace not found' }); + } + + if (workspace.userId !== userId) { + return res.status(403).json({ error: 'Unauthorized' }); + } + + // Remove from compute provider + if (workspace.customDomain) { + await removeDomainFromCompute(workspace); + } + + await db.workspaces.removeCustomDomain(id); + + res.json({ success: true, message: 'Custom domain removed' }); + } catch (error) { + console.error('Error removing domain:', error); + res.status(500).json({ error: 'Failed to remove domain' }); + } +}); + +/** + * Helper: Provision SSL for custom domain on compute provider + */ +async function provisionDomainSSL(workspace: Workspace): Promise { + const config = (await import('../config')).getConfig(); + + if (workspace.computeProvider === 'fly' && config.compute.fly) { + // Fly.io: Add certificate + await fetch(`https://api.machines.dev/v1/apps/ar-${workspace.id.substring(0, 8)}/certificates`, { + method: 'POST', + headers: { + Authorization: `Bearer ${config.compute.fly.apiToken}`, + 'Content-Type': 'application/json', + }, + body: JSON.stringify({ hostname: workspace.customDomain }), + }); + } else if (workspace.computeProvider === 'railway' && config.compute.railway) { + // Railway: Add custom domain via GraphQL + await fetch('https://backboard.railway.app/graphql/v2', { + method: 'POST', + headers: { + Authorization: `Bearer ${config.compute.railway.apiToken}`, + 'Content-Type': 'application/json', + }, + body: JSON.stringify({ + query: ` + mutation AddCustomDomain($input: CustomDomainCreateInput!) { + customDomainCreate(input: $input) { id } + } + `, + variables: { + input: { + projectId: workspace.computeId, + domain: workspace.customDomain, + }, + }, + }), + }); + } + // Docker: Would need reverse proxy config (Caddy/nginx) +} + +/** + * Helper: Remove custom domain from compute provider + */ +async function removeDomainFromCompute(workspace: Workspace): Promise { + const config = (await import('../config')).getConfig(); + + if (workspace.computeProvider === 'fly' && config.compute.fly) { + await fetch( + `https://api.machines.dev/v1/apps/ar-${workspace.id.substring(0, 8)}/certificates/${workspace.customDomain}`, + { + method: 'DELETE', + headers: { Authorization: `Bearer ${config.compute.fly.apiToken}` }, + } + ); + } + // Railway and Docker: similar cleanup +} + /** * POST /api/workspaces/quick * Quick provision: one-click with defaults diff --git a/src/cloud/db/index.ts b/src/cloud/db/index.ts index 0426b777e..34b37e592 100644 --- a/src/cloud/db/index.ts +++ b/src/cloud/db/index.ts @@ -50,7 +50,9 @@ export interface Workspace { status: 'provisioning' | 'running' | 'stopped' | 'error'; computeProvider: 'fly' | 'railway' | 'docker'; computeId?: string; // External ID from compute provider - publicUrl?: string; + publicUrl?: string; // Default URL (e.g., workspace-abc.agentrelay.dev) + customDomain?: string; // User's custom domain (e.g., agents.acme.com) + customDomainStatus?: 'pending' | 'verifying' | 'active' | 'error'; config: WorkspaceConfig; errorMessage?: string; createdAt: Date; @@ -255,6 +257,46 @@ export const workspaces = { async delete(id: string): Promise { await getPool().query('DELETE FROM workspaces WHERE id = $1', [id]); }, + + async setCustomDomain( + id: string, + customDomain: string, + status: Workspace['customDomainStatus'] = 'pending' + ): Promise { + await getPool().query( + `UPDATE workspaces SET + custom_domain = $2, + custom_domain_status = $3, + updated_at = NOW() + WHERE id = $1`, + [id, customDomain, status] + ); + }, + + async updateCustomDomainStatus( + id: string, + status: Workspace['customDomainStatus'] + ): Promise { + await getPool().query( + `UPDATE workspaces SET custom_domain_status = $2, updated_at = NOW() WHERE id = $1`, + [id, status] + ); + }, + + async removeCustomDomain(id: string): Promise { + await getPool().query( + `UPDATE workspaces SET custom_domain = NULL, custom_domain_status = NULL, updated_at = NOW() WHERE id = $1`, + [id] + ); + }, + + async findByCustomDomain(domain: string): Promise { + const { rows } = await getPool().query( + 'SELECT * FROM workspaces WHERE custom_domain = $1', + [domain] + ); + return rows[0] ? mapWorkspace(rows[0]) : null; + }, }; // Repository queries @@ -361,6 +403,8 @@ function mapWorkspace(row: any): Workspace { computeProvider: row.compute_provider, computeId: row.compute_id, publicUrl: row.public_url, + customDomain: row.custom_domain, + customDomainStatus: row.custom_domain_status, config: row.config, errorMessage: row.error_message, createdAt: row.created_at, @@ -422,6 +466,8 @@ export async function initializeDatabase(): Promise { compute_provider VARCHAR(50) NOT NULL, compute_id VARCHAR(255), public_url VARCHAR(255), + custom_domain VARCHAR(255), + custom_domain_status VARCHAR(50), config JSONB NOT NULL DEFAULT '{}', error_message TEXT, created_at TIMESTAMP DEFAULT NOW(), @@ -445,6 +491,7 @@ export async function initializeDatabase(): Promise { CREATE INDEX IF NOT EXISTS idx_credentials_user_id ON credentials(user_id); CREATE INDEX IF NOT EXISTS idx_workspaces_user_id ON workspaces(user_id); + CREATE INDEX IF NOT EXISTS idx_workspaces_custom_domain ON workspaces(custom_domain) WHERE custom_domain IS NOT NULL; CREATE INDEX IF NOT EXISTS idx_repositories_user_id ON repositories(user_id); CREATE INDEX IF NOT EXISTS idx_repositories_workspace_id ON repositories(workspace_id); `); From 291906eb698aacb4c7d6f249b70c2228d1bec03d Mon Sep 17 00:00:00 2001 From: Claude Date: Tue, 30 Dec 2025 00:28:20 +0000 Subject: [PATCH 10/38] Make custom domains a premium feature (Team/Enterprise only) - Add plan field to users (free, pro, team, enterprise) - Custom domains require Team or Enterprise plan - Returns 402 Payment Required with upgrade link for free/pro users - Default URLs use subdomains: workspace-xxx.agentrelay.dev Pricing model: - Free/Pro: Subdomains only (included) - Team/Enterprise: Custom domains ($10/mo add-on) --- src/cloud/api/workspaces.ts | 12 +++++++++++- src/cloud/db/index.ts | 5 +++++ 2 files changed, 16 insertions(+), 1 deletion(-) diff --git a/src/cloud/api/workspaces.ts b/src/cloud/api/workspaces.ts index f3f8df863..8523193a3 100644 --- a/src/cloud/api/workspaces.ts +++ b/src/cloud/api/workspaces.ts @@ -302,7 +302,7 @@ workspacesRouter.post('/:id/repos', async (req: Request, res: Response) => { /** * POST /api/workspaces/:id/domain - * Add or update custom domain + * Add or update custom domain (Premium feature - Team/Enterprise only) */ workspacesRouter.post('/:id/domain', async (req: Request, res: Response) => { const userId = req.session.userId!; @@ -330,6 +330,16 @@ workspacesRouter.post('/:id/domain', async (req: Request, res: Response) => { return res.status(403).json({ error: 'Unauthorized' }); } + // Check if user has premium plan (Team/Enterprise) + const user = await db.users.findById(userId); + const hasPremium = user?.plan === 'team' || user?.plan === 'enterprise'; + if (!hasPremium) { + return res.status(402).json({ + error: 'Custom domains require Team or Enterprise plan', + upgrade: '/settings/billing', + }); + } + // Check if domain is already in use const existing = await db.workspaces.findByCustomDomain(domain); if (existing && existing.id !== id) { diff --git a/src/cloud/db/index.ts b/src/cloud/db/index.ts index 34b37e592..2b84355ba 100644 --- a/src/cloud/db/index.ts +++ b/src/cloud/db/index.ts @@ -19,11 +19,14 @@ function getPool(): Pool { } // Types +export type PlanType = 'free' | 'pro' | 'team' | 'enterprise'; + export interface User { id: string; githubId: string; githubUsername: string; email?: string; + plan: PlanType; onboardingCompletedAt?: Date; createdAt: Date; updatedAt: Date; @@ -372,6 +375,7 @@ function mapUser(row: any): User { githubId: row.github_id, githubUsername: row.github_username, email: row.email, + plan: row.plan || 'free', onboardingCompletedAt: row.onboarding_completed_at, createdAt: row.created_at, updatedAt: row.updated_at, @@ -438,6 +442,7 @@ export async function initializeDatabase(): Promise { github_id VARCHAR(255) UNIQUE NOT NULL, github_username VARCHAR(255) NOT NULL, email VARCHAR(255), + plan VARCHAR(50) NOT NULL DEFAULT 'free', onboarding_completed_at TIMESTAMP, created_at TIMESTAMP DEFAULT NOW(), updated_at TIMESTAMP DEFAULT NOW() From 123fb2f63bc79bef8c7c933c61c5208f9f558c89 Mon Sep 17 00:00:00 2001 From: Claude Date: Tue, 30 Dec 2025 00:32:58 +0000 Subject: [PATCH 11/38] Add multi-user workspaces and team invitations - Add workspace_members table for team collaboration - Support roles: owner, admin, member, viewer - Add team invitation system with accept/decline - Add user avatar_url from GitHub - Add findByGithubUsername and findByEmail to users - Create /api/teams routes for member management - Update /api/auth/me to include avatar, plan, pending invites - Team members require Team/Enterprise plan Workspace member permissions: - Owner: Full control, can delete workspace - Admin: Can invite/remove members, edit settings - Member: Can use agents, view all - Viewer: Read-only access --- src/cloud/api/auth.ts | 7 + src/cloud/api/teams.ts | 311 +++++++++++++++++++++++++++++++++++++++++ src/cloud/db/index.ts | 188 ++++++++++++++++++++++++- src/cloud/server.ts | 2 + 4 files changed, 505 insertions(+), 3 deletions(-) create mode 100644 src/cloud/api/teams.ts diff --git a/src/cloud/api/auth.ts b/src/cloud/api/auth.ts index 72e6ddd09..5ee92194e 100644 --- a/src/cloud/api/auth.ts +++ b/src/cloud/api/auth.ts @@ -105,6 +105,7 @@ authRouter.get('/github/callback', async (req: Request, res: Response) => { githubId: String(userData.id), githubUsername: userData.login, email, + avatarUrl: userData.avatar_url, }); // Store GitHub token as a credential @@ -170,11 +171,17 @@ authRouter.get('/me', async (req: Request, res: Response) => { connectedAt: c.createdAt, })); + // Get pending invites + const pendingInvites = await db.workspaceMembers.getPendingInvites(user.id); + res.json({ id: user.id, githubUsername: user.githubUsername, email: user.email, + avatarUrl: user.avatarUrl, + plan: user.plan, connectedProviders, + pendingInvites: pendingInvites.length, onboardingCompleted: !!user.onboardingCompletedAt, }); } catch (error) { diff --git a/src/cloud/api/teams.ts b/src/cloud/api/teams.ts new file mode 100644 index 000000000..a21c54174 --- /dev/null +++ b/src/cloud/api/teams.ts @@ -0,0 +1,311 @@ +/** + * Teams API Routes + * + * Manage workspace members, invitations, and roles. + */ + +import { Router, Request, Response } from 'express'; +import { requireAuth } from './auth'; +import { db, WorkspaceMemberRole } from '../db'; + +export const teamsRouter = Router(); + +// All routes require authentication +teamsRouter.use(requireAuth); + +/** + * GET /api/workspaces/:workspaceId/members + * List workspace members + */ +teamsRouter.get('/workspaces/:workspaceId/members', async (req: Request, res: Response) => { + const userId = req.session.userId!; + const { workspaceId } = req.params; + + try { + // Check user has access to workspace + const canView = await db.workspaceMembers.canView(workspaceId, userId); + if (!canView) { + // Also check if user is the workspace owner (legacy single-user workspaces) + const workspace = await db.workspaces.findById(workspaceId); + if (!workspace || workspace.userId !== userId) { + return res.status(403).json({ error: 'Access denied' }); + } + } + + const members = await db.workspaceMembers.findByWorkspaceId(workspaceId); + + res.json({ + members: members.map((m) => ({ + id: m.id, + userId: m.userId, + role: m.role, + invitedAt: m.invitedAt, + acceptedAt: m.acceptedAt, + isPending: !m.acceptedAt, + user: m.user, + })), + }); + } catch (error) { + console.error('Error listing members:', error); + res.status(500).json({ error: 'Failed to list members' }); + } +}); + +/** + * POST /api/workspaces/:workspaceId/members + * Invite a user to workspace + */ +teamsRouter.post('/workspaces/:workspaceId/members', async (req: Request, res: Response) => { + const userId = req.session.userId!; + const { workspaceId } = req.params; + const { githubUsername, role = 'member' } = req.body; + + if (!githubUsername) { + return res.status(400).json({ error: 'GitHub username is required' }); + } + + const validRoles: WorkspaceMemberRole[] = ['admin', 'member', 'viewer']; + if (!validRoles.includes(role)) { + return res.status(400).json({ error: 'Invalid role. Must be admin, member, or viewer' }); + } + + try { + // Check user is owner or admin + const isOwner = await db.workspaceMembers.isOwner(workspaceId, userId); + const workspace = await db.workspaces.findById(workspaceId); + + if (!isOwner && workspace?.userId !== userId) { + const membership = await db.workspaceMembers.findMembership(workspaceId, userId); + if (!membership || membership.role !== 'admin') { + return res.status(403).json({ error: 'Only owners and admins can invite members' }); + } + } + + // Check plan allows team members + const owner = await db.users.findById(workspace!.userId); + if (owner?.plan !== 'team' && owner?.plan !== 'enterprise') { + return res.status(402).json({ + error: 'Team members require Team or Enterprise plan', + upgrade: '/settings/billing', + }); + } + + // Find user by GitHub username + const invitee = await db.users.findByGithubUsername(githubUsername); + if (!invitee) { + return res.status(404).json({ + error: 'User not found. They must sign up first.', + inviteLink: `https://agent-relay.com/invite?workspace=${workspaceId}`, + }); + } + + // Check if already a member + const existing = await db.workspaceMembers.findMembership(workspaceId, invitee.id); + if (existing) { + return res.status(409).json({ error: 'User is already a member' }); + } + + // Add member (pending acceptance) + const member = await db.workspaceMembers.addMember({ + workspaceId, + userId: invitee.id, + role, + invitedBy: userId, + }); + + // TODO: Send email notification to invitee + + res.status(201).json({ + success: true, + member: { + id: member.id, + userId: member.userId, + role: member.role, + isPending: true, + user: { + githubUsername: invitee.githubUsername, + email: invitee.email, + avatarUrl: invitee.avatarUrl, + }, + }, + }); + } catch (error) { + console.error('Error inviting member:', error); + res.status(500).json({ error: 'Failed to invite member' }); + } +}); + +/** + * PATCH /api/workspaces/:workspaceId/members/:memberId + * Update member role + */ +teamsRouter.patch('/workspaces/:workspaceId/members/:memberId', async (req: Request, res: Response) => { + const userId = req.session.userId!; + const { workspaceId, memberId } = req.params; + const { role } = req.body; + + const validRoles: WorkspaceMemberRole[] = ['admin', 'member', 'viewer']; + if (!validRoles.includes(role)) { + return res.status(400).json({ error: 'Invalid role' }); + } + + try { + // Check user is owner or admin + const isOwner = await db.workspaceMembers.isOwner(workspaceId, userId); + const workspace = await db.workspaces.findById(workspaceId); + + if (!isOwner && workspace?.userId !== userId) { + return res.status(403).json({ error: 'Only owners can change roles' }); + } + + // Get the member to update + const members = await db.workspaceMembers.findByWorkspaceId(workspaceId); + const member = members.find((m) => m.id === memberId); + + if (!member) { + return res.status(404).json({ error: 'Member not found' }); + } + + // Can't change owner role + if (member.role === 'owner') { + return res.status(400).json({ error: 'Cannot change owner role' }); + } + + await db.workspaceMembers.updateRole(workspaceId, member.userId, role); + + res.json({ success: true, role }); + } catch (error) { + console.error('Error updating role:', error); + res.status(500).json({ error: 'Failed to update role' }); + } +}); + +/** + * DELETE /api/workspaces/:workspaceId/members/:memberId + * Remove member from workspace + */ +teamsRouter.delete('/workspaces/:workspaceId/members/:memberId', async (req: Request, res: Response) => { + const userId = req.session.userId!; + const { workspaceId, memberId } = req.params; + + try { + const members = await db.workspaceMembers.findByWorkspaceId(workspaceId); + const member = members.find((m) => m.id === memberId); + + if (!member) { + return res.status(404).json({ error: 'Member not found' }); + } + + // Users can remove themselves + if (member.userId === userId) { + if (member.role === 'owner') { + return res.status(400).json({ error: 'Owner cannot leave. Transfer ownership first.' }); + } + await db.workspaceMembers.removeMember(workspaceId, userId); + return res.json({ success: true }); + } + + // Otherwise, must be owner or admin + const isOwner = await db.workspaceMembers.isOwner(workspaceId, userId); + const workspace = await db.workspaces.findById(workspaceId); + + if (!isOwner && workspace?.userId !== userId) { + const myMembership = await db.workspaceMembers.findMembership(workspaceId, userId); + if (!myMembership || myMembership.role !== 'admin') { + return res.status(403).json({ error: 'Permission denied' }); + } + } + + // Can't remove owner + if (member.role === 'owner') { + return res.status(400).json({ error: 'Cannot remove owner' }); + } + + await db.workspaceMembers.removeMember(workspaceId, member.userId); + + res.json({ success: true }); + } catch (error) { + console.error('Error removing member:', error); + res.status(500).json({ error: 'Failed to remove member' }); + } +}); + +/** + * GET /api/invites + * Get pending invites for current user + */ +teamsRouter.get('/invites', async (req: Request, res: Response) => { + const userId = req.session.userId!; + + try { + const invites = await db.workspaceMembers.getPendingInvites(userId); + + res.json({ + invites: invites.map((inv: any) => ({ + id: inv.id, + workspaceId: inv.workspaceId, + workspaceName: inv.workspace_name, + role: inv.role, + invitedAt: inv.invitedAt, + invitedBy: inv.inviter_username, + })), + }); + } catch (error) { + console.error('Error getting invites:', error); + res.status(500).json({ error: 'Failed to get invites' }); + } +}); + +/** + * POST /api/invites/:inviteId/accept + * Accept workspace invitation + */ +teamsRouter.post('/invites/:inviteId/accept', async (req: Request, res: Response) => { + const userId = req.session.userId!; + const { inviteId } = req.params; + + try { + const invites = await db.workspaceMembers.getPendingInvites(userId); + const invite = invites.find((i) => i.id === inviteId); + + if (!invite) { + return res.status(404).json({ error: 'Invite not found' }); + } + + await db.workspaceMembers.acceptInvite(invite.workspaceId, userId); + + res.json({ + success: true, + workspaceId: invite.workspaceId, + message: 'Invitation accepted', + }); + } catch (error) { + console.error('Error accepting invite:', error); + res.status(500).json({ error: 'Failed to accept invite' }); + } +}); + +/** + * POST /api/invites/:inviteId/decline + * Decline workspace invitation + */ +teamsRouter.post('/invites/:inviteId/decline', async (req: Request, res: Response) => { + const userId = req.session.userId!; + const { inviteId } = req.params; + + try { + const invites = await db.workspaceMembers.getPendingInvites(userId); + const invite = invites.find((i) => i.id === inviteId); + + if (!invite) { + return res.status(404).json({ error: 'Invite not found' }); + } + + await db.workspaceMembers.removeMember(invite.workspaceId, userId); + + res.json({ success: true, message: 'Invitation declined' }); + } catch (error) { + console.error('Error declining invite:', error); + res.status(500).json({ error: 'Failed to decline invite' }); + } +}); diff --git a/src/cloud/db/index.ts b/src/cloud/db/index.ts index 2b84355ba..d01157f4f 100644 --- a/src/cloud/db/index.ts +++ b/src/cloud/db/index.ts @@ -26,6 +26,7 @@ export interface User { githubId: string; githubUsername: string; email?: string; + avatarUrl?: string; plan: PlanType; onboardingCompletedAt?: Date; createdAt: Date; @@ -69,6 +70,24 @@ export interface WorkspaceConfig { maxAgents: number; } +export type WorkspaceMemberRole = 'owner' | 'admin' | 'member' | 'viewer'; + +export interface WorkspaceMember { + id: string; + workspaceId: string; + userId: string; + role: WorkspaceMemberRole; + invitedBy?: string; + invitedAt: Date; + acceptedAt?: Date; + // Denormalized for easy display + user?: { + githubUsername: string; + email?: string; + avatarUrl?: string; + }; +} + export interface Repository { id: string; userId: string; @@ -101,20 +120,38 @@ export const users = { return rows[0] ? mapUser(rows[0]) : null; }, + async findByGithubUsername(username: string): Promise { + const { rows } = await getPool().query( + 'SELECT * FROM users WHERE github_username = $1', + [username] + ); + return rows[0] ? mapUser(rows[0]) : null; + }, + + async findByEmail(email: string): Promise { + const { rows } = await getPool().query( + 'SELECT * FROM users WHERE email = $1', + [email] + ); + return rows[0] ? mapUser(rows[0]) : null; + }, + async upsert(data: { githubId: string; githubUsername: string; email?: string; + avatarUrl?: string; }): Promise { const { rows } = await getPool().query( - `INSERT INTO users (github_id, github_username, email) - VALUES ($1, $2, $3) + `INSERT INTO users (github_id, github_username, email, avatar_url) + VALUES ($1, $2, $3, $4) ON CONFLICT (github_id) DO UPDATE SET github_username = EXCLUDED.github_username, email = COALESCE(EXCLUDED.email, users.email), + avatar_url = COALESCE(EXCLUDED.avatar_url, users.avatar_url), updated_at = NOW() RETURNING *`, - [data.githubId, data.githubUsername, data.email] + [data.githubId, data.githubUsername, data.email, data.avatarUrl] ); return mapUser(rows[0]); }, @@ -302,6 +339,118 @@ export const workspaces = { }, }; +// Workspace member queries +export const workspaceMembers = { + async findByWorkspaceId(workspaceId: string): Promise { + const { rows } = await getPool().query( + `SELECT wm.*, u.github_username, u.email + FROM workspace_members wm + JOIN users u ON u.id = wm.user_id + WHERE wm.workspace_id = $1 + ORDER BY wm.role, wm.invited_at`, + [workspaceId] + ); + return rows.map(mapWorkspaceMember); + }, + + async findByUserId(userId: string): Promise { + const { rows } = await getPool().query( + `SELECT wm.*, u.github_username, u.email + FROM workspace_members wm + JOIN users u ON u.id = wm.user_id + WHERE wm.user_id = $1 AND wm.accepted_at IS NOT NULL`, + [userId] + ); + return rows.map(mapWorkspaceMember); + }, + + async findMembership(workspaceId: string, userId: string): Promise { + const { rows } = await getPool().query( + `SELECT wm.*, u.github_username, u.email + FROM workspace_members wm + JOIN users u ON u.id = wm.user_id + WHERE wm.workspace_id = $1 AND wm.user_id = $2`, + [workspaceId, userId] + ); + return rows[0] ? mapWorkspaceMember(rows[0]) : null; + }, + + async addMember(data: { + workspaceId: string; + userId: string; + role: WorkspaceMemberRole; + invitedBy: string; + }): Promise { + const { rows } = await getPool().query( + `INSERT INTO workspace_members (workspace_id, user_id, role, invited_by) + VALUES ($1, $2, $3, $4) + RETURNING *`, + [data.workspaceId, data.userId, data.role, data.invitedBy] + ); + return mapWorkspaceMember(rows[0]); + }, + + async acceptInvite(workspaceId: string, userId: string): Promise { + await getPool().query( + `UPDATE workspace_members SET accepted_at = NOW() WHERE workspace_id = $1 AND user_id = $2`, + [workspaceId, userId] + ); + }, + + async updateRole(workspaceId: string, userId: string, role: WorkspaceMemberRole): Promise { + await getPool().query( + `UPDATE workspace_members SET role = $3 WHERE workspace_id = $1 AND user_id = $2`, + [workspaceId, userId, role] + ); + }, + + async removeMember(workspaceId: string, userId: string): Promise { + await getPool().query( + `DELETE FROM workspace_members WHERE workspace_id = $1 AND user_id = $2`, + [workspaceId, userId] + ); + }, + + async getPendingInvites(userId: string): Promise { + const { rows } = await getPool().query( + `SELECT wm.*, w.name as workspace_name, u.github_username as inviter_username + FROM workspace_members wm + JOIN workspaces w ON w.id = wm.workspace_id + JOIN users u ON u.id = wm.invited_by + WHERE wm.user_id = $1 AND wm.accepted_at IS NULL`, + [userId] + ); + return rows.map(mapWorkspaceMember); + }, + + async isOwner(workspaceId: string, userId: string): Promise { + const { rows } = await getPool().query( + `SELECT 1 FROM workspace_members WHERE workspace_id = $1 AND user_id = $2 AND role = 'owner'`, + [workspaceId, userId] + ); + return rows.length > 0; + }, + + async canEdit(workspaceId: string, userId: string): Promise { + const { rows } = await getPool().query( + `SELECT 1 FROM workspace_members + WHERE workspace_id = $1 AND user_id = $2 AND role IN ('owner', 'admin', 'member') + AND accepted_at IS NOT NULL`, + [workspaceId, userId] + ); + return rows.length > 0; + }, + + async canView(workspaceId: string, userId: string): Promise { + const { rows } = await getPool().query( + `SELECT 1 FROM workspace_members + WHERE workspace_id = $1 AND user_id = $2 AND accepted_at IS NOT NULL`, + [workspaceId, userId] + ); + return rows.length > 0; + }, +}; + // Repository queries export const repositories = { async findByUserId(userId: string): Promise { @@ -375,6 +524,7 @@ function mapUser(row: any): User { githubId: row.github_id, githubUsername: row.github_username, email: row.email, + avatarUrl: row.avatar_url, plan: row.plan || 'free', onboardingCompletedAt: row.onboarding_completed_at, createdAt: row.created_at, @@ -382,6 +532,23 @@ function mapUser(row: any): User { }; } +function mapWorkspaceMember(row: any): WorkspaceMember { + return { + id: row.id, + workspaceId: row.workspace_id, + userId: row.user_id, + role: row.role, + invitedBy: row.invited_by, + invitedAt: row.invited_at, + acceptedAt: row.accepted_at, + user: row.github_username ? { + githubUsername: row.github_username, + email: row.email, + avatarUrl: row.avatar_url, + } : undefined, + }; +} + function mapCredential(row: any): Credential { return { id: row.id, @@ -442,6 +609,7 @@ export async function initializeDatabase(): Promise { github_id VARCHAR(255) UNIQUE NOT NULL, github_username VARCHAR(255) NOT NULL, email VARCHAR(255), + avatar_url VARCHAR(512), plan VARCHAR(50) NOT NULL DEFAULT 'free', onboarding_completed_at TIMESTAMP, created_at TIMESTAMP DEFAULT NOW(), @@ -494,11 +662,24 @@ export async function initializeDatabase(): Promise { UNIQUE(user_id, github_full_name) ); + CREATE TABLE IF NOT EXISTS workspace_members ( + id UUID PRIMARY KEY DEFAULT gen_random_uuid(), + workspace_id UUID NOT NULL REFERENCES workspaces(id) ON DELETE CASCADE, + user_id UUID NOT NULL REFERENCES users(id) ON DELETE CASCADE, + role VARCHAR(50) NOT NULL DEFAULT 'member', + invited_by UUID REFERENCES users(id), + invited_at TIMESTAMP DEFAULT NOW(), + accepted_at TIMESTAMP, + UNIQUE(workspace_id, user_id) + ); + CREATE INDEX IF NOT EXISTS idx_credentials_user_id ON credentials(user_id); CREATE INDEX IF NOT EXISTS idx_workspaces_user_id ON workspaces(user_id); CREATE INDEX IF NOT EXISTS idx_workspaces_custom_domain ON workspaces(custom_domain) WHERE custom_domain IS NOT NULL; CREATE INDEX IF NOT EXISTS idx_repositories_user_id ON repositories(user_id); CREATE INDEX IF NOT EXISTS idx_repositories_workspace_id ON repositories(workspace_id); + CREATE INDEX IF NOT EXISTS idx_workspace_members_workspace_id ON workspace_members(workspace_id); + CREATE INDEX IF NOT EXISTS idx_workspace_members_user_id ON workspace_members(user_id); `); } finally { client.release(); @@ -510,6 +691,7 @@ export const db = { users, credentials, workspaces, + workspaceMembers, repositories, initialize: initializeDatabase, getPool, diff --git a/src/cloud/server.ts b/src/cloud/server.ts index c5a28caa6..4bdcd950b 100644 --- a/src/cloud/server.ts +++ b/src/cloud/server.ts @@ -16,6 +16,7 @@ import { providersRouter } from './api/providers'; import { workspacesRouter } from './api/workspaces'; import { reposRouter } from './api/repos'; import { onboardingRouter } from './api/onboarding'; +import { teamsRouter } from './api/teams'; export interface CloudServer { app: Express; @@ -67,6 +68,7 @@ export async function createServer(): Promise { app.use('/api/workspaces', workspacesRouter); app.use('/api/repos', reposRouter); app.use('/api/onboarding', onboardingRouter); + app.use('/api/teams', teamsRouter); // Error handler app.use((err: Error, req: Request, res: Response, next: NextFunction) => { From e31a3a3e152bab82587f188b5d309711986bf1c9 Mon Sep 17 00:00:00 2001 From: Claude Date: Tue, 30 Dec 2025 00:38:13 +0000 Subject: [PATCH 12/38] Add agent resiliency module for health monitoring and auto-restart New src/resiliency/ module provides: ## Health Monitor (health-monitor.ts) - Periodic process liveness checks - Configurable health check intervals and timeouts - Max consecutive failures before marking dead - Memory/CPU usage tracking - Event-based notifications ## Structured Logger (logger.ts) - JSON format for production, pretty format for dev - Log levels with filtering (debug, info, warn, error, fatal) - Context propagation (correlation IDs, agent names) - File output with rotation - Child loggers for scoped context ## Metrics (metrics.ts) - Per-agent crash/restart/spawn counters - System-wide health status - Prometheus-compatible export format - Metric history for trending - JSON export for dashboards ## Supervisor (supervisor.ts) - Ties together health + logging + metrics - Auto-restart with configurable limits - Crash notifications - Force restart capability - Overall status reporting Key improvements: - Agents auto-restart on crash (up to 5 attempts) - Dead process detection via PID checks - Structured logs for debugging - Metrics endpoint for observability - Event-based notifications for alerts --- src/resiliency/health-monitor.ts | 371 +++++++++++++++++++++++++++++++ src/resiliency/index.ts | 59 +++++ src/resiliency/logger.ts | 324 +++++++++++++++++++++++++++ src/resiliency/metrics.ts | 311 ++++++++++++++++++++++++++ src/resiliency/supervisor.ts | 320 ++++++++++++++++++++++++++ 5 files changed, 1385 insertions(+) create mode 100644 src/resiliency/health-monitor.ts create mode 100644 src/resiliency/index.ts create mode 100644 src/resiliency/logger.ts create mode 100644 src/resiliency/metrics.ts create mode 100644 src/resiliency/supervisor.ts diff --git a/src/resiliency/health-monitor.ts b/src/resiliency/health-monitor.ts new file mode 100644 index 000000000..7fa58abbe --- /dev/null +++ b/src/resiliency/health-monitor.ts @@ -0,0 +1,371 @@ +/** + * Agent Health Monitor + * + * Monitors spawned agent processes and ensures they stay alive. + * - Periodic health checks (process liveness) + * - Auto-restart on crash + * - Death detection and logging + * - Metrics collection + */ + +import { EventEmitter } from 'events'; + +export interface AgentHealth { + name: string; + pid: number; + status: 'healthy' | 'unresponsive' | 'dead' | 'restarting'; + lastHealthCheck: Date; + lastResponse: Date; + restartCount: number; + consecutiveFailures: number; + uptime: number; // ms + startedAt: Date; + memoryUsage?: number; + cpuUsage?: number; + lastError?: string; +} + +export interface HealthMonitorConfig { + checkIntervalMs: number; // How often to check health (default: 5000) + responseTimeoutMs: number; // Max time to wait for response (default: 10000) + maxRestarts: number; // Max restarts before giving up (default: 5) + restartCooldownMs: number; // Time between restarts (default: 2000) + maxConsecutiveFailures: number; // Failures before marking dead (default: 3) +} + +export interface AgentProcess { + name: string; + pid: number; + isAlive: () => boolean; + kill: (signal?: string) => void; + restart: () => Promise; + sendHealthCheck?: () => Promise; +} + +const DEFAULT_CONFIG: HealthMonitorConfig = { + checkIntervalMs: 5000, + responseTimeoutMs: 10000, + maxRestarts: 5, + restartCooldownMs: 2000, + maxConsecutiveFailures: 3, +}; + +export class AgentHealthMonitor extends EventEmitter { + private agents = new Map(); + private health = new Map(); + private intervalId?: ReturnType; + private config: HealthMonitorConfig; + private isRunning = false; + + constructor(config: Partial = {}) { + super(); + this.config = { ...DEFAULT_CONFIG, ...config }; + } + + /** + * Register an agent for health monitoring + */ + register(agent: AgentProcess): void { + this.agents.set(agent.name, agent); + this.health.set(agent.name, { + name: agent.name, + pid: agent.pid, + status: 'healthy', + lastHealthCheck: new Date(), + lastResponse: new Date(), + restartCount: 0, + consecutiveFailures: 0, + uptime: 0, + startedAt: new Date(), + }); + + this.emit('registered', { name: agent.name, pid: agent.pid }); + this.log('info', `Registered agent for health monitoring: ${agent.name} (PID: ${agent.pid})`); + } + + /** + * Unregister an agent from health monitoring + */ + unregister(name: string): void { + this.agents.delete(name); + this.health.delete(name); + this.emit('unregistered', { name }); + this.log('info', `Unregistered agent: ${name}`); + } + + /** + * Start the health monitoring loop + */ + start(): void { + if (this.isRunning) return; + this.isRunning = true; + + this.log('info', 'Health monitor started', { + checkInterval: this.config.checkIntervalMs, + maxRestarts: this.config.maxRestarts, + }); + + this.intervalId = setInterval(() => { + this.checkAll(); + }, this.config.checkIntervalMs); + + // Initial check + this.checkAll(); + } + + /** + * Stop the health monitoring loop + */ + stop(): void { + if (this.intervalId) { + clearInterval(this.intervalId); + this.intervalId = undefined; + } + this.isRunning = false; + this.log('info', 'Health monitor stopped'); + } + + /** + * Get health status for all agents + */ + getAll(): AgentHealth[] { + return Array.from(this.health.values()).map((h) => ({ + ...h, + uptime: Date.now() - h.startedAt.getTime(), + })); + } + + /** + * Get health status for a specific agent + */ + get(name: string): AgentHealth | undefined { + const health = this.health.get(name); + if (health) { + return { ...health, uptime: Date.now() - health.startedAt.getTime() }; + } + return undefined; + } + + /** + * Check health of all registered agents + */ + private async checkAll(): Promise { + const checks = Array.from(this.agents.entries()).map(([name, agent]) => + this.checkAgent(name, agent) + ); + await Promise.all(checks); + } + + /** + * Check health of a single agent + */ + private async checkAgent(name: string, agent: AgentProcess): Promise { + const health = this.health.get(name); + if (!health) return; + + health.lastHealthCheck = new Date(); + + try { + // First check: Is the process alive? + const isAlive = this.isProcessAlive(agent.pid); + + if (!isAlive) { + await this.handleDeath(name, agent, health, 'Process not found'); + return; + } + + // Second check: Does it respond to health check? + if (agent.sendHealthCheck) { + const responded = await Promise.race([ + agent.sendHealthCheck(), + new Promise((resolve) => + setTimeout(() => resolve(false), this.config.responseTimeoutMs) + ), + ]); + + if (!responded) { + health.consecutiveFailures++; + this.log('warn', `Agent unresponsive: ${name}`, { + failures: health.consecutiveFailures, + max: this.config.maxConsecutiveFailures, + }); + + if (health.consecutiveFailures >= this.config.maxConsecutiveFailures) { + health.status = 'unresponsive'; + await this.handleDeath(name, agent, health, 'Unresponsive after multiple health checks'); + } else { + health.status = 'unresponsive'; + this.emit('unhealthy', { name, health }); + } + return; + } + } + + // Get memory/CPU usage if available + try { + const usage = await this.getProcessUsage(agent.pid); + health.memoryUsage = usage.memory; + health.cpuUsage = usage.cpu; + } catch { + // Ignore usage errors + } + + // All good + health.status = 'healthy'; + health.lastResponse = new Date(); + health.consecutiveFailures = 0; + + this.emit('healthy', { name, health }); + } catch (error) { + health.consecutiveFailures++; + health.lastError = error instanceof Error ? error.message : String(error); + this.log('error', `Health check error for ${name}`, { error: health.lastError }); + + if (health.consecutiveFailures >= this.config.maxConsecutiveFailures) { + await this.handleDeath(name, agent, health, health.lastError); + } + } + } + + /** + * Handle agent death - attempt restart or mark as dead + */ + private async handleDeath( + name: string, + agent: AgentProcess, + health: AgentHealth, + reason: string + ): Promise { + this.log('error', `Agent died: ${name}`, { + reason, + restartCount: health.restartCount, + maxRestarts: this.config.maxRestarts, + }); + + this.emit('died', { name, reason, restartCount: health.restartCount }); + + // Check if we should attempt restart + if (health.restartCount >= this.config.maxRestarts) { + health.status = 'dead'; + health.lastError = `Exceeded max restarts (${this.config.maxRestarts}): ${reason}`; + this.log('error', `Agent permanently dead: ${name}`, { reason: health.lastError }); + this.emit('permanentlyDead', { name, health }); + return; + } + + // Attempt restart + health.status = 'restarting'; + health.restartCount++; + + this.log('info', `Attempting restart ${health.restartCount}/${this.config.maxRestarts}: ${name}`); + this.emit('restarting', { name, attempt: health.restartCount }); + + // Wait cooldown + await new Promise((resolve) => setTimeout(resolve, this.config.restartCooldownMs)); + + try { + await agent.restart(); + + // Update health after successful restart + health.status = 'healthy'; + health.consecutiveFailures = 0; + health.startedAt = new Date(); + health.lastResponse = new Date(); + health.pid = agent.pid; + + this.log('info', `Agent restarted successfully: ${name}`, { + newPid: agent.pid, + attempt: health.restartCount, + }); + + this.emit('restarted', { name, pid: agent.pid, attempt: health.restartCount }); + } catch (error) { + health.lastError = error instanceof Error ? error.message : String(error); + this.log('error', `Restart failed: ${name}`, { error: health.lastError }); + this.emit('restartFailed', { name, error: health.lastError }); + + // Recursively try again if under limit + if (health.restartCount < this.config.maxRestarts) { + await this.handleDeath(name, agent, health, health.lastError); + } else { + health.status = 'dead'; + this.emit('permanentlyDead', { name, health }); + } + } + } + + /** + * Check if a process is alive by PID + */ + private isProcessAlive(pid: number): boolean { + try { + // Sending signal 0 checks if process exists without killing it + process.kill(pid, 0); + return true; + } catch { + return false; + } + } + + /** + * Get memory and CPU usage for a process + */ + private async getProcessUsage(pid: number): Promise<{ memory: number; cpu: number }> { + const { execSync } = await import('child_process'); + + try { + // This works on Linux/Mac + const output = execSync(`ps -o rss=,pcpu= -p ${pid}`, { encoding: 'utf8' }).trim(); + const [rss, cpu] = output.split(/\s+/); + return { + memory: parseInt(rss, 10) * 1024, // RSS in bytes + cpu: parseFloat(cpu), + }; + } catch { + return { memory: 0, cpu: 0 }; + } + } + + /** + * Structured logging + */ + private log( + level: 'info' | 'warn' | 'error', + message: string, + context?: Record + ): void { + const entry = { + timestamp: new Date().toISOString(), + level, + component: 'health-monitor', + message, + ...context, + }; + + this.emit('log', entry); + + // Also log to console with structure + const prefix = `[health-monitor]`; + switch (level) { + case 'info': + console.log(prefix, message, context ? JSON.stringify(context) : ''); + break; + case 'warn': + console.warn(prefix, message, context ? JSON.stringify(context) : ''); + break; + case 'error': + console.error(prefix, message, context ? JSON.stringify(context) : ''); + break; + } + } +} + +// Singleton instance +let _monitor: AgentHealthMonitor | null = null; + +export function getHealthMonitor(config?: Partial): AgentHealthMonitor { + if (!_monitor) { + _monitor = new AgentHealthMonitor(config); + } + return _monitor; +} diff --git a/src/resiliency/index.ts b/src/resiliency/index.ts new file mode 100644 index 000000000..fba4e929d --- /dev/null +++ b/src/resiliency/index.ts @@ -0,0 +1,59 @@ +/** + * Agent Resiliency Module + * + * Provides comprehensive health monitoring, auto-restart, logging, + * and metrics for agent-relay agents. + * + * Usage: + * + * ```ts + * import { getSupervisor, metrics, createLogger } from './resiliency'; + * + * // Start the supervisor + * const supervisor = getSupervisor({ + * autoRestart: true, + * maxRestarts: 5, + * }); + * supervisor.start(); + * + * // Add an agent to supervision + * supervisor.supervise( + * { name: 'worker-1', cli: 'claude', pid: 12345, spawnedAt: new Date() }, + * { + * isAlive: () => process.kill(12345, 0), + * kill: (sig) => process.kill(12345, sig), + * restart: async () => { ... }, + * } + * ); + * + * // Get metrics + * console.log(metrics.toPrometheus()); + * ``` + */ + +export { + AgentHealthMonitor, + getHealthMonitor, + type AgentHealth, + type AgentProcess, + type HealthMonitorConfig, +} from './health-monitor'; + +export { + Logger, + createLogger, + configure as configureLogging, + loggers, + type LogLevel, + type LogEntry, + type LoggerConfig, +} from './logger'; + +export { metrics, type AgentMetrics, type SystemMetrics, type MetricPoint } from './metrics'; + +export { + AgentSupervisor, + getSupervisor, + type SupervisedAgent, + type SupervisorConfig, +} from './supervisor'; diff --git a/src/resiliency/logger.ts b/src/resiliency/logger.ts new file mode 100644 index 000000000..69b9eddc5 --- /dev/null +++ b/src/resiliency/logger.ts @@ -0,0 +1,324 @@ +/** + * Structured Logger + * + * Provides consistent, structured logging across agent-relay components. + * - JSON format for machine parsing + * - Log levels with filtering + * - Context propagation (correlation IDs, agent names) + * - File rotation support + */ + +import { EventEmitter } from 'events'; +import * as fs from 'fs'; +import * as path from 'path'; + +export type LogLevel = 'debug' | 'info' | 'warn' | 'error' | 'fatal'; + +export interface LogEntry { + timestamp: string; + level: LogLevel; + component: string; + message: string; + correlationId?: string; + agentName?: string; + pid?: number; + duration?: number; + error?: { + name: string; + message: string; + stack?: string; + }; + [key: string]: unknown; +} + +export interface LoggerConfig { + level: LogLevel; + json: boolean; // Output as JSON + file?: string; // Log file path + maxFileSize?: number; // Max file size in bytes before rotation + maxFiles?: number; // Max number of rotated files to keep + console: boolean; // Log to console +} + +const LOG_LEVELS: Record = { + debug: 0, + info: 1, + warn: 2, + error: 3, + fatal: 4, +}; + +const LEVEL_COLORS: Record = { + debug: '\x1b[90m', // gray + info: '\x1b[36m', // cyan + warn: '\x1b[33m', // yellow + error: '\x1b[31m', // red + fatal: '\x1b[35m', // magenta +}; + +const RESET = '\x1b[0m'; + +const DEFAULT_CONFIG: LoggerConfig = { + level: 'info', + json: process.env.NODE_ENV === 'production', + console: true, + maxFileSize: 10 * 1024 * 1024, // 10MB + maxFiles: 5, +}; + +export class Logger extends EventEmitter { + private config: LoggerConfig; + private component: string; + private context: Record = {}; + private fileStream?: fs.WriteStream; + private currentFileSize = 0; + + constructor(component: string, config: Partial = {}) { + super(); + this.component = component; + this.config = { ...DEFAULT_CONFIG, ...config }; + + if (this.config.file) { + this.initFileStream(); + } + } + + /** + * Create a child logger with additional context + */ + child(context: Record): Logger { + const child = new Logger(this.component, this.config); + child.context = { ...this.context, ...context }; + return child; + } + + /** + * Set context that will be included in all log entries + */ + setContext(context: Record): void { + this.context = { ...this.context, ...context }; + } + + /** + * Log at debug level + */ + debug(message: string, context?: Record): void { + this.log('debug', message, context); + } + + /** + * Log at info level + */ + info(message: string, context?: Record): void { + this.log('info', message, context); + } + + /** + * Log at warn level + */ + warn(message: string, context?: Record): void { + this.log('warn', message, context); + } + + /** + * Log at error level + */ + error(message: string, context?: Record): void { + this.log('error', message, context); + } + + /** + * Log at fatal level + */ + fatal(message: string, context?: Record): void { + this.log('fatal', message, context); + } + + /** + * Log with timing (returns function to end timing) + */ + time(message: string, context?: Record): () => void { + const start = Date.now(); + return () => { + const duration = Date.now() - start; + this.info(message, { ...context, duration }); + }; + } + + /** + * Log an error with stack trace + */ + logError(error: Error, message?: string, context?: Record): void { + this.log('error', message || error.message, { + ...context, + error: { + name: error.name, + message: error.message, + stack: error.stack, + }, + }); + } + + /** + * Core log method + */ + private log(level: LogLevel, message: string, context?: Record): void { + if (LOG_LEVELS[level] < LOG_LEVELS[this.config.level]) { + return; + } + + const entry: LogEntry = { + timestamp: new Date().toISOString(), + level, + component: this.component, + message, + ...this.context, + ...context, + }; + + // Emit for external handlers + this.emit('log', entry); + + // Console output + if (this.config.console) { + this.writeConsole(entry); + } + + // File output + if (this.fileStream) { + this.writeFile(entry); + } + } + + /** + * Write to console + */ + private writeConsole(entry: LogEntry): void { + if (this.config.json) { + console.log(JSON.stringify(entry)); + } else { + const color = LEVEL_COLORS[entry.level]; + const levelStr = entry.level.toUpperCase().padEnd(5); + const componentStr = `[${entry.component}]`.padEnd(20); + + let line = `${entry.timestamp} ${color}${levelStr}${RESET} ${componentStr} ${entry.message}`; + + // Add context fields + const contextFields = { ...entry }; + delete contextFields.timestamp; + delete contextFields.level; + delete contextFields.component; + delete contextFields.message; + + if (Object.keys(contextFields).length > 0) { + line += ` ${JSON.stringify(contextFields)}`; + } + + console.log(line); + } + } + + /** + * Write to file with rotation + */ + private writeFile(entry: LogEntry): void { + if (!this.fileStream) return; + + const line = JSON.stringify(entry) + '\n'; + const lineBytes = Buffer.byteLength(line); + + // Check if rotation needed + if ( + this.config.maxFileSize && + this.currentFileSize + lineBytes > this.config.maxFileSize + ) { + this.rotateFile(); + } + + this.fileStream.write(line); + this.currentFileSize += lineBytes; + } + + /** + * Initialize file stream + */ + private initFileStream(): void { + if (!this.config.file) return; + + const dir = path.dirname(this.config.file); + if (!fs.existsSync(dir)) { + fs.mkdirSync(dir, { recursive: true }); + } + + // Get current file size + if (fs.existsSync(this.config.file)) { + const stats = fs.statSync(this.config.file); + this.currentFileSize = stats.size; + } + + this.fileStream = fs.createWriteStream(this.config.file, { flags: 'a' }); + } + + /** + * Rotate log file + */ + private rotateFile(): void { + if (!this.config.file || !this.fileStream) return; + + this.fileStream.end(); + + // Rotate existing files + for (let i = (this.config.maxFiles || 5) - 1; i >= 1; i--) { + const oldPath = `${this.config.file}.${i}`; + const newPath = `${this.config.file}.${i + 1}`; + + if (fs.existsSync(oldPath)) { + if (i === (this.config.maxFiles || 5) - 1) { + fs.unlinkSync(oldPath); // Delete oldest + } else { + fs.renameSync(oldPath, newPath); + } + } + } + + // Rename current to .1 + if (fs.existsSync(this.config.file)) { + fs.renameSync(this.config.file, `${this.config.file}.1`); + } + + // Create new stream + this.currentFileSize = 0; + this.fileStream = fs.createWriteStream(this.config.file, { flags: 'a' }); + } + + /** + * Close the logger + */ + close(): void { + if (this.fileStream) { + this.fileStream.end(); + this.fileStream = undefined; + } + } +} + +// Logger factory with global configuration +let globalConfig: Partial = {}; + +export function configure(config: Partial): void { + globalConfig = config; +} + +export function createLogger(component: string, config?: Partial): Logger { + return new Logger(component, { ...globalConfig, ...config }); +} + +// Pre-configured loggers for common components +export const loggers = { + daemon: () => createLogger('daemon'), + spawner: () => createLogger('spawner'), + router: () => createLogger('router'), + agent: (name: string) => createLogger('agent').child({ agentName: name }), + health: () => createLogger('health-monitor'), + connection: (id: string) => createLogger('connection').child({ connectionId: id }), +}; diff --git a/src/resiliency/metrics.ts b/src/resiliency/metrics.ts new file mode 100644 index 000000000..809f6f4f5 --- /dev/null +++ b/src/resiliency/metrics.ts @@ -0,0 +1,311 @@ +/** + * Agent Resiliency Metrics + * + * Collects and exposes metrics about agent health, crashes, and restarts. + * - Prometheus-compatible format + * - In-memory aggregation + * - Real-time stats + */ + +export interface AgentMetrics { + name: string; + spawns: number; + crashes: number; + restarts: number; + successfulRestarts: number; + failedRestarts: number; + currentStatus: 'healthy' | 'unhealthy' | 'dead' | 'unknown'; + uptimeMs: number; + lastCrashAt?: Date; + lastCrashReason?: string; + avgUptimeMs: number; + memoryUsageBytes?: number; + cpuUsagePercent?: number; +} + +export interface SystemMetrics { + totalAgents: number; + healthyAgents: number; + unhealthyAgents: number; + deadAgents: number; + totalCrashes: number; + totalRestarts: number; + uptimeSeconds: number; + memoryUsageMb: number; +} + +export interface MetricPoint { + name: string; + value: number; + labels: Record; + timestamp: number; +} + +class MetricsCollector { + private agents = new Map(); + private startTime = Date.now(); + private history: MetricPoint[] = []; + private maxHistorySize = 10000; + + /** + * Record an agent spawn + */ + recordSpawn(name: string): void { + const metrics = this.getOrCreate(name); + metrics.spawns++; + metrics.currentStatus = 'healthy'; + this.record('agent_spawns_total', 1, { agent: name }); + } + + /** + * Record an agent crash + */ + recordCrash(name: string, reason: string): void { + const metrics = this.getOrCreate(name); + metrics.crashes++; + metrics.lastCrashAt = new Date(); + metrics.lastCrashReason = reason; + metrics.currentStatus = 'unhealthy'; + + // Update average uptime + if (metrics.spawns > 0) { + const currentUptime = Date.now() - (this.startTime + metrics.uptimeMs); + metrics.avgUptimeMs = + (metrics.avgUptimeMs * (metrics.spawns - 1) + currentUptime) / metrics.spawns; + } + + this.record('agent_crashes_total', 1, { agent: name, reason }); + } + + /** + * Record a restart attempt + */ + recordRestartAttempt(name: string): void { + const metrics = this.getOrCreate(name); + metrics.restarts++; + metrics.currentStatus = 'unhealthy'; + this.record('agent_restart_attempts_total', 1, { agent: name }); + } + + /** + * Record a successful restart + */ + recordRestartSuccess(name: string): void { + const metrics = this.getOrCreate(name); + metrics.successfulRestarts++; + metrics.currentStatus = 'healthy'; + this.record('agent_restart_success_total', 1, { agent: name }); + } + + /** + * Record a failed restart + */ + recordRestartFailure(name: string, reason: string): void { + const metrics = this.getOrCreate(name); + metrics.failedRestarts++; + this.record('agent_restart_failures_total', 1, { agent: name, reason }); + } + + /** + * Mark agent as dead (exceeded max restarts) + */ + recordDead(name: string): void { + const metrics = this.getOrCreate(name); + metrics.currentStatus = 'dead'; + this.record('agent_dead_total', 1, { agent: name }); + } + + /** + * Update resource usage + */ + updateResourceUsage(name: string, memoryBytes: number, cpuPercent: number): void { + const metrics = this.getOrCreate(name); + metrics.memoryUsageBytes = memoryBytes; + metrics.cpuUsagePercent = cpuPercent; + this.record('agent_memory_bytes', memoryBytes, { agent: name }); + this.record('agent_cpu_percent', cpuPercent, { agent: name }); + } + + /** + * Get metrics for a specific agent + */ + getAgentMetrics(name: string): AgentMetrics | undefined { + return this.agents.get(name); + } + + /** + * Get metrics for all agents + */ + getAllAgentMetrics(): AgentMetrics[] { + return Array.from(this.agents.values()); + } + + /** + * Get system-wide metrics + */ + getSystemMetrics(): SystemMetrics { + const allMetrics = this.getAllAgentMetrics(); + + return { + totalAgents: allMetrics.length, + healthyAgents: allMetrics.filter((m) => m.currentStatus === 'healthy').length, + unhealthyAgents: allMetrics.filter((m) => m.currentStatus === 'unhealthy').length, + deadAgents: allMetrics.filter((m) => m.currentStatus === 'dead').length, + totalCrashes: allMetrics.reduce((sum, m) => sum + m.crashes, 0), + totalRestarts: allMetrics.reduce((sum, m) => sum + m.restarts, 0), + uptimeSeconds: Math.floor((Date.now() - this.startTime) / 1000), + memoryUsageMb: Math.round(process.memoryUsage().heapUsed / 1024 / 1024), + }; + } + + /** + * Export metrics in Prometheus format + */ + toPrometheus(): string { + const lines: string[] = []; + const system = this.getSystemMetrics(); + + // System metrics + lines.push('# HELP agent_relay_uptime_seconds Total uptime in seconds'); + lines.push('# TYPE agent_relay_uptime_seconds gauge'); + lines.push(`agent_relay_uptime_seconds ${system.uptimeSeconds}`); + + lines.push('# HELP agent_relay_agents_total Total number of agents'); + lines.push('# TYPE agent_relay_agents_total gauge'); + lines.push(`agent_relay_agents_total ${system.totalAgents}`); + + lines.push('# HELP agent_relay_agents_healthy Number of healthy agents'); + lines.push('# TYPE agent_relay_agents_healthy gauge'); + lines.push(`agent_relay_agents_healthy ${system.healthyAgents}`); + + lines.push('# HELP agent_relay_agents_unhealthy Number of unhealthy agents'); + lines.push('# TYPE agent_relay_agents_unhealthy gauge'); + lines.push(`agent_relay_agents_unhealthy ${system.unhealthyAgents}`); + + lines.push('# HELP agent_relay_agents_dead Number of dead agents'); + lines.push('# TYPE agent_relay_agents_dead gauge'); + lines.push(`agent_relay_agents_dead ${system.deadAgents}`); + + lines.push('# HELP agent_relay_crashes_total Total number of crashes'); + lines.push('# TYPE agent_relay_crashes_total counter'); + lines.push(`agent_relay_crashes_total ${system.totalCrashes}`); + + lines.push('# HELP agent_relay_restarts_total Total number of restart attempts'); + lines.push('# TYPE agent_relay_restarts_total counter'); + lines.push(`agent_relay_restarts_total ${system.totalRestarts}`); + + lines.push('# HELP agent_relay_memory_bytes Memory usage in bytes'); + lines.push('# TYPE agent_relay_memory_bytes gauge'); + lines.push(`agent_relay_memory_bytes ${system.memoryUsageMb * 1024 * 1024}`); + + // Per-agent metrics + lines.push('# HELP agent_crashes_total Crashes per agent'); + lines.push('# TYPE agent_crashes_total counter'); + for (const m of this.getAllAgentMetrics()) { + lines.push(`agent_crashes_total{agent="${m.name}"} ${m.crashes}`); + } + + lines.push('# HELP agent_restarts_total Restart attempts per agent'); + lines.push('# TYPE agent_restarts_total counter'); + for (const m of this.getAllAgentMetrics()) { + lines.push(`agent_restarts_total{agent="${m.name}"} ${m.restarts}`); + } + + lines.push('# HELP agent_status Current agent status (0=unknown, 1=healthy, 2=unhealthy, 3=dead)'); + lines.push('# TYPE agent_status gauge'); + for (const m of this.getAllAgentMetrics()) { + const statusValue = + m.currentStatus === 'healthy' + ? 1 + : m.currentStatus === 'unhealthy' + ? 2 + : m.currentStatus === 'dead' + ? 3 + : 0; + lines.push(`agent_status{agent="${m.name}"} ${statusValue}`); + } + + return lines.join('\n'); + } + + /** + * Export metrics as JSON + */ + toJSON(): { system: SystemMetrics; agents: AgentMetrics[] } { + return { + system: this.getSystemMetrics(), + agents: this.getAllAgentMetrics(), + }; + } + + /** + * Get recent metric history + */ + getHistory(name?: string, since?: Date): MetricPoint[] { + let points = this.history; + + if (since) { + const sinceTs = since.getTime(); + points = points.filter((p) => p.timestamp >= sinceTs); + } + + if (name) { + points = points.filter((p) => p.labels.agent === name); + } + + return points; + } + + /** + * Reset all metrics + */ + reset(): void { + this.agents.clear(); + this.history = []; + this.startTime = Date.now(); + } + + /** + * Get or create agent metrics + */ + private getOrCreate(name: string): AgentMetrics { + let metrics = this.agents.get(name); + if (!metrics) { + metrics = { + name, + spawns: 0, + crashes: 0, + restarts: 0, + successfulRestarts: 0, + failedRestarts: 0, + currentStatus: 'unknown', + uptimeMs: 0, + avgUptimeMs: 0, + }; + this.agents.set(name, metrics); + } + return metrics; + } + + /** + * Record a metric point + */ + private record(name: string, value: number, labels: Record): void { + const point: MetricPoint = { + name, + value, + labels, + timestamp: Date.now(), + }; + + this.history.push(point); + + // Trim history if too large + if (this.history.length > this.maxHistorySize) { + this.history = this.history.slice(-this.maxHistorySize / 2); + } + } +} + +// Singleton instance +export const metrics = new MetricsCollector(); diff --git a/src/resiliency/supervisor.ts b/src/resiliency/supervisor.ts new file mode 100644 index 000000000..652404cf1 --- /dev/null +++ b/src/resiliency/supervisor.ts @@ -0,0 +1,320 @@ +/** + * Agent Supervisor + * + * High-level supervisor that combines health monitoring, logging, and metrics + * to provide comprehensive agent resiliency. + */ + +import { EventEmitter } from 'events'; +import { AgentHealthMonitor, getHealthMonitor, HealthMonitorConfig, AgentProcess } from './health-monitor'; +import { Logger, createLogger, LogLevel } from './logger'; +import { metrics } from './metrics'; + +export interface SupervisedAgent { + name: string; + cli: string; + task?: string; + pid: number; + logFile?: string; + spawnedAt: Date; +} + +export interface SupervisorConfig { + healthCheck: Partial; + logging: { + level: LogLevel; + file?: string; + }; + autoRestart: boolean; + maxRestarts: number; + notifyOnCrash: boolean; +} + +const DEFAULT_CONFIG: SupervisorConfig = { + healthCheck: { + checkIntervalMs: 5000, + maxRestarts: 5, + }, + logging: { + level: 'info', + }, + autoRestart: true, + maxRestarts: 5, + notifyOnCrash: true, +}; + +export class AgentSupervisor extends EventEmitter { + private config: SupervisorConfig; + private healthMonitor: AgentHealthMonitor; + private logger: Logger; + private agents = new Map(); + private restarters = new Map Promise>(); + + constructor(config: Partial = {}) { + super(); + this.config = { ...DEFAULT_CONFIG, ...config }; + + this.logger = createLogger('supervisor', { + level: this.config.logging.level, + file: this.config.logging.file, + }); + + this.healthMonitor = getHealthMonitor(this.config.healthCheck); + this.setupHealthMonitorEvents(); + } + + /** + * Start supervising agents + */ + start(): void { + this.logger.info('Agent supervisor started', { + autoRestart: this.config.autoRestart, + maxRestarts: this.config.maxRestarts, + }); + this.healthMonitor.start(); + } + + /** + * Stop supervising agents + */ + stop(): void { + this.logger.info('Agent supervisor stopping'); + this.healthMonitor.stop(); + } + + /** + * Add an agent to supervision + */ + supervise( + agent: SupervisedAgent, + options: { + isAlive: () => boolean; + kill: (signal?: string) => void; + restart: () => Promise; + sendHealthCheck?: () => Promise; + } + ): void { + this.agents.set(agent.name, agent); + this.restarters.set(agent.name, options.restart); + + // Create agent process wrapper for health monitor + const agentProcess: AgentProcess = { + name: agent.name, + pid: agent.pid, + isAlive: options.isAlive, + kill: options.kill, + restart: async () => { + if (this.config.autoRestart) { + await options.restart(); + // Update PID after restart + const updated = this.agents.get(agent.name); + if (updated) { + agentProcess.pid = updated.pid; + } + } + }, + sendHealthCheck: options.sendHealthCheck, + }; + + this.healthMonitor.register(agentProcess); + metrics.recordSpawn(agent.name); + + this.logger.info('Agent added to supervision', { + name: agent.name, + cli: agent.cli, + pid: agent.pid, + }); + } + + /** + * Remove an agent from supervision + */ + unsupervise(name: string): void { + this.agents.delete(name); + this.restarters.delete(name); + this.healthMonitor.unregister(name); + + this.logger.info('Agent removed from supervision', { name }); + } + + /** + * Update agent info (e.g., after restart) + */ + updateAgent(name: string, updates: Partial): void { + const agent = this.agents.get(name); + if (agent) { + Object.assign(agent, updates); + } + } + + /** + * Get all supervised agents + */ + getAgents(): SupervisedAgent[] { + return Array.from(this.agents.values()); + } + + /** + * Get agent status + */ + getStatus(name: string): { + agent?: SupervisedAgent; + health?: ReturnType; + metrics?: ReturnType; + } { + return { + agent: this.agents.get(name), + health: this.healthMonitor.get(name), + metrics: metrics.getAgentMetrics(name), + }; + } + + /** + * Get overall supervisor status + */ + getOverallStatus(): { + agents: SupervisedAgent[]; + health: ReturnType; + systemMetrics: ReturnType; + } { + return { + agents: this.getAgents(), + health: this.healthMonitor.getAll(), + systemMetrics: metrics.getSystemMetrics(), + }; + } + + /** + * Force restart an agent + */ + async forceRestart(name: string): Promise { + const restarter = this.restarters.get(name); + if (!restarter) { + throw new Error(`Agent ${name} not found`); + } + + this.logger.info('Force restarting agent', { name }); + metrics.recordRestartAttempt(name); + + try { + await restarter(); + metrics.recordRestartSuccess(name); + this.logger.info('Force restart successful', { name }); + } catch (error) { + const reason = error instanceof Error ? error.message : String(error); + metrics.recordRestartFailure(name, reason); + this.logger.error('Force restart failed', { name, error: reason }); + throw error; + } + } + + /** + * Setup event handlers for health monitor + */ + private setupHealthMonitorEvents(): void { + this.healthMonitor.on('healthy', ({ name, health }) => { + this.emit('healthy', { name, health }); + }); + + this.healthMonitor.on('unhealthy', ({ name, health }) => { + this.logger.warn('Agent unhealthy', { + name, + consecutiveFailures: health.consecutiveFailures, + }); + this.emit('unhealthy', { name, health }); + }); + + this.healthMonitor.on('died', ({ name, reason, restartCount }) => { + this.logger.error('Agent died', { name, reason, restartCount }); + metrics.recordCrash(name, reason); + this.emit('died', { name, reason, restartCount }); + + if (this.config.notifyOnCrash) { + this.notifyCrash(name, reason); + } + }); + + this.healthMonitor.on('restarting', ({ name, attempt }) => { + this.logger.info('Restarting agent', { name, attempt }); + metrics.recordRestartAttempt(name); + this.emit('restarting', { name, attempt }); + }); + + this.healthMonitor.on('restarted', ({ name, pid, attempt }) => { + this.logger.info('Agent restarted', { name, pid, attempt }); + metrics.recordRestartSuccess(name); + + // Update our agent record + const agent = this.agents.get(name); + if (agent) { + agent.pid = pid; + agent.spawnedAt = new Date(); + } + + this.emit('restarted', { name, pid, attempt }); + }); + + this.healthMonitor.on('restartFailed', ({ name, error }) => { + this.logger.error('Restart failed', { name, error }); + metrics.recordRestartFailure(name, error); + this.emit('restartFailed', { name, error }); + }); + + this.healthMonitor.on('permanentlyDead', ({ name, health }) => { + this.logger.fatal('Agent permanently dead', { + name, + restartCount: health.restartCount, + lastError: health.lastError, + }); + metrics.recordDead(name); + this.emit('permanentlyDead', { name, health }); + + if (this.config.notifyOnCrash) { + this.notifyDead(name, health.lastError); + } + }); + + this.healthMonitor.on('log', (entry) => { + // Forward health monitor logs + this.emit('log', entry); + }); + } + + /** + * Send notification about agent crash + */ + private notifyCrash(name: string, reason: string): void { + // In cloud deployment, this would send to a notification service + // For now, just emit an event + this.emit('notification', { + type: 'crash', + severity: 'warning', + title: `Agent ${name} crashed`, + message: reason, + timestamp: new Date(), + }); + } + + /** + * Send notification about permanently dead agent + */ + private notifyDead(name: string, reason?: string): void { + this.emit('notification', { + type: 'dead', + severity: 'critical', + title: `Agent ${name} is permanently dead`, + message: reason || 'Exceeded max restart attempts', + timestamp: new Date(), + }); + } +} + +// Singleton instance +let _supervisor: AgentSupervisor | null = null; + +export function getSupervisor(config?: Partial): AgentSupervisor { + if (!_supervisor) { + _supervisor = new AgentSupervisor(config); + } + return _supervisor; +} From c9f1edbac37c794062963602800dcab29a500105 Mon Sep 17 00:00:00 2001 From: Claude Date: Tue, 30 Dec 2025 00:48:49 +0000 Subject: [PATCH 13/38] Add context persistence across agent restarts Implements Continuous-Claude-v2 inspired context persistence: - Ledger-based state storage for agent context - Handoff protocol for task continuation across restarts - Provider-specific context injection: - Claude: Uses hooks to inject context into CLAUDE.md - Codex: Uses config for periodic context refresh via system prompt - Gemini: Updates system instruction file - Auto-save functionality with configurable intervals - Integrated with supervisor for automatic context save on crash/restart --- package-lock.json | 3 +- package.json | 2 +- src/resiliency/context-persistence.ts | 538 ++++++++++++++++++++++++++ src/resiliency/index.ts | 52 ++- src/resiliency/provider-context.ts | 446 +++++++++++++++++++++ src/resiliency/supervisor.ts | 108 ++++++ 6 files changed, 1144 insertions(+), 5 deletions(-) create mode 100644 src/resiliency/context-persistence.ts create mode 100644 src/resiliency/provider-context.ts diff --git a/package-lock.json b/package-lock.json index ea8e1609c..b5e6dc1ca 100644 --- a/package-lock.json +++ b/package-lock.json @@ -27,7 +27,7 @@ "devDependencies": { "@types/better-sqlite3": "^7.6.13", "@types/express": "^5.0.6", - "@types/node": "^22.10.2", + "@types/node": "^22.19.3", "@types/uuid": "^10.0.0", "@types/ws": "^8.18.1", "@typescript-eslint/eslint-plugin": "^8.18.2", @@ -1307,6 +1307,7 @@ "version": "22.19.3", "resolved": "https://registry.npmjs.org/@types/node/-/node-22.19.3.tgz", "integrity": "sha512-1N9SBnWYOJTrNZCdh/yJE+t910Y128BoyY+zBLWhL3r0TYzlTmFdXrPwHL9DyFZmlEXNQQolTZh3KHV31QDhyA==", + "license": "MIT", "dependencies": { "undici-types": "~6.21.0" } diff --git a/package.json b/package.json index ba07b2971..49b5ad371 100644 --- a/package.json +++ b/package.json @@ -75,7 +75,7 @@ "devDependencies": { "@types/better-sqlite3": "^7.6.13", "@types/express": "^5.0.6", - "@types/node": "^22.10.2", + "@types/node": "^22.19.3", "@types/uuid": "^10.0.0", "@types/ws": "^8.18.1", "@typescript-eslint/eslint-plugin": "^8.18.2", diff --git a/src/resiliency/context-persistence.ts b/src/resiliency/context-persistence.ts new file mode 100644 index 000000000..76f938dd0 --- /dev/null +++ b/src/resiliency/context-persistence.ts @@ -0,0 +1,538 @@ +/** + * Context Persistence + * + * Maintains agent context across restarts using ledger-based state storage. + * Inspired by Continuous-Claude-v2: "Clear don't compact, save state to ledger." + * + * Key concepts: + * - Ledger: Periodic snapshots of agent state + * - Handoff: Detailed context for task continuation + * - Artifact index: Searchable history of decisions/actions + */ + +import * as fs from 'fs'; +import * as path from 'path'; +import { createLogger } from './logger'; + +const logger = createLogger('context-persistence'); + +export interface AgentState { + name: string; + cli: string; + task?: string; + currentPhase: string; + completedTasks: string[]; + decisions: Decision[]; + context: Record; + artifacts: Artifact[]; + lastCheckpoint: Date; + sessionCount: number; +} + +export interface Decision { + timestamp: Date; + description: string; + reasoning: string; + outcome?: 'success' | 'failure' | 'pending'; +} + +export interface Artifact { + id: string; + type: 'code' | 'file' | 'message' | 'error' | 'decision'; + path?: string; + content: string; + timestamp: Date; + tags: string[]; +} + +export interface Handoff { + fromAgent: string; + toAgent?: string; + createdAt: Date; + task: string; + summary: string; + completedSteps: string[]; + nextSteps: string[]; + context: Record; + warnings: string[]; + artifacts: string[]; // Artifact IDs +} + +export interface LedgerEntry { + timestamp: Date; + sessionId: string; + type: 'checkpoint' | 'handoff' | 'crash' | 'complete'; + state: AgentState; + handoff?: Handoff; +} + +export class ContextPersistence { + private baseDir: string; + private states = new Map(); + private saveInterval?: ReturnType; + private saveIntervalMs = 30000; // Save every 30 seconds + + constructor(baseDir?: string) { + this.baseDir = baseDir || path.join(process.cwd(), '.agent-relay', 'context'); + this.ensureDir(this.baseDir); + this.ensureDir(path.join(this.baseDir, 'ledgers')); + this.ensureDir(path.join(this.baseDir, 'handoffs')); + this.ensureDir(path.join(this.baseDir, 'artifacts')); + } + + /** + * Start periodic state saving + */ + startAutoSave(): void { + if (this.saveInterval) return; + + this.saveInterval = setInterval(() => { + this.saveAllStates(); + }, this.saveIntervalMs); + + logger.info('Auto-save started', { intervalMs: this.saveIntervalMs }); + } + + /** + * Stop periodic state saving + */ + stopAutoSave(): void { + if (this.saveInterval) { + clearInterval(this.saveInterval); + this.saveInterval = undefined; + logger.info('Auto-save stopped'); + } + } + + /** + * Initialize or load state for an agent + */ + initAgent(name: string, cli: string, task?: string): AgentState { + // Try to load existing state + const existing = this.loadLatestState(name); + if (existing) { + existing.sessionCount++; + existing.lastCheckpoint = new Date(); + this.states.set(name, existing); + logger.info('Loaded existing agent state', { + name, + sessionCount: existing.sessionCount, + completedTasks: existing.completedTasks.length, + }); + return existing; + } + + // Create new state + const state: AgentState = { + name, + cli, + task, + currentPhase: 'init', + completedTasks: [], + decisions: [], + context: {}, + artifacts: [], + lastCheckpoint: new Date(), + sessionCount: 1, + }; + + this.states.set(name, state); + this.saveState(name); + + logger.info('Created new agent state', { name, cli, task }); + return state; + } + + /** + * Update agent's current phase + */ + updatePhase(name: string, phase: string): void { + const state = this.states.get(name); + if (state) { + state.currentPhase = phase; + state.lastCheckpoint = new Date(); + } + } + + /** + * Record a completed task + */ + recordTask(name: string, task: string): void { + const state = this.states.get(name); + if (state) { + state.completedTasks.push(task); + state.lastCheckpoint = new Date(); + logger.debug('Recorded task completion', { name, task }); + } + } + + /** + * Record a decision + */ + recordDecision( + name: string, + description: string, + reasoning: string, + outcome?: 'success' | 'failure' | 'pending' + ): void { + const state = this.states.get(name); + if (state) { + state.decisions.push({ + timestamp: new Date(), + description, + reasoning, + outcome, + }); + state.lastCheckpoint = new Date(); + logger.debug('Recorded decision', { name, description, outcome }); + } + } + + /** + * Add an artifact + */ + addArtifact( + name: string, + type: Artifact['type'], + content: string, + options?: { path?: string; tags?: string[] } + ): string { + const state = this.states.get(name); + if (!state) return ''; + + const id = `${name}-${Date.now()}-${Math.random().toString(36).substr(2, 9)}`; + const artifact: Artifact = { + id, + type, + content: content.substring(0, 10000), // Limit size + timestamp: new Date(), + path: options?.path, + tags: options?.tags || [], + }; + + state.artifacts.push(artifact); + state.lastCheckpoint = new Date(); + + // Save artifact to disk for searchability + this.saveArtifact(artifact); + + return id; + } + + /** + * Update context + */ + updateContext(name: string, context: Record): void { + const state = this.states.get(name); + if (state) { + state.context = { ...state.context, ...context }; + state.lastCheckpoint = new Date(); + } + } + + /** + * Create a handoff document for resumption + */ + createHandoff(name: string, options?: { toAgent?: string }): Handoff { + const state = this.states.get(name); + if (!state) { + throw new Error(`Agent ${name} not found`); + } + + const handoff: Handoff = { + fromAgent: name, + toAgent: options?.toAgent, + createdAt: new Date(), + task: state.task || 'Unknown task', + summary: this.generateSummary(state), + completedSteps: state.completedTasks, + nextSteps: this.inferNextSteps(state), + context: state.context, + warnings: this.getWarnings(state), + artifacts: state.artifacts.slice(-10).map((a) => a.id), // Last 10 artifacts + }; + + // Save handoff + this.saveHandoff(name, handoff); + + logger.info('Created handoff', { + from: name, + to: options?.toAgent, + completedSteps: handoff.completedSteps.length, + }); + + return handoff; + } + + /** + * Load handoff for resumption + */ + loadHandoff(name: string): Handoff | null { + const handoffPath = path.join(this.baseDir, 'handoffs', `${name}_latest.json`); + + if (!fs.existsSync(handoffPath)) { + return null; + } + + try { + const content = fs.readFileSync(handoffPath, 'utf8'); + return JSON.parse(content); + } catch (error) { + logger.error('Failed to load handoff', { name, error }); + return null; + } + } + + /** + * Record a crash for debugging + */ + recordCrash(name: string, error: string, stack?: string): void { + const state = this.states.get(name); + if (!state) return; + + // Add crash as artifact + this.addArtifact(name, 'error', `${error}\n\n${stack || ''}`, { + tags: ['crash', 'error'], + }); + + // Save crash ledger entry + this.saveLedgerEntry(name, 'crash', state); + + // Create handoff for resumption + this.createHandoff(name); + + logger.error('Recorded crash', { name, error }); + } + + /** + * Save checkpoint (call before expected context clear) + */ + checkpoint(name: string): void { + const state = this.states.get(name); + if (!state) return; + + state.lastCheckpoint = new Date(); + this.saveLedgerEntry(name, 'checkpoint', state); + this.createHandoff(name); + + logger.info('Created checkpoint', { name, phase: state.currentPhase }); + } + + /** + * Generate markdown summary for CLAUDE.md injection + */ + generateResumptionContext(name: string): string { + const state = this.states.get(name); + const handoff = this.loadHandoff(name); + + if (!state && !handoff) { + return ''; + } + + const lines: string[] = [ + '# Agent Resumption Context', + '', + `**Session**: ${(state?.sessionCount || 0) + 1}`, + `**Last Checkpoint**: ${state?.lastCheckpoint?.toISOString() || 'Unknown'}`, + '', + ]; + + if (handoff) { + lines.push('## Previous Session Summary'); + lines.push(handoff.summary); + lines.push(''); + + if (handoff.completedSteps.length > 0) { + lines.push('## Completed Steps'); + handoff.completedSteps.forEach((step) => lines.push(`- ✅ ${step}`)); + lines.push(''); + } + + if (handoff.nextSteps.length > 0) { + lines.push('## Next Steps'); + handoff.nextSteps.forEach((step) => lines.push(`- ⏳ ${step}`)); + lines.push(''); + } + + if (handoff.warnings.length > 0) { + lines.push('## Warnings'); + handoff.warnings.forEach((w) => lines.push(`- ⚠️ ${w}`)); + lines.push(''); + } + } + + if (state?.decisions.length) { + lines.push('## Recent Decisions'); + state.decisions.slice(-5).forEach((d) => { + const icon = d.outcome === 'success' ? '✅' : d.outcome === 'failure' ? '❌' : '🔄'; + lines.push(`- ${icon} ${d.description}`); + if (d.reasoning) lines.push(` - Reasoning: ${d.reasoning}`); + }); + lines.push(''); + } + + return lines.join('\n'); + } + + /** + * Get state for an agent + */ + getState(name: string): AgentState | undefined { + return this.states.get(name); + } + + /** + * Clean up old ledger entries + */ + cleanup(name: string, keepDays: number = 7): void { + const ledgerDir = path.join(this.baseDir, 'ledgers', name); + if (!fs.existsSync(ledgerDir)) return; + + const cutoff = Date.now() - keepDays * 24 * 60 * 60 * 1000; + const files = fs.readdirSync(ledgerDir); + + for (const file of files) { + const filePath = path.join(ledgerDir, file); + const stats = fs.statSync(filePath); + if (stats.mtimeMs < cutoff) { + fs.unlinkSync(filePath); + logger.debug('Cleaned up old ledger', { file }); + } + } + } + + // Private methods + + private ensureDir(dir: string): void { + if (!fs.existsSync(dir)) { + fs.mkdirSync(dir, { recursive: true }); + } + } + + private saveState(name: string): void { + const state = this.states.get(name); + if (!state) return; + + const statePath = path.join(this.baseDir, 'ledgers', `${name}_current.json`); + fs.writeFileSync(statePath, JSON.stringify(state, null, 2)); + } + + private saveAllStates(): void { + Array.from(this.states.keys()).forEach((name) => { + this.saveState(name); + }); + } + + private loadLatestState(name: string): AgentState | null { + const statePath = path.join(this.baseDir, 'ledgers', `${name}_current.json`); + + if (!fs.existsSync(statePath)) { + return null; + } + + try { + const content = fs.readFileSync(statePath, 'utf8'); + return JSON.parse(content); + } catch (error) { + logger.error('Failed to load state', { name, error }); + return null; + } + } + + private saveLedgerEntry(name: string, type: LedgerEntry['type'], state: AgentState): void { + const ledgerDir = path.join(this.baseDir, 'ledgers', name); + this.ensureDir(ledgerDir); + + const entry: LedgerEntry = { + timestamp: new Date(), + sessionId: `${name}-${Date.now()}`, + type, + state: { ...state }, + }; + + const filename = `${type}_${Date.now()}.json`; + fs.writeFileSync(path.join(ledgerDir, filename), JSON.stringify(entry, null, 2)); + } + + private saveHandoff(name: string, handoff: Handoff): void { + const handoffDir = path.join(this.baseDir, 'handoffs'); + this.ensureDir(handoffDir); + + // Save as latest + fs.writeFileSync( + path.join(handoffDir, `${name}_latest.json`), + JSON.stringify(handoff, null, 2) + ); + + // Also save timestamped version + fs.writeFileSync( + path.join(handoffDir, `${name}_${Date.now()}.json`), + JSON.stringify(handoff, null, 2) + ); + } + + private saveArtifact(artifact: Artifact): void { + const artifactDir = path.join(this.baseDir, 'artifacts'); + this.ensureDir(artifactDir); + + fs.writeFileSync( + path.join(artifactDir, `${artifact.id}.json`), + JSON.stringify(artifact, null, 2) + ); + } + + private generateSummary(state: AgentState): string { + const parts: string[] = []; + + if (state.task) { + parts.push(`Task: ${state.task}`); + } + + parts.push(`Phase: ${state.currentPhase}`); + parts.push(`Completed ${state.completedTasks.length} tasks`); + parts.push(`Made ${state.decisions.length} decisions`); + + const successes = state.decisions.filter((d) => d.outcome === 'success').length; + const failures = state.decisions.filter((d) => d.outcome === 'failure').length; + if (successes || failures) { + parts.push(`(${successes} successful, ${failures} failed)`); + } + + return parts.join('. '); + } + + private inferNextSteps(state: AgentState): string[] { + const pending = state.decisions.filter((d) => d.outcome === 'pending'); + return pending.map((d) => d.description); + } + + private getWarnings(state: AgentState): string[] { + const warnings: string[] = []; + + const recentFailures = state.decisions.filter( + (d) => + d.outcome === 'failure' && + new Date(d.timestamp).getTime() > Date.now() - 10 * 60 * 1000 + ); + + if (recentFailures.length > 2) { + warnings.push(`${recentFailures.length} recent failures - review approach`); + } + + if (state.sessionCount > 3) { + warnings.push(`Multiple restarts (${state.sessionCount}) - check for persistent issues`); + } + + return warnings; + } +} + +// Singleton instance +let _persistence: ContextPersistence | null = null; + +export function getContextPersistence(baseDir?: string): ContextPersistence { + if (!_persistence) { + _persistence = new ContextPersistence(baseDir); + } + return _persistence; +} diff --git a/src/resiliency/index.ts b/src/resiliency/index.ts index fba4e929d..d02f1d61b 100644 --- a/src/resiliency/index.ts +++ b/src/resiliency/index.ts @@ -2,23 +2,42 @@ * Agent Resiliency Module * * Provides comprehensive health monitoring, auto-restart, logging, - * and metrics for agent-relay agents. + * metrics, and context persistence for agent-relay agents. + * + * Features: + * - Health monitoring with process liveness checks + * - Auto-restart on crash with configurable limits + * - Prometheus-compatible metrics export + * - Structured JSON logging with rotation + * - Context persistence across restarts (inspired by Continuous-Claude-v2) + * - Provider-specific context injection (Claude hooks, Codex config, Gemini instructions) * * Usage: * * ```ts * import { getSupervisor, metrics, createLogger } from './resiliency'; * - * // Start the supervisor + * // Start the supervisor with context persistence * const supervisor = getSupervisor({ * autoRestart: true, * maxRestarts: 5, + * contextPersistence: { + * enabled: true, + * autoInjectOnRestart: true, + * }, * }); * supervisor.start(); * * // Add an agent to supervision * supervisor.supervise( - * { name: 'worker-1', cli: 'claude', pid: 12345, spawnedAt: new Date() }, + * { + * name: 'worker-1', + * cli: 'claude', + * pid: 12345, + * spawnedAt: new Date(), + * workingDir: '/path/to/repo', + * provider: 'claude', // or 'codex', 'gemini' + * }, * { * isAlive: () => process.kill(12345, 0), * kill: (sig) => process.kill(12345, sig), @@ -29,6 +48,11 @@ * // Get metrics * console.log(metrics.toPrometheus()); * ``` + * + * Context persistence works differently per provider: + * - Claude: Uses hooks to inject context into CLAUDE.md + * - Codex: Uses config for periodic context refresh via system prompt + * - Gemini: Updates system instruction file */ export { @@ -57,3 +81,25 @@ export { type SupervisedAgent, type SupervisorConfig, } from './supervisor'; + +export { + ContextPersistence, + getContextPersistence, + type AgentState, + type Decision, + type Artifact, + type Handoff, + type LedgerEntry, +} from './context-persistence'; + +export { + createContextHandler, + detectProvider, + ClaudeContextHandler, + CodexContextHandler, + GeminiContextHandler, + type ProviderType, + type ProviderContextConfig, + type ClaudeHooksConfig, + type CodexContextConfig, +} from './provider-context'; diff --git a/src/resiliency/provider-context.ts b/src/resiliency/provider-context.ts new file mode 100644 index 000000000..d1b1a5c80 --- /dev/null +++ b/src/resiliency/provider-context.ts @@ -0,0 +1,446 @@ +/** + * Provider-Specific Context Injection + * + * Handles context persistence differently based on the AI provider: + * - Claude: Uses hooks (PreToolUse, PostToolUse, Stop) to inject/save context + * - Codex: Uses config settings for periodic context refresh + * - Gemini: Uses system instruction updates + */ + +import * as fs from 'fs'; +import * as path from 'path'; +import { createLogger } from './logger'; +import { ContextPersistence, getContextPersistence, Handoff } from './context-persistence'; + +const logger = createLogger('provider-context'); + +export type ProviderType = 'claude' | 'codex' | 'gemini' | 'generic'; + +export interface ProviderContextConfig { + provider: ProviderType; + workingDir: string; + agentName: string; + task?: string; +} + +export interface ClaudeHooksConfig { + hooksDir: string; // .claude/hooks/ + onPreToolUse?: boolean; // Inject context before tool use + onStop?: boolean; // Save context on stop + contextFile?: string; // Path to inject (CLAUDE.md or custom) +} + +export interface CodexContextConfig { + configPath: string; // .codex/config.json + contextRefreshInterval?: number; // ms between context updates + systemPromptPath?: string; // Path to system prompt file +} + +/** + * Base class for provider-specific context handling + */ +abstract class ProviderContextHandler { + protected persistence: ContextPersistence; + protected config: ProviderContextConfig; + + constructor(config: ProviderContextConfig) { + this.config = config; + this.persistence = getContextPersistence( + path.join(config.workingDir, '.agent-relay', 'context') + ); + } + + abstract setup(): Promise; + abstract injectContext(handoff: Handoff): Promise; + abstract saveContext(): Promise; + abstract cleanup(): Promise; + + protected getState() { + return this.persistence.getState(this.config.agentName); + } +} + +/** + * Claude Context Handler using Hooks + * + * Creates hooks that: + * - Pre-tool: Inject resumption context before critical operations + * - Stop: Save state to ledger on session end + */ +export class ClaudeContextHandler extends ProviderContextHandler { + private hooksConfig: ClaudeHooksConfig; + + constructor(config: ProviderContextConfig, hooksConfig?: Partial) { + super(config); + this.hooksConfig = { + hooksDir: path.join(config.workingDir, '.claude', 'hooks'), + onPreToolUse: true, + onStop: true, + contextFile: path.join(config.workingDir, 'CLAUDE.md'), + ...hooksConfig, + }; + } + + async setup(): Promise { + // Ensure hooks directory exists + if (!fs.existsSync(this.hooksConfig.hooksDir)) { + fs.mkdirSync(this.hooksConfig.hooksDir, { recursive: true }); + } + + // Create or update settings.json with hook configuration + const settingsPath = path.join(this.config.workingDir, '.claude', 'settings.json'); + let settings: Record = {}; + + if (fs.existsSync(settingsPath)) { + try { + settings = JSON.parse(fs.readFileSync(settingsPath, 'utf8')); + } catch { + // Start fresh if invalid + } + } + + // Configure hooks + const hooks: Record = (settings.hooks as Record) || {}; + + if (this.hooksConfig.onStop) { + // Stop hook to save context + const stopHookScript = this.createStopHookScript(); + const stopHookPath = path.join(this.hooksConfig.hooksDir, 'save-context.sh'); + fs.writeFileSync(stopHookPath, stopHookScript, { mode: 0o755 }); + + hooks.Stop = hooks.Stop || []; + const stopHookEntry = { + matcher: '', + hooks: [{ type: 'command', command: stopHookPath }], + }; + // Only add if not already present + if (!hooks.Stop.some((h: unknown) => (h as Record).hooks?.[0]?.command === stopHookPath)) { + hooks.Stop.push(stopHookEntry); + } + } + + settings.hooks = hooks; + + // Write updated settings + const settingsDir = path.dirname(settingsPath); + if (!fs.existsSync(settingsDir)) { + fs.mkdirSync(settingsDir, { recursive: true }); + } + fs.writeFileSync(settingsPath, JSON.stringify(settings, null, 2)); + + logger.info('Claude hooks configured', { + hooksDir: this.hooksConfig.hooksDir, + onStop: this.hooksConfig.onStop, + }); + } + + async injectContext(handoff: Handoff): Promise { + if (!this.hooksConfig.contextFile) return; + + // Read existing CLAUDE.md + let existingContent = ''; + if (fs.existsSync(this.hooksConfig.contextFile)) { + existingContent = fs.readFileSync(this.hooksConfig.contextFile, 'utf8'); + } + + // Generate resumption context + const resumptionContext = this.persistence.generateResumptionContext(this.config.agentName); + + if (!resumptionContext) return; + + // Check if we already have resumption context + const marker = ''; + const endMarker = ''; + + let newContent: string; + if (existingContent.includes(marker)) { + // Replace existing context + const regex = new RegExp(`${marker}[\\s\\S]*?${endMarker}`, 'g'); + newContent = existingContent.replace( + regex, + `${marker}\n${resumptionContext}\n${endMarker}` + ); + } else { + // Prepend context + newContent = `${marker}\n${resumptionContext}\n${endMarker}\n\n${existingContent}`; + } + + fs.writeFileSync(this.hooksConfig.contextFile, newContent); + + logger.info('Injected resumption context into CLAUDE.md', { + agent: this.config.agentName, + handoffId: handoff.fromAgent, + }); + } + + async saveContext(): Promise { + this.persistence.checkpoint(this.config.agentName); + logger.info('Saved Claude context checkpoint', { agent: this.config.agentName }); + } + + async cleanup(): Promise { + // Optionally remove the resumption context from CLAUDE.md + if (this.hooksConfig.contextFile && fs.existsSync(this.hooksConfig.contextFile)) { + const content = fs.readFileSync(this.hooksConfig.contextFile, 'utf8'); + const marker = ''; + const endMarker = ''; + const regex = new RegExp(`${marker}[\\s\\S]*?${endMarker}\\n*`, 'g'); + const cleaned = content.replace(regex, ''); + fs.writeFileSync(this.hooksConfig.contextFile, cleaned); + } + } + + private createStopHookScript(): string { + const contextDir = path.join(this.config.workingDir, '.agent-relay', 'context'); + return `#!/bin/bash +# Claude Code Stop Hook - Save agent context +# Generated by agent-relay + +AGENT_NAME="${this.config.agentName}" +CONTEXT_DIR="${contextDir}" + +# Read hook input from stdin +read -r INPUT + +# Save checkpoint marker +mkdir -p "$CONTEXT_DIR/ledgers" +echo '{"event":"stop","timestamp":"'$(date -Iseconds)'","agent":"'$AGENT_NAME'"}' >> "$CONTEXT_DIR/ledgers/events.jsonl" + +# Exit successfully (don't block stop) +exit 0 +`; + } +} + +/** + * Codex Context Handler using Config + * + * Uses Codex's configuration for: + * - Periodic context refresh via system prompt updates + * - History file for context continuity + */ +export class CodexContextHandler extends ProviderContextHandler { + private codexConfig: CodexContextConfig; + private refreshInterval?: ReturnType; + + constructor(config: ProviderContextConfig, codexConfig?: Partial) { + super(config); + this.codexConfig = { + configPath: path.join(config.workingDir, '.codex', 'config.json'), + contextRefreshInterval: 60000, // 1 minute default + systemPromptPath: path.join(config.workingDir, '.codex', 'system-prompt.md'), + ...codexConfig, + }; + } + + async setup(): Promise { + const configDir = path.dirname(this.codexConfig.configPath); + if (!fs.existsSync(configDir)) { + fs.mkdirSync(configDir, { recursive: true }); + } + + // Read or create config + let config: Record = {}; + if (fs.existsSync(this.codexConfig.configPath)) { + try { + config = JSON.parse(fs.readFileSync(this.codexConfig.configPath, 'utf8')); + } catch { + // Start fresh + } + } + + // Set up context-aware configuration + config.history = config.history || {}; + (config.history as Record).save_history = true; + (config.history as Record).max_history_size = 1000; + + // Point to our system prompt if using custom context + if (this.codexConfig.systemPromptPath) { + config.system_prompt_file = this.codexConfig.systemPromptPath; + } + + fs.writeFileSync(this.codexConfig.configPath, JSON.stringify(config, null, 2)); + + logger.info('Codex config configured', { + configPath: this.codexConfig.configPath, + refreshInterval: this.codexConfig.contextRefreshInterval, + }); + } + + async injectContext(handoff: Handoff): Promise { + if (!this.codexConfig.systemPromptPath) return; + + // Generate resumption context + const resumptionContext = this.persistence.generateResumptionContext(this.config.agentName); + + if (!resumptionContext) return; + + // Read existing system prompt + let existingPrompt = ''; + if (fs.existsSync(this.codexConfig.systemPromptPath)) { + existingPrompt = fs.readFileSync(this.codexConfig.systemPromptPath, 'utf8'); + } + + // Add/update resumption context + const marker = ''; + const endMarker = ''; + + let newPrompt: string; + if (existingPrompt.includes(marker)) { + const regex = new RegExp(`${marker}[\\s\\S]*?${endMarker}`, 'g'); + newPrompt = existingPrompt.replace(regex, `${marker}\n${resumptionContext}\n${endMarker}`); + } else { + newPrompt = `${marker}\n${resumptionContext}\n${endMarker}\n\n${existingPrompt}`; + } + + fs.writeFileSync(this.codexConfig.systemPromptPath, newPrompt); + + logger.info('Injected resumption context into Codex system prompt', { + agent: this.config.agentName, + }); + } + + async saveContext(): Promise { + this.persistence.checkpoint(this.config.agentName); + logger.info('Saved Codex context checkpoint', { agent: this.config.agentName }); + } + + /** + * Start periodic context refresh + */ + startPeriodicRefresh(): void { + if (this.refreshInterval) return; + + this.refreshInterval = setInterval(async () => { + const handoff = this.persistence.createHandoff(this.config.agentName); + await this.injectContext(handoff); + }, this.codexConfig.contextRefreshInterval); + + logger.info('Started periodic context refresh for Codex', { + interval: this.codexConfig.contextRefreshInterval, + }); + } + + stopPeriodicRefresh(): void { + if (this.refreshInterval) { + clearInterval(this.refreshInterval); + this.refreshInterval = undefined; + } + } + + async cleanup(): Promise { + this.stopPeriodicRefresh(); + + if (this.codexConfig.systemPromptPath && fs.existsSync(this.codexConfig.systemPromptPath)) { + const content = fs.readFileSync(this.codexConfig.systemPromptPath, 'utf8'); + const marker = ''; + const endMarker = ''; + const regex = new RegExp(`${marker}[\\s\\S]*?${endMarker}\\n*`, 'g'); + const cleaned = content.replace(regex, ''); + fs.writeFileSync(this.codexConfig.systemPromptPath, cleaned); + } + } +} + +/** + * Gemini Context Handler + * + * Uses system instruction file for context injection + */ +export class GeminiContextHandler extends ProviderContextHandler { + private systemInstructionPath: string; + + constructor(config: ProviderContextConfig) { + super(config); + this.systemInstructionPath = path.join( + config.workingDir, + '.gemini', + 'system-instruction.md' + ); + } + + async setup(): Promise { + const dir = path.dirname(this.systemInstructionPath); + if (!fs.existsSync(dir)) { + fs.mkdirSync(dir, { recursive: true }); + } + + logger.info('Gemini context handler configured', { + systemInstructionPath: this.systemInstructionPath, + }); + } + + async injectContext(handoff: Handoff): Promise { + const resumptionContext = this.persistence.generateResumptionContext(this.config.agentName); + + if (!resumptionContext) return; + + let existingContent = ''; + if (fs.existsSync(this.systemInstructionPath)) { + existingContent = fs.readFileSync(this.systemInstructionPath, 'utf8'); + } + + const marker = ''; + const endMarker = ''; + + let newContent: string; + if (existingContent.includes(marker)) { + const regex = new RegExp(`${marker}[\\s\\S]*?${endMarker}`, 'g'); + newContent = existingContent.replace(regex, `${marker}\n${resumptionContext}\n${endMarker}`); + } else { + newContent = `${marker}\n${resumptionContext}\n${endMarker}\n\n${existingContent}`; + } + + fs.writeFileSync(this.systemInstructionPath, newContent); + + logger.info('Injected resumption context for Gemini', { agent: this.config.agentName }); + } + + async saveContext(): Promise { + this.persistence.checkpoint(this.config.agentName); + } + + async cleanup(): Promise { + if (fs.existsSync(this.systemInstructionPath)) { + const content = fs.readFileSync(this.systemInstructionPath, 'utf8'); + const marker = ''; + const endMarker = ''; + const regex = new RegExp(`${marker}[\\s\\S]*?${endMarker}\\n*`, 'g'); + const cleaned = content.replace(regex, ''); + fs.writeFileSync(this.systemInstructionPath, cleaned); + } + } +} + +/** + * Factory function to create the appropriate context handler + */ +export function createContextHandler( + config: ProviderContextConfig, + providerOptions?: Record +): ProviderContextHandler { + switch (config.provider) { + case 'claude': + return new ClaudeContextHandler(config, providerOptions as Partial); + case 'codex': + return new CodexContextHandler(config, providerOptions as Partial); + case 'gemini': + return new GeminiContextHandler(config); + default: + // Generic handler - use Claude-style CLAUDE.md injection + return new ClaudeContextHandler(config, { + contextFile: path.join(config.workingDir, 'AGENT_CONTEXT.md'), + }); + } +} + +/** + * Detect provider from CLI command + */ +export function detectProvider(cli: string): ProviderType { + const cmd = cli.toLowerCase(); + if (cmd.includes('claude')) return 'claude'; + if (cmd.includes('codex')) return 'codex'; + if (cmd.includes('gemini')) return 'gemini'; + return 'generic'; +} diff --git a/src/resiliency/supervisor.ts b/src/resiliency/supervisor.ts index 652404cf1..b866ff2d3 100644 --- a/src/resiliency/supervisor.ts +++ b/src/resiliency/supervisor.ts @@ -9,6 +9,8 @@ import { EventEmitter } from 'events'; import { AgentHealthMonitor, getHealthMonitor, HealthMonitorConfig, AgentProcess } from './health-monitor'; import { Logger, createLogger, LogLevel } from './logger'; import { metrics } from './metrics'; +import { ContextPersistence, getContextPersistence } from './context-persistence'; +import { createContextHandler, detectProvider, ProviderType } from './provider-context'; export interface SupervisedAgent { name: string; @@ -17,6 +19,8 @@ export interface SupervisedAgent { pid: number; logFile?: string; spawnedAt: Date; + workingDir?: string; + provider?: ProviderType; } export interface SupervisorConfig { @@ -28,6 +32,11 @@ export interface SupervisorConfig { autoRestart: boolean; maxRestarts: number; notifyOnCrash: boolean; + contextPersistence: { + enabled: boolean; + baseDir?: string; + autoInjectOnRestart: boolean; + }; } const DEFAULT_CONFIG: SupervisorConfig = { @@ -41,6 +50,10 @@ const DEFAULT_CONFIG: SupervisorConfig = { autoRestart: true, maxRestarts: 5, notifyOnCrash: true, + contextPersistence: { + enabled: true, + autoInjectOnRestart: true, + }, }; export class AgentSupervisor extends EventEmitter { @@ -49,6 +62,8 @@ export class AgentSupervisor extends EventEmitter { private logger: Logger; private agents = new Map(); private restarters = new Map Promise>(); + private contextPersistence?: ContextPersistence; + private contextHandlers = new Map>(); constructor(config: Partial = {}) { super(); @@ -61,6 +76,13 @@ export class AgentSupervisor extends EventEmitter { this.healthMonitor = getHealthMonitor(this.config.healthCheck); this.setupHealthMonitorEvents(); + + // Initialize context persistence if enabled + if (this.config.contextPersistence.enabled) { + this.contextPersistence = getContextPersistence(this.config.contextPersistence.baseDir); + this.contextPersistence.startAutoSave(); + this.logger.info('Context persistence enabled'); + } } /** @@ -80,6 +102,18 @@ export class AgentSupervisor extends EventEmitter { stop(): void { this.logger.info('Agent supervisor stopping'); this.healthMonitor.stop(); + + // Stop context persistence + if (this.contextPersistence) { + this.contextPersistence.stopAutoSave(); + } + + // Cleanup context handlers + Array.from(this.contextHandlers.entries()).forEach(([name, handler]) => { + handler.cleanup().catch((err) => { + this.logger.error('Error cleaning up context handler', { name, error: String(err) }); + }); + }); } /** @@ -119,6 +153,44 @@ export class AgentSupervisor extends EventEmitter { this.healthMonitor.register(agentProcess); metrics.recordSpawn(agent.name); + // Set up context persistence for this agent + if (this.contextPersistence && this.config.contextPersistence.enabled) { + const provider = agent.provider || detectProvider(agent.cli); + const workingDir = agent.workingDir || process.cwd(); + + // Initialize agent state + this.contextPersistence.initAgent(agent.name, agent.cli, agent.task); + + // Create provider-specific context handler + const contextHandler = createContextHandler({ + provider, + workingDir, + agentName: agent.name, + task: agent.task, + }); + + contextHandler.setup().then(() => { + this.contextHandlers.set(agent.name, contextHandler); + + // Check for existing handoff to restore + const handoff = this.contextPersistence?.loadHandoff(agent.name); + if (handoff && this.config.contextPersistence.autoInjectOnRestart) { + contextHandler.injectContext(handoff).catch((err) => { + this.logger.error('Failed to inject context on start', { + name: agent.name, + error: String(err), + }); + }); + } + }).catch((err) => { + this.logger.error('Failed to setup context handler', { + name: agent.name, + provider, + error: String(err), + }); + }); + } + this.logger.info('Agent added to supervision', { name: agent.name, cli: agent.cli, @@ -134,6 +206,17 @@ export class AgentSupervisor extends EventEmitter { this.restarters.delete(name); this.healthMonitor.unregister(name); + // Clean up context handler + const contextHandler = this.contextHandlers.get(name); + if (contextHandler) { + contextHandler.saveContext().then(() => { + return contextHandler.cleanup(); + }).catch((err) => { + this.logger.error('Error cleaning up context handler', { name, error: String(err) }); + }); + this.contextHandlers.delete(name); + } + this.logger.info('Agent removed from supervision', { name }); } @@ -229,6 +312,11 @@ export class AgentSupervisor extends EventEmitter { metrics.recordCrash(name, reason); this.emit('died', { name, reason, restartCount }); + // Record crash in context persistence for resumption + if (this.contextPersistence) { + this.contextPersistence.recordCrash(name, reason); + } + if (this.config.notifyOnCrash) { this.notifyCrash(name, reason); } @@ -237,6 +325,12 @@ export class AgentSupervisor extends EventEmitter { this.healthMonitor.on('restarting', ({ name, attempt }) => { this.logger.info('Restarting agent', { name, attempt }); metrics.recordRestartAttempt(name); + + // Save checkpoint before restart + if (this.contextPersistence) { + this.contextPersistence.checkpoint(name); + } + this.emit('restarting', { name, attempt }); }); @@ -251,6 +345,20 @@ export class AgentSupervisor extends EventEmitter { agent.spawnedAt = new Date(); } + // Inject context on restart + if (this.config.contextPersistence.autoInjectOnRestart) { + const handoff = this.contextPersistence?.loadHandoff(name); + const contextHandler = this.contextHandlers.get(name); + if (handoff && contextHandler) { + contextHandler.injectContext(handoff).catch((err) => { + this.logger.error('Failed to inject context after restart', { + name, + error: String(err), + }); + }); + } + } + this.emit('restarted', { name, pid, attempt }); }); From d4e6ac574036cdeef81c74925509cf157e8c854a Mon Sep 17 00:00:00 2001 From: Claude Date: Tue, 30 Dec 2025 01:12:56 +0000 Subject: [PATCH 14/38] Refactor to daemon-first architecture with multi-workspace orchestrator The new architecture makes the relay daemon the default mode: - Orchestrator manages multiple workspaces (repos) from a single API - Dashboard becomes primary interface for project switching - No separate "bridge" command needed New modules: - orchestrator.ts: Top-level service managing workspace daemons - workspace-manager.ts: Add/remove/switch workspaces - agent-manager.ts: Spawn/stop agents with resiliency integration - api.ts: REST and WebSocket API for dashboard - types.ts: Core types for workspaces, agents, events API endpoints: - GET/POST /workspaces - List/add workspaces - POST /workspaces/:id/switch - Switch active workspace - GET/POST /workspaces/:id/agents - List/spawn agents - WebSocket for real-time events --- src/daemon/agent-manager.ts | 488 ++++++++++++++++++ src/daemon/api.ts | 512 +++++++++++++++++++ src/daemon/index.ts | 7 + src/daemon/orchestrator.ts | 853 ++++++++++++++++++++++++++++++++ src/daemon/types.ts | 148 ++++++ src/daemon/workspace-manager.ts | 344 +++++++++++++ 6 files changed, 2352 insertions(+) create mode 100644 src/daemon/agent-manager.ts create mode 100644 src/daemon/api.ts create mode 100644 src/daemon/orchestrator.ts create mode 100644 src/daemon/types.ts create mode 100644 src/daemon/workspace-manager.ts diff --git a/src/daemon/agent-manager.ts b/src/daemon/agent-manager.ts new file mode 100644 index 000000000..643346724 --- /dev/null +++ b/src/daemon/agent-manager.ts @@ -0,0 +1,488 @@ +/** + * Agent Manager + * Manages agents across workspaces with integrated resiliency. + */ + +import * as fs from 'fs'; +import * as path from 'path'; +import { EventEmitter } from 'events'; +import { createLogger } from '../resiliency/logger.js'; +import { getSupervisor, type SupervisedAgent } from '../resiliency/supervisor.js'; +import { getContextPersistence } from '../resiliency/context-persistence.js'; +import { detectProvider } from '../resiliency/provider-context.js'; +import { PtyWrapper, type PtyWrapperConfig } from '../wrapper/pty-wrapper.js'; +import { resolveCommand } from '../utils/command-resolver.js'; +import type { + Agent, + AgentStatus, + ProviderType, + DaemonEvent, + SpawnAgentRequest, +} from './types.js'; + +const logger = createLogger('agent-manager'); + +function generateId(): string { + return Math.random().toString(36).substring(2, 15); +} + +interface ManagedAgent extends Agent { + pty?: PtyWrapper; +} + +export class AgentManager extends EventEmitter { + private agents = new Map(); + private supervisor = getSupervisor({ + autoRestart: true, + maxRestarts: 5, + contextPersistence: { + enabled: true, + autoInjectOnRestart: true, + }, + }); + private dataDir: string; + private logsDir: string; + + constructor(dataDir: string) { + super(); + this.dataDir = dataDir; + this.logsDir = path.join(dataDir, 'logs'); + + // Ensure directories exist + if (!fs.existsSync(this.logsDir)) { + fs.mkdirSync(this.logsDir, { recursive: true }); + } + + // Setup supervisor event handlers + this.setupSupervisorEvents(); + + // Start supervisor + this.supervisor.start(); + + logger.info('Agent manager initialized'); + } + + /** + * Spawn a new agent in a workspace + */ + async spawn( + workspaceId: string, + workspacePath: string, + request: SpawnAgentRequest + ): Promise { + const { name, task } = request; + + // Check if agent already exists + const existing = this.findByName(workspaceId, name); + if (existing) { + throw new Error(`Agent ${name} already exists in workspace`); + } + + // Determine provider and CLI + const provider = request.provider || detectProvider(name); + const cli = this.getCliCommand(provider); + + logger.info('Spawning agent', { name, workspaceId, provider, cli }); + + try { + // Parse CLI command + const cliParts = cli.split(' '); + const commandName = cliParts[0]; + const args = [...cliParts.slice(1)]; + + // Resolve full path + const command = resolveCommand(commandName); + + // Add required flags for non-interactive mode + if (provider === 'claude' && !args.includes('--dangerously-skip-permissions')) { + args.push('--dangerously-skip-permissions'); + } + if (provider === 'codex' && !args.includes('--dangerously-bypass-approvals-and-sandbox')) { + args.push('--dangerously-bypass-approvals-and-sandbox'); + } + + // Create agent record + const agent: ManagedAgent = { + id: generateId(), + name, + workspaceId, + provider, + status: 'running', + spawnedAt: new Date(), + restartCount: 0, + task, + logFile: path.join(this.logsDir, `${name}-${Date.now()}.log`), + }; + + // Create PTY config + const ptyConfig: PtyWrapperConfig = { + name, + command, + args, + cwd: workspacePath, + logsDir: this.logsDir, + onExit: (code) => { + logger.info('Agent process exited', { name, code }); + this.handleAgentExit(agent.id, code); + }, + }; + + // Create and start PTY + const pty = new PtyWrapper(ptyConfig); + await pty.start(); + + agent.pid = pty.pid; + agent.pty = pty; + + // Inject initial task + if (task && task.trim()) { + pty.write(task + '\r'); + } + + // Track agent + this.agents.set(agent.id, agent); + + // Add to supervisor for health monitoring + this.supervisor.supervise( + { + name: agent.name, + cli, + task, + pid: agent.pid!, + spawnedAt: agent.spawnedAt, + workingDir: workspacePath, + provider, + }, + { + isAlive: () => { + try { + process.kill(agent.pid!, 0); + return true; + } catch { + return false; + } + }, + kill: (signal) => { + try { + process.kill(agent.pid!, signal); + } catch { + // Already dead + } + }, + restart: async () => { + await this.restartAgent(agent.id, workspacePath); + }, + } + ); + + logger.info('Agent spawned', { id: agent.id, name, pid: agent.pid }); + + this.emitEvent({ + type: 'agent:spawned', + workspaceId, + agentId: agent.id, + data: this.toPublicAgent(agent), + timestamp: new Date(), + }); + + return this.toPublicAgent(agent); + } catch (err) { + logger.error('Failed to spawn agent', { name, error: String(err) }); + throw err; + } + } + + /** + * Stop an agent + */ + async stop(agentId: string): Promise { + const agent = this.agents.get(agentId); + if (!agent) { + return false; + } + + logger.info('Stopping agent', { id: agentId, name: agent.name }); + + try { + // Remove from supervisor + this.supervisor.unsupervise(agent.name); + + // Stop PTY + if (agent.pty) { + agent.pty.stop(); + + // Wait for graceful shutdown + await new Promise((resolve) => setTimeout(resolve, 2000)); + + // Force kill if still running + if (agent.pty.isRunning) { + agent.pty.kill(); + } + } + + agent.status = 'stopped'; + this.agents.delete(agentId); + + this.emitEvent({ + type: 'agent:stopped', + workspaceId: agent.workspaceId, + agentId, + data: { name: agent.name }, + timestamp: new Date(), + }); + + return true; + } catch (err) { + logger.error('Failed to stop agent', { id: agentId, error: String(err) }); + return false; + } + } + + /** + * Stop all agents in a workspace + */ + async stopAllInWorkspace(workspaceId: string): Promise { + const agents = this.getByWorkspace(workspaceId); + for (const agent of agents) { + await this.stop(agent.id); + } + } + + /** + * Stop all agents + */ + async stopAll(): Promise { + const agentIds = Array.from(this.agents.keys()); + for (const id of agentIds) { + await this.stop(id); + } + } + + /** + * Get an agent by ID + */ + get(agentId: string): Agent | undefined { + const agent = this.agents.get(agentId); + return agent ? this.toPublicAgent(agent) : undefined; + } + + /** + * Get all agents in a workspace + */ + getByWorkspace(workspaceId: string): Agent[] { + return Array.from(this.agents.values()) + .filter((a) => a.workspaceId === workspaceId) + .map((a) => this.toPublicAgent(a)); + } + + /** + * Get all agents + */ + getAll(): Agent[] { + return Array.from(this.agents.values()).map((a) => this.toPublicAgent(a)); + } + + /** + * Find agent by name in a workspace + */ + findByName(workspaceId: string, name: string): Agent | undefined { + const agent = Array.from(this.agents.values()).find( + (a) => a.workspaceId === workspaceId && a.name === name + ); + return agent ? this.toPublicAgent(agent) : undefined; + } + + /** + * Get agent output/logs + */ + getOutput(agentId: string, limit?: number): string[] | null { + const agent = this.agents.get(agentId); + if (!agent?.pty) return null; + return agent.pty.getOutput(limit); + } + + /** + * Get raw output from agent + */ + getRawOutput(agentId: string): string | null { + const agent = this.agents.get(agentId); + if (!agent?.pty) return null; + return agent.pty.getRawOutput(); + } + + /** + * Send input to an agent + */ + sendInput(agentId: string, input: string): boolean { + const agent = this.agents.get(agentId); + if (!agent?.pty) return false; + agent.pty.write(input); + return true; + } + + /** + * Restart an agent + */ + private async restartAgent(agentId: string, workspacePath: string): Promise { + const agent = this.agents.get(agentId); + if (!agent) return; + + logger.info('Restarting agent', { id: agentId, name: agent.name }); + + agent.status = 'restarting'; + agent.restartCount++; + + try { + // Get CLI command + const cli = this.getCliCommand(agent.provider); + const cliParts = cli.split(' '); + const command = resolveCommand(cliParts[0]); + const args = [...cliParts.slice(1)]; + + if (agent.provider === 'claude' && !args.includes('--dangerously-skip-permissions')) { + args.push('--dangerously-skip-permissions'); + } + if (agent.provider === 'codex' && !args.includes('--dangerously-bypass-approvals-and-sandbox')) { + args.push('--dangerously-bypass-approvals-and-sandbox'); + } + + // Create new PTY + const ptyConfig: PtyWrapperConfig = { + name: agent.name, + command, + args, + cwd: workspacePath, + logsDir: this.logsDir, + onExit: (code) => { + this.handleAgentExit(agent.id, code); + }, + }; + + const pty = new PtyWrapper(ptyConfig); + await pty.start(); + + agent.pid = pty.pid; + agent.pty = pty; + agent.status = 'running'; + agent.spawnedAt = new Date(); + + logger.info('Agent restarted', { id: agentId, name: agent.name, pid: agent.pid }); + + this.emitEvent({ + type: 'agent:restarted', + workspaceId: agent.workspaceId, + agentId, + data: { name: agent.name, restartCount: agent.restartCount }, + timestamp: new Date(), + }); + } catch (err) { + logger.error('Failed to restart agent', { id: agentId, error: String(err) }); + agent.status = 'crashed'; + } + } + + /** + * Handle agent exit + */ + private handleAgentExit(agentId: string, code: number | null): void { + const agent = this.agents.get(agentId); + if (!agent) return; + + if (agent.status === 'running') { + agent.status = code === 0 ? 'stopped' : 'crashed'; + + if (agent.status === 'crashed') { + this.emitEvent({ + type: 'agent:crashed', + workspaceId: agent.workspaceId, + agentId, + data: { name: agent.name, exitCode: code }, + timestamp: new Date(), + }); + } + } + } + + /** + * Setup supervisor event handlers + */ + private setupSupervisorEvents(): void { + this.supervisor.on('died', ({ name, reason }) => { + logger.warn('Agent died (supervisor)', { name, reason }); + }); + + this.supervisor.on('restarted', ({ name, pid }) => { + logger.info('Agent restarted (supervisor)', { name, pid }); + }); + + this.supervisor.on('permanentlyDead', ({ name }) => { + logger.error('Agent permanently dead', { name }); + // Find and update agent status + const agent = Array.from(this.agents.values()).find((a) => a.name === name); + if (agent) { + agent.status = 'crashed'; + } + }); + } + + /** + * Get CLI command for provider + */ + private getCliCommand(provider: ProviderType): string { + switch (provider) { + case 'claude': + return 'claude'; + case 'codex': + return 'codex'; + case 'gemini': + return 'gemini'; + default: + return 'claude'; + } + } + + /** + * Convert internal agent to public agent (without pty reference) + */ + private toPublicAgent(agent: ManagedAgent): Agent { + return { + id: agent.id, + name: agent.name, + workspaceId: agent.workspaceId, + provider: agent.provider, + status: agent.status, + pid: agent.pid, + task: agent.task, + spawnedAt: agent.spawnedAt, + lastHealthCheck: agent.lastHealthCheck, + restartCount: agent.restartCount, + logFile: agent.logFile, + }; + } + + /** + * Emit a daemon event + */ + private emitEvent(event: DaemonEvent): void { + this.emit('event', event); + } + + /** + * Shutdown the agent manager + */ + async shutdown(): Promise { + logger.info('Shutting down agent manager'); + await this.stopAll(); + this.supervisor.stop(); + } +} + +let agentManagerInstance: AgentManager | undefined; + +export function getAgentManager(dataDir?: string): AgentManager { + if (!agentManagerInstance) { + const dir = dataDir || path.join(process.env.HOME || '', '.agent-relay', 'daemon'); + agentManagerInstance = new AgentManager(dir); + } + return agentManagerInstance; +} diff --git a/src/daemon/api.ts b/src/daemon/api.ts new file mode 100644 index 000000000..b8bdc2925 --- /dev/null +++ b/src/daemon/api.ts @@ -0,0 +1,512 @@ +/** + * Daemon API + * REST and WebSocket API for dashboard communication. + */ + +import * as http from 'http'; +import * as WebSocket from 'ws'; +import { EventEmitter } from 'events'; +import { createLogger } from '../resiliency/logger.js'; +import { metrics } from '../resiliency/metrics.js'; +import { getWorkspaceManager, WorkspaceManager } from './workspace-manager.js'; +import { getAgentManager, AgentManager } from './agent-manager.js'; +import type { + DaemonConfig, + DaemonEvent, + UserSession, + WorkspacesResponse, + AgentsResponse, + AddWorkspaceRequest, + SpawnAgentRequest, +} from './types.js'; + +const logger = createLogger('daemon-api'); + +interface ApiRequest { + method: string; + path: string; + body?: unknown; + params: Record; + query: Record; +} + +interface ApiResponse { + status: number; + body: unknown; + headers?: Record; +} + +type RouteHandler = (req: ApiRequest) => Promise; + +export class DaemonApi extends EventEmitter { + private server?: http.Server; + private wss?: WebSocket.WebSocketServer; + private workspaceManager: WorkspaceManager; + private agentManager: AgentManager; + private sessions = new Map(); + private routes = new Map(); + private config: DaemonConfig; + + constructor(config: DaemonConfig) { + super(); + this.config = config; + this.workspaceManager = getWorkspaceManager(config.dataDir); + this.agentManager = getAgentManager(config.dataDir); + + // Setup routes + this.setupRoutes(); + + // Forward events to WebSocket clients + this.workspaceManager.on('event', (event: DaemonEvent) => this.broadcastEvent(event)); + this.agentManager.on('event', (event: DaemonEvent) => this.broadcastEvent(event)); + } + + /** + * Start the API server + */ + async start(): Promise { + return new Promise((resolve) => { + this.server = http.createServer((req, res) => this.handleRequest(req, res)); + + // Setup WebSocket server + this.wss = new WebSocket.WebSocketServer({ server: this.server }); + this.wss.on('connection', (ws, req) => this.handleWebSocketConnection(ws, req)); + + this.server.listen(this.config.port, this.config.host, () => { + logger.info('Daemon API started', { port: this.config.port, host: this.config.host }); + resolve(); + }); + }); + } + + /** + * Stop the API server + */ + async stop(): Promise { + // Close all WebSocket connections + if (this.wss) { + for (const ws of this.wss.clients) { + ws.close(); + } + this.wss.close(); + } + + // Stop agent manager + await this.agentManager.shutdown(); + + // Close HTTP server + if (this.server) { + return new Promise((resolve) => { + this.server!.close(() => { + logger.info('Daemon API stopped'); + resolve(); + }); + }); + } + } + + /** + * Setup API routes + */ + private setupRoutes(): void { + // Health check + this.routes.set('GET /', async () => ({ + status: 200, + body: { status: 'ok', version: '1.0.0' }, + })); + + // Metrics endpoint + this.routes.set('GET /metrics', async () => ({ + status: 200, + body: metrics.toPrometheus(), + headers: { 'Content-Type': 'text/plain' }, + })); + + // === Workspaces === + + // List workspaces + this.routes.set('GET /workspaces', async (): Promise => { + const workspaces = this.workspaceManager.getAll(); + const active = this.workspaceManager.getActive(); + const response: WorkspacesResponse = { + workspaces, + activeWorkspaceId: active?.id, + }; + return { status: 200, body: response }; + }); + + // Add workspace + this.routes.set('POST /workspaces', async (req): Promise => { + const body = req.body as AddWorkspaceRequest; + if (!body?.path) { + return { status: 400, body: { error: 'path is required' } }; + } + try { + const workspace = this.workspaceManager.add(body); + return { status: 201, body: workspace }; + } catch (err) { + return { status: 400, body: { error: String(err) } }; + } + }); + + // Get workspace + this.routes.set('GET /workspaces/:id', async (req): Promise => { + const workspace = this.workspaceManager.get(req.params.id); + if (!workspace) { + return { status: 404, body: { error: 'Workspace not found' } }; + } + return { status: 200, body: workspace }; + }); + + // Delete workspace + this.routes.set('DELETE /workspaces/:id', async (req): Promise => { + const removed = this.workspaceManager.remove(req.params.id); + if (!removed) { + return { status: 404, body: { error: 'Workspace not found' } }; + } + return { status: 204, body: null }; + }); + + // Switch workspace + this.routes.set('POST /workspaces/:id/switch', async (req): Promise => { + try { + const workspace = this.workspaceManager.switchTo(req.params.id); + return { status: 200, body: workspace }; + } catch (err) { + return { status: 404, body: { error: String(err) } }; + } + }); + + // === Agents === + + // List agents in workspace + this.routes.set('GET /workspaces/:id/agents', async (req): Promise => { + const workspace = this.workspaceManager.get(req.params.id); + if (!workspace) { + return { status: 404, body: { error: 'Workspace not found' } }; + } + const agents = this.agentManager.getByWorkspace(req.params.id); + const response: AgentsResponse = { + agents, + workspaceId: req.params.id, + }; + return { status: 200, body: response }; + }); + + // Spawn agent in workspace + this.routes.set('POST /workspaces/:id/agents', async (req): Promise => { + const workspace = this.workspaceManager.get(req.params.id); + if (!workspace) { + return { status: 404, body: { error: 'Workspace not found' } }; + } + const body = req.body as SpawnAgentRequest; + if (!body?.name) { + return { status: 400, body: { error: 'name is required' } }; + } + try { + const agent = await this.agentManager.spawn(req.params.id, workspace.path, body); + return { status: 201, body: agent }; + } catch (err) { + return { status: 400, body: { error: String(err) } }; + } + }); + + // Get agent + this.routes.set('GET /agents/:id', async (req): Promise => { + const agent = this.agentManager.get(req.params.id); + if (!agent) { + return { status: 404, body: { error: 'Agent not found' } }; + } + return { status: 200, body: agent }; + }); + + // Stop agent + this.routes.set('DELETE /agents/:id', async (req): Promise => { + const stopped = await this.agentManager.stop(req.params.id); + if (!stopped) { + return { status: 404, body: { error: 'Agent not found' } }; + } + return { status: 204, body: null }; + }); + + // Get agent output + this.routes.set('GET /agents/:id/output', async (req): Promise => { + const limit = req.query.limit ? parseInt(req.query.limit, 10) : undefined; + const output = this.agentManager.getOutput(req.params.id, limit); + if (output === null) { + return { status: 404, body: { error: 'Agent not found' } }; + } + return { status: 200, body: { output } }; + }); + + // Send input to agent + this.routes.set('POST /agents/:id/input', async (req): Promise => { + const body = req.body as { input: string }; + if (!body?.input) { + return { status: 400, body: { error: 'input is required' } }; + } + const sent = this.agentManager.sendInput(req.params.id, body.input); + if (!sent) { + return { status: 404, body: { error: 'Agent not found' } }; + } + return { status: 200, body: { success: true } }; + }); + + // === All Agents === + + // List all agents + this.routes.set('GET /agents', async (): Promise => { + const agents = this.agentManager.getAll(); + return { status: 200, body: { agents } }; + }); + } + + /** + * Handle HTTP request + */ + private async handleRequest(req: http.IncomingMessage, res: http.ServerResponse): Promise { + // CORS headers + res.setHeader('Access-Control-Allow-Origin', '*'); + res.setHeader('Access-Control-Allow-Methods', 'GET, POST, PUT, DELETE, OPTIONS'); + res.setHeader('Access-Control-Allow-Headers', 'Content-Type, Authorization'); + + if (req.method === 'OPTIONS') { + res.writeHead(204); + res.end(); + return; + } + + try { + const url = new URL(req.url || '/', `http://${req.headers.host}`); + const apiReq = await this.parseRequest(req, url); + + // Find matching route + const response = await this.routeRequest(apiReq); + + // Send response + res.writeHead(response.status, { + 'Content-Type': 'application/json', + ...response.headers, + }); + + if (response.body !== null) { + const body = + typeof response.body === 'string' ? response.body : JSON.stringify(response.body); + res.end(body); + } else { + res.end(); + } + } catch (err) { + logger.error('Request error', { error: String(err) }); + res.writeHead(500, { 'Content-Type': 'application/json' }); + res.end(JSON.stringify({ error: 'Internal server error' })); + } + } + + /** + * Parse incoming request + */ + private async parseRequest(req: http.IncomingMessage, url: URL): Promise { + // Parse query params + const query: Record = {}; + url.searchParams.forEach((value, key) => { + query[key] = value; + }); + + // Parse body for POST/PUT + let body: unknown; + if (req.method === 'POST' || req.method === 'PUT') { + body = await this.parseBody(req); + } + + return { + method: req.method || 'GET', + path: url.pathname, + body, + params: {}, + query, + }; + } + + /** + * Parse request body + */ + private parseBody(req: http.IncomingMessage): Promise { + return new Promise((resolve, reject) => { + let data = ''; + req.on('data', (chunk) => { + data += chunk; + }); + req.on('end', () => { + try { + resolve(data ? JSON.parse(data) : undefined); + } catch { + reject(new Error('Invalid JSON body')); + } + }); + req.on('error', reject); + }); + } + + /** + * Route request to handler + */ + private async routeRequest(req: ApiRequest): Promise { + for (const [pattern, handler] of this.routes) { + const match = this.matchRoute(pattern, req.method, req.path); + if (match) { + req.params = match.params; + return handler(req); + } + } + + return { status: 404, body: { error: 'Not found' } }; + } + + /** + * Match route pattern against request + */ + private matchRoute( + pattern: string, + method: string, + path: string + ): { params: Record } | null { + const [patternMethod, patternPath] = pattern.split(' '); + + if (patternMethod !== method) { + return null; + } + + const patternParts = patternPath.split('/'); + const pathParts = path.split('/'); + + if (patternParts.length !== pathParts.length) { + return null; + } + + const params: Record = {}; + + for (let i = 0; i < patternParts.length; i++) { + const patternPart = patternParts[i]; + const pathPart = pathParts[i]; + + if (patternPart.startsWith(':')) { + params[patternPart.slice(1)] = pathPart; + } else if (patternPart !== pathPart) { + return null; + } + } + + return { params }; + } + + /** + * Handle WebSocket connection + */ + private handleWebSocketConnection(ws: WebSocket.WebSocket, req: http.IncomingMessage): void { + logger.info('WebSocket client connected', { url: req.url }); + + // Create session + const session: UserSession = { + userId: 'anonymous', // Would be set from auth + githubUsername: 'anonymous', + connectedAt: new Date(), + }; + this.sessions.set(ws, session); + + // Send initial state + this.sendInitialState(ws); + + // Handle messages + ws.on('message', (data) => { + try { + const message = JSON.parse(data.toString()); + this.handleWebSocketMessage(ws, session, message); + } catch (err) { + logger.error('WebSocket message error', { error: String(err) }); + } + }); + + ws.on('close', () => { + logger.info('WebSocket client disconnected'); + this.sessions.delete(ws); + }); + + ws.on('error', (err) => { + logger.error('WebSocket error', { error: String(err) }); + }); + } + + /** + * Send initial state to WebSocket client + */ + private sendInitialState(ws: WebSocket.WebSocket): void { + const workspaces = this.workspaceManager.getAll(); + const active = this.workspaceManager.getActive(); + const agents = this.agentManager.getAll(); + + this.sendToClient(ws, { + type: 'init', + data: { + workspaces, + activeWorkspaceId: active?.id, + agents, + }, + }); + } + + /** + * Handle WebSocket message from client + */ + private handleWebSocketMessage( + ws: WebSocket.WebSocket, + session: UserSession, + message: { type: string; data?: unknown } + ): void { + switch (message.type) { + case 'switch_workspace': + if (typeof message.data === 'string') { + try { + this.workspaceManager.switchTo(message.data); + session.activeWorkspaceId = message.data; + } catch (err) { + this.sendToClient(ws, { type: 'error', data: String(err) }); + } + } + break; + + case 'subscribe_output': + // Subscribe to agent output stream + // TODO: Implement output streaming + break; + + case 'ping': + this.sendToClient(ws, { type: 'pong' }); + break; + } + } + + /** + * Send message to WebSocket client + */ + private sendToClient(ws: WebSocket.WebSocket, message: unknown): void { + if (ws.readyState === WebSocket.OPEN) { + ws.send(JSON.stringify(message)); + } + } + + /** + * Broadcast event to all WebSocket clients + */ + private broadcastEvent(event: DaemonEvent): void { + if (!this.wss) return; + + const message = JSON.stringify({ type: 'event', data: event }); + + for (const ws of this.wss.clients) { + if (ws.readyState === WebSocket.OPEN) { + ws.send(message); + } + } + } +} diff --git a/src/daemon/index.ts b/src/daemon/index.ts index 818fb886d..a9c08059b 100644 --- a/src/daemon/index.ts +++ b/src/daemon/index.ts @@ -1,5 +1,12 @@ +// Core daemon infrastructure (per-project) export * from './server.js'; export * from './router.js'; export * from './connection.js'; export * from './agent-registry.js'; export * from './registry.js'; + +// Multi-workspace orchestrator (dashboard-first) +export * from './types.js'; +export * from './orchestrator.js'; +export * from './workspace-manager.js'; +export * from './agent-manager.js'; diff --git a/src/daemon/orchestrator.ts b/src/daemon/orchestrator.ts new file mode 100644 index 000000000..732d98353 --- /dev/null +++ b/src/daemon/orchestrator.ts @@ -0,0 +1,853 @@ +/** + * Daemon Orchestrator + * + * Manages multiple workspace daemons and provides a unified API for the dashboard. + * This is the top-level service that runs by default, handling workspace switching + * and agent management across all connected repositories. + */ + +import * as http from 'http'; +import * as path from 'path'; +import * as fs from 'fs'; +import { EventEmitter } from 'events'; +import { WebSocketServer, WebSocket } from 'ws'; +import { createLogger } from '../resiliency/logger.js'; +import { metrics } from '../resiliency/metrics.js'; +import { getSupervisor } from '../resiliency/supervisor.js'; +import { Daemon } from './server.js'; +import { AgentSpawner } from '../bridge/spawner.js'; +import { getProjectPaths } from '../utils/project-namespace.js'; +import type { + Workspace, + Agent, + DaemonEvent, + UserSession, + ProviderType, + AddWorkspaceRequest, + SpawnAgentRequest, +} from './types.js'; + +const logger = createLogger('orchestrator'); + +function generateId(): string { + return Math.random().toString(36).substring(2, 15); +} + +export interface OrchestratorConfig { + /** Port for HTTP/WebSocket API */ + port: number; + /** Host to bind to */ + host: string; + /** Data directory for persistence */ + dataDir: string; + /** Auto-start daemons for workspaces */ + autoStartDaemons: boolean; +} + +const DEFAULT_CONFIG: OrchestratorConfig = { + port: 3456, + host: 'localhost', + dataDir: path.join(process.env.HOME || '', '.agent-relay', 'orchestrator'), + autoStartDaemons: true, +}; + +interface ManagedWorkspace extends Workspace { + daemon?: Daemon; + spawner?: AgentSpawner; +} + +export class Orchestrator extends EventEmitter { + private config: OrchestratorConfig; + private workspaces = new Map(); + private activeWorkspaceId?: string; + private server?: http.Server; + private wss?: WebSocketServer; + private sessions = new Map(); + private supervisor = getSupervisor({ + autoRestart: true, + maxRestarts: 5, + contextPersistence: { enabled: true, autoInjectOnRestart: true }, + }); + private workspacesFile: string; + + constructor(config: Partial = {}) { + super(); + this.config = { ...DEFAULT_CONFIG, ...config }; + this.workspacesFile = path.join(this.config.dataDir, 'workspaces.json'); + + // Ensure data directory exists + if (!fs.existsSync(this.config.dataDir)) { + fs.mkdirSync(this.config.dataDir, { recursive: true }); + } + + // Load existing workspaces + this.loadWorkspaces(); + } + + /** + * Start the orchestrator + */ + async start(): Promise { + logger.info('Starting orchestrator', { + port: this.config.port, + host: this.config.host, + }); + + // Start supervisor + this.supervisor.start(); + + // Auto-start daemons for workspaces + if (this.config.autoStartDaemons) { + for (const [id, workspace] of this.workspaces) { + if (fs.existsSync(workspace.path)) { + await this.startWorkspaceDaemon(id); + } + } + } + + // Start HTTP server + this.server = http.createServer((req, res) => this.handleRequest(req, res)); + + // Setup WebSocket + this.wss = new WebSocketServer({ server: this.server }); + this.wss.on('connection', (ws, req) => this.handleWebSocket(ws, req)); + + return new Promise((resolve) => { + this.server!.listen(this.config.port, this.config.host, () => { + logger.info('Orchestrator started', { + url: `http://${this.config.host}:${this.config.port}`, + }); + resolve(); + }); + }); + } + + /** + * Stop the orchestrator + */ + async stop(): Promise { + logger.info('Stopping orchestrator'); + + // Stop all workspace daemons + for (const [id] of this.workspaces) { + await this.stopWorkspaceDaemon(id); + } + + // Stop supervisor + this.supervisor.stop(); + + // Close WebSocket connections + if (this.wss) { + for (const ws of this.wss.clients) { + ws.close(); + } + this.wss.close(); + } + + // Close HTTP server + if (this.server) { + return new Promise((resolve) => { + this.server!.close(() => { + logger.info('Orchestrator stopped'); + resolve(); + }); + }); + } + } + + // === Workspace Management === + + /** + * Add a workspace + */ + addWorkspace(request: AddWorkspaceRequest): Workspace { + const resolvedPath = this.resolvePath(request.path); + + // Check if already exists + const existing = this.findWorkspaceByPath(resolvedPath); + if (existing) { + return existing; + } + + // Validate path exists + if (!fs.existsSync(resolvedPath)) { + throw new Error(`Path does not exist: ${resolvedPath}`); + } + + const workspace: ManagedWorkspace = { + id: generateId(), + name: request.name || path.basename(resolvedPath), + path: resolvedPath, + status: 'inactive', + provider: request.provider || this.detectProvider(resolvedPath), + createdAt: new Date(), + lastActiveAt: new Date(), + ...this.getGitInfo(resolvedPath), + }; + + this.workspaces.set(workspace.id, workspace); + this.saveWorkspaces(); + + logger.info('Workspace added', { id: workspace.id, name: workspace.name }); + + this.broadcastEvent({ + type: 'workspace:added', + workspaceId: workspace.id, + data: this.toPublicWorkspace(workspace), + timestamp: new Date(), + }); + + // Auto-start daemon + if (this.config.autoStartDaemons) { + this.startWorkspaceDaemon(workspace.id).catch((err) => { + logger.error('Failed to start workspace daemon', { id: workspace.id, error: String(err) }); + }); + } + + return this.toPublicWorkspace(workspace); + } + + /** + * Remove a workspace + */ + async removeWorkspace(workspaceId: string): Promise { + const workspace = this.workspaces.get(workspaceId); + if (!workspace) return false; + + // Stop daemon if running + await this.stopWorkspaceDaemon(workspaceId); + + // Clear active if this was active + if (this.activeWorkspaceId === workspaceId) { + this.activeWorkspaceId = undefined; + } + + this.workspaces.delete(workspaceId); + this.saveWorkspaces(); + + logger.info('Workspace removed', { id: workspaceId }); + + this.broadcastEvent({ + type: 'workspace:removed', + workspaceId, + data: { id: workspaceId }, + timestamp: new Date(), + }); + + return true; + } + + /** + * Switch to a workspace + */ + async switchWorkspace(workspaceId: string): Promise { + const workspace = this.workspaces.get(workspaceId); + if (!workspace) { + throw new Error(`Workspace not found: ${workspaceId}`); + } + + const previousId = this.activeWorkspaceId; + + // Update status + if (previousId && previousId !== workspaceId) { + const prev = this.workspaces.get(previousId); + if (prev) { + prev.status = 'inactive'; + } + } + + workspace.status = 'active'; + workspace.lastActiveAt = new Date(); + this.activeWorkspaceId = workspaceId; + + // Ensure daemon is running + if (!workspace.daemon?.isRunning) { + await this.startWorkspaceDaemon(workspaceId); + } + + this.saveWorkspaces(); + + logger.info('Switched workspace', { id: workspaceId, name: workspace.name }); + + this.broadcastEvent({ + type: 'workspace:switched', + workspaceId, + data: { previousId, currentId: workspaceId }, + timestamp: new Date(), + }); + + return this.toPublicWorkspace(workspace); + } + + /** + * Get all workspaces + */ + getWorkspaces(): Workspace[] { + return Array.from(this.workspaces.values()).map((w) => this.toPublicWorkspace(w)); + } + + /** + * Get workspace by ID + */ + getWorkspace(workspaceId: string): Workspace | undefined { + const workspace = this.workspaces.get(workspaceId); + return workspace ? this.toPublicWorkspace(workspace) : undefined; + } + + /** + * Get active workspace + */ + getActiveWorkspace(): Workspace | undefined { + if (!this.activeWorkspaceId) return undefined; + return this.getWorkspace(this.activeWorkspaceId); + } + + // === Agent Management === + + /** + * Spawn an agent in a workspace + */ + async spawnAgent(workspaceId: string, request: SpawnAgentRequest): Promise { + const workspace = this.workspaces.get(workspaceId); + if (!workspace) { + throw new Error(`Workspace not found: ${workspaceId}`); + } + + // Ensure daemon is running + if (!workspace.daemon?.isRunning) { + await this.startWorkspaceDaemon(workspaceId); + } + + // Ensure spawner exists + if (!workspace.spawner) { + workspace.spawner = new AgentSpawner(workspace.path); + } + + const result = await workspace.spawner.spawn({ + name: request.name, + cli: this.getCliForProvider(request.provider || workspace.provider), + task: request.task || '', + }); + + if (!result.success) { + throw new Error(result.error || 'Failed to spawn agent'); + } + + const agent: Agent = { + id: generateId(), + name: request.name, + workspaceId, + provider: request.provider || workspace.provider, + status: 'running', + pid: result.pid, + task: request.task, + spawnedAt: new Date(), + restartCount: 0, + }; + + logger.info('Agent spawned', { id: agent.id, name: agent.name, workspaceId }); + + this.broadcastEvent({ + type: 'agent:spawned', + workspaceId, + agentId: agent.id, + data: agent, + timestamp: new Date(), + }); + + return agent; + } + + /** + * Stop an agent + */ + async stopAgent(workspaceId: string, agentName: string): Promise { + const workspace = this.workspaces.get(workspaceId); + if (!workspace?.spawner) return false; + + const released = await workspace.spawner.release(agentName); + + if (released) { + this.broadcastEvent({ + type: 'agent:stopped', + workspaceId, + data: { name: agentName }, + timestamp: new Date(), + }); + } + + return released; + } + + /** + * Get agents in a workspace + */ + getAgents(workspaceId: string): Agent[] { + const workspace = this.workspaces.get(workspaceId); + if (!workspace?.spawner) return []; + + return workspace.spawner.getActiveWorkers().map((w) => ({ + id: w.name, + name: w.name, + workspaceId, + provider: this.detectProviderFromCli(w.cli), + status: 'running' as const, + pid: w.pid, + task: w.task, + spawnedAt: new Date(w.spawnedAt), + restartCount: 0, + })); + } + + // === Private Methods === + + /** + * Start daemon for a workspace + */ + private async startWorkspaceDaemon(workspaceId: string): Promise { + const workspace = this.workspaces.get(workspaceId); + if (!workspace) return; + + if (workspace.daemon?.isRunning) return; + + try { + const paths = getProjectPaths(workspace.path); + + workspace.daemon = new Daemon({ + socketPath: paths.socketPath, + teamDir: paths.teamDir, + }); + + await workspace.daemon.start(); + workspace.status = 'active'; + + // Create spawner + workspace.spawner = new AgentSpawner(workspace.path); + + logger.info('Workspace daemon started', { id: workspaceId, socket: paths.socketPath }); + } catch (err) { + workspace.status = 'error'; + logger.error('Failed to start workspace daemon', { id: workspaceId, error: String(err) }); + throw err; + } + } + + /** + * Stop daemon for a workspace + */ + private async stopWorkspaceDaemon(workspaceId: string): Promise { + const workspace = this.workspaces.get(workspaceId); + if (!workspace) return; + + // Release all agents first + if (workspace.spawner) { + await workspace.spawner.releaseAll(); + } + + // Stop daemon + if (workspace.daemon) { + await workspace.daemon.stop(); + workspace.daemon = undefined; + } + + workspace.spawner = undefined; + workspace.status = 'inactive'; + + logger.info('Workspace daemon stopped', { id: workspaceId }); + } + + /** + * Handle HTTP request + */ + private async handleRequest(req: http.IncomingMessage, res: http.ServerResponse): Promise { + // CORS + res.setHeader('Access-Control-Allow-Origin', '*'); + res.setHeader('Access-Control-Allow-Methods', 'GET, POST, PUT, DELETE, OPTIONS'); + res.setHeader('Access-Control-Allow-Headers', 'Content-Type'); + + if (req.method === 'OPTIONS') { + res.writeHead(204); + res.end(); + return; + } + + const url = new URL(req.url || '/', `http://${req.headers.host}`); + const pathname = url.pathname; + const method = req.method || 'GET'; + + try { + let response: { status: number; body: unknown }; + + // Health check + if (pathname === '/' && method === 'GET') { + response = { status: 200, body: { status: 'ok', version: '1.0.0' } }; + } + // Metrics + else if (pathname === '/metrics' && method === 'GET') { + res.setHeader('Content-Type', 'text/plain'); + res.writeHead(200); + res.end(metrics.toPrometheus()); + return; + } + // List workspaces + else if (pathname === '/workspaces' && method === 'GET') { + response = { + status: 200, + body: { + workspaces: this.getWorkspaces(), + activeWorkspaceId: this.activeWorkspaceId, + }, + }; + } + // Add workspace + else if (pathname === '/workspaces' && method === 'POST') { + const body = await this.parseBody(req); + const workspace = this.addWorkspace(body as AddWorkspaceRequest); + response = { status: 201, body: workspace }; + } + // Get workspace + else if (pathname.match(/^\/workspaces\/[^/]+$/) && method === 'GET') { + const id = pathname.split('/')[2]; + const workspace = this.getWorkspace(id); + response = workspace + ? { status: 200, body: workspace } + : { status: 404, body: { error: 'Not found' } }; + } + // Delete workspace + else if (pathname.match(/^\/workspaces\/[^/]+$/) && method === 'DELETE') { + const id = pathname.split('/')[2]; + const removed = await this.removeWorkspace(id); + response = removed + ? { status: 204, body: null } + : { status: 404, body: { error: 'Not found' } }; + } + // Switch workspace + else if (pathname.match(/^\/workspaces\/[^/]+\/switch$/) && method === 'POST') { + const id = pathname.split('/')[2]; + const workspace = await this.switchWorkspace(id); + response = { status: 200, body: workspace }; + } + // List agents in workspace + else if (pathname.match(/^\/workspaces\/[^/]+\/agents$/) && method === 'GET') { + const id = pathname.split('/')[2]; + const agents = this.getAgents(id); + response = { status: 200, body: { agents, workspaceId: id } }; + } + // Spawn agent + else if (pathname.match(/^\/workspaces\/[^/]+\/agents$/) && method === 'POST') { + const id = pathname.split('/')[2]; + const body = await this.parseBody(req); + const agent = await this.spawnAgent(id, body as SpawnAgentRequest); + response = { status: 201, body: agent }; + } + // Stop agent + else if (pathname.match(/^\/workspaces\/[^/]+\/agents\/[^/]+$/) && method === 'DELETE') { + const parts = pathname.split('/'); + const workspaceId = parts[2]; + const agentName = parts[4]; + const stopped = await this.stopAgent(workspaceId, agentName); + response = stopped + ? { status: 204, body: null } + : { status: 404, body: { error: 'Not found' } }; + } + // Not found + else { + response = { status: 404, body: { error: 'Not found' } }; + } + + res.setHeader('Content-Type', 'application/json'); + res.writeHead(response.status); + res.end(response.body ? JSON.stringify(response.body) : ''); + } catch (err) { + logger.error('Request error', { error: String(err) }); + res.setHeader('Content-Type', 'application/json'); + res.writeHead(500); + res.end(JSON.stringify({ error: String(err) })); + } + } + + /** + * Handle WebSocket connection + */ + private handleWebSocket(ws: WebSocket, req: http.IncomingMessage): void { + logger.info('WebSocket client connected'); + + const session: UserSession = { + userId: 'anonymous', + githubUsername: 'anonymous', + connectedAt: new Date(), + activeWorkspaceId: this.activeWorkspaceId, + }; + this.sessions.set(ws, session); + + // Send initial state + this.sendToClient(ws, { + type: 'init', + data: { + workspaces: this.getWorkspaces(), + activeWorkspaceId: this.activeWorkspaceId, + agents: this.activeWorkspaceId ? this.getAgents(this.activeWorkspaceId) : [], + }, + }); + + ws.on('message', (data) => { + try { + const msg = JSON.parse(data.toString()); + this.handleWebSocketMessage(ws, session, msg); + } catch (err) { + logger.error('WebSocket message error', { error: String(err) }); + } + }); + + ws.on('close', () => { + this.sessions.delete(ws); + logger.info('WebSocket client disconnected'); + }); + } + + /** + * Handle WebSocket message + */ + private handleWebSocketMessage( + ws: WebSocket, + session: UserSession, + msg: { type: string; data?: unknown } + ): void { + switch (msg.type) { + case 'switch_workspace': + if (typeof msg.data === 'string') { + this.switchWorkspace(msg.data) + .then((workspace) => { + session.activeWorkspaceId = workspace.id; + }) + .catch((err) => { + this.sendToClient(ws, { type: 'error', data: String(err) }); + }); + } + break; + case 'ping': + this.sendToClient(ws, { type: 'pong' }); + break; + } + } + + /** + * Send to WebSocket client + */ + private sendToClient(ws: WebSocket, msg: unknown): void { + if (ws.readyState === WebSocket.OPEN) { + ws.send(JSON.stringify(msg)); + } + } + + /** + * Broadcast event to all clients + */ + private broadcastEvent(event: DaemonEvent): void { + if (!this.wss) return; + const msg = JSON.stringify({ type: 'event', data: event }); + for (const ws of this.wss.clients) { + if (ws.readyState === WebSocket.OPEN) { + ws.send(msg); + } + } + } + + /** + * Parse request body + */ + private parseBody(req: http.IncomingMessage): Promise { + return new Promise((resolve, reject) => { + let data = ''; + req.on('data', (chunk) => (data += chunk)); + req.on('end', () => { + try { + resolve(data ? JSON.parse(data) : {}); + } catch { + reject(new Error('Invalid JSON')); + } + }); + }); + } + + /** + * Load workspaces from disk + */ + private loadWorkspaces(): void { + if (!fs.existsSync(this.workspacesFile)) return; + try { + const data = JSON.parse(fs.readFileSync(this.workspacesFile, 'utf8')); + for (const w of data.workspaces || []) { + this.workspaces.set(w.id, { + ...w, + createdAt: new Date(w.createdAt), + lastActiveAt: new Date(w.lastActiveAt), + status: 'inactive', + }); + } + this.activeWorkspaceId = data.activeWorkspaceId; + logger.info('Loaded workspaces', { count: this.workspaces.size }); + } catch (err) { + logger.error('Failed to load workspaces', { error: String(err) }); + } + } + + /** + * Save workspaces to disk + */ + private saveWorkspaces(): void { + try { + const data = { + workspaces: Array.from(this.workspaces.values()).map((w) => this.toPublicWorkspace(w)), + activeWorkspaceId: this.activeWorkspaceId, + }; + fs.writeFileSync(this.workspacesFile, JSON.stringify(data, null, 2)); + } catch (err) { + logger.error('Failed to save workspaces', { error: String(err) }); + } + } + + /** + * Find workspace by path + */ + private findWorkspaceByPath(path: string): Workspace | undefined { + const resolved = this.resolvePath(path); + const workspace = Array.from(this.workspaces.values()).find((w) => w.path === resolved); + return workspace ? this.toPublicWorkspace(workspace) : undefined; + } + + /** + * Resolve path + */ + private resolvePath(p: string): string { + if (p.startsWith('~')) { + p = path.join(process.env.HOME || '', p.slice(1)); + } + return path.resolve(p); + } + + /** + * Detect provider from workspace + */ + private detectProvider(workspacePath: string): ProviderType { + if ( + fs.existsSync(path.join(workspacePath, 'CLAUDE.md')) || + fs.existsSync(path.join(workspacePath, '.claude')) + ) { + return 'claude'; + } + if (fs.existsSync(path.join(workspacePath, '.codex'))) { + return 'codex'; + } + if (fs.existsSync(path.join(workspacePath, '.gemini'))) { + return 'gemini'; + } + return 'generic'; + } + + /** + * Detect provider from CLI command + */ + private detectProviderFromCli(cli: string): ProviderType { + if (cli.includes('claude')) return 'claude'; + if (cli.includes('codex')) return 'codex'; + if (cli.includes('gemini')) return 'gemini'; + return 'generic'; + } + + /** + * Get CLI command for provider + */ + private getCliForProvider(provider: ProviderType): string { + switch (provider) { + case 'claude': + return 'claude'; + case 'codex': + return 'codex'; + case 'gemini': + return 'gemini'; + default: + return 'claude'; + } + } + + /** + * Get git info + */ + private getGitInfo(workspacePath: string): { gitRemote?: string; gitBranch?: string } { + try { + const { execSync } = require('child_process'); + const branch = execSync('git branch --show-current', { + cwd: workspacePath, + encoding: 'utf8', + stdio: ['pipe', 'pipe', 'pipe'], + }).trim(); + let remote: string | undefined; + try { + remote = execSync('git remote get-url origin', { + cwd: workspacePath, + encoding: 'utf8', + stdio: ['pipe', 'pipe', 'pipe'], + }).trim(); + } catch { + // No remote + } + return { gitRemote: remote, gitBranch: branch }; + } catch { + return {}; + } + } + + /** + * Convert to public workspace (without internal references) + */ + private toPublicWorkspace(w: ManagedWorkspace): Workspace { + return { + id: w.id, + name: w.name, + path: w.path, + status: w.status, + provider: w.provider, + createdAt: w.createdAt, + lastActiveAt: w.lastActiveAt, + cloudId: w.cloudId, + customDomain: w.customDomain, + gitRemote: w.gitRemote, + gitBranch: w.gitBranch, + }; + } +} + +let orchestratorInstance: Orchestrator | undefined; + +/** + * Start the orchestrator + */ +export async function startOrchestrator( + config: Partial = {} +): Promise { + if (orchestratorInstance) { + return orchestratorInstance; + } + + orchestratorInstance = new Orchestrator(config); + await orchestratorInstance.start(); + return orchestratorInstance; +} + +/** + * Stop the orchestrator + */ +export async function stopOrchestrator(): Promise { + if (orchestratorInstance) { + await orchestratorInstance.stop(); + orchestratorInstance = undefined; + } +} + +/** + * Get orchestrator instance + */ +export function getOrchestrator(): Orchestrator | undefined { + return orchestratorInstance; +} diff --git a/src/daemon/types.ts b/src/daemon/types.ts new file mode 100644 index 000000000..69e32ada7 --- /dev/null +++ b/src/daemon/types.ts @@ -0,0 +1,148 @@ +/** + * Daemon Types + * Core types for the agent-relay daemon + */ + +export type WorkspaceStatus = 'active' | 'inactive' | 'error'; +export type AgentStatus = 'running' | 'idle' | 'crashed' | 'restarting' | 'stopped'; +export type ProviderType = 'claude' | 'codex' | 'gemini' | 'generic'; + +/** + * Workspace represents a connected repository/project + */ +export interface Workspace { + id: string; + name: string; + path: string; + status: WorkspaceStatus; + provider: ProviderType; + createdAt: Date; + lastActiveAt: Date; + /** Cloud workspace ID if provisioned via cloud */ + cloudId?: string; + /** Custom domain if configured */ + customDomain?: string; + /** Git remote URL */ + gitRemote?: string; + /** Current branch */ + gitBranch?: string; +} + +/** + * Agent running within a workspace + */ +export interface Agent { + id: string; + name: string; + workspaceId: string; + provider: ProviderType; + status: AgentStatus; + pid?: number; + task?: string; + spawnedAt: Date; + lastHealthCheck?: Date; + restartCount: number; + logFile?: string; +} + +/** + * Message between agents or from dashboard + */ +export interface AgentMessage { + id: string; + from: string; + to: string; + workspaceId: string; + body: string; + timestamp: Date; + delivered: boolean; +} + +/** + * Real-time event for WebSocket updates + */ +export interface DaemonEvent { + type: + | 'workspace:added' + | 'workspace:removed' + | 'workspace:updated' + | 'workspace:switched' + | 'agent:spawned' + | 'agent:stopped' + | 'agent:crashed' + | 'agent:restarted' + | 'agent:output' + | 'message:received' + | 'message:sent'; + workspaceId?: string; + agentId?: string; + data: unknown; + timestamp: Date; +} + +/** + * Dashboard user session + */ +export interface UserSession { + userId: string; + githubUsername: string; + avatarUrl?: string; + activeWorkspaceId?: string; + connectedAt: Date; +} + +/** + * Daemon configuration + */ +export interface DaemonConfig { + /** Port for HTTP/WebSocket API */ + port: number; + /** Host to bind to */ + host: string; + /** Data directory for persistence */ + dataDir: string; + /** Enable auto-restart for crashed agents */ + autoRestart: boolean; + /** Max restart attempts */ + maxRestarts: number; + /** Health check interval in ms */ + healthCheckInterval: number; + /** Cloud API URL (if using cloud features) */ + cloudApiUrl?: string; + /** User's authentication token for cloud */ + cloudToken?: string; +} + +/** + * API request to spawn an agent + */ +export interface SpawnAgentRequest { + name: string; + provider?: ProviderType; + task?: string; +} + +/** + * API request to add a workspace + */ +export interface AddWorkspaceRequest { + path: string; + name?: string; + provider?: ProviderType; +} + +/** + * API response for workspace list + */ +export interface WorkspacesResponse { + workspaces: Workspace[]; + activeWorkspaceId?: string; +} + +/** + * API response for agents in a workspace + */ +export interface AgentsResponse { + agents: Agent[]; + workspaceId: string; +} diff --git a/src/daemon/workspace-manager.ts b/src/daemon/workspace-manager.ts new file mode 100644 index 000000000..2e76c2d90 --- /dev/null +++ b/src/daemon/workspace-manager.ts @@ -0,0 +1,344 @@ +/** + * Workspace Manager + * Manages multiple workspaces (repositories) and handles switching between them. + */ + +import * as fs from 'fs'; +import * as path from 'path'; +import { EventEmitter } from 'events'; +import { execSync } from 'child_process'; +import { createLogger } from '../resiliency/logger.js'; +import type { + Workspace, + WorkspaceStatus, + ProviderType, + DaemonEvent, + AddWorkspaceRequest, +} from './types.js'; + +const logger = createLogger('workspace-manager'); + +function generateId(): string { + return Math.random().toString(36).substring(2, 15); +} + +export class WorkspaceManager extends EventEmitter { + private workspaces = new Map(); + private activeWorkspaceId?: string; + private dataDir: string; + private workspacesFile: string; + + constructor(dataDir: string) { + super(); + this.dataDir = dataDir; + this.workspacesFile = path.join(dataDir, 'workspaces.json'); + + // Ensure data directory exists + if (!fs.existsSync(dataDir)) { + fs.mkdirSync(dataDir, { recursive: true }); + } + + // Load existing workspaces + this.loadWorkspaces(); + } + + /** + * Add a new workspace + */ + add(request: AddWorkspaceRequest): Workspace { + const resolvedPath = this.resolvePath(request.path); + + // Check if already exists + const existing = this.findByPath(resolvedPath); + if (existing) { + logger.info('Workspace already exists', { id: existing.id, path: resolvedPath }); + return existing; + } + + // Validate path exists + if (!fs.existsSync(resolvedPath)) { + throw new Error(`Path does not exist: ${resolvedPath}`); + } + + // Get git info + const gitInfo = this.getGitInfo(resolvedPath); + + const workspace: Workspace = { + id: generateId(), + name: request.name || path.basename(resolvedPath), + path: resolvedPath, + status: 'inactive', + provider: request.provider || this.detectProvider(resolvedPath), + createdAt: new Date(), + lastActiveAt: new Date(), + gitRemote: gitInfo.remote, + gitBranch: gitInfo.branch, + }; + + this.workspaces.set(workspace.id, workspace); + this.saveWorkspaces(); + + logger.info('Workspace added', { id: workspace.id, name: workspace.name, path: resolvedPath }); + + this.emitEvent({ + type: 'workspace:added', + workspaceId: workspace.id, + data: workspace, + timestamp: new Date(), + }); + + return workspace; + } + + /** + * Remove a workspace + */ + remove(workspaceId: string): boolean { + const workspace = this.workspaces.get(workspaceId); + if (!workspace) { + return false; + } + + // If this is the active workspace, deactivate first + if (this.activeWorkspaceId === workspaceId) { + this.activeWorkspaceId = undefined; + } + + this.workspaces.delete(workspaceId); + this.saveWorkspaces(); + + logger.info('Workspace removed', { id: workspaceId, name: workspace.name }); + + this.emitEvent({ + type: 'workspace:removed', + workspaceId, + data: { id: workspaceId, name: workspace.name }, + timestamp: new Date(), + }); + + return true; + } + + /** + * Switch to a workspace (set as active) + */ + switchTo(workspaceId: string): Workspace { + const workspace = this.workspaces.get(workspaceId); + if (!workspace) { + throw new Error(`Workspace not found: ${workspaceId}`); + } + + const previousId = this.activeWorkspaceId; + + // Deactivate previous workspace + if (previousId && previousId !== workspaceId) { + const prev = this.workspaces.get(previousId); + if (prev) { + prev.status = 'inactive'; + } + } + + // Activate new workspace + workspace.status = 'active'; + workspace.lastActiveAt = new Date(); + this.activeWorkspaceId = workspaceId; + + this.saveWorkspaces(); + + logger.info('Switched to workspace', { id: workspaceId, name: workspace.name }); + + this.emitEvent({ + type: 'workspace:switched', + workspaceId, + data: { previousId, currentId: workspaceId, workspace }, + timestamp: new Date(), + }); + + return workspace; + } + + /** + * Get a workspace by ID + */ + get(workspaceId: string): Workspace | undefined { + return this.workspaces.get(workspaceId); + } + + /** + * Get the active workspace + */ + getActive(): Workspace | undefined { + if (!this.activeWorkspaceId) return undefined; + return this.workspaces.get(this.activeWorkspaceId); + } + + /** + * Get all workspaces + */ + getAll(): Workspace[] { + return Array.from(this.workspaces.values()); + } + + /** + * Find workspace by path + */ + findByPath(workspacePath: string): Workspace | undefined { + const resolved = this.resolvePath(workspacePath); + return Array.from(this.workspaces.values()).find((w) => w.path === resolved); + } + + /** + * Update workspace status + */ + updateStatus(workspaceId: string, status: WorkspaceStatus): void { + const workspace = this.workspaces.get(workspaceId); + if (!workspace) return; + + workspace.status = status; + this.saveWorkspaces(); + + this.emitEvent({ + type: 'workspace:updated', + workspaceId, + data: { status }, + timestamp: new Date(), + }); + } + + /** + * Update workspace git info + */ + refreshGitInfo(workspaceId: string): void { + const workspace = this.workspaces.get(workspaceId); + if (!workspace) return; + + const gitInfo = this.getGitInfo(workspace.path); + workspace.gitRemote = gitInfo.remote; + workspace.gitBranch = gitInfo.branch; + this.saveWorkspaces(); + } + + /** + * Resolve path (expand ~ and make absolute) + */ + private resolvePath(p: string): string { + if (p.startsWith('~')) { + p = path.join(process.env.HOME || '', p.slice(1)); + } + return path.resolve(p); + } + + /** + * Detect provider from workspace files + */ + private detectProvider(workspacePath: string): ProviderType { + // Check for CLAUDE.md or .claude directory + if ( + fs.existsSync(path.join(workspacePath, 'CLAUDE.md')) || + fs.existsSync(path.join(workspacePath, '.claude')) + ) { + return 'claude'; + } + + // Check for .codex directory + if (fs.existsSync(path.join(workspacePath, '.codex'))) { + return 'codex'; + } + + // Check for .gemini directory + if (fs.existsSync(path.join(workspacePath, '.gemini'))) { + return 'gemini'; + } + + return 'generic'; + } + + /** + * Get git info for a workspace + */ + private getGitInfo(workspacePath: string): { remote?: string; branch?: string } { + try { + const branch = execSync('git branch --show-current', { + cwd: workspacePath, + encoding: 'utf8', + stdio: ['pipe', 'pipe', 'pipe'], + }).trim(); + + let remote: string | undefined; + try { + remote = execSync('git remote get-url origin', { + cwd: workspacePath, + encoding: 'utf8', + stdio: ['pipe', 'pipe', 'pipe'], + }).trim(); + } catch { + // No remote configured + } + + return { remote, branch }; + } catch { + // Not a git repo + return {}; + } + } + + /** + * Load workspaces from disk + */ + private loadWorkspaces(): void { + if (!fs.existsSync(this.workspacesFile)) { + return; + } + + try { + const data = JSON.parse(fs.readFileSync(this.workspacesFile, 'utf8')); + if (Array.isArray(data.workspaces)) { + for (const w of data.workspaces) { + this.workspaces.set(w.id, { + ...w, + createdAt: new Date(w.createdAt), + lastActiveAt: new Date(w.lastActiveAt), + status: 'inactive', // Reset status on load + }); + } + } + this.activeWorkspaceId = data.activeWorkspaceId; + + logger.info('Loaded workspaces', { count: this.workspaces.size }); + } catch (err) { + logger.error('Failed to load workspaces', { error: String(err) }); + } + } + + /** + * Save workspaces to disk + */ + private saveWorkspaces(): void { + try { + const data = { + workspaces: Array.from(this.workspaces.values()), + activeWorkspaceId: this.activeWorkspaceId, + }; + fs.writeFileSync(this.workspacesFile, JSON.stringify(data, null, 2)); + } catch (err) { + logger.error('Failed to save workspaces', { error: String(err) }); + } + } + + /** + * Emit a daemon event + */ + private emitEvent(event: DaemonEvent): void { + this.emit('event', event); + } +} + +let workspaceManagerInstance: WorkspaceManager | undefined; + +export function getWorkspaceManager(dataDir?: string): WorkspaceManager { + if (!workspaceManagerInstance) { + const dir = dataDir || path.join(process.env.HOME || '', '.agent-relay', 'daemon'); + workspaceManagerInstance = new WorkspaceManager(dir); + } + return workspaceManagerInstance; +} From 02c7a844731d6b072613c5f941ee5930d0e3b710 Mon Sep 17 00:00:00 2001 From: Claude Date: Tue, 30 Dec 2025 01:16:41 +0000 Subject: [PATCH 15/38] Add workspace switching UI components for dashboard New components for multi-workspace navigation: - WorkspaceSelector: Dropdown for switching between workspaces - AddWorkspaceModal: Modal for adding new repository paths - useOrchestrator hook: Connects to orchestrator API and WebSocket Features: - Real-time workspace/agent updates via WebSocket - Provider detection (Claude, Codex, Gemini) - Git branch display - Status indicators (active, inactive, error) --- .../react-components/AddWorkspaceModal.tsx | 278 +++++++++++++ .../react-components/WorkspaceSelector.tsx | 382 ++++++++++++++++++ src/dashboard/react-components/hooks/index.ts | 7 + .../react-components/hooks/useOrchestrator.ts | 353 ++++++++++++++++ src/dashboard/react-components/index.ts | 7 + 5 files changed, 1027 insertions(+) create mode 100644 src/dashboard/react-components/AddWorkspaceModal.tsx create mode 100644 src/dashboard/react-components/WorkspaceSelector.tsx create mode 100644 src/dashboard/react-components/hooks/useOrchestrator.ts diff --git a/src/dashboard/react-components/AddWorkspaceModal.tsx b/src/dashboard/react-components/AddWorkspaceModal.tsx new file mode 100644 index 000000000..ad1d657ae --- /dev/null +++ b/src/dashboard/react-components/AddWorkspaceModal.tsx @@ -0,0 +1,278 @@ +/** + * Add Workspace Modal + * + * Modal dialog for adding a new workspace (repository) to the orchestrator. + */ + +import React, { useState, useEffect, useRef } from 'react'; + +export interface AddWorkspaceModalProps { + isOpen: boolean; + onClose: () => void; + onAdd: (path: string, name?: string) => Promise; + isAdding?: boolean; + error?: string | null; +} + +export function AddWorkspaceModal({ + isOpen, + onClose, + onAdd, + isAdding = false, + error, +}: AddWorkspaceModalProps) { + const [path, setPath] = useState(''); + const [name, setName] = useState(''); + const [localError, setLocalError] = useState(null); + const inputRef = useRef(null); + + // Focus input when modal opens + useEffect(() => { + if (isOpen && inputRef.current) { + inputRef.current.focus(); + } + }, [isOpen]); + + // Reset form when modal closes + useEffect(() => { + if (!isOpen) { + setPath(''); + setName(''); + setLocalError(null); + } + }, [isOpen]); + + const handleSubmit = async (e: React.FormEvent) => { + e.preventDefault(); + + if (!path.trim()) { + setLocalError('Path is required'); + return; + } + + try { + await onAdd(path.trim(), name.trim() || undefined); + onClose(); + } catch (err) { + setLocalError(err instanceof Error ? err.message : 'Failed to add workspace'); + } + }; + + const handleKeyDown = (e: React.KeyboardEvent) => { + if (e.key === 'Escape') { + onClose(); + } + }; + + if (!isOpen) return null; + + const displayError = error || localError; + + return ( +
+
e.stopPropagation()}> +
+

Add Workspace

+ +
+ +
+
+ + { + setPath(e.target.value); + setLocalError(null); + }} + placeholder="/path/to/repository" + disabled={isAdding} + autoComplete="off" + /> +

+ Enter the full path to your repository. Use ~ for home directory. +

+
+ +
+ + setName(e.target.value)} + placeholder="My Project" + disabled={isAdding} + autoComplete="off" + /> +

+ A friendly name for this workspace. Defaults to the folder name. +

+
+ + {displayError &&
{displayError}
} + +
+ + +
+
+
+
+ ); +} + +function CloseIcon() { + return ( + + + + + ); +} + +export const addWorkspaceModalStyles = ` +.add-workspace-modal { + min-width: 450px; + max-width: 90vw; +} + +.modal-header { + display: flex; + align-items: center; + justify-content: space-between; + margin-bottom: 24px; +} + +.modal-header h2 { + margin: 0; + font-size: 18px; + font-weight: 600; + color: #e8e8e8; +} + +.modal-close { + background: transparent; + border: none; + color: #666; + cursor: pointer; + padding: 4px; + display: flex; + align-items: center; + justify-content: center; + border-radius: 4px; + transition: all 0.2s; +} + +.modal-close:hover { + background: rgba(255, 255, 255, 0.1); + color: #e8e8e8; +} + +.form-group { + margin-bottom: 20px; +} + +.form-group label { + display: block; + margin-bottom: 8px; + font-size: 13px; + font-weight: 500; + color: #e8e8e8; +} + +.form-group input { + width: 100%; + padding: 10px 12px; + background: #2a2a3e; + border: 1px solid #3a3a4e; + border-radius: 6px; + color: #e8e8e8; + font-size: 14px; + outline: none; + transition: border-color 0.2s; + box-sizing: border-box; +} + +.form-group input:focus { + border-color: #00c896; +} + +.form-group input::placeholder { + color: #666; +} + +.form-group input:disabled { + opacity: 0.6; + cursor: not-allowed; +} + +.form-hint { + margin-top: 6px; + font-size: 12px; + color: #666; + line-height: 1.4; +} + +.form-error { + padding: 10px 12px; + background: rgba(239, 68, 68, 0.1); + border: 1px solid rgba(239, 68, 68, 0.3); + border-radius: 6px; + color: #ef4444; + font-size: 13px; + margin-bottom: 20px; +} + +.modal-actions { + display: flex; + gap: 12px; + justify-content: flex-end; + margin-top: 24px; +} + +.btn-secondary, +.btn-primary { + padding: 10px 20px; + border-radius: 6px; + font-size: 14px; + font-weight: 500; + cursor: pointer; + transition: all 0.2s; +} + +.btn-secondary { + background: transparent; + border: 1px solid #3a3a4e; + color: #e8e8e8; +} + +.btn-secondary:hover:not(:disabled) { + background: rgba(255, 255, 255, 0.05); +} + +.btn-primary { + background: #00c896; + border: none; + color: #1a1a2e; +} + +.btn-primary:hover:not(:disabled) { + background: #00a87d; +} + +.btn-secondary:disabled, +.btn-primary:disabled { + opacity: 0.5; + cursor: not-allowed; +} +`; diff --git a/src/dashboard/react-components/WorkspaceSelector.tsx b/src/dashboard/react-components/WorkspaceSelector.tsx new file mode 100644 index 000000000..5e351cbf4 --- /dev/null +++ b/src/dashboard/react-components/WorkspaceSelector.tsx @@ -0,0 +1,382 @@ +/** + * Workspace Selector Component + * + * Dropdown/list for switching between workspaces (repositories). + * Connects to the orchestrator API for workspace management. + */ + +import React, { useState, useRef, useEffect } from 'react'; + +export interface Workspace { + id: string; + name: string; + path: string; + status: 'active' | 'inactive' | 'error'; + provider: 'claude' | 'codex' | 'gemini' | 'generic'; + gitBranch?: string; + gitRemote?: string; + lastActiveAt: Date; +} + +export interface WorkspaceSelectorProps { + workspaces: Workspace[]; + activeWorkspaceId?: string; + onSelect: (workspace: Workspace) => void; + onAddWorkspace: () => void; + isLoading?: boolean; +} + +export function WorkspaceSelector({ + workspaces, + activeWorkspaceId, + onSelect, + onAddWorkspace, + isLoading = false, +}: WorkspaceSelectorProps) { + const [isOpen, setIsOpen] = useState(false); + const dropdownRef = useRef(null); + + const activeWorkspace = workspaces.find((w) => w.id === activeWorkspaceId); + + // Close on outside click + useEffect(() => { + const handleClickOutside = (event: MouseEvent) => { + if (dropdownRef.current && !dropdownRef.current.contains(event.target as Node)) { + setIsOpen(false); + } + }; + + document.addEventListener('mousedown', handleClickOutside); + return () => document.removeEventListener('mousedown', handleClickOutside); + }, []); + + // Close on escape + useEffect(() => { + const handleEscape = (event: KeyboardEvent) => { + if (event.key === 'Escape') { + setIsOpen(false); + } + }; + + document.addEventListener('keydown', handleEscape); + return () => document.removeEventListener('keydown', handleEscape); + }, []); + + return ( +
+ + + {isOpen && ( +
+
+ {workspaces.length === 0 ? ( +
+ No workspaces added yet. +
+ Add a repository to get started. +
+ ) : ( + workspaces.map((workspace) => ( + + )) + )} +
+ +
+ +
+
+ )} +
+ ); +} + +function ProviderIcon({ provider }: { provider: string }) { + const icons: Record = { + claude: '🤖', + codex: '🧠', + gemini: '✨', + generic: '📁', + }; + + return ( + + {icons[provider] || icons.generic} + + ); +} + +function StatusIndicator({ status }: { status: string }) { + const colors: Record = { + active: '#22c55e', + inactive: '#6b7280', + error: '#ef4444', + }; + + return ( + + ); +} + +function ChevronIcon({ isOpen }: { isOpen: boolean }) { + return ( + + + + ); +} + +function BranchIcon() { + return ( + + + + + + + ); +} + +function PlusIcon() { + return ( + + + + + ); +} + +export const workspaceSelectorStyles = ` +.workspace-selector { + position: relative; + width: 100%; +} + +.workspace-trigger { + width: 100%; + display: flex; + align-items: center; + gap: 8px; + padding: 10px 12px; + background: #2a2a3e; + border: 1px solid #3a3a4e; + border-radius: 8px; + color: #e8e8e8; + font-size: 14px; + cursor: pointer; + transition: all 0.2s; +} + +.workspace-trigger:hover { + background: #3a3a4e; + border-color: #4a4a5e; +} + +.workspace-trigger:disabled { + opacity: 0.6; + cursor: not-allowed; +} + +.provider-icon { + font-size: 16px; +} + +.workspace-name { + flex: 1; + text-align: left; + font-weight: 500; +} + +.workspace-branch { + display: flex; + align-items: center; + gap: 4px; + font-size: 12px; + color: #888; + background: rgba(255, 255, 255, 0.05); + padding: 2px 6px; + border-radius: 4px; +} + +.workspace-placeholder { + flex: 1; + text-align: left; + color: #666; +} + +.workspace-loading { + flex: 1; + text-align: left; + color: #666; +} + +.chevron-icon { + color: #666; + transition: transform 0.2s; +} + +.chevron-icon.open { + transform: rotate(180deg); +} + +.workspace-dropdown { + position: absolute; + top: calc(100% + 4px); + left: 0; + right: 0; + background: #1a1a2e; + border: 1px solid #3a3a4e; + border-radius: 8px; + box-shadow: 0 10px 40px rgba(0, 0, 0, 0.4); + z-index: 1000; + overflow: hidden; +} + +.workspace-list { + max-height: 300px; + overflow-y: auto; +} + +.workspace-empty { + padding: 24px 16px; + text-align: center; + color: #666; + font-size: 13px; + line-height: 1.5; +} + +.workspace-item { + width: 100%; + display: flex; + align-items: center; + gap: 10px; + padding: 10px 12px; + background: transparent; + border: none; + color: #e8e8e8; + font-size: 14px; + cursor: pointer; + transition: background 0.15s; + text-align: left; +} + +.workspace-item:hover { + background: rgba(255, 255, 255, 0.05); +} + +.workspace-item.active { + background: rgba(0, 200, 150, 0.1); +} + +.workspace-item-info { + flex: 1; + display: flex; + flex-direction: column; + gap: 2px; + min-width: 0; +} + +.workspace-item-name { + font-weight: 500; +} + +.workspace-item-path { + font-size: 11px; + color: #666; + overflow: hidden; + text-overflow: ellipsis; + white-space: nowrap; +} + +.status-indicator { + width: 8px; + height: 8px; + border-radius: 50%; + flex-shrink: 0; +} + +.workspace-actions { + padding: 8px; + border-top: 1px solid #3a3a4e; +} + +.workspace-add-btn { + width: 100%; + display: flex; + align-items: center; + justify-content: center; + gap: 6px; + padding: 8px 12px; + background: transparent; + border: 1px dashed #3a3a4e; + border-radius: 6px; + color: #888; + font-size: 13px; + cursor: pointer; + transition: all 0.2s; +} + +.workspace-add-btn:hover { + background: rgba(255, 255, 255, 0.05); + border-color: #4a4a5e; + color: #e8e8e8; +} +`; diff --git a/src/dashboard/react-components/hooks/index.ts b/src/dashboard/react-components/hooks/index.ts index 9a7b517a2..9f644b51d 100644 --- a/src/dashboard/react-components/hooks/index.ts +++ b/src/dashboard/react-components/hooks/index.ts @@ -5,3 +5,10 @@ export { useWebSocket, type UseWebSocketOptions, type UseWebSocketReturn, type DashboardData } from './useWebSocket'; export { useAgents, type UseAgentsOptions, type UseAgentsReturn, type AgentWithColor } from './useAgents'; export { useMessages, type UseMessagesOptions, type UseMessagesReturn } from './useMessages'; +export { + useOrchestrator, + type UseOrchestratorOptions, + type UseOrchestratorResult, + type OrchestratorAgent, + type OrchestratorEvent, +} from './useOrchestrator'; diff --git a/src/dashboard/react-components/hooks/useOrchestrator.ts b/src/dashboard/react-components/hooks/useOrchestrator.ts new file mode 100644 index 000000000..95adf971d --- /dev/null +++ b/src/dashboard/react-components/hooks/useOrchestrator.ts @@ -0,0 +1,353 @@ +/** + * useOrchestrator Hook + * + * Connects to the daemon orchestrator for workspace and agent management. + * Provides real-time updates via WebSocket. + */ + +import { useState, useEffect, useCallback, useRef } from 'react'; +import type { Workspace } from '../WorkspaceSelector'; + +export interface OrchestratorAgent { + id: string; + name: string; + workspaceId: string; + provider: string; + status: 'running' | 'idle' | 'crashed' | 'restarting' | 'stopped'; + pid?: number; + task?: string; + spawnedAt: Date; + restartCount: number; +} + +export interface OrchestratorEvent { + type: string; + workspaceId?: string; + agentId?: string; + data: unknown; + timestamp: Date; +} + +export interface UseOrchestratorOptions { + /** Orchestrator API URL (default: http://localhost:3456) */ + apiUrl?: string; +} + +export interface UseOrchestratorResult { + /** All workspaces */ + workspaces: Workspace[]; + /** Currently active workspace ID */ + activeWorkspaceId?: string; + /** Active workspace agents */ + agents: OrchestratorAgent[]; + /** Connection status */ + isConnected: boolean; + /** Loading state */ + isLoading: boolean; + /** Error state */ + error: Error | null; + /** Switch to a workspace */ + switchWorkspace: (workspaceId: string) => Promise; + /** Add a new workspace */ + addWorkspace: (path: string, name?: string) => Promise; + /** Remove a workspace */ + removeWorkspace: (workspaceId: string) => Promise; + /** Spawn an agent */ + spawnAgent: (name: string, task?: string, provider?: string) => Promise; + /** Stop an agent */ + stopAgent: (agentName: string) => Promise; + /** Refresh data */ + refresh: () => Promise; +} + +export function useOrchestrator(options: UseOrchestratorOptions = {}): UseOrchestratorResult { + const { apiUrl = 'http://localhost:3456' } = options; + + const [workspaces, setWorkspaces] = useState([]); + const [activeWorkspaceId, setActiveWorkspaceId] = useState(); + const [agents, setAgents] = useState([]); + const [isConnected, setIsConnected] = useState(false); + const [isLoading, setIsLoading] = useState(true); + const [error, setError] = useState(null); + + const wsRef = useRef(null); + const reconnectTimeoutRef = useRef>(); + + // Convert API URL to WebSocket URL + const wsUrl = apiUrl.replace(/^http/, 'ws'); + + // Fetch initial data + const fetchData = useCallback(async () => { + try { + setIsLoading(true); + setError(null); + + const response = await fetch(`${apiUrl}/workspaces`); + if (!response.ok) { + throw new Error(`Failed to fetch workspaces: ${response.statusText}`); + } + + const data = await response.json(); + setWorkspaces( + data.workspaces.map((w: Workspace) => ({ + ...w, + lastActiveAt: new Date(w.lastActiveAt), + })) + ); + setActiveWorkspaceId(data.activeWorkspaceId); + + // Fetch agents for active workspace + if (data.activeWorkspaceId) { + const agentsResponse = await fetch(`${apiUrl}/workspaces/${data.activeWorkspaceId}/agents`); + if (agentsResponse.ok) { + const agentsData = await agentsResponse.json(); + setAgents( + agentsData.agents.map((a: OrchestratorAgent) => ({ + ...a, + spawnedAt: new Date(a.spawnedAt), + })) + ); + } + } + } catch (err) { + setError(err instanceof Error ? err : new Error(String(err))); + } finally { + setIsLoading(false); + } + }, [apiUrl]); + + // WebSocket connection + useEffect(() => { + const connect = () => { + try { + const ws = new WebSocket(wsUrl); + + ws.onopen = () => { + setIsConnected(true); + setError(null); + }; + + ws.onmessage = (event) => { + try { + const message = JSON.parse(event.data); + + if (message.type === 'init') { + // Initial state from server + setWorkspaces( + message.data.workspaces.map((w: Workspace) => ({ + ...w, + lastActiveAt: new Date(w.lastActiveAt), + })) + ); + setActiveWorkspaceId(message.data.activeWorkspaceId); + setAgents( + message.data.agents?.map((a: OrchestratorAgent) => ({ + ...a, + spawnedAt: new Date(a.spawnedAt), + })) || [] + ); + setIsLoading(false); + } else if (message.type === 'event') { + handleEvent(message.data as OrchestratorEvent); + } + } catch (err) { + console.error('Failed to parse WebSocket message:', err); + } + }; + + ws.onclose = () => { + setIsConnected(false); + wsRef.current = null; + + // Reconnect after delay + reconnectTimeoutRef.current = setTimeout(connect, 3000); + }; + + ws.onerror = (err) => { + console.error('WebSocket error:', err); + ws.close(); + }; + + wsRef.current = ws; + } catch (err) { + setError(err instanceof Error ? err : new Error(String(err))); + // Retry connection + reconnectTimeoutRef.current = setTimeout(connect, 3000); + } + }; + + // Start with HTTP fetch, then upgrade to WebSocket + fetchData().then(connect); + + return () => { + if (reconnectTimeoutRef.current) { + clearTimeout(reconnectTimeoutRef.current); + } + if (wsRef.current) { + wsRef.current.close(); + } + }; + }, [wsUrl, fetchData]); + + // Handle real-time events + const handleEvent = useCallback((event: OrchestratorEvent) => { + switch (event.type) { + case 'workspace:added': + setWorkspaces((prev) => [...prev, event.data as Workspace]); + break; + + case 'workspace:removed': + setWorkspaces((prev) => prev.filter((w) => w.id !== event.workspaceId)); + break; + + case 'workspace:updated': + setWorkspaces((prev) => + prev.map((w) => + w.id === event.workspaceId ? { ...w, ...(event.data as Partial) } : w + ) + ); + break; + + case 'workspace:switched': + setActiveWorkspaceId((event.data as { currentId: string }).currentId); + break; + + case 'agent:spawned': + setAgents((prev) => [...prev, event.data as OrchestratorAgent]); + break; + + case 'agent:stopped': + case 'agent:crashed': + setAgents((prev) => prev.filter((a) => a.name !== (event.data as { name: string }).name)); + break; + + case 'agent:restarted': + setAgents((prev) => + prev.map((a) => + a.name === (event.data as { name: string }).name + ? { ...a, status: 'running' as const, restartCount: a.restartCount + 1 } + : a + ) + ); + break; + } + }, []); + + // Switch workspace + const switchWorkspace = useCallback( + async (workspaceId: string) => { + const response = await fetch(`${apiUrl}/workspaces/${workspaceId}/switch`, { + method: 'POST', + }); + + if (!response.ok) { + throw new Error(`Failed to switch workspace: ${response.statusText}`); + } + + // Fetch agents for new workspace + const agentsResponse = await fetch(`${apiUrl}/workspaces/${workspaceId}/agents`); + if (agentsResponse.ok) { + const agentsData = await agentsResponse.json(); + setAgents( + agentsData.agents.map((a: OrchestratorAgent) => ({ + ...a, + spawnedAt: new Date(a.spawnedAt), + })) + ); + } + }, + [apiUrl] + ); + + // Add workspace + const addWorkspace = useCallback( + async (path: string, name?: string): Promise => { + const response = await fetch(`${apiUrl}/workspaces`, { + method: 'POST', + headers: { 'Content-Type': 'application/json' }, + body: JSON.stringify({ path, name }), + }); + + if (!response.ok) { + const error = await response.json(); + throw new Error(error.error || 'Failed to add workspace'); + } + + return response.json(); + }, + [apiUrl] + ); + + // Remove workspace + const removeWorkspace = useCallback( + async (workspaceId: string) => { + const response = await fetch(`${apiUrl}/workspaces/${workspaceId}`, { + method: 'DELETE', + }); + + if (!response.ok) { + throw new Error(`Failed to remove workspace: ${response.statusText}`); + } + }, + [apiUrl] + ); + + // Spawn agent + const spawnAgent = useCallback( + async (name: string, task?: string, provider?: string): Promise => { + if (!activeWorkspaceId) { + throw new Error('No active workspace'); + } + + const response = await fetch(`${apiUrl}/workspaces/${activeWorkspaceId}/agents`, { + method: 'POST', + headers: { 'Content-Type': 'application/json' }, + body: JSON.stringify({ name, task, provider }), + }); + + if (!response.ok) { + const error = await response.json(); + throw new Error(error.error || 'Failed to spawn agent'); + } + + return response.json(); + }, + [apiUrl, activeWorkspaceId] + ); + + // Stop agent + const stopAgent = useCallback( + async (agentName: string) => { + if (!activeWorkspaceId) { + throw new Error('No active workspace'); + } + + const response = await fetch( + `${apiUrl}/workspaces/${activeWorkspaceId}/agents/${agentName}`, + { + method: 'DELETE', + } + ); + + if (!response.ok) { + throw new Error(`Failed to stop agent: ${response.statusText}`); + } + }, + [apiUrl, activeWorkspaceId] + ); + + return { + workspaces, + activeWorkspaceId, + agents, + isConnected, + isLoading, + error, + switchWorkspace, + addWorkspace, + removeWorkspace, + spawnAgent, + stopAgent, + refresh: fetchData, + }; +} diff --git a/src/dashboard/react-components/index.ts b/src/dashboard/react-components/index.ts index 687908c60..e7de91e9f 100644 --- a/src/dashboard/react-components/index.ts +++ b/src/dashboard/react-components/index.ts @@ -22,6 +22,8 @@ export { NotificationToast, notificationToastStyles, useToasts, type Notificatio export { ThemeProvider, ThemeToggle, themeStyles, themeToggleStyles, useTheme, type ThemeProviderProps, type Theme, type ResolvedTheme } from './ThemeProvider'; export { App, appStyles, type AppProps } from './App'; export { MentionAutocomplete, mentionAutocompleteStyles, useMentionAutocomplete, getMentionQuery, completeMentionInValue, type MentionAutocompleteProps } from './MentionAutocomplete'; +export { WorkspaceSelector, workspaceSelectorStyles, type WorkspaceSelectorProps, type Workspace } from './WorkspaceSelector'; +export { AddWorkspaceModal, addWorkspaceModalStyles, type AddWorkspaceModalProps } from './AddWorkspaceModal'; // Layout Components export { Sidebar, sidebarStyles, type SidebarProps } from './layout/Sidebar'; @@ -32,14 +34,19 @@ export { useWebSocket, useAgents, useMessages, + useOrchestrator, type UseWebSocketOptions, type UseWebSocketReturn, type UseAgentsOptions, type UseAgentsReturn, type UseMessagesOptions, type UseMessagesReturn, + type UseOrchestratorOptions, + type UseOrchestratorResult, type DashboardData, type AgentWithColor, + type OrchestratorAgent, + type OrchestratorEvent, } from './hooks'; // Combined styles for easy import From b0b0b8cfe73e3ce389a65b92ffa27d3f5e0f6324 Mon Sep 17 00:00:00 2001 From: Claude Date: Tue, 30 Dec 2025 01:28:27 +0000 Subject: [PATCH 16/38] Wire up WorkspaceSelector and orchestrator in main App component Integrates multi-workspace support into the dashboard: - Connect useOrchestrator hook for workspace/agent management - Add WorkspaceSelector dropdown in sidebar for switching projects - Add AddWorkspaceModal for adding new repositories - Convert workspaces to projects for unified navigation - Update spawn/release handlers to use orchestrator when available --- src/dashboard/react-components/App.tsx | 214 +++++++++++++++++++++---- 1 file changed, 182 insertions(+), 32 deletions(-) diff --git a/src/dashboard/react-components/App.tsx b/src/dashboard/react-components/App.tsx index b814fd309..ccec1a06f 100644 --- a/src/dashboard/react-components/App.tsx +++ b/src/dashboard/react-components/App.tsx @@ -14,24 +14,44 @@ import { CommandPalette } from './CommandPalette'; import { SpawnModal, type SpawnConfig } from './SpawnModal'; import { SettingsPanel, defaultSettings, type Settings } from './SettingsPanel'; import { MentionAutocomplete, getMentionQuery, completeMentionInValue } from './MentionAutocomplete'; +import { WorkspaceSelector, type Workspace } from './WorkspaceSelector'; +import { AddWorkspaceModal } from './AddWorkspaceModal'; import { useWebSocket } from './hooks/useWebSocket'; import { useAgents } from './hooks/useAgents'; import { useMessages } from './hooks/useMessages'; +import { useOrchestrator } from './hooks/useOrchestrator'; import { api } from '../lib/api'; export interface AppProps { /** Initial WebSocket URL (optional, defaults to current host) */ wsUrl?: string; + /** Orchestrator API URL (optional, defaults to localhost:3456) */ + orchestratorUrl?: string; } -export function App({ wsUrl }: AppProps) { - // WebSocket connection for real-time data +export function App({ wsUrl, orchestratorUrl }: AppProps) { + // WebSocket connection for real-time data (per-project daemon) const { data, isConnected, error: wsError } = useWebSocket({ url: wsUrl }); + // Orchestrator for multi-workspace management + const { + workspaces, + activeWorkspaceId, + agents: orchestratorAgents, + isConnected: isOrchestratorConnected, + isLoading: isOrchestratorLoading, + error: orchestratorError, + switchWorkspace, + addWorkspace, + removeWorkspace, + spawnAgent: orchestratorSpawnAgent, + stopAgent: orchestratorStopAgent, + } = useOrchestrator({ apiUrl: orchestratorUrl }); + // View mode state const [viewMode, setViewMode] = useState<'local' | 'fleet'>('local'); - // Project state for unified navigation + // Project state for unified navigation (converted from workspaces) const [projects, setProjects] = useState([]); const [currentProject, setCurrentProject] = useState(); @@ -40,6 +60,11 @@ export function App({ wsUrl }: AppProps) { const [isSpawning, setIsSpawning] = useState(false); const [spawnError, setSpawnError] = useState(null); + // Add workspace modal state + const [isAddWorkspaceOpen, setIsAddWorkspaceOpen] = useState(false); + const [isAddingWorkspace, setIsAddingWorkspace] = useState(false); + const [addWorkspaceError, setAddWorkspaceError] = useState(null); + // Command palette state const [isCommandPaletteOpen, setIsCommandPaletteOpen] = useState(false); @@ -87,45 +112,98 @@ export function App({ wsUrl }: AppProps) { }); // Check if fleet view is available - const isFleetAvailable = Boolean(data?.fleet?.servers?.length); + const isFleetAvailable = Boolean(data?.fleet?.servers?.length) || workspaces.length > 0; - // Fetch bridge/project data when fleet is available + // Convert workspaces to projects for unified navigation useEffect(() => { - if (!isFleetAvailable) return; + if (workspaces.length > 0) { + // Convert workspaces to projects + const projectList: Project[] = workspaces.map((workspace) => ({ + id: workspace.id, + path: workspace.path, + name: workspace.name, + agents: orchestratorAgents + .filter((a) => a.workspaceId === workspace.id) + .map((a) => ({ + name: a.name, + status: a.status === 'running' ? 'online' : 'offline', + isSpawned: true, + cli: a.provider, + })) as Agent[], + lead: undefined, + })); + setProjects(projectList); + setCurrentProject(activeWorkspaceId); + } + }, [workspaces, orchestratorAgents, activeWorkspaceId]); + + // Fallback: Fetch bridge/project data when fleet is available (legacy) + useEffect(() => { + if (workspaces.length > 0) return; // Skip if using orchestrator + if (!data?.fleet?.servers?.length) return; const fetchProjects = async () => { const result = await api.getBridgeData(); if (result.success && result.data) { - // Destructure to avoid non-null assertion in closure const { servers, agents } = result.data; - // Convert fleet servers to projects const projectList: Project[] = servers.map((server) => ({ id: server.id, path: server.url, name: server.name || server.url.split('/').pop(), agents: agents.filter((a) => a.server === server.id), - lead: undefined, // Could be enhanced to detect lead agent + lead: undefined, })); setProjects(projectList); } }; fetchProjects(); - // Refresh periodically const interval = setInterval(fetchProjects, 30000); return () => clearInterval(interval); - }, [isFleetAvailable]); + }, [data?.fleet?.servers?.length, workspaces.length]); + + // Handle workspace selection + const handleWorkspaceSelect = useCallback(async (workspace: Workspace) => { + try { + await switchWorkspace(workspace.id); + } catch (err) { + console.error('Failed to switch workspace:', err); + } + }, [switchWorkspace]); + + // Handle add workspace + const handleAddWorkspace = useCallback(async (path: string, name?: string) => { + setIsAddingWorkspace(true); + setAddWorkspaceError(null); + try { + await addWorkspace(path, name); + setIsAddWorkspaceOpen(false); + } catch (err) { + setAddWorkspaceError(err instanceof Error ? err.message : 'Failed to add workspace'); + throw err; + } finally { + setIsAddingWorkspace(false); + } + }, [addWorkspace]); - // Handle project selection + // Handle project selection (also switches workspace if using orchestrator) const handleProjectSelect = useCallback((project: Project) => { setCurrentProject(project.id); + + // Switch workspace if using orchestrator + if (workspaces.length > 0) { + switchWorkspace(project.id).catch((err) => { + console.error('Failed to switch workspace:', err); + }); + } + // Optionally navigate to project's first agent or general channel if (project.agents.length > 0) { selectAgent(project.agents[0].name); setCurrentChannel(project.agents[0].name); } closeSidebarOnMobile(); - }, [selectAgent, setCurrentChannel, closeSidebarOnMobile]); + }, [selectAgent, setCurrentChannel, closeSidebarOnMobile, workspaces.length, switchWorkspace]); // Handle agent selection const handleAgentSelect = useCallback((agent: Agent) => { @@ -150,6 +228,13 @@ export function App({ wsUrl }: AppProps) { setIsSpawning(true); setSpawnError(null); try { + // Use orchestrator if workspaces are available + if (workspaces.length > 0 && activeWorkspaceId) { + await orchestratorSpawnAgent(config.name, config.task, config.command); + return true; + } + + // Fallback to legacy API const result = await api.spawnAgent({ name: config.name, cli: config.command, team: config.team }); if (!result.success) { setSpawnError(result.error || 'Failed to spawn agent'); @@ -162,7 +247,7 @@ export function App({ wsUrl }: AppProps) { } finally { setIsSpawning(false); } - }, []); + }, [workspaces.length, activeWorkspaceId, orchestratorSpawnAgent]); // Handle release/kill agent const handleReleaseAgent = useCallback(async (agent: Agent) => { @@ -172,6 +257,13 @@ export function App({ wsUrl }: AppProps) { if (!confirmed) return; try { + // Use orchestrator if workspaces are available + if (workspaces.length > 0 && activeWorkspaceId) { + await orchestratorStopAgent(agent.name); + return; + } + + // Fallback to legacy API const result = await api.releaseAgent(agent.name); if (!result.success) { console.error('Failed to release agent:', result.error); @@ -179,7 +271,7 @@ export function App({ wsUrl }: AppProps) { } catch (err) { console.error('Failed to release agent:', err); } - }, []); + }, [workspaces.length, activeWorkspaceId, orchestratorStopAgent]); // Handle command palette const handleCommandPaletteOpen = useCallback(() => { @@ -248,23 +340,37 @@ export function App({ wsUrl }: AppProps) { onClick={() => setIsSidebarOpen(false)} /> - {/* Sidebar */} - setIsSidebarOpen(false)} - /> + {/* Sidebar with Workspace Selector */} +
+ {/* Workspace Selector */} +
+ setIsAddWorkspaceOpen(true)} + isLoading={isOrchestratorLoading} + /> +
+ + {/* Sidebar */} + setIsSidebarOpen(false)} + /> +
{/* Main Content */}
@@ -351,6 +457,18 @@ export function App({ wsUrl }: AppProps) { onSettingsChange={setSettings} onResetSettings={() => setSettings(defaultSettings)} /> + + {/* Add Workspace Modal */} + { + setIsAddWorkspaceOpen(false); + setAddWorkspaceError(null); + }} + onAdd={handleAddWorkspace} + isAdding={isAddingWorkspace} + error={addWorkspaceError} + />
); } @@ -527,6 +645,38 @@ export const appStyles = ` background: #1a1d21; } +.sidebar-container { + display: flex; + flex-direction: column; + width: 280px; + height: 100vh; + background: #1a1a2e; + border-right: 1px solid #2a2a3e; +} + +.workspace-selector-container { + padding: 12px; + border-bottom: 1px solid #2a2a3e; +} + +.sidebar-container .sidebar { + width: 100%; + border-right: none; +} + +@media (max-width: 768px) { + .sidebar-container { + position: fixed; + left: -280px; + z-index: 1000; + transition: left 0.3s ease; + } + + .sidebar-container.open { + left: 0; + } +} + .dashboard-main { flex: 1; display: flex; From af1af1b1ae916b94e4e7a3f23f7b21639801a18b Mon Sep 17 00:00:00 2001 From: Claude Date: Tue, 30 Dec 2025 01:36:45 +0000 Subject: [PATCH 17/38] Add Stripe billing integration for subscription management Implements complete billing system for Agent Relay Cloud: - Billing types and plan definitions (Free, Pro, Team, Enterprise) - Stripe service for customer, subscription, and payment management - Billing API endpoints (checkout, portal, webhooks, invoices) - PricingPlans component with monthly/yearly toggle - BillingPanel for subscription overview and management - Usage tracking and plan limit comparisons --- src/cloud/api/billing.ts | 448 +++++++++ src/cloud/billing/index.ts | 9 + src/cloud/billing/plans.ts | 245 +++++ src/cloud/billing/service.ts | 482 +++++++++ src/cloud/billing/types.ts | 168 ++++ src/cloud/config.ts | 29 + src/cloud/index.ts | 3 + src/cloud/server.ts | 2 + .../react-components/BillingPanel.tsx | 922 ++++++++++++++++++ .../react-components/PricingPlans.tsx | 386 ++++++++ src/dashboard/react-components/index.ts | 2 + 11 files changed, 2696 insertions(+) create mode 100644 src/cloud/api/billing.ts create mode 100644 src/cloud/billing/index.ts create mode 100644 src/cloud/billing/plans.ts create mode 100644 src/cloud/billing/service.ts create mode 100644 src/cloud/billing/types.ts create mode 100644 src/dashboard/react-components/BillingPanel.tsx create mode 100644 src/dashboard/react-components/PricingPlans.tsx diff --git a/src/cloud/api/billing.ts b/src/cloud/api/billing.ts new file mode 100644 index 000000000..a2be1e04e --- /dev/null +++ b/src/cloud/api/billing.ts @@ -0,0 +1,448 @@ +/** + * Agent Relay Cloud - Billing API + * + * REST API for subscription and billing management. + */ + +import { Router, Request, Response, NextFunction } from 'express'; +import { getBillingService, getAllPlans, getPlan, comparePlans } from '../billing'; +import type { SubscriptionTier } from '../billing/types'; +import { getConfig } from '../config'; + +// Extend express session with user info +declare module 'express-session' { + interface SessionData { + user?: { + id: string; + email: string; + name?: string; + stripeCustomerId?: string; + }; + } +} + +export const billingRouter = Router(); + +/** + * Middleware to require authentication + */ +function requireAuth(req: Request, res: Response, next: NextFunction) { + if (!req.session?.user) { + res.status(401).json({ error: 'Authentication required' }); + return; + } + next(); +} + +/** + * GET /api/billing/plans + * Get all available billing plans + */ +billingRouter.get('/plans', (req, res) => { + const plans = getAllPlans(); + + // Add publishable key for frontend + const config = getConfig(); + + res.json({ + plans, + publishableKey: config.stripe.publishableKey, + }); +}); + +/** + * GET /api/billing/plans/:tier + * Get a specific plan by tier + */ +billingRouter.get('/plans/:tier', (req, res) => { + const { tier } = req.params; + + try { + const plan = getPlan(tier as SubscriptionTier); + res.json({ plan }); + } catch { + res.status(404).json({ error: 'Plan not found' }); + } +}); + +/** + * GET /api/billing/compare + * Compare two plans + */ +billingRouter.get('/compare', (req, res) => { + const { from, to } = req.query; + + if (!from || !to) { + res.status(400).json({ error: 'Missing from or to parameter' }); + return; + } + + try { + const comparison = comparePlans(from as SubscriptionTier, to as SubscriptionTier); + res.json({ comparison }); + } catch { + res.status(400).json({ error: 'Invalid plan tier' }); + } +}); + +/** + * GET /api/billing/subscription + * Get current user's subscription status + */ +billingRouter.get('/subscription', requireAuth, async (req, res) => { + const user = req.session!.user!; + const billing = getBillingService(); + + try { + // Get or create Stripe customer + const customerId = user.stripeCustomerId || + await billing.getOrCreateCustomer(user.id, user.email, user.name); + + // Save customer ID to session if newly created + if (!user.stripeCustomerId) { + req.session!.user!.stripeCustomerId = customerId; + } + + // Get customer details + const customer = await billing.getCustomer(customerId); + + if (!customer) { + res.json({ + tier: 'free', + subscription: null, + customer: null, + }); + return; + } + + res.json({ + tier: customer.subscription?.tier || 'free', + subscription: customer.subscription, + customer: { + id: customer.id, + email: customer.email, + name: customer.name, + paymentMethods: customer.paymentMethods, + invoices: customer.invoices, + }, + }); + } catch (error) { + console.error('Failed to get subscription:', error); + res.status(500).json({ error: 'Failed to get subscription status' }); + } +}); + +/** + * POST /api/billing/checkout + * Create a checkout session for subscription + */ +billingRouter.post('/checkout', requireAuth, async (req, res) => { + const user = req.session!.user!; + const { tier, interval = 'month' } = req.body; + + if (!tier || !['pro', 'team', 'enterprise'].includes(tier)) { + res.status(400).json({ error: 'Invalid tier' }); + return; + } + + if (!['month', 'year'].includes(interval)) { + res.status(400).json({ error: 'Invalid billing interval' }); + return; + } + + const billing = getBillingService(); + const config = getConfig(); + + try { + // Get or create customer + const customerId = user.stripeCustomerId || + await billing.getOrCreateCustomer(user.id, user.email, user.name); + + // Save customer ID to session + if (!user.stripeCustomerId) { + req.session!.user!.stripeCustomerId = customerId; + } + + // Create checkout session + const session = await billing.createCheckoutSession( + customerId, + tier as SubscriptionTier, + interval as 'month' | 'year', + `${config.publicUrl}/billing/success?session_id={CHECKOUT_SESSION_ID}`, + `${config.publicUrl}/billing/canceled` + ); + + res.json(session); + } catch (error) { + console.error('Failed to create checkout session:', error); + res.status(500).json({ error: 'Failed to create checkout session' }); + } +}); + +/** + * POST /api/billing/portal + * Create a billing portal session for managing subscription + */ +billingRouter.post('/portal', requireAuth, async (req, res) => { + const user = req.session!.user!; + + if (!user.stripeCustomerId) { + res.status(400).json({ error: 'No billing account found' }); + return; + } + + const billing = getBillingService(); + const config = getConfig(); + + try { + const session = await billing.createPortalSession( + user.stripeCustomerId, + `${config.publicUrl}/billing` + ); + + res.json(session); + } catch (error) { + console.error('Failed to create portal session:', error); + res.status(500).json({ error: 'Failed to create billing portal' }); + } +}); + +/** + * POST /api/billing/change + * Change subscription tier + */ +billingRouter.post('/change', requireAuth, async (req, res) => { + const user = req.session!.user!; + const { tier, interval = 'month' } = req.body; + + if (!tier || !['free', 'pro', 'team', 'enterprise'].includes(tier)) { + res.status(400).json({ error: 'Invalid tier' }); + return; + } + + if (!user.stripeCustomerId) { + res.status(400).json({ error: 'No billing account found' }); + return; + } + + const billing = getBillingService(); + + try { + // Get current subscription + const customer = await billing.getCustomer(user.stripeCustomerId); + + if (!customer?.subscription) { + res.status(400).json({ error: 'No active subscription' }); + return; + } + + // Handle downgrade to free (cancel) + if (tier === 'free') { + const subscription = await billing.cancelSubscription( + customer.subscription.stripeSubscriptionId + ); + res.json({ subscription, message: 'Subscription will be canceled at period end' }); + return; + } + + // Change subscription + const subscription = await billing.changeSubscription( + customer.subscription.stripeSubscriptionId, + tier as SubscriptionTier, + interval as 'month' | 'year' + ); + + res.json({ subscription }); + } catch (error) { + console.error('Failed to change subscription:', error); + res.status(500).json({ error: 'Failed to change subscription' }); + } +}); + +/** + * POST /api/billing/cancel + * Cancel subscription at period end + */ +billingRouter.post('/cancel', requireAuth, async (req, res) => { + const user = req.session!.user!; + + if (!user.stripeCustomerId) { + res.status(400).json({ error: 'No billing account found' }); + return; + } + + const billing = getBillingService(); + + try { + const customer = await billing.getCustomer(user.stripeCustomerId); + + if (!customer?.subscription) { + res.status(400).json({ error: 'No active subscription' }); + return; + } + + const subscription = await billing.cancelSubscription( + customer.subscription.stripeSubscriptionId + ); + + res.json({ + subscription, + message: `Subscription will be canceled on ${subscription.currentPeriodEnd.toLocaleDateString()}`, + }); + } catch (error) { + console.error('Failed to cancel subscription:', error); + res.status(500).json({ error: 'Failed to cancel subscription' }); + } +}); + +/** + * POST /api/billing/resume + * Resume a canceled subscription + */ +billingRouter.post('/resume', requireAuth, async (req, res) => { + const user = req.session!.user!; + + if (!user.stripeCustomerId) { + res.status(400).json({ error: 'No billing account found' }); + return; + } + + const billing = getBillingService(); + + try { + const customer = await billing.getCustomer(user.stripeCustomerId); + + if (!customer?.subscription) { + res.status(400).json({ error: 'No subscription to resume' }); + return; + } + + if (!customer.subscription.cancelAtPeriodEnd) { + res.status(400).json({ error: 'Subscription is not set to cancel' }); + return; + } + + const subscription = await billing.resumeSubscription( + customer.subscription.stripeSubscriptionId + ); + + res.json({ subscription, message: 'Subscription resumed' }); + } catch (error) { + console.error('Failed to resume subscription:', error); + res.status(500).json({ error: 'Failed to resume subscription' }); + } +}); + +/** + * GET /api/billing/invoices + * Get user's invoices + */ +billingRouter.get('/invoices', requireAuth, async (req, res) => { + const user = req.session!.user!; + + if (!user.stripeCustomerId) { + res.json({ invoices: [] }); + return; + } + + const billing = getBillingService(); + + try { + const customer = await billing.getCustomer(user.stripeCustomerId); + res.json({ invoices: customer?.invoices || [] }); + } catch (error) { + console.error('Failed to get invoices:', error); + res.status(500).json({ error: 'Failed to get invoices' }); + } +}); + +/** + * GET /api/billing/upcoming + * Get upcoming invoice preview + */ +billingRouter.get('/upcoming', requireAuth, async (req, res) => { + const user = req.session!.user!; + + if (!user.stripeCustomerId) { + res.json({ invoice: null }); + return; + } + + const billing = getBillingService(); + + try { + const invoice = await billing.getUpcomingInvoice(user.stripeCustomerId); + res.json({ invoice }); + } catch (error) { + console.error('Failed to get upcoming invoice:', error); + res.status(500).json({ error: 'Failed to get upcoming invoice' }); + } +}); + +/** + * POST /api/billing/webhook + * Handle Stripe webhooks + */ +billingRouter.post( + '/webhook', + // Use raw body for webhook signature verification + (req, res, next) => { + if (req.headers['content-type'] === 'application/json') { + next(); + } else { + next(); + } + }, + async (req, res) => { + const sig = req.headers['stripe-signature']; + + if (!sig) { + res.status(400).json({ error: 'Missing signature' }); + return; + } + + const billing = getBillingService(); + + try { + // Get raw body + const rawBody = JSON.stringify(req.body); + + // Verify and parse event + const event = billing.verifyWebhookSignature(rawBody, sig as string); + + // Process the event + const billingEvent = await billing.processWebhookEvent(event); + + // Log for debugging + console.log('Processed billing event:', { + id: billingEvent.id, + type: billingEvent.type, + userId: billingEvent.userId, + }); + + // Handle specific events + switch (billingEvent.type) { + case 'subscription.created': + case 'subscription.updated': + // Update user's subscription in database + // This would integrate with your user/database layer + console.log('Subscription updated for user:', billingEvent.userId); + break; + + case 'subscription.canceled': + console.log('Subscription canceled for user:', billingEvent.userId); + break; + + case 'invoice.payment_failed': + // Notify user of failed payment + console.log('Payment failed for user:', billingEvent.userId); + break; + } + + res.json({ received: true }); + } catch (error) { + console.error('Webhook error:', error); + res.status(400).json({ error: 'Webhook verification failed' }); + } + } +); diff --git a/src/cloud/billing/index.ts b/src/cloud/billing/index.ts new file mode 100644 index 000000000..ef7e8cfde --- /dev/null +++ b/src/cloud/billing/index.ts @@ -0,0 +1,9 @@ +/** + * Agent Relay Cloud - Billing Module + * + * Stripe-based subscription management and billing. + */ + +export * from './types'; +export * from './plans'; +export { BillingService, getBillingService } from './service'; diff --git a/src/cloud/billing/plans.ts b/src/cloud/billing/plans.ts new file mode 100644 index 000000000..23cfc7113 --- /dev/null +++ b/src/cloud/billing/plans.ts @@ -0,0 +1,245 @@ +/** + * Agent Relay Cloud - Billing Plans + * + * Plan definitions for subscription tiers. + */ + +import type { BillingPlan, SubscriptionTier } from './types'; + +/** + * All available billing plans + */ +export const BILLING_PLANS: Record = { + free: { + id: 'free', + name: 'Free', + description: 'For individuals exploring AI agent workflows', + priceMonthly: 0, + priceYearly: 0, + limits: { + maxWorkspaces: 2, + maxAgentsPerWorkspace: 3, + maxTeamMembers: 1, + maxStorageGB: 1, + maxComputeHoursPerMonth: 10, + customDomains: false, + prioritySupport: false, + sla: false, + ssoEnabled: false, + auditLogs: false, + }, + features: [ + 'Up to 2 workspaces', + 'Up to 3 agents per workspace', + '10 compute hours/month', + '1 GB storage', + 'Community support', + ], + }, + + pro: { + id: 'pro', + name: 'Pro', + description: 'For professional developers and small teams', + priceMonthly: 2900, // $29/month + priceYearly: 29000, // $290/year (2 months free) + stripePriceIdMonthly: process.env.STRIPE_PRO_MONTHLY_PRICE_ID, + stripePriceIdYearly: process.env.STRIPE_PRO_YEARLY_PRICE_ID, + limits: { + maxWorkspaces: 10, + maxAgentsPerWorkspace: 10, + maxTeamMembers: 5, + maxStorageGB: 10, + maxComputeHoursPerMonth: 100, + customDomains: true, + prioritySupport: false, + sla: false, + ssoEnabled: false, + auditLogs: false, + }, + features: [ + 'Up to 10 workspaces', + 'Up to 10 agents per workspace', + '100 compute hours/month', + '10 GB storage', + '5 team members', + 'Custom domains', + 'Email support', + ], + }, + + team: { + id: 'team', + name: 'Team', + description: 'For growing teams with advanced needs', + priceMonthly: 9900, // $99/month + priceYearly: 99000, // $990/year (2 months free) + stripePriceIdMonthly: process.env.STRIPE_TEAM_MONTHLY_PRICE_ID, + stripePriceIdYearly: process.env.STRIPE_TEAM_YEARLY_PRICE_ID, + limits: { + maxWorkspaces: 50, + maxAgentsPerWorkspace: 25, + maxTeamMembers: 25, + maxStorageGB: 50, + maxComputeHoursPerMonth: 500, + customDomains: true, + prioritySupport: true, + sla: false, + ssoEnabled: false, + auditLogs: true, + }, + features: [ + 'Up to 50 workspaces', + 'Up to 25 agents per workspace', + '500 compute hours/month', + '50 GB storage', + '25 team members', + 'Custom domains', + 'Priority support', + 'Audit logs', + ], + }, + + enterprise: { + id: 'enterprise', + name: 'Enterprise', + description: 'For organizations requiring dedicated support and SLAs', + priceMonthly: 49900, // $499/month starting + priceYearly: 499000, // $4990/year + stripePriceIdMonthly: process.env.STRIPE_ENTERPRISE_MONTHLY_PRICE_ID, + stripePriceIdYearly: process.env.STRIPE_ENTERPRISE_YEARLY_PRICE_ID, + limits: { + maxWorkspaces: -1, // unlimited + maxAgentsPerWorkspace: -1, // unlimited + maxTeamMembers: -1, // unlimited + maxStorageGB: 500, + maxComputeHoursPerMonth: -1, // unlimited + customDomains: true, + prioritySupport: true, + sla: true, + ssoEnabled: true, + auditLogs: true, + }, + features: [ + 'Unlimited workspaces', + 'Unlimited agents', + 'Unlimited compute hours', + '500 GB storage', + 'Unlimited team members', + 'Custom domains', + 'Priority support with SLA', + 'SSO/SAML integration', + 'Audit logs & compliance', + 'Dedicated account manager', + ], + }, +}; + +/** + * Get plan by ID + */ +export function getPlan(tier: SubscriptionTier): BillingPlan { + return BILLING_PLANS[tier]; +} + +/** + * Get all plans as array + */ +export function getAllPlans(): BillingPlan[] { + return Object.values(BILLING_PLANS); +} + +/** + * Check if a limit is within plan bounds + * Returns true if the value is within limits (-1 means unlimited) + */ +export function isWithinLimit(limit: number, current: number): boolean { + if (limit === -1) return true; // unlimited + return current < limit; +} + +/** + * Get the next tier upgrade from current + */ +export function getUpgradeTier(current: SubscriptionTier): SubscriptionTier | null { + const tiers: SubscriptionTier[] = ['free', 'pro', 'team', 'enterprise']; + const currentIndex = tiers.indexOf(current); + if (currentIndex === -1 || currentIndex >= tiers.length - 1) { + return null; + } + return tiers[currentIndex + 1]; +} + +/** + * Format price for display + */ +export function formatPrice(cents: number): string { + if (cents === 0) return 'Free'; + return `$${(cents / 100).toFixed(0)}`; +} + +/** + * Get plan limits comparison + */ +export function comparePlans(from: SubscriptionTier, to: SubscriptionTier): { + upgrades: string[]; + downgrades: string[]; +} { + const fromPlan = BILLING_PLANS[from]; + const toPlan = BILLING_PLANS[to]; + + const upgrades: string[] = []; + const downgrades: string[] = []; + + // Compare limits + const compareLimit = (name: string, fromVal: number, toVal: number) => { + if (toVal === -1 && fromVal !== -1) { + upgrades.push(`Unlimited ${name}`); + } else if (fromVal === -1 && toVal !== -1) { + downgrades.push(`${name} limited to ${toVal}`); + } else if (toVal > fromVal) { + upgrades.push(`${name}: ${fromVal} -> ${toVal}`); + } else if (toVal < fromVal) { + downgrades.push(`${name}: ${fromVal} -> ${toVal}`); + } + }; + + compareLimit('workspaces', fromPlan.limits.maxWorkspaces, toPlan.limits.maxWorkspaces); + compareLimit('agents per workspace', fromPlan.limits.maxAgentsPerWorkspace, toPlan.limits.maxAgentsPerWorkspace); + compareLimit('team members', fromPlan.limits.maxTeamMembers, toPlan.limits.maxTeamMembers); + compareLimit('storage GB', fromPlan.limits.maxStorageGB, toPlan.limits.maxStorageGB); + compareLimit('compute hours', fromPlan.limits.maxComputeHoursPerMonth, toPlan.limits.maxComputeHoursPerMonth); + + // Compare boolean features + if (toPlan.limits.customDomains && !fromPlan.limits.customDomains) { + upgrades.push('Custom domains'); + } else if (!toPlan.limits.customDomains && fromPlan.limits.customDomains) { + downgrades.push('Custom domains'); + } + + if (toPlan.limits.prioritySupport && !fromPlan.limits.prioritySupport) { + upgrades.push('Priority support'); + } else if (!toPlan.limits.prioritySupport && fromPlan.limits.prioritySupport) { + downgrades.push('Priority support'); + } + + if (toPlan.limits.sla && !fromPlan.limits.sla) { + upgrades.push('SLA'); + } else if (!toPlan.limits.sla && fromPlan.limits.sla) { + downgrades.push('SLA'); + } + + if (toPlan.limits.ssoEnabled && !fromPlan.limits.ssoEnabled) { + upgrades.push('SSO/SAML'); + } else if (!toPlan.limits.ssoEnabled && fromPlan.limits.ssoEnabled) { + downgrades.push('SSO/SAML'); + } + + if (toPlan.limits.auditLogs && !fromPlan.limits.auditLogs) { + upgrades.push('Audit logs'); + } else if (!toPlan.limits.auditLogs && fromPlan.limits.auditLogs) { + downgrades.push('Audit logs'); + } + + return { upgrades, downgrades }; +} diff --git a/src/cloud/billing/service.ts b/src/cloud/billing/service.ts new file mode 100644 index 000000000..11a8da77b --- /dev/null +++ b/src/cloud/billing/service.ts @@ -0,0 +1,482 @@ +/** + * Agent Relay Cloud - Billing Service + * + * Stripe integration for subscription management, payments, and webhooks. + */ + +import Stripe from 'stripe'; +import { getConfig } from '../config'; +import { BILLING_PLANS, getPlan } from './plans'; +import type { + SubscriptionTier, + BillingCustomer, + CustomerSubscription, + PaymentMethod, + Invoice, + CheckoutSession, + PortalSession, + BillingEvent, + SubscriptionStatus, +} from './types'; + +let stripeClient: Stripe | null = null; + +/** + * Get or create Stripe client + */ +function getStripe(): Stripe { + if (!stripeClient) { + const config = getConfig(); + stripeClient = new Stripe(config.stripe.secretKey, { + apiVersion: '2024-11-20.acacia', + typescript: true, + }); + } + return stripeClient; +} + +/** + * Billing Service + */ +export class BillingService { + private stripe: Stripe; + + constructor() { + this.stripe = getStripe(); + } + + /** + * Create or get a Stripe customer for a user + */ + async getOrCreateCustomer( + userId: string, + email: string, + name?: string + ): Promise { + // Search for existing customer by metadata + const existing = await this.stripe.customers.search({ + query: `metadata['user_id']:'${userId}'`, + limit: 1, + }); + + if (existing.data.length > 0) { + return existing.data[0].id; + } + + // Create new customer + const customer = await this.stripe.customers.create({ + email, + name, + metadata: { + user_id: userId, + }, + }); + + return customer.id; + } + + /** + * Get customer details including subscription + */ + async getCustomer(stripeCustomerId: string): Promise { + try { + const customer = await this.stripe.customers.retrieve(stripeCustomerId, { + expand: ['subscriptions', 'invoice_settings.default_payment_method'], + }); + + if (customer.deleted) { + return null; + } + + // Get payment methods + const paymentMethods = await this.stripe.paymentMethods.list({ + customer: stripeCustomerId, + type: 'card', + }); + + // Get recent invoices + const invoices = await this.stripe.invoices.list({ + customer: stripeCustomerId, + limit: 10, + }); + + const subscription = (customer as Stripe.Customer).subscriptions?.data[0]; + + return { + id: customer.metadata?.user_id || '', + stripeCustomerId, + email: (customer as Stripe.Customer).email || '', + name: (customer as Stripe.Customer).name || undefined, + subscription: subscription ? this.mapSubscription(subscription) : undefined, + paymentMethods: paymentMethods.data.map((pm) => this.mapPaymentMethod(pm)), + invoices: invoices.data.map((inv) => this.mapInvoice(inv)), + createdAt: new Date((customer as Stripe.Customer).created * 1000), + updatedAt: new Date(), + }; + } catch (error) { + if ((error as Stripe.errors.StripeError).code === 'resource_missing') { + return null; + } + throw error; + } + } + + /** + * Create a checkout session for subscription + */ + async createCheckoutSession( + customerId: string, + tier: SubscriptionTier, + billingInterval: 'month' | 'year', + successUrl: string, + cancelUrl: string + ): Promise { + const config = getConfig(); + const plan = getPlan(tier); + + // Get the appropriate price ID + let priceId: string | undefined; + if (billingInterval === 'month') { + priceId = config.stripe.priceIds[`${tier}Monthly` as keyof typeof config.stripe.priceIds]; + } else { + priceId = config.stripe.priceIds[`${tier}Yearly` as keyof typeof config.stripe.priceIds]; + } + + if (!priceId) { + throw new Error(`No price configured for ${tier} ${billingInterval}ly plan`); + } + + const session = await this.stripe.checkout.sessions.create({ + customer: customerId, + payment_method_types: ['card'], + mode: 'subscription', + line_items: [ + { + price: priceId, + quantity: 1, + }, + ], + success_url: successUrl, + cancel_url: cancelUrl, + subscription_data: { + metadata: { + tier, + }, + }, + allow_promotion_codes: true, + }); + + return { + sessionId: session.id, + url: session.url!, + }; + } + + /** + * Create a billing portal session for managing subscription + */ + async createPortalSession( + customerId: string, + returnUrl: string + ): Promise { + const session = await this.stripe.billingPortal.sessions.create({ + customer: customerId, + return_url: returnUrl, + }); + + return { + url: session.url, + }; + } + + /** + * Change subscription tier + */ + async changeSubscription( + subscriptionId: string, + newTier: SubscriptionTier, + billingInterval: 'month' | 'year' + ): Promise { + const config = getConfig(); + + // Get new price ID + let priceId: string | undefined; + if (billingInterval === 'month') { + priceId = config.stripe.priceIds[`${newTier}Monthly` as keyof typeof config.stripe.priceIds]; + } else { + priceId = config.stripe.priceIds[`${newTier}Yearly` as keyof typeof config.stripe.priceIds]; + } + + if (!priceId) { + throw new Error(`No price configured for ${newTier} ${billingInterval}ly plan`); + } + + // Get current subscription + const subscription = await this.stripe.subscriptions.retrieve(subscriptionId); + const currentItem = subscription.items.data[0]; + + // Update subscription + const updated = await this.stripe.subscriptions.update(subscriptionId, { + items: [ + { + id: currentItem.id, + price: priceId, + }, + ], + metadata: { + tier: newTier, + }, + proration_behavior: 'create_prorations', + }); + + return this.mapSubscription(updated); + } + + /** + * Cancel subscription at period end + */ + async cancelSubscription(subscriptionId: string): Promise { + const subscription = await this.stripe.subscriptions.update(subscriptionId, { + cancel_at_period_end: true, + }); + + return this.mapSubscription(subscription); + } + + /** + * Resume a canceled subscription + */ + async resumeSubscription(subscriptionId: string): Promise { + const subscription = await this.stripe.subscriptions.update(subscriptionId, { + cancel_at_period_end: false, + }); + + return this.mapSubscription(subscription); + } + + /** + * Add a payment method to customer + */ + async addPaymentMethod( + customerId: string, + paymentMethodId: string, + setAsDefault: boolean = false + ): Promise { + // Attach payment method to customer + const pm = await this.stripe.paymentMethods.attach(paymentMethodId, { + customer: customerId, + }); + + // Set as default if requested + if (setAsDefault) { + await this.stripe.customers.update(customerId, { + invoice_settings: { + default_payment_method: paymentMethodId, + }, + }); + } + + return this.mapPaymentMethod(pm, setAsDefault); + } + + /** + * Remove a payment method + */ + async removePaymentMethod(paymentMethodId: string): Promise { + await this.stripe.paymentMethods.detach(paymentMethodId); + } + + /** + * Set default payment method + */ + async setDefaultPaymentMethod( + customerId: string, + paymentMethodId: string + ): Promise { + await this.stripe.customers.update(customerId, { + invoice_settings: { + default_payment_method: paymentMethodId, + }, + }); + } + + /** + * Get upcoming invoice preview + */ + async getUpcomingInvoice(customerId: string): Promise { + try { + const invoice = await this.stripe.invoices.retrieveUpcoming({ + customer: customerId, + }); + + return this.mapInvoice(invoice); + } catch (error) { + if ((error as Stripe.errors.StripeError).code === 'invoice_upcoming_none') { + return null; + } + throw error; + } + } + + /** + * Record usage for metered billing + */ + async recordUsage( + subscriptionItemId: string, + quantity: number, + timestamp?: Date + ): Promise { + await this.stripe.subscriptionItems.createUsageRecord(subscriptionItemId, { + quantity, + timestamp: timestamp ? Math.floor(timestamp.getTime() / 1000) : undefined, + action: 'increment', + }); + } + + /** + * Verify webhook signature + */ + verifyWebhookSignature(payload: string | Buffer, signature: string): Stripe.Event { + const config = getConfig(); + return this.stripe.webhooks.constructEvent( + payload, + signature, + config.stripe.webhookSecret + ); + } + + /** + * Process webhook event + */ + async processWebhookEvent(event: Stripe.Event): Promise { + const billingEvent: BillingEvent = { + id: event.id, + type: this.mapEventType(event.type), + stripeEventId: event.id, + data: event.data.object as Record, + createdAt: new Date(event.created * 1000), + }; + + // Extract user ID from customer metadata if available + if ('customer' in event.data.object) { + const customerId = event.data.object.customer as string; + if (customerId) { + try { + const customer = await this.stripe.customers.retrieve(customerId); + if (!customer.deleted && customer.metadata?.user_id) { + billingEvent.userId = customer.metadata.user_id; + } + } catch { + // Customer not found, continue without user ID + } + } + } + + billingEvent.processedAt = new Date(); + return billingEvent; + } + + /** + * Get subscription tier from Stripe subscription + */ + getTierFromSubscription(subscription: Stripe.Subscription): SubscriptionTier { + // Check metadata first + if (subscription.metadata?.tier) { + return subscription.metadata.tier as SubscriptionTier; + } + + // Fallback: determine from price ID + const config = getConfig(); + const priceId = subscription.items.data[0]?.price.id; + + for (const [key, value] of Object.entries(config.stripe.priceIds)) { + if (value === priceId) { + // Extract tier from key (e.g., 'proMonthly' -> 'pro') + return key.replace(/(Monthly|Yearly)$/, '').toLowerCase() as SubscriptionTier; + } + } + + return 'free'; // Default fallback + } + + // Helper: Map Stripe subscription to our type + private mapSubscription(subscription: Stripe.Subscription): CustomerSubscription { + return { + id: subscription.id, + stripeSubscriptionId: subscription.id, + tier: this.getTierFromSubscription(subscription), + status: subscription.status as SubscriptionStatus, + currentPeriodStart: new Date(subscription.current_period_start * 1000), + currentPeriodEnd: new Date(subscription.current_period_end * 1000), + cancelAtPeriodEnd: subscription.cancel_at_period_end, + billingInterval: subscription.items.data[0]?.price.recurring?.interval === 'year' + ? 'year' + : 'month', + createdAt: new Date(subscription.created * 1000), + }; + } + + // Helper: Map Stripe payment method to our type + private mapPaymentMethod(pm: Stripe.PaymentMethod, isDefault = false): PaymentMethod { + return { + id: pm.id, + stripePaymentMethodId: pm.id, + type: pm.type as 'card' | 'us_bank_account' | 'sepa_debit', + isDefault, + card: pm.card + ? { + brand: pm.card.brand, + last4: pm.card.last4, + expMonth: pm.card.exp_month, + expYear: pm.card.exp_year, + } + : undefined, + }; + } + + // Helper: Map Stripe invoice to our type + private mapInvoice(invoice: Stripe.Invoice | Stripe.UpcomingInvoice): Invoice { + const isUpcoming = !('id' in invoice) || invoice.id === null; + + return { + id: isUpcoming ? 'upcoming' : invoice.id!, + stripeInvoiceId: isUpcoming ? 'upcoming' : invoice.id!, + amountDue: invoice.amount_due, + amountPaid: invoice.amount_paid, + status: isUpcoming ? 'draft' : (invoice.status as Invoice['status']), + invoicePdf: 'invoice_pdf' in invoice ? invoice.invoice_pdf ?? undefined : undefined, + hostedInvoiceUrl: 'hosted_invoice_url' in invoice ? invoice.hosted_invoice_url ?? undefined : undefined, + periodStart: new Date(invoice.period_start * 1000), + periodEnd: new Date(invoice.period_end * 1000), + createdAt: new Date((invoice.created || Date.now() / 1000) * 1000), + }; + } + + // Helper: Map Stripe event type to our type + private mapEventType(stripeType: string): BillingEvent['type'] { + const mapping: Record = { + 'customer.subscription.created': 'subscription.created', + 'customer.subscription.updated': 'subscription.updated', + 'customer.subscription.deleted': 'subscription.canceled', + 'customer.subscription.trial_will_end': 'subscription.trial_ending', + 'invoice.paid': 'invoice.paid', + 'invoice.payment_failed': 'invoice.payment_failed', + 'payment_method.attached': 'payment_method.attached', + 'payment_method.detached': 'payment_method.detached', + 'customer.created': 'customer.created', + 'customer.updated': 'customer.updated', + }; + + return mapping[stripeType] || 'customer.updated'; + } +} + +// Export singleton instance +let billingService: BillingService | null = null; + +export function getBillingService(): BillingService { + if (!billingService) { + billingService = new BillingService(); + } + return billingService; +} diff --git a/src/cloud/billing/types.ts b/src/cloud/billing/types.ts new file mode 100644 index 000000000..206eab5d0 --- /dev/null +++ b/src/cloud/billing/types.ts @@ -0,0 +1,168 @@ +/** + * Agent Relay Cloud - Billing Types + * + * Defines subscription plans, customer data, and billing events. + */ + +/** + * Subscription tier levels + */ +export type SubscriptionTier = 'free' | 'pro' | 'team' | 'enterprise'; + +/** + * Plan definitions with limits and pricing + */ +export interface BillingPlan { + id: SubscriptionTier; + name: string; + description: string; + priceMonthly: number; // cents + priceYearly: number; // cents + stripePriceIdMonthly?: string; + stripePriceIdYearly?: string; + limits: PlanLimits; + features: string[]; +} + +/** + * Resource limits per plan + */ +export interface PlanLimits { + maxWorkspaces: number; + maxAgentsPerWorkspace: number; + maxTeamMembers: number; + maxStorageGB: number; + maxComputeHoursPerMonth: number; + customDomains: boolean; + prioritySupport: boolean; + sla: boolean; + ssoEnabled: boolean; + auditLogs: boolean; +} + +/** + * Customer billing information + */ +export interface BillingCustomer { + id: string; // Internal user ID + stripeCustomerId: string; + email: string; + name?: string; + subscription?: CustomerSubscription; + paymentMethods: PaymentMethod[]; + invoices: Invoice[]; + createdAt: Date; + updatedAt: Date; +} + +/** + * Active subscription + */ +export interface CustomerSubscription { + id: string; + stripeSubscriptionId: string; + tier: SubscriptionTier; + status: SubscriptionStatus; + currentPeriodStart: Date; + currentPeriodEnd: Date; + cancelAtPeriodEnd: boolean; + billingInterval: 'month' | 'year'; + createdAt: Date; +} + +export type SubscriptionStatus = + | 'active' + | 'past_due' + | 'canceled' + | 'incomplete' + | 'trialing' + | 'unpaid'; + +/** + * Payment method + */ +export interface PaymentMethod { + id: string; + stripePaymentMethodId: string; + type: 'card' | 'us_bank_account' | 'sepa_debit'; + isDefault: boolean; + card?: { + brand: string; + last4: string; + expMonth: number; + expYear: number; + }; +} + +/** + * Invoice + */ +export interface Invoice { + id: string; + stripeInvoiceId: string; + amountDue: number; + amountPaid: number; + status: 'draft' | 'open' | 'paid' | 'void' | 'uncollectible'; + invoicePdf?: string; + hostedInvoiceUrl?: string; + periodStart: Date; + periodEnd: Date; + createdAt: Date; +} + +/** + * Usage record for metered billing + */ +export interface UsageRecord { + userId: string; + workspaceId: string; + metric: UsageMetric; + quantity: number; + timestamp: Date; +} + +export type UsageMetric = + | 'compute_hours' + | 'storage_gb' + | 'api_calls' + | 'agent_spawns'; + +/** + * Billing event for webhooks and audit + */ +export interface BillingEvent { + id: string; + type: BillingEventType; + userId?: string; + stripeEventId?: string; + data: Record; + processedAt?: Date; + createdAt: Date; +} + +export type BillingEventType = + | 'subscription.created' + | 'subscription.updated' + | 'subscription.canceled' + | 'subscription.trial_ending' + | 'invoice.paid' + | 'invoice.payment_failed' + | 'payment_method.attached' + | 'payment_method.detached' + | 'customer.created' + | 'customer.updated'; + +/** + * Checkout session result + */ +export interface CheckoutSession { + sessionId: string; + url: string; +} + +/** + * Portal session for managing subscription + */ +export interface PortalSession { + url: string; +} diff --git a/src/cloud/config.ts b/src/cloud/config.ts index e49b97131..5b6304ac8 100644 --- a/src/cloud/config.ts +++ b/src/cloud/config.ts @@ -47,6 +47,21 @@ export interface CloudConfig { apiToken: string; }; }; + + // Stripe billing + stripe: { + secretKey: string; + publishableKey: string; + webhookSecret: string; + priceIds: { + proMonthly?: string; + proYearly?: string; + teamMonthly?: string; + teamYearly?: string; + enterpriseMonthly?: string; + enterpriseYearly?: string; + }; + }; } function requireEnv(name: string): string { @@ -111,6 +126,20 @@ export function loadConfig(): CloudConfig { } : undefined, }, + + stripe: { + secretKey: requireEnv('STRIPE_SECRET_KEY'), + publishableKey: requireEnv('STRIPE_PUBLISHABLE_KEY'), + webhookSecret: requireEnv('STRIPE_WEBHOOK_SECRET'), + priceIds: { + proMonthly: optionalEnv('STRIPE_PRO_MONTHLY_PRICE_ID'), + proYearly: optionalEnv('STRIPE_PRO_YEARLY_PRICE_ID'), + teamMonthly: optionalEnv('STRIPE_TEAM_MONTHLY_PRICE_ID'), + teamYearly: optionalEnv('STRIPE_TEAM_YEARLY_PRICE_ID'), + enterpriseMonthly: optionalEnv('STRIPE_ENTERPRISE_MONTHLY_PRICE_ID'), + enterpriseYearly: optionalEnv('STRIPE_ENTERPRISE_YEARLY_PRICE_ID'), + }, + }, }; } diff --git a/src/cloud/index.ts b/src/cloud/index.ts index 3dcd0a172..7f9771f9a 100644 --- a/src/cloud/index.ts +++ b/src/cloud/index.ts @@ -11,6 +11,9 @@ export { getConfig, loadConfig, CloudConfig } from './config'; export { CredentialVault } from './vault'; export { WorkspaceProvisioner, ProvisionConfig, Workspace, WorkspaceStatus } from './provisioner'; +// Billing +export * from './billing'; + // Run if executed directly if (require.main === module) { (async () => { diff --git a/src/cloud/server.ts b/src/cloud/server.ts index 4bdcd950b..98168f6a6 100644 --- a/src/cloud/server.ts +++ b/src/cloud/server.ts @@ -17,6 +17,7 @@ import { workspacesRouter } from './api/workspaces'; import { reposRouter } from './api/repos'; import { onboardingRouter } from './api/onboarding'; import { teamsRouter } from './api/teams'; +import { billingRouter } from './api/billing'; export interface CloudServer { app: Express; @@ -69,6 +70,7 @@ export async function createServer(): Promise { app.use('/api/repos', reposRouter); app.use('/api/onboarding', onboardingRouter); app.use('/api/teams', teamsRouter); + app.use('/api/billing', billingRouter); // Error handler app.use((err: Error, req: Request, res: Response, next: NextFunction) => { diff --git a/src/dashboard/react-components/BillingPanel.tsx b/src/dashboard/react-components/BillingPanel.tsx new file mode 100644 index 000000000..17b84d883 --- /dev/null +++ b/src/dashboard/react-components/BillingPanel.tsx @@ -0,0 +1,922 @@ +/** + * Billing Panel Component + * + * Shows current subscription status, usage, and billing management options. + */ + +import React, { useState, useEffect, useCallback } from 'react'; +import { PricingPlans, type Plan } from './PricingPlans'; + +export interface Subscription { + id: string; + tier: string; + status: string; + currentPeriodStart: Date; + currentPeriodEnd: Date; + cancelAtPeriodEnd: boolean; + billingInterval: 'month' | 'year'; +} + +export interface Invoice { + id: string; + amountDue: number; + amountPaid: number; + status: string; + invoicePdf?: string; + hostedInvoiceUrl?: string; + periodStart: Date; + periodEnd: Date; + createdAt: Date; +} + +export interface PaymentMethod { + id: string; + type: string; + isDefault: boolean; + card?: { + brand: string; + last4: string; + expMonth: number; + expYear: number; + }; +} + +export interface BillingPanelProps { + apiUrl?: string; + onClose?: () => void; +} + +export function BillingPanel({ apiUrl = '/api/billing', onClose }: BillingPanelProps) { + const [activeTab, setActiveTab] = useState<'overview' | 'plans' | 'invoices'>('overview'); + const [subscription, setSubscription] = useState(null); + const [plans, setPlans] = useState([]); + const [invoices, setInvoices] = useState([]); + const [paymentMethods, setPaymentMethods] = useState([]); + const [isLoading, setIsLoading] = useState(true); + const [isProcessing, setIsProcessing] = useState(false); + const [error, setError] = useState(null); + + // Fetch billing data + const fetchBillingData = useCallback(async () => { + setIsLoading(true); + setError(null); + + try { + // Fetch plans + const plansResponse = await fetch(`${apiUrl}/plans`); + const plansData = await plansResponse.json(); + setPlans(plansData.plans); + + // Fetch subscription + const subResponse = await fetch(`${apiUrl}/subscription`); + const subData = await subResponse.json(); + if (subData.subscription) { + setSubscription({ + ...subData.subscription, + currentPeriodStart: new Date(subData.subscription.currentPeriodStart), + currentPeriodEnd: new Date(subData.subscription.currentPeriodEnd), + }); + } + if (subData.customer?.paymentMethods) { + setPaymentMethods(subData.customer.paymentMethods); + } + if (subData.customer?.invoices) { + setInvoices( + subData.customer.invoices.map((inv: Invoice) => ({ + ...inv, + periodStart: new Date(inv.periodStart), + periodEnd: new Date(inv.periodEnd), + createdAt: new Date(inv.createdAt), + })) + ); + } + } catch (err) { + setError(err instanceof Error ? err.message : 'Failed to load billing data'); + } finally { + setIsLoading(false); + } + }, [apiUrl]); + + useEffect(() => { + fetchBillingData(); + }, [fetchBillingData]); + + // Handle plan selection + const handleSelectPlan = async (planId: string, interval: 'month' | 'year') => { + if (planId === 'enterprise') { + // Redirect to contact sales + window.open('mailto:sales@agent-relay.com?subject=Enterprise%20Plan%20Inquiry', '_blank'); + return; + } + + setIsProcessing(true); + setError(null); + + try { + // Check if upgrading or changing plan + if (subscription && planId !== 'free') { + // Change existing subscription + const response = await fetch(`${apiUrl}/change`, { + method: 'POST', + headers: { 'Content-Type': 'application/json' }, + body: JSON.stringify({ tier: planId, interval }), + }); + + if (!response.ok) { + const data = await response.json(); + throw new Error(data.error || 'Failed to change subscription'); + } + + await fetchBillingData(); + } else if (planId === 'free' && subscription) { + // Cancel subscription + const response = await fetch(`${apiUrl}/cancel`, { + method: 'POST', + }); + + if (!response.ok) { + const data = await response.json(); + throw new Error(data.error || 'Failed to cancel subscription'); + } + + await fetchBillingData(); + } else { + // Create new subscription via checkout + const response = await fetch(`${apiUrl}/checkout`, { + method: 'POST', + headers: { 'Content-Type': 'application/json' }, + body: JSON.stringify({ tier: planId, interval }), + }); + + if (!response.ok) { + const data = await response.json(); + throw new Error(data.error || 'Failed to create checkout session'); + } + + const { url } = await response.json(); + window.location.href = url; + } + } catch (err) { + setError(err instanceof Error ? err.message : 'An error occurred'); + } finally { + setIsProcessing(false); + } + }; + + // Handle resume subscription + const handleResumeSubscription = async () => { + setIsProcessing(true); + setError(null); + + try { + const response = await fetch(`${apiUrl}/resume`, { + method: 'POST', + }); + + if (!response.ok) { + const data = await response.json(); + throw new Error(data.error || 'Failed to resume subscription'); + } + + await fetchBillingData(); + } catch (err) { + setError(err instanceof Error ? err.message : 'An error occurred'); + } finally { + setIsProcessing(false); + } + }; + + // Handle open billing portal + const handleOpenPortal = async () => { + setIsProcessing(true); + setError(null); + + try { + const response = await fetch(`${apiUrl}/portal`, { + method: 'POST', + }); + + if (!response.ok) { + const data = await response.json(); + throw new Error(data.error || 'Failed to open billing portal'); + } + + const { url } = await response.json(); + window.open(url, '_blank'); + } catch (err) { + setError(err instanceof Error ? err.message : 'An error occurred'); + } finally { + setIsProcessing(false); + } + }; + + const currentTier = subscription?.tier || 'free'; + const currentPlan = plans.find((p) => p.id === currentTier); + + const formatDate = (date: Date) => { + return date.toLocaleDateString('en-US', { + year: 'numeric', + month: 'long', + day: 'numeric', + }); + }; + + const formatAmount = (cents: number) => { + return `$${(cents / 100).toFixed(2)}`; + }; + + if (isLoading) { + return ( +
+
+ +

Loading billing information...

+
+
+ ); + } + + return ( +
+ {/* Header */} +
+

Billing & Subscription

+ {onClose && ( + + )} +
+ + {/* Error */} + {error && ( +
+ {error} + +
+ )} + + {/* Tabs */} +
+ + + +
+ + {/* Tab Content */} +
+ {activeTab === 'overview' && ( +
+ {/* Current Plan */} +
+

Current Plan

+
+
+ {currentPlan?.name || 'Free'} + {currentTier} +
+ {subscription && ( +
+

+ Status:{' '} + + {subscription.status} + +

+

+ Billing: {subscription.billingInterval === 'year' ? 'Annual' : 'Monthly'} +

+

+ Current Period:{' '} + {formatDate(subscription.currentPeriodStart)} - {formatDate(subscription.currentPeriodEnd)} +

+ {subscription.cancelAtPeriodEnd && ( +
+

Your subscription will be canceled on {formatDate(subscription.currentPeriodEnd)}

+ +
+ )} +
+ )} + {!subscription && ( +

+ You're on the free plan. Upgrade to unlock more features! +

+ )} +
+
+ + {/* Usage */} + {currentPlan && ( +
+

Usage & Limits

+
+ + + + + +
+
+ )} + + {/* Payment Method */} + {paymentMethods.length > 0 && ( +
+

Payment Method

+
+ {paymentMethods.map((pm) => ( +
+ {pm.card && ( + <> + + + {pm.card.brand.charAt(0).toUpperCase() + pm.card.brand.slice(1)} •••• {pm.card.last4} + + + Expires {pm.card.expMonth}/{pm.card.expYear} + + {pm.isDefault && Default} + + )} +
+ ))} +
+ +
+ )} +
+ )} + + {activeTab === 'plans' && ( + + )} + + {activeTab === 'invoices' && ( +
+ {invoices.length === 0 ? ( +
+

No invoices yet

+
+ ) : ( + + + + + + + + + + + + {invoices.map((invoice) => ( + + + + + + + + ))} + +
DatePeriodAmountStatusActions
{formatDate(invoice.createdAt)} + {formatDate(invoice.periodStart)} - {formatDate(invoice.periodEnd)} + {formatAmount(invoice.amountPaid || invoice.amountDue)} + + {invoice.status} + + + {invoice.invoicePdf && ( + + PDF + + )} + {invoice.hostedInvoiceUrl && ( + + View + + )} +
+ )} +
+ )} +
+
+ ); +} + +// Helper components +function UsageItem({ + label, + current, + limit, + unit, +}: { + label: string; + current: number; + limit: number; + unit?: string; +}) { + const isUnlimited = limit === -1; + const percentage = isUnlimited ? 0 : (current / limit) * 100; + + return ( +
+
+ {label} + + {current}{unit ? ` ${unit}` : ''} / {isUnlimited ? 'Unlimited' : `${limit}${unit ? ` ${unit}` : ''}`} + +
+
+
80 ? 'warning' : ''} ${percentage > 95 ? 'critical' : ''}`} + style={{ width: `${Math.min(percentage, 100)}%` }} + /> +
+
+ ); +} + +function CardIcon({ brand }: { brand: string }) { + return ( + + + + {brand.toUpperCase()} + + + ); +} + +function LoadingSpinner() { + return ( + + + + ); +} + +function CloseIcon() { + return ( + + + + + ); +} + +export const billingPanelStyles = ` +.billing-panel { + background: #1a1a2e; + border: 1px solid #2a2a3e; + border-radius: 12px; + max-width: 1000px; + margin: 0 auto; + overflow: hidden; +} + +.billing-header { + display: flex; + align-items: center; + justify-content: space-between; + padding: 20px 24px; + border-bottom: 1px solid #2a2a3e; +} + +.billing-header h2 { + margin: 0; + font-size: 18px; + font-weight: 600; + color: #e8e8e8; +} + +.billing-close { + background: transparent; + border: none; + color: #666; + cursor: pointer; + padding: 4px; + display: flex; + border-radius: 4px; + transition: all 0.2s; +} + +.billing-close:hover { + background: rgba(255, 255, 255, 0.1); + color: #e8e8e8; +} + +.billing-loading { + display: flex; + flex-direction: column; + align-items: center; + justify-content: center; + padding: 60px 24px; + color: #8d8d8e; +} + +.billing-loading .spinner { + animation: spin 1s linear infinite; + margin-bottom: 16px; + color: #00c896; +} + +@keyframes spin { + from { transform: rotate(0deg); } + to { transform: rotate(360deg); } +} + +.billing-error { + display: flex; + align-items: center; + justify-content: space-between; + padding: 12px 24px; + background: rgba(239, 68, 68, 0.1); + border-bottom: 1px solid rgba(239, 68, 68, 0.3); + color: #ef4444; + font-size: 14px; +} + +.billing-error button { + background: none; + border: none; + color: #ef4444; + cursor: pointer; + font-size: 18px; +} + +.billing-tabs { + display: flex; + border-bottom: 1px solid #2a2a3e; +} + +.billing-tab { + flex: 1; + padding: 14px 20px; + background: transparent; + border: none; + border-bottom: 2px solid transparent; + color: #8d8d8e; + font-size: 14px; + cursor: pointer; + transition: all 0.2s; +} + +.billing-tab:hover { + color: #e8e8e8; + background: rgba(255, 255, 255, 0.02); +} + +.billing-tab.active { + color: #00c896; + border-bottom-color: #00c896; +} + +.billing-content { + padding: 24px; +} + +.billing-overview { + display: flex; + flex-direction: column; + gap: 32px; +} + +.overview-section h3 { + margin: 0 0 16px; + font-size: 16px; + font-weight: 600; + color: #e8e8e8; +} + +.current-plan-card { + background: #222234; + border: 1px solid #2a2a3e; + border-radius: 8px; + padding: 20px; +} + +.plan-info { + display: flex; + align-items: center; + gap: 12px; + margin-bottom: 16px; +} + +.plan-info .plan-name { + font-size: 20px; + font-weight: 600; + color: #e8e8e8; +} + +.plan-tier-badge { + padding: 4px 10px; + background: #00c896; + color: #1a1a2e; + border-radius: 4px; + font-size: 12px; + font-weight: 500; + text-transform: capitalize; +} + +.plan-details p { + margin: 8px 0; + font-size: 14px; + color: #b8b8b8; +} + +.plan-details strong { + color: #e8e8e8; +} + +.status-active { color: #00c896; } +.status-past_due { color: #f59e0b; } +.status-canceled { color: #ef4444; } +.status-trialing { color: #3b82f6; } + +.cancel-notice { + margin-top: 16px; + padding: 12px; + background: rgba(239, 68, 68, 0.1); + border: 1px solid rgba(239, 68, 68, 0.3); + border-radius: 6px; +} + +.cancel-notice p { + color: #ef4444; + margin-bottom: 12px; +} + +.btn-resume { + padding: 8px 16px; + background: #00c896; + color: #1a1a2e; + border: none; + border-radius: 6px; + font-size: 14px; + cursor: pointer; + transition: all 0.2s; +} + +.btn-resume:hover:not(:disabled) { + background: #00a87d; +} + +.btn-resume:disabled { + opacity: 0.6; + cursor: not-allowed; +} + +.free-notice { + color: #8d8d8e; + font-size: 14px; +} + +.usage-grid { + display: grid; + grid-template-columns: repeat(auto-fit, minmax(200px, 1fr)); + gap: 16px; +} + +.usage-item { + background: #222234; + border: 1px solid #2a2a3e; + border-radius: 8px; + padding: 16px; +} + +.usage-header { + display: flex; + justify-content: space-between; + margin-bottom: 8px; +} + +.usage-label { + font-size: 13px; + color: #8d8d8e; +} + +.usage-value { + font-size: 13px; + color: #e8e8e8; + font-weight: 500; +} + +.usage-bar { + height: 6px; + background: #2a2a3e; + border-radius: 3px; + overflow: hidden; +} + +.usage-fill { + height: 100%; + background: #00c896; + border-radius: 3px; + transition: width 0.3s; +} + +.usage-fill.warning { + background: #f59e0b; +} + +.usage-fill.critical { + background: #ef4444; +} + +.payment-methods { + display: flex; + flex-direction: column; + gap: 12px; + margin-bottom: 16px; +} + +.payment-method { + display: flex; + align-items: center; + gap: 12px; + padding: 12px 16px; + background: #222234; + border: 1px solid #2a2a3e; + border-radius: 8px; +} + +.payment-method.default { + border-color: #00c896; +} + +.card-icon { + flex-shrink: 0; +} + +.card-info { + font-size: 14px; + color: #e8e8e8; +} + +.card-expiry { + font-size: 12px; + color: #8d8d8e; + margin-left: auto; +} + +.default-badge { + padding: 2px 8px; + background: #00c896; + color: #1a1a2e; + border-radius: 4px; + font-size: 11px; + font-weight: 500; +} + +.btn-manage-billing { + padding: 10px 16px; + background: transparent; + border: 1px solid #3a3a4e; + border-radius: 6px; + color: #e8e8e8; + font-size: 14px; + cursor: pointer; + transition: all 0.2s; +} + +.btn-manage-billing:hover:not(:disabled) { + background: rgba(255, 255, 255, 0.05); + border-color: #4a4a5e; +} + +.btn-manage-billing:disabled { + opacity: 0.6; + cursor: not-allowed; +} + +.billing-invoices { + min-height: 200px; +} + +.no-invoices { + display: flex; + align-items: center; + justify-content: center; + padding: 60px; + color: #8d8d8e; +} + +.invoices-table { + width: 100%; + border-collapse: collapse; +} + +.invoices-table th, +.invoices-table td { + padding: 12px 16px; + text-align: left; + border-bottom: 1px solid #2a2a3e; +} + +.invoices-table th { + font-size: 12px; + font-weight: 500; + color: #8d8d8e; + text-transform: uppercase; + letter-spacing: 0.5px; +} + +.invoices-table td { + font-size: 14px; + color: #e8e8e8; +} + +.invoice-status { + padding: 4px 8px; + border-radius: 4px; + font-size: 12px; + text-transform: capitalize; +} + +.invoice-status.status-paid { + background: rgba(0, 200, 150, 0.1); + color: #00c896; +} + +.invoice-status.status-open { + background: rgba(59, 130, 246, 0.1); + color: #3b82f6; +} + +.invoice-status.status-void { + background: rgba(107, 114, 128, 0.1); + color: #6b7280; +} + +.invoices-table a { + color: #00c896; + text-decoration: none; + margin-right: 12px; +} + +.invoices-table a:hover { + text-decoration: underline; +} +`; diff --git a/src/dashboard/react-components/PricingPlans.tsx b/src/dashboard/react-components/PricingPlans.tsx new file mode 100644 index 000000000..6a1820c7c --- /dev/null +++ b/src/dashboard/react-components/PricingPlans.tsx @@ -0,0 +1,386 @@ +/** + * Pricing Plans Component + * + * Displays available subscription plans with features and pricing. + */ + +import React, { useState } from 'react'; + +export interface Plan { + id: string; + name: string; + description: string; + priceMonthly: number; + priceYearly: number; + limits: { + maxWorkspaces: number; + maxAgentsPerWorkspace: number; + maxTeamMembers: number; + maxStorageGB: number; + maxComputeHoursPerMonth: number; + customDomains: boolean; + prioritySupport: boolean; + sla: boolean; + ssoEnabled: boolean; + auditLogs: boolean; + }; + features: string[]; +} + +export interface PricingPlansProps { + plans: Plan[]; + currentPlan?: string; + onSelectPlan: (planId: string, interval: 'month' | 'year') => void; + isLoading?: boolean; +} + +export function PricingPlans({ + plans, + currentPlan = 'free', + onSelectPlan, + isLoading = false, +}: PricingPlansProps) { + const [billingInterval, setBillingInterval] = useState<'month' | 'year'>('month'); + + const formatPrice = (cents: number) => { + if (cents === 0) return 'Free'; + return `$${(cents / 100).toFixed(0)}`; + }; + + const formatLimit = (value: number) => { + if (value === -1) return 'Unlimited'; + return value.toString(); + }; + + return ( +
+ {/* Billing Toggle */} +
+ + +
+ + {/* Plans Grid */} +
+ {plans.map((plan) => { + const isCurrent = plan.id === currentPlan; + const price = billingInterval === 'month' ? plan.priceMonthly : plan.priceYearly; + const monthlyEquivalent = billingInterval === 'year' ? plan.priceYearly / 12 : plan.priceMonthly; + + return ( +
+ {plan.id === 'pro' &&
Most Popular
} + {isCurrent &&
Current Plan
} + +
+

{plan.name}

+

{plan.description}

+
+ +
+ {formatPrice(monthlyEquivalent)} + {price > 0 && ( + + /month{billingInterval === 'year' && ', billed yearly'} + + )} +
+ +
    + {plan.features.map((feature, i) => ( +
  • + + {feature} +
    • + ))} +
+ +
+
+ Workspaces + {formatLimit(plan.limits.maxWorkspaces)} +
+
+ Agents/Workspace + {formatLimit(plan.limits.maxAgentsPerWorkspace)} +
+
+ Team Members + {formatLimit(plan.limits.maxTeamMembers)} +
+
+ Storage + {formatLimit(plan.limits.maxStorageGB)} GB +
+
+ + +
+ ); + })} +
+
+ ); +} + +function CheckIcon() { + return ( + + + + ); +} + +export const pricingPlansStyles = ` +.pricing-plans { + max-width: 1200px; + margin: 0 auto; + padding: 24px; +} + +.billing-toggle { + display: flex; + justify-content: center; + gap: 4px; + margin-bottom: 32px; + background: #2a2a3e; + padding: 4px; + border-radius: 8px; + width: fit-content; + margin-left: auto; + margin-right: auto; +} + +.toggle-btn { + padding: 10px 20px; + background: transparent; + border: none; + border-radius: 6px; + color: #8d8d8e; + font-size: 14px; + cursor: pointer; + transition: all 0.2s; + display: flex; + align-items: center; + gap: 8px; +} + +.toggle-btn.active { + background: #00c896; + color: #1a1a2e; +} + +.save-badge { + font-size: 11px; + padding: 2px 6px; + background: rgba(0, 200, 150, 0.2); + border-radius: 4px; + color: #00c896; +} + +.toggle-btn.active .save-badge { + background: rgba(26, 26, 46, 0.3); + color: #1a1a2e; +} + +.plans-grid { + display: grid; + grid-template-columns: repeat(auto-fit, minmax(280px, 1fr)); + gap: 24px; +} + +.plan-card { + background: #1a1a2e; + border: 1px solid #2a2a3e; + border-radius: 12px; + padding: 24px; + position: relative; + transition: all 0.2s; +} + +.plan-card:hover { + border-color: #3a3a4e; +} + +.plan-card.popular { + border-color: #00c896; +} + +.plan-card.current { + border-color: #1264a3; +} + +.popular-badge, +.current-badge { + position: absolute; + top: -12px; + left: 50%; + transform: translateX(-50%); + padding: 4px 12px; + border-radius: 12px; + font-size: 12px; + font-weight: 500; + white-space: nowrap; +} + +.popular-badge { + background: #00c896; + color: #1a1a2e; +} + +.current-badge { + background: #1264a3; + color: white; +} + +.plan-header { + margin-bottom: 20px; +} + +.plan-name { + margin: 0 0 8px; + font-size: 20px; + font-weight: 600; + color: #e8e8e8; +} + +.plan-description { + margin: 0; + font-size: 14px; + color: #8d8d8e; +} + +.plan-pricing { + margin-bottom: 24px; +} + +.plan-price { + font-size: 36px; + font-weight: 700; + color: #e8e8e8; +} + +.plan-period { + font-size: 14px; + color: #8d8d8e; + margin-left: 4px; +} + +.plan-features { + list-style: none; + padding: 0; + margin: 0 0 24px; +} + +.plan-features li { + display: flex; + align-items: flex-start; + gap: 10px; + padding: 8px 0; + font-size: 14px; + color: #b8b8b8; +} + +.plan-features li svg { + color: #00c896; + flex-shrink: 0; + margin-top: 2px; +} + +.plan-limits { + padding: 16px 0; + border-top: 1px solid #2a2a3e; + margin-bottom: 24px; +} + +.limit-item { + display: flex; + justify-content: space-between; + padding: 6px 0; + font-size: 13px; +} + +.limit-label { + color: #8d8d8e; +} + +.limit-value { + color: #e8e8e8; + font-weight: 500; +} + +.plan-button { + width: 100%; + padding: 12px 24px; + border: none; + border-radius: 8px; + font-size: 14px; + font-weight: 500; + cursor: pointer; + transition: all 0.2s; + background: #00c896; + color: #1a1a2e; +} + +.plan-button:hover:not(:disabled) { + background: #00a87d; +} + +.plan-button.current { + background: #2a2a3e; + color: #8d8d8e; + cursor: default; +} + +.plan-button.free { + background: transparent; + border: 1px solid #3a3a4e; + color: #8d8d8e; +} + +.plan-button.free:hover:not(:disabled) { + background: rgba(255, 255, 255, 0.05); + border-color: #4a4a5e; +} + +.plan-button:disabled { + opacity: 0.6; + cursor: not-allowed; +} + +@media (max-width: 768px) { + .plans-grid { + grid-template-columns: 1fr; + } +} +`; diff --git a/src/dashboard/react-components/index.ts b/src/dashboard/react-components/index.ts index e7de91e9f..3e6e1db55 100644 --- a/src/dashboard/react-components/index.ts +++ b/src/dashboard/react-components/index.ts @@ -24,6 +24,8 @@ export { App, appStyles, type AppProps } from './App'; export { MentionAutocomplete, mentionAutocompleteStyles, useMentionAutocomplete, getMentionQuery, completeMentionInValue, type MentionAutocompleteProps } from './MentionAutocomplete'; export { WorkspaceSelector, workspaceSelectorStyles, type WorkspaceSelectorProps, type Workspace } from './WorkspaceSelector'; export { AddWorkspaceModal, addWorkspaceModalStyles, type AddWorkspaceModalProps } from './AddWorkspaceModal'; +export { PricingPlans, pricingPlansStyles, type PricingPlansProps, type Plan } from './PricingPlans'; +export { BillingPanel, billingPanelStyles, type BillingPanelProps, type Subscription, type Invoice, type PaymentMethod } from './BillingPanel'; // Layout Components export { Sidebar, sidebarStyles, type SidebarProps } from './layout/Sidebar'; From b02758a61a5bba8b25cf2b980f52a633101d4e89 Mon Sep 17 00:00:00 2001 From: Claude Date: Tue, 30 Dec 2025 01:48:35 +0000 Subject: [PATCH 18/38] Add stunning landing page for Agent Relay Cloud Mission-control themed landing page with: - Animated agent network visualization with glowing connections - Live demo section showing agents collaborating in real-time - Dark atmospheric design with cyan/purple/orange accent colors - Responsive layout with smooth animations - Features, providers, and pricing sections - Terminal-style CTA with realistic CLI output - Static HTML version for SEO and fast initial load - React component version for dynamic interactions --- public/index.html | 784 ++++++++++++++++++++ src/landing/LandingPage.tsx | 623 ++++++++++++++++ src/landing/index.html | 52 ++ src/landing/index.ts | 5 + src/landing/styles.css | 1362 +++++++++++++++++++++++++++++++++++ 5 files changed, 2826 insertions(+) create mode 100644 public/index.html create mode 100644 src/landing/LandingPage.tsx create mode 100644 src/landing/index.html create mode 100644 src/landing/index.ts create mode 100644 src/landing/styles.css diff --git a/public/index.html b/public/index.html new file mode 100644 index 000000000..fcbce7d5e --- /dev/null +++ b/public/index.html @@ -0,0 +1,784 @@ + + + + + + + + + + + + + + + + + + + + + + + + + Agent Relay - Orchestrate AI Agents Like a Symphony + + + + + + + + + +
+ +
+
+
+
+
+
+
+
+
+
+
+ + + + + +
+
+
+ + Now in Public Beta +
+

+ Orchestrate AI Agents + Like a Symphony +

+

+ Deploy Claude, Codex, and Gemini agents that communicate in real-time. + One dashboard to rule them all. Zero infrastructure headaches. +

+
+ + Start Building + → + + + ▶ + Watch Demo + +
+
+
+ 10K+ + Agents Spawned +
+
+
+ 500+ + Teams +
+
+
+ 99.9% + Uptime +
+
+
+ + +
+
+ + + + + + + + + + + + + +
+
+
◈
+
Lead
+
+
+
+
⬡
+
Backend
+
+
+
+
◈
+
Frontend
+
+
+
+
◇
+
Reviewer
+
+ +
+
+
+
+
+
+ + +
+
+ Features +

Everything You Need

+

Built for developers who want AI agents that actually work together.

+
+
+
+
⚡
+

One-Click Workspaces

+

Spin up isolated environments for each project. Connect your repo and agents are ready in seconds.

+
+
+
🔄
+

Real-Time Messaging

+

Agents communicate through a blazing-fast relay. @mentions, broadcasts, and direct messages.

+
+
+
🔐
+

Secure Credential Vault

+

Store API keys and secrets encrypted at rest. Agents access only what they need.

+
+
+
🎯
+

Smart Orchestration

+

Lead agents delegate tasks. Workers report progress. The system handles the complexity.

+
+
+
📊
+

Full Observability

+

Trace every message, tool call, and decision. Replay and debug any session.

+
+
+
🚀
+

Auto-Scaling

+

From 1 agent to 100. Pay only for what you use. Scale down to zero when idle.

+
+
+
+ + +
+
+ Providers +

Bring Your Own Agents

+

Use any AI provider. Mix and match for the perfect team.

+
+
+
+
◈
+
Claude
+
Supported
+
+
+
⬡
+
Codex
+
Supported
+
+
+
◇
+
Gemini
+
Supported
+
+
+
◎
+
More Coming
+
2025
+
+
+
+ + +
+
+ Pricing +

Simple, Transparent Pricing

+

Start free. Scale as you grow. No hidden fees.

+
+
+
+
+

Free

+
+ $0 + forever +
+

For individuals exploring AI agent workflows

+
+
    +
  • ✓2 workspaces
    • +
  • ✓3 agents per workspace
    • +
  • ✓10 compute hours/month
    • +
  • ✓Community support
    • +
+ Get Started +
+
+
Most Popular
+
+

Pro

+
+ $29 + /month +
+

For professional developers and small teams

+
+
    +
  • ✓10 workspaces
    • +
  • ✓10 agents per workspace
    • +
  • ✓100 compute hours/month
    • +
  • ✓Custom domains
    • +
  • ✓Email support
    • +
+ Start Free Trial +
+
+
+

Team

+
+ $99 + /month +
+

For growing teams with advanced needs

+
+
    +
  • ✓50 workspaces
    • +
  • ✓25 agents per workspace
    • +
  • ✓500 compute hours/month
    • +
  • ✓Priority support
    • +
  • ✓Audit logs
    • +
+ Start Free Trial +
+
+
+

Enterprise

+
+ Custom +
+

For organizations requiring dedicated support

+
+
    +
  • ✓Unlimited everything
    • +
  • ✓SSO/SAML
    • +
  • ✓SLA guarantee
    • +
  • ✓Dedicated account manager
    • +
  • ✓Custom integrations
    • +
+ Contact Sales +
+
+
+ + +
+
+

Ready to Orchestrate?

+

Join thousands of developers building with AI agent teams.

+
+ + Start Building Free + → + + Read the Docs +
+
+
+
+ $ + npx agent-relay init +
+
+ ✓ Connected to Agent Relay Cloud + ✓ Workspace created: my-project + ✓ Ready to spawn agents + → agent-relay spawn Lead --provider claude +
+
+
+ + + +
+ + + + diff --git a/src/landing/LandingPage.tsx b/src/landing/LandingPage.tsx new file mode 100644 index 000000000..ce6a9797d --- /dev/null +++ b/src/landing/LandingPage.tsx @@ -0,0 +1,623 @@ +/** + * Agent Relay Cloud - Landing Page + * + * A mission-control themed landing page showcasing AI agent orchestration. + * Features animated agent networks, live demo, and immersive visuals. + */ + +import React, { useState, useEffect, useRef } from 'react'; + +// Agent providers with their signature colors +const PROVIDERS = { + claude: { name: 'Claude', color: '#00D9FF', icon: '◈' }, + codex: { name: 'Codex', color: '#FF6B35', icon: '⬡' }, + gemini: { name: 'Gemini', color: '#A855F7', icon: '◇' }, +}; + +// Simulated agent messages for the live demo +const DEMO_MESSAGES = [ + { from: 'Architect', to: 'all', content: 'Starting auth module implementation. @Backend handle API, @Frontend build login UI.', provider: 'claude' }, + { from: 'Backend', to: 'Architect', content: 'Acknowledged. Setting up JWT middleware and user routes.', provider: 'codex' }, + { from: 'Frontend', to: 'Architect', content: 'On it. Creating login form with OAuth integration.', provider: 'claude' }, + { from: 'Backend', to: 'Frontend', content: 'API ready at /api/auth. Endpoints: POST /login, POST /register, GET /me', provider: 'codex' }, + { from: 'Frontend', to: 'Backend', content: 'Perfect. Integrating now. Need CORS headers for localhost:3000', provider: 'claude' }, + { from: 'Backend', to: 'Frontend', content: 'Done. CORS configured for development.', provider: 'codex' }, + { from: 'Reviewer', to: 'all', content: 'Running security audit on auth implementation...', provider: 'gemini' }, + { from: 'Reviewer', to: 'Backend', content: 'Found issue: password not being hashed. Use bcrypt.', provider: 'gemini' }, + { from: 'Backend', to: 'Reviewer', content: 'Good catch. Fixed and pushed. Using bcrypt with 12 rounds.', provider: 'codex' }, + { from: 'Architect', to: 'all', content: 'Auth module complete. Moving to dashboard implementation.', provider: 'claude' }, +]; + +export function LandingPage() { + return ( +
+
+ + +
+ + + +
+ + + + + + +
+ +
+
+ ); +} + +function Navigation() { + const [scrolled, setScrolled] = useState(false); + + useEffect(() => { + const handleScroll = () => setScrolled(window.scrollY > 50); + window.addEventListener('scroll', handleScroll); + return () => window.removeEventListener('scroll', handleScroll); + }, []); + + return ( + + ); +} + +function HeroSection() { + return ( +
+
+
+ + Now in Public Beta +
+ +

+ Orchestrate AI Agents + Like a Symphony +

+ +

+ Deploy Claude, Codex, and Gemini agents that communicate in real-time. + One dashboard to rule them all. Zero infrastructure headaches. +

+ + + +
+
+ 10K+ + Agents Spawned +
+
+
+ 500+ + Teams +
+
+
+ 99.9% + Uptime +
+
+
+ +
+ +
+
+ ); +} + +function AgentNetwork() { + const agents = [ + { id: 'lead', name: 'Lead', x: 50, y: 30, provider: 'claude', pulse: true }, + { id: 'backend', name: 'Backend', x: 25, y: 55, provider: 'codex', pulse: false }, + { id: 'frontend', name: 'Frontend', x: 75, y: 55, provider: 'claude', pulse: false }, + { id: 'reviewer', name: 'Reviewer', x: 50, y: 80, provider: 'gemini', pulse: false }, + ]; + + const connections = [ + { from: 'lead', to: 'backend' }, + { from: 'lead', to: 'frontend' }, + { from: 'backend', to: 'frontend' }, + { from: 'backend', to: 'reviewer' }, + { from: 'frontend', to: 'reviewer' }, + ]; + + return ( +
+ + {connections.map((conn, i) => { + const fromAgent = agents.find((a) => a.id === conn.from)!; + const toAgent = agents.find((a) => a.id === conn.to)!; + return ( + + + + + ); + })} + + + {agents.map((agent) => { + const provider = PROVIDERS[agent.provider as keyof typeof PROVIDERS]; + return ( +
+
+
{provider.icon}
+
{agent.name}
+
+ ); + })} + + + + +
+ ); +} + +function DataPacket({ fromX, fromY, toX, toY, delay }: { fromX: number; fromY: number; toX: number; toY: number; delay: number }) { + return ( +
+ ); +} + +function LiveDemoSection() { + const [messages, setMessages] = useState([]); + const [currentIndex, setCurrentIndex] = useState(0); + const messagesEndRef = useRef(null); + + useEffect(() => { + if (currentIndex >= DEMO_MESSAGES.length) { + // Reset after a pause + const timeout = setTimeout(() => { + setMessages([]); + setCurrentIndex(0); + }, 3000); + return () => clearTimeout(timeout); + } + + const timeout = setTimeout(() => { + setMessages((prev) => [...prev, DEMO_MESSAGES[currentIndex]]); + setCurrentIndex((prev) => prev + 1); + }, 1500); + + return () => clearTimeout(timeout); + }, [currentIndex]); + + useEffect(() => { + messagesEndRef.current?.scrollIntoView({ behavior: 'smooth' }); + }, [messages]); + + return ( +
+
+ Live Demo +

Watch Agents Collaborate

+

See how multiple AI agents work together on a real task in real-time.

+
+ +
+
+
+
+ + + +
+
Agent Relay — auth-module
+
+ + 4 agents online +
+
+ +
+
+
+
AGENTS
+ {['Architect', 'Backend', 'Frontend', 'Reviewer'].map((name, i) => { + const providers = ['claude', 'codex', 'claude', 'gemini']; + const provider = PROVIDERS[providers[i] as keyof typeof PROVIDERS]; + return ( +
+ + {name} + ● +
+ ); + })} +
+
+ +
+ {messages.map((msg, i) => { + const provider = PROVIDERS[msg.provider as keyof typeof PROVIDERS]; + return ( +
+
+ {provider.icon} + {msg.from} + → + {msg.to === 'all' ? 'everyone' : msg.to} + just now +
+
{msg.content}
+
+ ); + })} +
+ + {messages.length < DEMO_MESSAGES.length && ( +
+ + + +
+ )} +
+
+
+ +
+

This is a simulation of agents completing a task. In production, agents run your actual code.

+
+
+
+ ); +} + +function FeaturesSection() { + const features = [ + { + icon: '⚡', + title: 'One-Click Workspaces', + description: 'Spin up isolated environments for each project. Connect your repo and agents are ready in seconds.', + }, + { + icon: '🔄', + title: 'Real-Time Messaging', + description: 'Agents communicate through a blazing-fast relay. @mentions, broadcasts, and direct messages.', + }, + { + icon: '🔐', + title: 'Secure Credential Vault', + description: 'Store API keys and secrets encrypted at rest. Agents access only what they need.', + }, + { + icon: '🎯', + title: 'Smart Orchestration', + description: 'Lead agents delegate tasks. Workers report progress. The system handles the complexity.', + }, + { + icon: '📊', + title: 'Full Observability', + description: 'Trace every message, tool call, and decision. Replay and debug any session.', + }, + { + icon: '🚀', + title: 'Auto-Scaling', + description: 'From 1 agent to 100. Pay only for what you use. Scale down to zero when idle.', + }, + ]; + + return ( +
+
+ Features +

Everything You Need

+

Built for developers who want AI agents that actually work together.

+
+ +
+ {features.map((feature, i) => ( +
+
{feature.icon}
+

{feature.title}

+

{feature.description}

+
+ ))} +
+
+ ); +} + +function ProvidersSection() { + return ( +
+
+ Providers +

Bring Your Own Agents

+

Use any AI provider. Mix and match for the perfect team.

+
+ +
+ {Object.entries(PROVIDERS).map(([key, provider]) => ( +
+
{provider.icon}
+
{provider.name}
+
Supported
+
+ ))} +
+
◎
+
More Coming
+
2025
+
+
+
+ ); +} + +function PricingSection() { + const plans = [ + { + name: 'Free', + price: '$0', + period: 'forever', + description: 'For individuals exploring AI agent workflows', + features: ['2 workspaces', '3 agents per workspace', '10 compute hours/month', 'Community support'], + cta: 'Get Started', + highlighted: false, + }, + { + name: 'Pro', + price: '$29', + period: '/month', + description: 'For professional developers and small teams', + features: ['10 workspaces', '10 agents per workspace', '100 compute hours/month', 'Custom domains', 'Email support'], + cta: 'Start Free Trial', + highlighted: true, + }, + { + name: 'Team', + price: '$99', + period: '/month', + description: 'For growing teams with advanced needs', + features: ['50 workspaces', '25 agents per workspace', '500 compute hours/month', 'Priority support', 'Audit logs'], + cta: 'Start Free Trial', + highlighted: false, + }, + { + name: 'Enterprise', + price: 'Custom', + period: '', + description: 'For organizations requiring dedicated support', + features: ['Unlimited everything', 'SSO/SAML', 'SLA guarantee', 'Dedicated account manager', 'Custom integrations'], + cta: 'Contact Sales', + highlighted: false, + }, + ]; + + return ( +
+
+ Pricing +

Simple, Transparent Pricing

+

Start free. Scale as you grow. No hidden fees.

+
+ +
+ {plans.map((plan, i) => ( +
+ {plan.highlighted &&
Most Popular
} +
+

{plan.name}

+
+ {plan.price} + {plan.period} +
+

{plan.description}

+
+
    + {plan.features.map((feature, j) => ( +
  • + ✓ + {feature} +
    • + ))} +
+ + {plan.cta} + +
+ ))} +
+
+ ); +} + +function CTASection() { + return ( +
+
+

Ready to Orchestrate?

+

Join thousands of developers building with AI agent teams.

+ +
+ +
+
+ $ + npx agent-relay init +
+
+ ✓ Connected to Agent Relay Cloud + ✓ Workspace created: my-project + ✓ Ready to spawn agents + → agent-relay spawn Lead --provider claude +
+
+
+ ); +} + +function Footer() { + return ( + + ); +} + +// Background components +function GridBackground() { + return ( +
+
+
+
+ ); +} + +function GlowOrbs() { + return ( +
+
+
+
+
+ ); +} + +// Icons +function GitHubIcon() { + return ( + + + + ); +} + +function TwitterIcon() { + return ( + + + + ); +} + +function DiscordIcon() { + return ( + + + + ); +} + +export default LandingPage; diff --git a/src/landing/index.html b/src/landing/index.html new file mode 100644 index 000000000..7c59ed092 --- /dev/null +++ b/src/landing/index.html @@ -0,0 +1,52 @@ + + + + + + + + + + + + + + + + + + + + + + + + + Agent Relay - Orchestrate AI Agents Like a Symphony + + + + + + + + + + + + + +
+ + + + + + + + diff --git a/src/landing/index.ts b/src/landing/index.ts new file mode 100644 index 000000000..472e617fa --- /dev/null +++ b/src/landing/index.ts @@ -0,0 +1,5 @@ +/** + * Agent Relay Cloud - Landing Page Module + */ + +export { LandingPage, default } from './LandingPage'; diff --git a/src/landing/styles.css b/src/landing/styles.css new file mode 100644 index 000000000..55a7daab6 --- /dev/null +++ b/src/landing/styles.css @@ -0,0 +1,1362 @@ +/** + * Agent Relay Cloud - Landing Page Styles + * + * Aesthetic: Mission Control / Command Center + * Dark, atmospheric, with glowing agent connections + */ + +/* ============================================ + FONTS + ============================================ */ +@import url('https://fonts.googleapis.com/css2?family=Syne:wght@400;500;600;700;800&family=IBM+Plex+Mono:wght@400;500;600&family=Inter:wght@400;500;600&display=swap'); + +/* ============================================ + CSS VARIABLES + ============================================ */ +:root { + /* Colors */ + --bg-deep: #0a0a0f; + --bg-primary: #0d0d14; + --bg-secondary: #12121c; + --bg-tertiary: #181824; + --bg-card: #1a1a28; + --bg-elevated: #202030; + + --text-primary: #f0f0f5; + --text-secondary: #a0a0b0; + --text-muted: #606070; + --text-dim: #404050; + + --accent-cyan: #00d9ff; + --accent-orange: #ff6b35; + --accent-purple: #a855f7; + --accent-green: #00ffc8; + + --border-subtle: rgba(255, 255, 255, 0.06); + --border-light: rgba(255, 255, 255, 0.1); + --border-medium: rgba(255, 255, 255, 0.15); + + --glow-cyan: 0 0 30px rgba(0, 217, 255, 0.3); + --glow-orange: 0 0 30px rgba(255, 107, 53, 0.3); + --glow-purple: 0 0 30px rgba(168, 85, 247, 0.3); + + /* Typography */ + --font-display: 'Syne', sans-serif; + --font-mono: 'IBM Plex Mono', monospace; + --font-body: 'Inter', sans-serif; + + /* Spacing */ + --section-padding: 120px; + --container-max: 1280px; + + /* Transitions */ + --transition-fast: 0.15s ease; + --transition-medium: 0.3s ease; + --transition-slow: 0.5s ease; +} + +/* ============================================ + RESET & BASE + ============================================ */ +*, *::before, *::after { + margin: 0; + padding: 0; + box-sizing: border-box; +} + +html { + scroll-behavior: smooth; +} + +body { + font-family: var(--font-body); + font-size: 16px; + line-height: 1.6; + color: var(--text-primary); + background: var(--bg-deep); + -webkit-font-smoothing: antialiased; + -moz-osx-font-smoothing: grayscale; +} + +a { + color: inherit; + text-decoration: none; +} + +button { + font-family: inherit; + cursor: pointer; + border: none; + background: none; +} + +/* ============================================ + LANDING PAGE CONTAINER + ============================================ */ +.landing-page { + position: relative; + min-height: 100vh; + overflow-x: hidden; +} + +.landing-bg { + position: fixed; + inset: 0; + pointer-events: none; + z-index: 0; +} + +/* ============================================ + GRID BACKGROUND + ============================================ */ +.grid-bg { + position: absolute; + inset: 0; + overflow: hidden; +} + +.grid-lines { + position: absolute; + inset: 0; + background-image: + linear-gradient(rgba(255, 255, 255, 0.02) 1px, transparent 1px), + linear-gradient(90deg, rgba(255, 255, 255, 0.02) 1px, transparent 1px); + background-size: 60px 60px; + mask-image: radial-gradient(ellipse 80% 60% at 50% 0%, black 30%, transparent 70%); +} + +.grid-glow { + position: absolute; + top: 0; + left: 50%; + transform: translateX(-50%); + width: 100%; + height: 600px; + background: radial-gradient(ellipse 60% 40% at 50% 0%, rgba(0, 217, 255, 0.08) 0%, transparent 70%); +} + +/* ============================================ + GLOW ORBS + ============================================ */ +.glow-orbs { + position: absolute; + inset: 0; +} + +.orb { + position: absolute; + border-radius: 50%; + filter: blur(100px); + opacity: 0.4; + animation: float 20s ease-in-out infinite; +} + +.orb-1 { + width: 600px; + height: 600px; + background: var(--accent-cyan); + top: -200px; + left: -200px; + animation-delay: 0s; +} + +.orb-2 { + width: 500px; + height: 500px; + background: var(--accent-purple); + top: 40%; + right: -150px; + animation-delay: -7s; +} + +.orb-3 { + width: 400px; + height: 400px; + background: var(--accent-orange); + bottom: 10%; + left: 20%; + animation-delay: -14s; +} + +@keyframes float { + 0%, 100% { transform: translate(0, 0) scale(1); } + 25% { transform: translate(30px, -30px) scale(1.05); } + 50% { transform: translate(-20px, 20px) scale(0.95); } + 75% { transform: translate(20px, 10px) scale(1.02); } +} + +/* ============================================ + NAVIGATION + ============================================ */ +.nav { + position: fixed; + top: 0; + left: 0; + right: 0; + z-index: 100; + padding: 20px 40px; + transition: var(--transition-medium); +} + +.nav.scrolled { + background: rgba(10, 10, 15, 0.9); + backdrop-filter: blur(20px); + border-bottom: 1px solid var(--border-subtle); + padding: 16px 40px; +} + +.nav-inner { + max-width: var(--container-max); + margin: 0 auto; + display: flex; + align-items: center; + justify-content: space-between; +} + +.nav-logo { + display: flex; + align-items: center; + gap: 10px; + font-family: var(--font-display); + font-weight: 700; + font-size: 20px; +} + +.logo-icon { + font-size: 24px; + color: var(--accent-cyan); + filter: drop-shadow(var(--glow-cyan)); +} + +.nav-links { + display: flex; + align-items: center; + gap: 40px; +} + +.nav-links a { + font-size: 14px; + font-weight: 500; + color: var(--text-secondary); + transition: var(--transition-fast); +} + +.nav-links a:hover { + color: var(--text-primary); +} + +.nav-docs { + padding: 6px 14px; + background: var(--bg-elevated); + border-radius: 6px; + border: 1px solid var(--border-light); +} + +.nav-actions { + display: flex; + align-items: center; + gap: 12px; +} + +/* ============================================ + BUTTONS + ============================================ */ +.btn-primary { + display: inline-flex; + align-items: center; + gap: 8px; + padding: 12px 24px; + background: linear-gradient(135deg, var(--accent-cyan) 0%, #00b8d9 100%); + color: var(--bg-deep); + font-weight: 600; + font-size: 14px; + border-radius: 8px; + transition: var(--transition-fast); + box-shadow: 0 4px 20px rgba(0, 217, 255, 0.3); +} + +.btn-primary:hover { + transform: translateY(-2px); + box-shadow: 0 6px 30px rgba(0, 217, 255, 0.4); +} + +.btn-ghost { + display: inline-flex; + align-items: center; + gap: 8px; + padding: 12px 24px; + background: transparent; + color: var(--text-primary); + font-weight: 500; + font-size: 14px; + border-radius: 8px; + border: 1px solid var(--border-light); + transition: var(--transition-fast); +} + +.btn-ghost:hover { + background: rgba(255, 255, 255, 0.05); + border-color: var(--border-medium); +} + +.btn-large { + padding: 16px 32px; + font-size: 16px; +} + +.btn-full { + width: 100%; + justify-content: center; +} + +.btn-arrow { + transition: transform var(--transition-fast); +} + +.btn-primary:hover .btn-arrow { + transform: translateX(4px); +} + +.play-icon { + font-size: 10px; +} + +/* ============================================ + HERO SECTION + ============================================ */ +.hero { + position: relative; + z-index: 1; + min-height: 100vh; + display: grid; + grid-template-columns: 1fr 1fr; + gap: 80px; + align-items: center; + max-width: var(--container-max); + margin: 0 auto; + padding: 140px 40px 100px; +} + +.hero-badge { + display: inline-flex; + align-items: center; + gap: 8px; + padding: 8px 16px; + background: rgba(0, 217, 255, 0.1); + border: 1px solid rgba(0, 217, 255, 0.2); + border-radius: 100px; + font-size: 13px; + font-weight: 500; + color: var(--accent-cyan); + margin-bottom: 24px; + animation: fadeInUp 0.6s ease forwards; +} + +.badge-dot { + width: 6px; + height: 6px; + background: var(--accent-cyan); + border-radius: 50%; + animation: pulse 2s ease-in-out infinite; +} + +@keyframes pulse { + 0%, 100% { opacity: 1; transform: scale(1); } + 50% { opacity: 0.5; transform: scale(1.2); } +} + +.hero-title { + font-family: var(--font-display); + font-size: clamp(48px, 6vw, 72px); + font-weight: 800; + line-height: 1.1; + letter-spacing: -0.02em; + margin-bottom: 24px; +} + +.title-line { + display: block; + animation: fadeInUp 0.6s ease forwards; + animation-delay: 0.1s; + opacity: 0; +} + +.title-line:nth-child(2) { + animation-delay: 0.2s; +} + +.title-line.gradient { + background: linear-gradient(135deg, var(--accent-cyan) 0%, var(--accent-purple) 50%, var(--accent-orange) 100%); + -webkit-background-clip: text; + -webkit-text-fill-color: transparent; + background-clip: text; +} + +@keyframes fadeInUp { + from { + opacity: 0; + transform: translateY(20px); + } + to { + opacity: 1; + transform: translateY(0); + } +} + +.hero-subtitle { + font-size: 18px; + line-height: 1.7; + color: var(--text-secondary); + max-width: 500px; + margin-bottom: 40px; + animation: fadeInUp 0.6s ease forwards; + animation-delay: 0.3s; + opacity: 0; +} + +.hero-cta { + display: flex; + gap: 16px; + margin-bottom: 60px; + animation: fadeInUp 0.6s ease forwards; + animation-delay: 0.4s; + opacity: 0; +} + +.hero-stats { + display: flex; + align-items: center; + gap: 32px; + animation: fadeInUp 0.6s ease forwards; + animation-delay: 0.5s; + opacity: 0; +} + +.stat { + display: flex; + flex-direction: column; + gap: 4px; +} + +.stat-value { + font-family: var(--font-display); + font-size: 28px; + font-weight: 700; + color: var(--text-primary); +} + +.stat-label { + font-size: 13px; + color: var(--text-muted); +} + +.stat-divider { + width: 1px; + height: 40px; + background: var(--border-light); +} + +/* ============================================ + AGENT NETWORK VISUALIZATION + ============================================ */ +.hero-visual { + position: relative; + animation: fadeIn 1s ease forwards; + animation-delay: 0.6s; + opacity: 0; +} + +@keyframes fadeIn { + to { opacity: 1; } +} + +.agent-network { + position: relative; + width: 100%; + aspect-ratio: 1; + max-width: 500px; + margin: 0 auto; +} + +.network-lines { + position: absolute; + inset: 0; + width: 100%; + height: 100%; +} + +.network-line { + stroke: rgba(255, 255, 255, 0.1); + stroke-width: 0.5; +} + +.network-line-glow { + stroke: var(--accent-cyan); + stroke-width: 1; + stroke-dasharray: 100; + stroke-dashoffset: 100; + animation: lineFlow 3s ease-in-out infinite; + filter: drop-shadow(0 0 4px var(--accent-cyan)); +} + +@keyframes lineFlow { + 0% { stroke-dashoffset: 100; opacity: 0; } + 50% { opacity: 1; } + 100% { stroke-dashoffset: -100; opacity: 0; } +} + +.network-agent { + position: absolute; + transform: translate(-50%, -50%); + display: flex; + flex-direction: column; + align-items: center; + gap: 8px; +} + +.agent-glow { + position: absolute; + width: 80px; + height: 80px; + background: var(--agent-color); + border-radius: 50%; + filter: blur(30px); + opacity: 0.3; + z-index: -1; +} + +.agent-icon { + width: 56px; + height: 56px; + display: flex; + align-items: center; + justify-content: center; + background: var(--bg-card); + border: 2px solid var(--agent-color); + border-radius: 16px; + font-size: 24px; + color: var(--agent-color); + box-shadow: 0 0 20px rgba(0, 0, 0, 0.5), inset 0 0 20px rgba(255, 255, 255, 0.02); + transition: var(--transition-medium); +} + +.network-agent.pulse .agent-icon { + animation: agentPulse 2s ease-in-out infinite; +} + +@keyframes agentPulse { + 0%, 100% { box-shadow: 0 0 20px rgba(0, 0, 0, 0.5), 0 0 0 0 var(--agent-color); } + 50% { box-shadow: 0 0 20px rgba(0, 0, 0, 0.5), 0 0 30px 10px transparent; } +} + +.agent-label { + font-family: var(--font-mono); + font-size: 12px; + font-weight: 500; + color: var(--text-secondary); + text-transform: uppercase; + letter-spacing: 0.5px; +} + +.data-packet { + position: absolute; + width: 8px; + height: 8px; + background: var(--accent-cyan); + border-radius: 50%; + filter: blur(2px); + box-shadow: 0 0 10px var(--accent-cyan); + animation: packetMove 3s ease-in-out infinite; +} + +@keyframes packetMove { + 0% { + left: var(--from-x); + top: var(--from-y); + opacity: 0; + } + 10% { opacity: 1; } + 90% { opacity: 1; } + 100% { + left: var(--to-x); + top: var(--to-y); + opacity: 0; + } +} + +/* ============================================ + SECTION COMMON STYLES + ============================================ */ +section { + position: relative; + z-index: 1; +} + +.section-header { + text-align: center; + max-width: 700px; + margin: 0 auto 60px; +} + +.section-tag { + display: inline-block; + font-family: var(--font-mono); + font-size: 12px; + font-weight: 500; + text-transform: uppercase; + letter-spacing: 2px; + color: var(--accent-cyan); + margin-bottom: 16px; +} + +.section-header h2 { + font-family: var(--font-display); + font-size: clamp(32px, 4vw, 48px); + font-weight: 700; + margin-bottom: 16px; +} + +.section-header p { + font-size: 18px; + color: var(--text-secondary); +} + +/* ============================================ + DEMO SECTION + ============================================ */ +.demo-section { + padding: var(--section-padding) 40px; + max-width: var(--container-max); + margin: 0 auto; +} + +.demo-container { + perspective: 1000px; +} + +.demo-window { + background: var(--bg-secondary); + border: 1px solid var(--border-light); + border-radius: 16px; + overflow: hidden; + box-shadow: + 0 0 0 1px rgba(255, 255, 255, 0.05), + 0 20px 80px rgba(0, 0, 0, 0.5); + transform: rotateX(2deg); + transition: var(--transition-medium); +} + +.demo-window:hover { + transform: rotateX(0deg); + box-shadow: + 0 0 0 1px rgba(255, 255, 255, 0.1), + 0 30px 100px rgba(0, 0, 0, 0.6); +} + +.window-header { + display: flex; + align-items: center; + padding: 16px 20px; + background: var(--bg-tertiary); + border-bottom: 1px solid var(--border-subtle); +} + +.window-dots { + display: flex; + gap: 8px; +} + +.dot { + width: 12px; + height: 12px; + border-radius: 50%; +} + +.dot.red { background: #ff5f57; } +.dot.yellow { background: #febc2e; } +.dot.green { background: #28c840; } + +.window-title { + flex: 1; + text-align: center; + font-family: var(--font-mono); + font-size: 13px; + color: var(--text-muted); +} + +.window-status { + display: flex; + align-items: center; + gap: 8px; + font-size: 12px; + color: var(--text-muted); +} + +.status-dot { + width: 8px; + height: 8px; + background: var(--accent-green); + border-radius: 50%; + animation: pulse 2s ease-in-out infinite; +} + +.demo-content { + display: grid; + grid-template-columns: 200px 1fr; + height: 400px; +} + +.demo-sidebar { + padding: 20px; + background: var(--bg-tertiary); + border-right: 1px solid var(--border-subtle); +} + +.sidebar-section { + margin-bottom: 24px; +} + +.sidebar-label { + font-family: var(--font-mono); + font-size: 10px; + font-weight: 600; + text-transform: uppercase; + letter-spacing: 1px; + color: var(--text-dim); + margin-bottom: 12px; +} + +.sidebar-agent { + display: flex; + align-items: center; + gap: 10px; + padding: 8px 10px; + border-radius: 6px; + margin-bottom: 4px; + transition: var(--transition-fast); +} + +.sidebar-agent:hover { + background: rgba(255, 255, 255, 0.03); +} + +.agent-dot { + width: 8px; + height: 8px; + border-radius: 50%; +} + +.sidebar-agent .agent-name { + flex: 1; + font-size: 13px; + color: var(--text-secondary); +} + +.sidebar-agent .agent-status { + font-size: 8px; + color: var(--accent-green); +} + +.demo-messages { + padding: 20px; + overflow-y: auto; + display: flex; + flex-direction: column; + gap: 16px; +} + +.message { + animation: messageSlide 0.3s ease forwards; +} + +@keyframes messageSlide { + from { + opacity: 0; + transform: translateY(10px); + } + to { + opacity: 1; + transform: translateY(0); + } +} + +.message-header { + display: flex; + align-items: center; + gap: 8px; + margin-bottom: 6px; +} + +.message-icon { + width: 24px; + height: 24px; + display: flex; + align-items: center; + justify-content: center; + border-radius: 6px; + font-size: 12px; + color: var(--bg-deep); +} + +.message-from { + font-weight: 600; + font-size: 13px; + color: var(--msg-color); +} + +.message-arrow { + font-size: 10px; + color: var(--text-dim); +} + +.message-to { + font-size: 13px; + color: var(--text-muted); +} + +.message-time { + margin-left: auto; + font-size: 11px; + color: var(--text-dim); +} + +.message-content { + font-size: 14px; + color: var(--text-secondary); + line-height: 1.6; + padding-left: 32px; +} + +.typing-indicator { + display: flex; + align-items: center; + gap: 4px; + padding: 8px 0; + padding-left: 32px; +} + +.typing-dot { + width: 6px; + height: 6px; + background: var(--text-dim); + border-radius: 50%; + animation: typingBounce 1.4s ease-in-out infinite; +} + +.typing-dot:nth-child(2) { animation-delay: 0.2s; } +.typing-dot:nth-child(3) { animation-delay: 0.4s; } + +@keyframes typingBounce { + 0%, 60%, 100% { transform: translateY(0); } + 30% { transform: translateY(-6px); } +} + +.demo-caption { + text-align: center; + margin-top: 20px; +} + +.demo-caption p { + font-size: 13px; + color: var(--text-dim); +} + +/* ============================================ + FEATURES SECTION + ============================================ */ +.features-section { + padding: var(--section-padding) 40px; + max-width: var(--container-max); + margin: 0 auto; +} + +.features-grid { + display: grid; + grid-template-columns: repeat(3, 1fr); + gap: 24px; +} + +.feature-card { + padding: 32px; + background: var(--bg-card); + border: 1px solid var(--border-subtle); + border-radius: 16px; + transition: var(--transition-medium); + animation: fadeInUp 0.6s ease forwards; + opacity: 0; +} + +.feature-card:hover { + background: var(--bg-elevated); + border-color: var(--border-light); + transform: translateY(-4px); +} + +.feature-icon { + font-size: 32px; + margin-bottom: 20px; +} + +.feature-card h3 { + font-family: var(--font-display); + font-size: 18px; + font-weight: 600; + margin-bottom: 12px; +} + +.feature-card p { + font-size: 14px; + color: var(--text-secondary); + line-height: 1.6; +} + +/* ============================================ + PROVIDERS SECTION + ============================================ */ +.providers-section { + padding: var(--section-padding) 40px; + max-width: var(--container-max); + margin: 0 auto; +} + +.providers-grid { + display: grid; + grid-template-columns: repeat(4, 1fr); + gap: 24px; +} + +.provider-card { + padding: 40px 32px; + background: var(--bg-card); + border: 1px solid var(--border-subtle); + border-radius: 16px; + text-align: center; + transition: var(--transition-medium); +} + +.provider-card:hover { + border-color: var(--provider-color); + box-shadow: 0 0 40px rgba(0, 0, 0, 0.3); +} + +.provider-icon { + font-size: 48px; + color: var(--provider-color); + margin-bottom: 16px; + filter: drop-shadow(0 0 20px var(--provider-color)); +} + +.provider-name { + font-family: var(--font-display); + font-size: 20px; + font-weight: 600; + margin-bottom: 8px; +} + +.provider-status { + font-size: 12px; + color: var(--accent-green); + text-transform: uppercase; + letter-spacing: 1px; +} + +.provider-card.coming-soon { + --provider-color: var(--text-dim); +} + +.provider-card.coming-soon .provider-status { + color: var(--text-muted); +} + +/* ============================================ + PRICING SECTION + ============================================ */ +.pricing-section { + padding: var(--section-padding) 40px; + max-width: var(--container-max); + margin: 0 auto; +} + +.pricing-grid { + display: grid; + grid-template-columns: repeat(4, 1fr); + gap: 24px; + align-items: start; +} + +.pricing-card { + position: relative; + padding: 32px; + background: var(--bg-card); + border: 1px solid var(--border-subtle); + border-radius: 16px; + transition: var(--transition-medium); +} + +.pricing-card:hover { + border-color: var(--border-light); +} + +.pricing-card.highlighted { + background: linear-gradient(135deg, rgba(0, 217, 255, 0.05) 0%, rgba(168, 85, 247, 0.05) 100%); + border-color: var(--accent-cyan); + transform: scale(1.02); +} + +.pricing-card .popular-badge { + position: absolute; + top: -12px; + left: 50%; + transform: translateX(-50%); + padding: 6px 16px; + background: linear-gradient(135deg, var(--accent-cyan) 0%, var(--accent-purple) 100%); + color: var(--bg-deep); + font-size: 11px; + font-weight: 600; + text-transform: uppercase; + letter-spacing: 1px; + border-radius: 100px; +} + +.pricing-header { + margin-bottom: 24px; + padding-bottom: 24px; + border-bottom: 1px solid var(--border-subtle); +} + +.pricing-header h3 { + font-family: var(--font-display); + font-size: 20px; + font-weight: 600; + margin-bottom: 12px; +} + +.pricing-price { + margin-bottom: 12px; +} + +.pricing-price .price { + font-family: var(--font-display); + font-size: 40px; + font-weight: 700; +} + +.pricing-price .period { + font-size: 16px; + color: var(--text-muted); +} + +.pricing-description { + font-size: 13px; + color: var(--text-muted); +} + +.pricing-features { + list-style: none; + margin-bottom: 32px; +} + +.pricing-features li { + display: flex; + align-items: flex-start; + gap: 10px; + font-size: 14px; + color: var(--text-secondary); + padding: 8px 0; +} + +.pricing-features .check { + color: var(--accent-green); + font-weight: bold; +} + +/* ============================================ + CTA SECTION + ============================================ */ +.cta-section { + padding: var(--section-padding) 40px; + max-width: var(--container-max); + margin: 0 auto; + display: grid; + grid-template-columns: 1fr 1fr; + gap: 80px; + align-items: center; +} + +.cta-content h2 { + font-family: var(--font-display); + font-size: clamp(32px, 4vw, 48px); + font-weight: 700; + margin-bottom: 16px; +} + +.cta-content p { + font-size: 18px; + color: var(--text-secondary); + margin-bottom: 32px; +} + +.cta-buttons { + display: flex; + gap: 16px; +} + +.cta-terminal { + background: var(--bg-secondary); + border: 1px solid var(--border-light); + border-radius: 12px; + padding: 24px; + font-family: var(--font-mono); + font-size: 14px; +} + +.terminal-header { + display: flex; + align-items: center; + gap: 12px; + margin-bottom: 20px; + padding-bottom: 16px; + border-bottom: 1px solid var(--border-subtle); +} + +.terminal-prompt { + color: var(--accent-cyan); +} + +.terminal-text { + color: var(--text-primary); +} + +.terminal-output { + display: flex; + flex-direction: column; + gap: 8px; +} + +.output-line { + color: var(--text-secondary); +} + +.output-line.cursor::after { + content: '▋'; + animation: cursorBlink 1s step-end infinite; + color: var(--accent-cyan); +} + +@keyframes cursorBlink { + 50% { opacity: 0; } +} + +/* ============================================ + FOOTER + ============================================ */ +.footer { + position: relative; + z-index: 1; + border-top: 1px solid var(--border-subtle); + padding: 60px 40px 40px; + background: var(--bg-primary); +} + +.footer-inner { + max-width: var(--container-max); + margin: 0 auto; + display: grid; + grid-template-columns: 1fr 2fr; + gap: 80px; + margin-bottom: 60px; +} + +.footer-logo { + display: flex; + align-items: center; + gap: 10px; + font-family: var(--font-display); + font-weight: 700; + font-size: 18px; + margin-bottom: 12px; +} + +.footer-brand p { + font-size: 14px; + color: var(--text-muted); +} + +.footer-links { + display: grid; + grid-template-columns: repeat(3, 1fr); + gap: 40px; +} + +.footer-column h4 { + font-family: var(--font-display); + font-size: 14px; + font-weight: 600; + margin-bottom: 20px; +} + +.footer-column a { + display: block; + font-size: 14px; + color: var(--text-muted); + padding: 6px 0; + transition: var(--transition-fast); +} + +.footer-column a:hover { + color: var(--text-primary); +} + +.footer-bottom { + max-width: var(--container-max); + margin: 0 auto; + display: flex; + align-items: center; + justify-content: space-between; + padding-top: 24px; + border-top: 1px solid var(--border-subtle); +} + +.footer-bottom p { + font-size: 13px; + color: var(--text-dim); +} + +.social-links { + display: flex; + gap: 16px; +} + +.social-links a { + display: flex; + align-items: center; + justify-content: center; + width: 36px; + height: 36px; + background: var(--bg-card); + border: 1px solid var(--border-subtle); + border-radius: 8px; + color: var(--text-muted); + transition: var(--transition-fast); +} + +.social-links a:hover { + background: var(--bg-elevated); + border-color: var(--border-light); + color: var(--text-primary); +} + +/* ============================================ + RESPONSIVE + ============================================ */ +@media (max-width: 1024px) { + .hero { + grid-template-columns: 1fr; + text-align: center; + padding: 140px 24px 80px; + } + + .hero-subtitle { + margin-left: auto; + margin-right: auto; + } + + .hero-cta { + justify-content: center; + } + + .hero-stats { + justify-content: center; + } + + .hero-visual { + order: -1; + max-width: 400px; + margin: 0 auto; + } + + .features-grid { + grid-template-columns: repeat(2, 1fr); + } + + .providers-grid { + grid-template-columns: repeat(2, 1fr); + } + + .pricing-grid { + grid-template-columns: repeat(2, 1fr); + } + + .cta-section { + grid-template-columns: 1fr; + text-align: center; + } + + .cta-buttons { + justify-content: center; + } + + .demo-content { + grid-template-columns: 1fr; + } + + .demo-sidebar { + display: none; + } + + .footer-inner { + grid-template-columns: 1fr; + gap: 40px; + } +} + +@media (max-width: 768px) { + :root { + --section-padding: 80px; + } + + .nav { + padding: 16px 20px; + } + + .nav-links { + display: none; + } + + .hero-title { + font-size: 36px; + } + + .hero-cta { + flex-direction: column; + } + + .hero-stats { + flex-wrap: wrap; + gap: 24px; + } + + .stat-divider { + display: none; + } + + .features-grid, + .providers-grid, + .pricing-grid { + grid-template-columns: 1fr; + } + + .pricing-card.highlighted { + transform: none; + } + + .footer-links { + grid-template-columns: repeat(2, 1fr); + } + + .footer-bottom { + flex-direction: column; + gap: 16px; + text-align: center; + } +} From 52496f2325812bc658f32252f9484c51454e3eff Mon Sep 17 00:00:00 2001 From: Claude Date: Tue, 30 Dec 2025 01:54:14 +0000 Subject: [PATCH 19/38] Add beads tasks for remaining Agent Relay Cloud work --- .beads/issues.jsonl | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/.beads/issues.jsonl b/.beads/issues.jsonl index 7cd9338ca..7af0052c9 100644 --- a/.beads/issues.jsonl +++ b/.beads/issues.jsonl @@ -11,10 +11,22 @@ {"id":"agent-relay-293","title":"Fix agent-relay release CLI command","description":"The 'agent-relay release' CLI fails with 'open terminal failed: not a terminal' when called from another agent. Spawned agents cannot be released via CLI. Need to fix terminal detection or use API directly.","status":"open","priority":1,"issue_type":"bug","created_at":"2025-12-29T06:42:00.654052127Z","updated_at":"2025-12-29T06:42:00.654052127Z"} {"id":"agent-relay-294","title":"Increase ACK timeout from 2s to 5-10s","description":"Message ACK timeout is only 2s (src/daemon/router.ts:43). Too short for agents doing heavy processing, causing 'Waiting for X ACK' loops. Increase to 5-10s.","status":"open","priority":2,"issue_type":"bug","created_at":"2025-12-29T06:42:03.047914487Z","updated_at":"2025-12-29T06:42:03.047914487Z"} {"id":"agent-relay-295","title":"Add heartbeat exemption during active processing","description":"Heartbeat timeout (30s) can kill agents during long tool calls. Add exemption or async heartbeat handling during active processing state.","status":"open","priority":2,"issue_type":"bug","created_at":"2025-12-29T06:42:04.854217445Z","updated_at":"2025-12-29T06:42:04.854217445Z"} +{"id":"agent-relay-296","title":"Deploy to agent-relay.com","description":"Set up production deployment pipeline (Fly.io or Railway), configure DNS, SSL, and environment variables for the cloud service","status":"open","priority":0,"issue_type":"task","created_at":"2025-12-30T01:52:27.025958494Z","created_by":"Claude","updated_at":"2025-12-30T01:52:27.025958494Z"} +{"id":"agent-relay-297","title":"Database schema and migrations","description":"Create PostgreSQL schema for users, workspaces, subscriptions, and agents. Set up Prisma or Drizzle ORM with migrations.","status":"open","priority":0,"issue_type":"task","created_at":"2025-12-30T01:52:42.065587035Z","created_by":"Claude","updated_at":"2025-12-30T01:52:42.065587035Z"} +{"id":"agent-relay-298","title":"Complete GitHub OAuth flow","description":"Build login/signup pages, session management, and user profile. Wire up to existing auth router.","status":"open","priority":0,"issue_type":"task","created_at":"2025-12-30T01:52:46.297798737Z","created_by":"Claude","updated_at":"2025-12-30T01:52:46.297798737Z"} +{"id":"agent-relay-299","title":"Agent logs streaming","description":"Real-time log streaming from agents to dashboard via WebSocket. Include log viewer component with filtering and search.","status":"open","priority":1,"issue_type":"task","created_at":"2025-12-30T01:52:51.082034751Z","created_by":"Claude","updated_at":"2025-12-30T01:52:51.082034751Z"} {"id":"agent-relay-2lw","title":"Add agent metadata tracking","description":"Track program, model, task description in agents.json. Better agent discovery.","status":"closed","priority":2,"issue_type":"feature","assignee":"Implementer","created_at":"2025-12-20T21:36:19.741328+01:00","updated_at":"2025-12-22T17:17:25.919228+01:00","closed_at":"2025-12-22T17:17:25.919228+01:00"} {"id":"agent-relay-2sn","title":"Competitive Analysis: mcp_agent_mail vs agent-relay","status":"closed","priority":2,"issue_type":"task","created_at":"2025-12-20T21:34:44.49366+01:00","updated_at":"2025-12-20T21:36:26.362391+01:00","closed_at":"2025-12-20T21:36:26.362391+01:00"} {"id":"agent-relay-2uf","title":"Add message threading support","description":"@relay:Bob [thread:feature-123] pattern. Group related messages for better context.","notes":"Current state: thread parsing + protocol/storage support implemented (ParsedCommand.thread, SendPayload.thread, DB messages.thread + filter). Remaining: wire cmd.thread through tmux-wrapper sendRelayCommand -\u003e RelayClient.sendMessage(..., thread) and include thread in injected display/Inbox. See src/wrapper/tmux-wrapper.ts sendRelayCommand + handleIncomingMessage.","status":"closed","priority":2,"issue_type":"feature","assignee":"SecondLead","created_at":"2025-12-20T21:36:19.631448+01:00","updated_at":"2025-12-22T17:17:42.876826+01:00","closed_at":"2025-12-22T17:17:42.876826+01:00"} {"id":"agent-relay-2z1","title":"ACK messages not used for reliability","description":"In connection.ts:114-116, ACK messages are accepted but not processed. The protocol supports reliable delivery with ACK/NACK but it's not implemented. Need to: (1) Track unACKed messages, (2) Implement retry logic, (3) Add configurable TTL for messages.","status":"closed","priority":2,"issue_type":"feature","assignee":"LeadDev","created_at":"2025-12-20T00:17:43.615251+01:00","updated_at":"2025-12-20T21:56:07.202292+01:00","closed_at":"2025-12-20T21:56:07.202292+01:00"} +{"id":"agent-relay-300","title":"Environment variables UI","description":"Dashboard component to manage environment variables per workspace. Integrate with credential vault for encryption.","status":"open","priority":1,"issue_type":"task","created_at":"2025-12-30T01:52:55.477123756Z","created_by":"Claude","updated_at":"2025-12-30T01:52:55.477123756Z"} +{"id":"agent-relay-301","title":"CLI package (npx agent-relay)","description":"Create npm package for 'npx agent-relay init' command. Should bootstrap workspace, authenticate, and connect to cloud.","status":"open","priority":1,"issue_type":"task","created_at":"2025-12-30T01:53:11.040148913Z","created_by":"Claude","updated_at":"2025-12-30T01:53:11.040148913Z"} +{"id":"agent-relay-302","title":"Documentation site","description":"Build docs.agent-relay.com with guides for getting started, API reference, CLI commands, and provider integration.","status":"open","priority":1,"issue_type":"task","created_at":"2025-12-30T01:53:15.155816758Z","created_by":"Claude","updated_at":"2025-12-30T01:53:15.155816758Z"} +{"id":"agent-relay-303","title":"Email notifications","description":"Transactional emails for billing (receipts, failed payments), alerts (agent crashes), and team invitations. Use Resend or SendGrid.","status":"open","priority":2,"issue_type":"task","created_at":"2025-12-30T01:53:19.446560459Z","created_by":"Claude","updated_at":"2025-12-30T01:53:19.446560459Z"} +{"id":"agent-relay-304","title":"Rate limiting and usage tracking","description":"Implement rate limits per plan tier. Track compute hours, storage, and API calls. Integrate with billing for overages.","status":"open","priority":1,"issue_type":"task","created_at":"2025-12-30T01:53:24.488292839Z","created_by":"Claude","updated_at":"2025-12-30T01:53:24.488292839Z"} +{"id":"agent-relay-305","title":"Integration tests","description":"End-to-end tests for critical flows: signup, workspace creation, agent spawn, billing checkout. Use Playwright.","status":"open","priority":2,"issue_type":"task","created_at":"2025-12-30T01:53:36.69351706Z","created_by":"Claude","updated_at":"2025-12-30T01:53:36.69351706Z"} +{"id":"agent-relay-306","title":"Webhook endpoints for providers","description":"Receive events from Claude/Codex/Gemini (if available). Forward to appropriate workspace agents.","status":"open","priority":2,"issue_type":"task","created_at":"2025-12-30T01:53:41.191436248Z","created_by":"Claude","updated_at":"2025-12-30T01:53:41.191436248Z"} +{"id":"agent-relay-307","title":"Agent trajectory/replay viewer","description":"Visualize agent decision paths, tool calls, and outputs. Allow session replay for debugging.","status":"open","priority":2,"issue_type":"task","created_at":"2025-12-30T01:53:45.560017297Z","created_by":"Claude","updated_at":"2025-12-30T01:53:45.560017297Z"} {"id":"agent-relay-30fu","title":"Fix dashboard conversation routing logic","description":"Conversation routing in the dashboard needs fixing: 1) If conversation starts in DM, it should continue in DM. 2) If conversation starts in general channel, it should flow to general. 3) Messages without '@' should naturally broadcast to everyone.","status":"closed","priority":1,"issue_type":"bug","created_at":"2025-12-28T22:05:12.683854-05:00","updated_at":"2025-12-28T22:06:29.421436-05:00","closed_at":"2025-12-28T22:06:29.421436-05:00","close_reason":"Fixed by Frontend agent"} {"id":"agent-relay-37i","title":"Message deduplication uses in-memory Set without limits","description":"In tmux-wrapper.ts:65, sentMessageHashes is a Set that grows unbounded. For long-running sessions, this could cause memory issues. Add: (1) Max size with LRU eviction, (2) Time-based expiration, (3) Bloom filter alternative for memory efficiency.","status":"open","priority":2,"issue_type":"task","created_at":"2025-12-20T00:18:47.229988+01:00","updated_at":"2025-12-20T00:18:47.229988+01:00"} {"id":"agent-relay-3px","title":"Add playbook system for batch automation","description":"Implement playbook system (like Maestro's Auto Run) for batch-processing task lists through agents. Define workflows in YAML/markdown, execute automatically with context isolation. Enables reproducible multi-step automation.","status":"open","priority":3,"issue_type":"feature","created_at":"2025-12-23T17:04:54.464749+01:00","updated_at":"2025-12-23T17:04:54.464749+01:00"} From 87758daf251d31608bf4fe128dbe5aa31027063e Mon Sep 17 00:00:00 2001 From: Claude Date: Tue, 30 Dec 2025 02:03:26 +0000 Subject: [PATCH 20/38] Fix linting issues across cloud and daemon modules --- src/cloud/api/auth.ts | 2 +- src/cloud/api/onboarding.ts | 6 ++---- src/cloud/api/repos.ts | 2 +- src/cloud/api/workspaces.ts | 4 ++-- src/cloud/billing/service.ts | 5 +++-- src/cloud/db/index.ts | 2 +- src/cloud/provisioner/index.ts | 2 +- src/cloud/server.ts | 4 ++-- src/cloud/vault/index.ts | 2 +- src/daemon/agent-manager.ts | 4 +--- src/daemon/orchestrator.ts | 3 ++- src/resiliency/provider-context.ts | 4 ++-- 12 files changed, 19 insertions(+), 21 deletions(-) diff --git a/src/cloud/api/auth.ts b/src/cloud/api/auth.ts index 5ee92194e..9b4475c03 100644 --- a/src/cloud/api/auth.ts +++ b/src/cloud/api/auth.ts @@ -193,7 +193,7 @@ authRouter.get('/me', async (req: Request, res: Response) => { /** * Middleware to require authentication */ -export function requireAuth(req: Request, res: Response, next: Function) { +export function requireAuth(req: Request, res: Response, next: () => void) { if (!req.session.userId) { return res.status(401).json({ error: 'Authentication required' }); } diff --git a/src/cloud/api/onboarding.ts b/src/cloud/api/onboarding.ts index e44b53421..0bb625e4c 100644 --- a/src/cloud/api/onboarding.ts +++ b/src/cloud/api/onboarding.ts @@ -111,12 +111,12 @@ onboardingRouter.post('/cli/:provider/start', async (req: Request, res: Response }); session.process = proc; - let output = ''; + let _output = ''; // Capture stdout/stderr for auth URL const handleOutput = (data: Buffer) => { const text = data.toString(); - output += text; + _output += text; // Look for auth URL const match = text.match(config.urlPattern); @@ -392,8 +392,6 @@ async function extractCredentials( try { const fs = await import('fs/promises'); const os = await import('os'); - const path = await import('path'); - const credPath = config.credentialPath.replace('~', os.homedir()); const content = await fs.readFile(credPath, 'utf8'); const creds = JSON.parse(content); diff --git a/src/cloud/api/repos.ts b/src/cloud/api/repos.ts index ff95955ff..2d4b39bea 100644 --- a/src/cloud/api/repos.ts +++ b/src/cloud/api/repos.ts @@ -207,7 +207,7 @@ reposRouter.post('/bulk', async (req: Request, res: Response) => { }); results.push({ fullName, success: true }); - } catch (error) { + } catch (_error) { results.push({ fullName, success: false, error: 'Import failed' }); } } diff --git a/src/cloud/api/workspaces.ts b/src/cloud/api/workspaces.ts index 8523193a3..aed040a23 100644 --- a/src/cloud/api/workspaces.ts +++ b/src/cloud/api/workspaces.ts @@ -7,7 +7,7 @@ import { Router, Request, Response } from 'express'; import { requireAuth } from './auth'; import { db, Workspace } from '../db'; -import { getProvisioner, ProvisionConfig } from '../provisioner'; +import { getProvisioner } from '../provisioner'; export const workspacesRouter = Router(); @@ -423,7 +423,7 @@ workspacesRouter.post('/:id/domain/verify', async (req: Request, res: Response) found: records, }); } - } catch (dnsError) { + } catch (_dnsError) { res.status(400).json({ success: false, status: 'pending', diff --git a/src/cloud/billing/service.ts b/src/cloud/billing/service.ts index 11a8da77b..c77557a38 100644 --- a/src/cloud/billing/service.ts +++ b/src/cloud/billing/service.ts @@ -6,7 +6,7 @@ import Stripe from 'stripe'; import { getConfig } from '../config'; -import { BILLING_PLANS, getPlan } from './plans'; +import { getPlan } from './plans'; import type { SubscriptionTier, BillingCustomer, @@ -132,7 +132,8 @@ export class BillingService { cancelUrl: string ): Promise { const config = getConfig(); - const plan = getPlan(tier); + // Validate tier exists + getPlan(tier); // Get the appropriate price ID let priceId: string | undefined; diff --git a/src/cloud/db/index.ts b/src/cloud/db/index.ts index d01157f4f..71f048e87 100644 --- a/src/cloud/db/index.ts +++ b/src/cloud/db/index.ts @@ -4,7 +4,7 @@ * PostgreSQL database access for users, credentials, workspaces, and repos. */ -import { Pool, PoolClient } from 'pg'; +import { Pool } from 'pg'; import { getConfig } from '../config'; // Initialize pool lazily diff --git a/src/cloud/provisioner/index.ts b/src/cloud/provisioner/index.ts index 352fa58f9..1c5c6d2c9 100644 --- a/src/cloud/provisioner/index.ts +++ b/src/cloud/provisioner/index.ts @@ -5,7 +5,7 @@ */ import { getConfig } from '../config'; -import { db, Workspace, WorkspaceConfig } from '../db'; +import { db, Workspace } from '../db'; import { vault } from '../vault'; export interface ProvisionConfig { diff --git a/src/cloud/server.ts b/src/cloud/server.ts index 98168f6a6..47e6c4d5e 100644 --- a/src/cloud/server.ts +++ b/src/cloud/server.ts @@ -8,7 +8,7 @@ import cors from 'cors'; import helmet from 'helmet'; import { createClient } from 'redis'; import RedisStore from 'connect-redis'; -import { getConfig, CloudConfig } from './config'; +import { getConfig } from './config'; // API routers import { authRouter } from './api/auth'; @@ -73,7 +73,7 @@ export async function createServer(): Promise { app.use('/api/billing', billingRouter); // Error handler - app.use((err: Error, req: Request, res: Response, next: NextFunction) => { + app.use((err: Error, req: Request, res: Response, _next: NextFunction) => { console.error('Error:', err); res.status(500).json({ error: 'Internal server error', diff --git a/src/cloud/vault/index.ts b/src/cloud/vault/index.ts index 0a55f6633..a9ea2f5bf 100644 --- a/src/cloud/vault/index.ts +++ b/src/cloud/vault/index.ts @@ -6,7 +6,7 @@ import crypto from 'crypto'; import { getConfig } from '../config'; -import { db, Credential } from '../db'; +import { db } from '../db'; const ALGORITHM = 'aes-256-gcm'; const IV_LENGTH = 12; diff --git a/src/daemon/agent-manager.ts b/src/daemon/agent-manager.ts index 643346724..5204f8146 100644 --- a/src/daemon/agent-manager.ts +++ b/src/daemon/agent-manager.ts @@ -7,14 +7,12 @@ import * as fs from 'fs'; import * as path from 'path'; import { EventEmitter } from 'events'; import { createLogger } from '../resiliency/logger.js'; -import { getSupervisor, type SupervisedAgent } from '../resiliency/supervisor.js'; -import { getContextPersistence } from '../resiliency/context-persistence.js'; +import { getSupervisor } from '../resiliency/supervisor.js'; import { detectProvider } from '../resiliency/provider-context.js'; import { PtyWrapper, type PtyWrapperConfig } from '../wrapper/pty-wrapper.js'; import { resolveCommand } from '../utils/command-resolver.js'; import type { Agent, - AgentStatus, ProviderType, DaemonEvent, SpawnAgentRequest, diff --git a/src/daemon/orchestrator.ts b/src/daemon/orchestrator.ts index 732d98353..3d3151407 100644 --- a/src/daemon/orchestrator.ts +++ b/src/daemon/orchestrator.ts @@ -569,7 +569,7 @@ export class Orchestrator extends EventEmitter { /** * Handle WebSocket connection */ - private handleWebSocket(ws: WebSocket, req: http.IncomingMessage): void { + private handleWebSocket(ws: WebSocket, _req: http.IncomingMessage): void { logger.info('WebSocket client connected'); const session: UserSession = { @@ -776,6 +776,7 @@ export class Orchestrator extends EventEmitter { */ private getGitInfo(workspacePath: string): { gitRemote?: string; gitBranch?: string } { try { + // eslint-disable-next-line @typescript-eslint/no-require-imports const { execSync } = require('child_process'); const branch = execSync('git branch --show-current', { cwd: workspacePath, diff --git a/src/resiliency/provider-context.ts b/src/resiliency/provider-context.ts index d1b1a5c80..6d7067476 100644 --- a/src/resiliency/provider-context.ts +++ b/src/resiliency/provider-context.ts @@ -267,7 +267,7 @@ export class CodexContextHandler extends ProviderContextHandler { }); } - async injectContext(handoff: Handoff): Promise { + async injectContext(_handoff: Handoff): Promise { if (!this.codexConfig.systemPromptPath) return; // Generate resumption context @@ -370,7 +370,7 @@ export class GeminiContextHandler extends ProviderContextHandler { }); } - async injectContext(handoff: Handoff): Promise { + async injectContext(_handoff: Handoff): Promise { const resumptionContext = this.persistence.generateResumptionContext(this.config.agentName); if (!resumptionContext) return; From c39ec375e4db16e5a39a8fbb30ea27248e4f5dee Mon Sep 17 00:00:00 2001 From: Claude Date: Tue, 30 Dec 2025 02:31:17 +0000 Subject: [PATCH 21/38] Fix TypeScript build errors and API compatibility issues - Add .js extensions to all ESM imports in cloud and resiliency modules - Install missing type declarations (@types/pg, @types/cors, etc.) - Fix Stripe API compatibility with type assertions for API version changes - Fix Redis/connect-redis API compatibility with type assertions - Fix WebSocket import in daemon/api.ts - Rename DaemonConfig to ApiDaemonConfig to avoid duplicate export - Exclude landing page from main tsconfig (it's React/browser code) - Fix type annotations for event handlers in supervisor.ts - Fix logger delete operator issue using destructuring - Fix SpawnConfig type mismatch in dashboard App.tsx --- package-lock.json | 275 +++++++++++++++++++++++++ package.json | 6 + src/cloud/api/auth.ts | 23 ++- src/cloud/api/billing.ts | 6 +- src/cloud/api/onboarding.ts | 6 +- src/cloud/api/providers.ts | 33 ++- src/cloud/api/repos.ts | 49 ++++- src/cloud/api/teams.ts | 4 +- src/cloud/api/workspaces.ts | 10 +- src/cloud/billing/index.ts | 6 +- src/cloud/billing/plans.ts | 2 +- src/cloud/billing/service.ts | 28 ++- src/cloud/db/index.ts | 2 +- src/cloud/index.ts | 12 +- src/cloud/provisioner/index.ts | 20 +- src/cloud/server.ts | 20 +- src/cloud/vault/index.ts | 10 +- src/daemon/api.ts | 22 +- src/daemon/types.ts | 4 +- src/dashboard/react-components/App.tsx | 2 +- src/resiliency/context-persistence.ts | 2 +- src/resiliency/index.ts | 12 +- src/resiliency/logger.ts | 8 +- src/resiliency/provider-context.ts | 9 +- src/resiliency/supervisor.ts | 28 +-- tsconfig.json | 2 +- 26 files changed, 472 insertions(+), 129 deletions(-) diff --git a/package-lock.json b/package-lock.json index b5e6dc1ca..7aff8d1b0 100644 --- a/package-lock.json +++ b/package-lock.json @@ -18,6 +18,7 @@ "express": "^5.2.1", "http-proxy-middleware": "^3.0.5", "node-pty": "1.0.0", + "stripe": "^20.1.0", "uuid": "^10.0.0", "ws": "^8.18.3" }, @@ -26,8 +27,13 @@ }, "devDependencies": { "@types/better-sqlite3": "^7.6.13", + "@types/connect-redis": "^0.0.23", + "@types/cors": "^2.8.19", "@types/express": "^5.0.6", + "@types/express-session": "^1.18.2", + "@types/helmet": "^0.0.48", "@types/node": "^22.19.3", + "@types/pg": "^8.16.0", "@types/uuid": "^10.0.0", "@types/ws": "^8.18.1", "@typescript-eslint/eslint-plugin": "^8.18.2", @@ -796,6 +802,13 @@ "dev": true, "license": "BSD-3-Clause" }, + "node_modules/@ioredis/commands": { + "version": "1.4.0", + "resolved": "https://registry.npmjs.org/@ioredis/commands/-/commands-1.4.0.tgz", + "integrity": "sha512-aFT2yemJJo+TZCmieA7qnYGQooOS7QfNmYrzGtsYd3g9j5iDP8AimYYAesf79ohjbLG12XxC4nG5DyEnC88AsQ==", + "dev": true, + "license": "MIT" + }, "node_modules/@isaacs/cliui": { "version": "8.0.2", "resolved": "https://registry.npmjs.org/@isaacs/cliui/-/cliui-8.0.2.tgz", @@ -1257,6 +1270,30 @@ "@types/node": "*" } }, + "node_modules/@types/connect-redis": { + "version": "0.0.23", + "resolved": "https://registry.npmjs.org/@types/connect-redis/-/connect-redis-0.0.23.tgz", + "integrity": "sha512-+yKa9EQJ7YZIWjTKbCdXhqYSpirGf7Cc0o5QTFrkWORneFHVu3QOopRUi6E/ye41QGMom+cj1/kvWFHamHTADA==", + "dev": true, + "license": "MIT", + "dependencies": { + "@types/express": "*", + "@types/express-session": "*", + "@types/node": "*", + "@types/redis": "^2.8.0", + "ioredis": "^5.3.0" + } + }, + "node_modules/@types/cors": { + "version": "2.8.19", + "resolved": "https://registry.npmjs.org/@types/cors/-/cors-2.8.19.tgz", + "integrity": "sha512-mFNylyeyqN93lfe/9CSxOGREz8cpzAhH+E93xJ4xWQf62V8sQ/24reV2nyzUWM6H6Xji+GGHpkbLe7pVoUEskg==", + "dev": true, + "license": "MIT", + "dependencies": { + "@types/node": "*" + } + }, "node_modules/@types/estree": { "version": "1.0.8", "resolved": "https://registry.npmjs.org/@types/estree/-/estree-1.0.8.tgz", @@ -1288,6 +1325,26 @@ "@types/send": "*" } }, + "node_modules/@types/express-session": { + "version": "1.18.2", + "resolved": "https://registry.npmjs.org/@types/express-session/-/express-session-1.18.2.tgz", + "integrity": "sha512-k+I0BxwVXsnEU2hV77cCobC08kIsn4y44C3gC0b46uxZVMaXA04lSPgRLR/bSL2w0t0ShJiG8o4jPzRG/nscFg==", + "dev": true, + "license": "MIT", + "dependencies": { + "@types/express": "*" + } + }, + "node_modules/@types/helmet": { + "version": "0.0.48", + "resolved": "https://registry.npmjs.org/@types/helmet/-/helmet-0.0.48.tgz", + "integrity": "sha512-C7MpnvSDrunS1q2Oy1VWCY7CDWHozqSnM8P4tFeRTuzwqni+PYOjEredwcqWG+kLpYcgLsgcY3orHB54gbx2Jw==", + "dev": true, + "license": "MIT", + "dependencies": { + "@types/express": "*" + } + }, "node_modules/@types/http-errors": { "version": "2.0.5", "resolved": "https://registry.npmjs.org/@types/http-errors/-/http-errors-2.0.5.tgz", @@ -1312,6 +1369,18 @@ "undici-types": "~6.21.0" } }, + "node_modules/@types/pg": { + "version": "8.16.0", + "resolved": "https://registry.npmjs.org/@types/pg/-/pg-8.16.0.tgz", + "integrity": "sha512-RmhMd/wD+CF8Dfo+cVIy3RR5cl8CyfXQ0tGgW6XBL8L4LM/UTEbNXYRbLwU6w+CgrKBNbrQWt4FUtTfaU5jSYQ==", + "dev": true, + "license": "MIT", + "dependencies": { + "@types/node": "*", + "pg-protocol": "*", + "pg-types": "^2.2.0" + } + }, "node_modules/@types/qs": { "version": "6.14.0", "resolved": "https://registry.npmjs.org/@types/qs/-/qs-6.14.0.tgz", @@ -1326,6 +1395,16 @@ "dev": true, "license": "MIT" }, + "node_modules/@types/redis": { + "version": "2.8.32", + "resolved": "https://registry.npmjs.org/@types/redis/-/redis-2.8.32.tgz", + "integrity": "sha512-7jkMKxcGq9p242exlbsVzuJb57KqHRhNl4dHoQu2Y5v9bCAbtIXXH0R3HleSQW4CTOqpHIYUW3t6tpUj4BVQ+w==", + "dev": true, + "license": "MIT", + "dependencies": { + "@types/node": "*" + } + }, "node_modules/@types/send": { "version": "1.2.1", "resolved": "https://registry.npmjs.org/@types/send/-/send-1.2.1.tgz", @@ -2099,6 +2178,16 @@ "integrity": "sha512-jJ0bqzaylmJtVnNgzTeSOs8DPavpbYgEr/b0YL8/2GO3xJEhInFmhKMUnEJQjZumK7KXGFhUy89PrsJWlakBVg==", "license": "ISC" }, + "node_modules/cluster-key-slot": { + "version": "1.1.2", + "resolved": "https://registry.npmjs.org/cluster-key-slot/-/cluster-key-slot-1.1.2.tgz", + "integrity": "sha512-RMr0FhtfXemyinomL4hrWcYJxmX6deFdCxpJzhDttxgO1+bcCnkk+9drydLVDmAMG7NE6aN/fl4F7ucU/90gAA==", + "dev": true, + "license": "Apache-2.0", + "engines": { + "node": ">=0.10.0" + } + }, "node_modules/color-convert": { "version": "2.0.1", "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz", @@ -2310,6 +2399,16 @@ "node": ">=0.4.0" } }, + "node_modules/denque": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/denque/-/denque-2.1.0.tgz", + "integrity": "sha512-HVQE3AAb/pxF8fQAoiqpvg9i3evqug3hoiwakOyZAwJm+6vZehbkYXZ0l4JxS+I3QxM97v5aaRNhj8v5oBhekw==", + "dev": true, + "license": "Apache-2.0", + "engines": { + "node": ">=0.10" + } + }, "node_modules/depd": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/depd/-/depd-2.0.0.tgz", @@ -3439,6 +3538,31 @@ "integrity": "sha512-JV/yugV2uzW5iMRSiZAyDtQd+nxtUnjeLt0acNdw98kKLrvuRVyB80tsREOE7yvGVgalhZ6RNXCmEHkUKBKxew==", "license": "ISC" }, + "node_modules/ioredis": { + "version": "5.8.2", + "resolved": "https://registry.npmjs.org/ioredis/-/ioredis-5.8.2.tgz", + "integrity": "sha512-C6uC+kleiIMmjViJINWk80sOQw5lEzse1ZmvD+S/s8p8CWapftSaC+kocGTx6xrbrJ4WmYQGC08ffHLr6ToR6Q==", + "dev": true, + "license": "MIT", + "dependencies": { + "@ioredis/commands": "1.4.0", + "cluster-key-slot": "^1.1.0", + "debug": "^4.3.4", + "denque": "^2.1.0", + "lodash.defaults": "^4.2.0", + "lodash.isarguments": "^3.1.0", + "redis-errors": "^1.2.0", + "redis-parser": "^3.0.0", + "standard-as-callback": "^2.1.0" + }, + "engines": { + "node": ">=12.22.0" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/ioredis" + } + }, "node_modules/ipaddr.js": { "version": "1.9.1", "resolved": "https://registry.npmjs.org/ipaddr.js/-/ipaddr.js-1.9.1.tgz", @@ -3708,6 +3832,20 @@ "url": "https://github.com/sponsors/sindresorhus" } }, + "node_modules/lodash.defaults": { + "version": "4.2.0", + "resolved": "https://registry.npmjs.org/lodash.defaults/-/lodash.defaults-4.2.0.tgz", + "integrity": "sha512-qjxPLHd3r5DnsdGacqOMU6pb/avJzdh9tFX2ymgoZE27BmjXrNy/y4LoaiTeAb+O3gL8AfpJGtqfX/ae2leYYQ==", + "dev": true, + "license": "MIT" + }, + "node_modules/lodash.isarguments": { + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/lodash.isarguments/-/lodash.isarguments-3.1.0.tgz", + "integrity": "sha512-chi4NHZlZqZD18a0imDHnZPrDeBbTtVN7GXMwuGdRH9qotxAjYs3aVLKc7zNOG9eddR5Ksd8rvFEBc9SsggPpg==", + "dev": true, + "license": "MIT" + }, "node_modules/lodash.merge": { "version": "4.6.2", "resolved": "https://registry.npmjs.org/lodash.merge/-/lodash.merge-4.6.2.tgz", @@ -4169,6 +4307,40 @@ "node": ">= 14.16" } }, + "node_modules/pg-int8": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/pg-int8/-/pg-int8-1.0.1.tgz", + "integrity": "sha512-WCtabS6t3c8SkpDBUlb1kjOs7l66xsGdKpIPZsg4wR+B3+u9UAum2odSsF9tnvxg80h4ZxLWMy4pRjOsFIqQpw==", + "dev": true, + "license": "ISC", + "engines": { + "node": ">=4.0.0" + } + }, + "node_modules/pg-protocol": { + "version": "1.10.3", + "resolved": "https://registry.npmjs.org/pg-protocol/-/pg-protocol-1.10.3.tgz", + "integrity": "sha512-6DIBgBQaTKDJyxnXaLiLR8wBpQQcGWuAESkRBX/t6OwA8YsqP+iVSiond2EDy6Y/dsGk8rh/jtax3js5NeV7JQ==", + "dev": true, + "license": "MIT" + }, + "node_modules/pg-types": { + "version": "2.2.0", + "resolved": "https://registry.npmjs.org/pg-types/-/pg-types-2.2.0.tgz", + "integrity": "sha512-qTAAlrEsl8s4OiEQY69wDvcMIdQN6wdz5ojQiOy6YRMuynxenON0O5oCpJI6lshc6scgAY8qvJ2On/p+CXY0GA==", + "dev": true, + "license": "MIT", + "dependencies": { + "pg-int8": "1.0.1", + "postgres-array": "~2.0.0", + "postgres-bytea": "~1.0.0", + "postgres-date": "~1.0.4", + "postgres-interval": "^1.1.0" + }, + "engines": { + "node": ">=4" + } + }, "node_modules/picocolors": { "version": "1.1.1", "resolved": "https://registry.npmjs.org/picocolors/-/picocolors-1.1.1.tgz", @@ -4216,6 +4388,49 @@ "node": "^10 || ^12 || >=14" } }, + "node_modules/postgres-array": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/postgres-array/-/postgres-array-2.0.0.tgz", + "integrity": "sha512-VpZrUqU5A69eQyW2c5CA1jtLecCsN2U/bD6VilrFDWq5+5UIEVO7nazS3TEcHf1zuPYO/sqGvUvW62g86RXZuA==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=4" + } + }, + "node_modules/postgres-bytea": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/postgres-bytea/-/postgres-bytea-1.0.1.tgz", + "integrity": "sha512-5+5HqXnsZPE65IJZSMkZtURARZelel2oXUEO8rH83VS/hxH5vv1uHquPg5wZs8yMAfdv971IU+kcPUczi7NVBQ==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/postgres-date": { + "version": "1.0.7", + "resolved": "https://registry.npmjs.org/postgres-date/-/postgres-date-1.0.7.tgz", + "integrity": "sha512-suDmjLVQg78nMK2UZ454hAG+OAW+HQPZ6n++TNDUX+L0+uUlLywnoxJKDou51Zm+zTCjrCl0Nq6J9C5hP9vK/Q==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/postgres-interval": { + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/postgres-interval/-/postgres-interval-1.2.0.tgz", + "integrity": "sha512-9ZhXKM/rw350N1ovuWHbGxnGh/SNJ4cnxHiM0rxE4VN41wsg8P8zWn9hv/buK00RP4WvlOyr/RBDiptyxVbkZQ==", + "dev": true, + "license": "MIT", + "dependencies": { + "xtend": "^4.0.0" + }, + "engines": { + "node": ">=0.10.0" + } + }, "node_modules/prebuild-install": { "version": "7.1.3", "resolved": "https://registry.npmjs.org/prebuild-install/-/prebuild-install-7.1.3.tgz", @@ -4396,6 +4611,29 @@ "url": "https://paulmillr.com/funding/" } }, + "node_modules/redis-errors": { + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/redis-errors/-/redis-errors-1.2.0.tgz", + "integrity": "sha512-1qny3OExCf0UvUV/5wpYKf2YwPcOqXzkwKKSmKHiE6ZMQs5heeE/c8eXK+PNllPvmjgAbfnsbpkGZWy8cBpn9w==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=4" + } + }, + "node_modules/redis-parser": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/redis-parser/-/redis-parser-3.0.0.tgz", + "integrity": "sha512-DJnGAeenTdpMEH6uAJRK/uiyEIH9WVsUmoLwzudwGJUwZPp80PDBWPHXSAGNPwNvIXAbe7MSUB1zQFugFml66A==", + "dev": true, + "license": "MIT", + "dependencies": { + "redis-errors": "^1.0.0" + }, + "engines": { + "node": ">=4" + } + }, "node_modules/requires-port": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/requires-port/-/requires-port-1.0.0.tgz", @@ -4801,6 +5039,13 @@ "integrity": "sha512-1XMJE5fQo1jGH6Y/7ebnwPOBEkIEnT4QF32d5R1+VXdXveM0IBMJt8zfaxX1P3QhVwrYe+576+jkANtSS2mBbw==", "dev": true }, + "node_modules/standard-as-callback": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/standard-as-callback/-/standard-as-callback-2.1.0.tgz", + "integrity": "sha512-qoRRSyROncaz1z0mvYqIE4lCd9p2R90i6GxW3uZv5ucSu8tU7B5HXUP1gG8pVZsYNVaXjk8ClXHPttLyxAL48A==", + "dev": true, + "license": "MIT" + }, "node_modules/statuses": { "version": "2.0.2", "resolved": "https://registry.npmjs.org/statuses/-/statuses-2.0.2.tgz", @@ -4935,6 +5180,26 @@ "url": "https://github.com/sponsors/sindresorhus" } }, + "node_modules/stripe": { + "version": "20.1.0", + "resolved": "https://registry.npmjs.org/stripe/-/stripe-20.1.0.tgz", + "integrity": "sha512-o1VNRuMkY76ZCq92U3EH3/XHm/WHp7AerpzDs4Zyo8uE5mFL4QUcv/2SudWsSnhBSp4moO2+ZoGCZ7mT8crPmQ==", + "license": "MIT", + "dependencies": { + "qs": "^6.11.0" + }, + "engines": { + "node": ">=16" + }, + "peerDependencies": { + "@types/node": ">=16" + }, + "peerDependenciesMeta": { + "@types/node": { + "optional": true + } + } + }, "node_modules/supports-color": { "version": "7.2.0", "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz", @@ -6076,6 +6341,16 @@ "integrity": "sha512-JZnDKK8B0RCDw84FNdDAIpZK+JuJw+s7Lz8nksI7SIuU3UXJJslUthsi+uWBUYOwPFwW7W7PRLRfUKpxjtjFCw==", "dev": true }, + "node_modules/xtend": { + "version": "4.0.2", + "resolved": "https://registry.npmjs.org/xtend/-/xtend-4.0.2.tgz", + "integrity": "sha512-LKYU1iAXJXUgAXn9URjiu+MWhyUXHsvfp7mcuYm9dSUKK0/CjtrUwFAxD82/mCWbtLsGjFIad0wIsod4zrTAEQ==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=0.4" + } + }, "node_modules/yocto-queue": { "version": "0.1.0", "resolved": "https://registry.npmjs.org/yocto-queue/-/yocto-queue-0.1.0.tgz", diff --git a/package.json b/package.json index 49b5ad371..522664bb2 100644 --- a/package.json +++ b/package.json @@ -69,13 +69,19 @@ "express": "^5.2.1", "http-proxy-middleware": "^3.0.5", "node-pty": "1.0.0", + "stripe": "^20.1.0", "uuid": "^10.0.0", "ws": "^8.18.3" }, "devDependencies": { "@types/better-sqlite3": "^7.6.13", + "@types/connect-redis": "^0.0.23", + "@types/cors": "^2.8.19", "@types/express": "^5.0.6", + "@types/express-session": "^1.18.2", + "@types/helmet": "^0.0.48", "@types/node": "^22.19.3", + "@types/pg": "^8.16.0", "@types/uuid": "^10.0.0", "@types/ws": "^8.18.1", "@typescript-eslint/eslint-plugin": "^8.18.2", diff --git a/src/cloud/api/auth.ts b/src/cloud/api/auth.ts index 9b4475c03..145ccee6f 100644 --- a/src/cloud/api/auth.ts +++ b/src/cloud/api/auth.ts @@ -6,8 +6,8 @@ import { Router, Request, Response } from 'express'; import crypto from 'crypto'; -import { getConfig } from '../config'; -import { db } from '../db'; +import { getConfig } from '../config.js'; +import { db } from '../db/index.js'; export const authRouter = Router(); @@ -69,12 +69,16 @@ authRouter.get('/github/callback', async (req: Request, res: Response) => { }), }); - const tokenData = await tokenResponse.json(); + const tokenData = await tokenResponse.json() as { + access_token?: string; + error?: string; + error_description?: string; + }; if (tokenData.error) { throw new Error(tokenData.error_description || tokenData.error); } - const accessToken = tokenData.access_token; + const accessToken = tokenData.access_token!; // Get user info const userResponse = await fetch('https://api.github.com/user', { @@ -84,7 +88,12 @@ authRouter.get('/github/callback', async (req: Request, res: Response) => { }, }); - const userData = await userResponse.json(); + const userData = await userResponse.json() as { + id: number; + login: string; + email?: string; + avatar_url: string; + }; // Get user email if not public let email = userData.email; @@ -95,8 +104,8 @@ authRouter.get('/github/callback', async (req: Request, res: Response) => { Accept: 'application/vnd.github.v3+json', }, }); - const emails = await emailsResponse.json(); - const primaryEmail = emails.find((e: any) => e.primary); + const emails = await emailsResponse.json() as Array<{ email: string; primary: boolean }>; + const primaryEmail = emails.find((e) => e.primary); email = primaryEmail?.email; } diff --git a/src/cloud/api/billing.ts b/src/cloud/api/billing.ts index a2be1e04e..9b6d10130 100644 --- a/src/cloud/api/billing.ts +++ b/src/cloud/api/billing.ts @@ -5,9 +5,9 @@ */ import { Router, Request, Response, NextFunction } from 'express'; -import { getBillingService, getAllPlans, getPlan, comparePlans } from '../billing'; -import type { SubscriptionTier } from '../billing/types'; -import { getConfig } from '../config'; +import { getBillingService, getAllPlans, getPlan, comparePlans } from '../billing/index.js'; +import type { SubscriptionTier } from '../billing/types.js'; +import { getConfig } from '../config.js'; // Extend express session with user info declare module 'express-session' { diff --git a/src/cloud/api/onboarding.ts b/src/cloud/api/onboarding.ts index 0bb625e4c..670e045a9 100644 --- a/src/cloud/api/onboarding.ts +++ b/src/cloud/api/onboarding.ts @@ -8,9 +8,9 @@ import { Router, Request, Response } from 'express'; import { spawn, ChildProcess } from 'child_process'; import crypto from 'crypto'; -import { requireAuth } from './auth'; -import { db } from '../db'; -import { vault } from '../vault'; +import { requireAuth } from './auth.js'; +import { db } from '../db/index.js'; +import { vault } from '../vault/index.js'; export const onboardingRouter = Router(); diff --git a/src/cloud/api/providers.ts b/src/cloud/api/providers.ts index a609ea80c..c6f20168d 100644 --- a/src/cloud/api/providers.ts +++ b/src/cloud/api/providers.ts @@ -6,10 +6,10 @@ import { Router, Request, Response } from 'express'; import crypto from 'crypto'; -import { requireAuth } from './auth'; -import { getConfig } from '../config'; -import { db } from '../db'; -import { vault } from '../vault'; +import { requireAuth } from './auth.js'; +import { getConfig } from '../config.js'; +import { db } from '../db/index.js'; +import { vault } from '../vault/index.js'; export const providersRouter = Router(); @@ -123,6 +123,8 @@ providersRouter.get('/', async (req: Request, res: Response) => { displayName: 'Copilot', description: 'GitHub Copilot - connected via signup', color: '#24292F', + authStrategy: 'device_flow' as const, + cliCommand: undefined, isConnected: true, connectedAs: githubCred?.providerAccountEmail, connectedAt: githubCred?.createdAt, @@ -193,7 +195,14 @@ providersRouter.post('/:provider/connect', async (req: Request, res: Response) = throw new Error(`Failed to get device code: ${error}`); } - const data = await response.json(); + const data = await response.json() as { + device_code: string; + user_code: string; + verification_uri: string; + verification_uri_complete?: string; + expires_in: number; + interval?: number; + }; // Generate flow ID const flowId = crypto.randomUUID(); @@ -364,7 +373,15 @@ async function pollForToken(flowId: string, provider: ProviderType, clientId: st }), }); - const data = await response.json(); + const data = await response.json() as { + error?: string; + error_description?: string; + interval?: number; + access_token?: string; + refresh_token?: string; + expires_in?: number; + scope?: string; + }; if (data.error) { switch (data.error) { @@ -390,7 +407,7 @@ async function pollForToken(flowId: string, provider: ProviderType, clientId: st // Success! Store tokens await storeProviderTokens(current.userId, provider, { - accessToken: data.access_token, + accessToken: data.access_token!, refreshToken: data.refresh_token, expiresIn: data.expires_in, scope: data.scope, @@ -434,7 +451,7 @@ async function storeProviderTokens( }, }); if (response.ok) { - userInfo = await response.json(); + userInfo = await response.json() as { id?: string; email?: string }; } } catch (error) { console.error('Error fetching user info:', error); diff --git a/src/cloud/api/repos.ts b/src/cloud/api/repos.ts index 2d4b39bea..da62c36e4 100644 --- a/src/cloud/api/repos.ts +++ b/src/cloud/api/repos.ts @@ -5,8 +5,8 @@ */ import { Router, Request, Response } from 'express'; -import { requireAuth } from './auth'; -import { db } from '../db'; +import { requireAuth } from './auth.js'; +import { db } from '../db/index.js'; export const reposRouter = Router(); @@ -70,14 +70,25 @@ reposRouter.get('/github', async (req: Request, res: Response) => { throw new Error(`GitHub API error: ${error}`); } - const repos = await response.json(); + const repos = await response.json() as Array<{ + id: number; + full_name: string; + name: string; + owner: { login: string }; + description: string | null; + default_branch: string; + private: boolean; + language: string | null; + updated_at: string; + html_url: string; + }>; // Get link header for pagination const linkHeader = response.headers.get('link'); const hasMore = linkHeader?.includes('rel="next"') || false; res.json({ - repositories: repos.map((r: any) => ({ + repositories: repos.map((r) => ({ githubId: r.id, fullName: r.full_name, name: r.name, @@ -134,7 +145,12 @@ reposRouter.post('/', async (req: Request, res: Response) => { throw new Error('Failed to verify repository'); } - const repoData = await repoResponse.json(); + const repoData = await repoResponse.json() as { + id: number; + full_name: string; + default_branch: string; + private: boolean; + }; // Import repo const repository = await db.repositories.upsert({ @@ -196,7 +212,12 @@ reposRouter.post('/bulk', async (req: Request, res: Response) => { continue; } - const repoData = await repoResponse.json(); + const repoData = await repoResponse.json() as { + id: number; + full_name: string; + default_branch: string; + private: boolean; + }; await db.repositories.upsert({ userId, @@ -345,10 +366,22 @@ reposRouter.get('/search', async (req: Request, res: Response) => { throw new Error('GitHub search failed'); } - const data = await response.json(); + const data = await response.json() as { + items: Array<{ + id: number; + full_name: string; + name: string; + owner: { login: string }; + description: string | null; + default_branch: string; + private: boolean; + language: string | null; + }>; + total_count: number; + }; res.json({ - repositories: data.items.map((r: any) => ({ + repositories: data.items.map((r) => ({ githubId: r.id, fullName: r.full_name, name: r.name, diff --git a/src/cloud/api/teams.ts b/src/cloud/api/teams.ts index a21c54174..e2255b481 100644 --- a/src/cloud/api/teams.ts +++ b/src/cloud/api/teams.ts @@ -5,8 +5,8 @@ */ import { Router, Request, Response } from 'express'; -import { requireAuth } from './auth'; -import { db, WorkspaceMemberRole } from '../db'; +import { requireAuth } from './auth.js'; +import { db, WorkspaceMemberRole } from '../db/index.js'; export const teamsRouter = Router(); diff --git a/src/cloud/api/workspaces.ts b/src/cloud/api/workspaces.ts index aed040a23..c81186a46 100644 --- a/src/cloud/api/workspaces.ts +++ b/src/cloud/api/workspaces.ts @@ -5,9 +5,9 @@ */ import { Router, Request, Response } from 'express'; -import { requireAuth } from './auth'; -import { db, Workspace } from '../db'; -import { getProvisioner } from '../provisioner'; +import { requireAuth } from './auth.js'; +import { db, Workspace } from '../db/index.js'; +import { getProvisioner } from '../provisioner/index.js'; export const workspacesRouter = Router(); @@ -473,7 +473,7 @@ workspacesRouter.delete('/:id/domain', async (req: Request, res: Response) => { * Helper: Provision SSL for custom domain on compute provider */ async function provisionDomainSSL(workspace: Workspace): Promise { - const config = (await import('../config')).getConfig(); + const config = (await import('../config.js')).getConfig(); if (workspace.computeProvider === 'fly' && config.compute.fly) { // Fly.io: Add certificate @@ -515,7 +515,7 @@ async function provisionDomainSSL(workspace: Workspace): Promise { * Helper: Remove custom domain from compute provider */ async function removeDomainFromCompute(workspace: Workspace): Promise { - const config = (await import('../config')).getConfig(); + const config = (await import('../config.js')).getConfig(); if (workspace.computeProvider === 'fly' && config.compute.fly) { await fetch( diff --git a/src/cloud/billing/index.ts b/src/cloud/billing/index.ts index ef7e8cfde..4986958ea 100644 --- a/src/cloud/billing/index.ts +++ b/src/cloud/billing/index.ts @@ -4,6 +4,6 @@ * Stripe-based subscription management and billing. */ -export * from './types'; -export * from './plans'; -export { BillingService, getBillingService } from './service'; +export * from './types.js'; +export * from './plans.js'; +export { BillingService, getBillingService } from './service.js'; diff --git a/src/cloud/billing/plans.ts b/src/cloud/billing/plans.ts index 23cfc7113..60a9520b8 100644 --- a/src/cloud/billing/plans.ts +++ b/src/cloud/billing/plans.ts @@ -4,7 +4,7 @@ * Plan definitions for subscription tiers. */ -import type { BillingPlan, SubscriptionTier } from './types'; +import type { BillingPlan, SubscriptionTier } from './types.js'; /** * All available billing plans diff --git a/src/cloud/billing/service.ts b/src/cloud/billing/service.ts index c77557a38..ffa423d83 100644 --- a/src/cloud/billing/service.ts +++ b/src/cloud/billing/service.ts @@ -5,8 +5,8 @@ */ import Stripe from 'stripe'; -import { getConfig } from '../config'; -import { getPlan } from './plans'; +import { getConfig } from '../config.js'; +import { getPlan } from './plans.js'; import type { SubscriptionTier, BillingCustomer, @@ -17,7 +17,7 @@ import type { PortalSession, BillingEvent, SubscriptionStatus, -} from './types'; +} from './types.js'; let stripeClient: Stripe | null = null; @@ -27,10 +27,7 @@ let stripeClient: Stripe | null = null; function getStripe(): Stripe { if (!stripeClient) { const config = getConfig(); - stripeClient = new Stripe(config.stripe.secretKey, { - apiVersion: '2024-11-20.acacia', - typescript: true, - }); + stripeClient = new Stripe(config.stripe.secretKey); } return stripeClient; } @@ -108,8 +105,8 @@ export class BillingService { email: (customer as Stripe.Customer).email || '', name: (customer as Stripe.Customer).name || undefined, subscription: subscription ? this.mapSubscription(subscription) : undefined, - paymentMethods: paymentMethods.data.map((pm) => this.mapPaymentMethod(pm)), - invoices: invoices.data.map((inv) => this.mapInvoice(inv)), + paymentMethods: paymentMethods.data.map((pm: Stripe.PaymentMethod) => this.mapPaymentMethod(pm)), + invoices: invoices.data.map((inv: Stripe.Invoice) => this.mapInvoice(inv)), createdAt: new Date((customer as Stripe.Customer).created * 1000), updatedAt: new Date(), }; @@ -306,7 +303,7 @@ export class BillingService { */ async getUpcomingInvoice(customerId: string): Promise { try { - const invoice = await this.stripe.invoices.retrieveUpcoming({ + const invoice = await (this.stripe.invoices as any).retrieveUpcoming({ customer: customerId, }); @@ -327,7 +324,7 @@ export class BillingService { quantity: number, timestamp?: Date ): Promise { - await this.stripe.subscriptionItems.createUsageRecord(subscriptionItemId, { + await (this.stripe.subscriptionItems as any).createUsageRecord(subscriptionItemId, { quantity, timestamp: timestamp ? Math.floor(timestamp.getTime() / 1000) : undefined, action: 'increment', @@ -354,7 +351,7 @@ export class BillingService { id: event.id, type: this.mapEventType(event.type), stripeEventId: event.id, - data: event.data.object as Record, + data: event.data.object as unknown as Record, createdAt: new Date(event.created * 1000), }; @@ -374,7 +371,7 @@ export class BillingService { } billingEvent.processedAt = new Date(); - return billingEvent; + return billingEvent as BillingEvent; } /** @@ -402,13 +399,14 @@ export class BillingService { // Helper: Map Stripe subscription to our type private mapSubscription(subscription: Stripe.Subscription): CustomerSubscription { + const sub = subscription as any; return { id: subscription.id, stripeSubscriptionId: subscription.id, tier: this.getTierFromSubscription(subscription), status: subscription.status as SubscriptionStatus, - currentPeriodStart: new Date(subscription.current_period_start * 1000), - currentPeriodEnd: new Date(subscription.current_period_end * 1000), + currentPeriodStart: new Date((sub.current_period_start || sub.billing_cycle_anchor) * 1000), + currentPeriodEnd: new Date((sub.current_period_end || sub.current_period_start + 30 * 24 * 60 * 60) * 1000), cancelAtPeriodEnd: subscription.cancel_at_period_end, billingInterval: subscription.items.data[0]?.price.recurring?.interval === 'year' ? 'year' diff --git a/src/cloud/db/index.ts b/src/cloud/db/index.ts index 71f048e87..a4de52a54 100644 --- a/src/cloud/db/index.ts +++ b/src/cloud/db/index.ts @@ -5,7 +5,7 @@ */ import { Pool } from 'pg'; -import { getConfig } from '../config'; +import { getConfig } from '../config.js'; // Initialize pool lazily let pool: Pool | null = null; diff --git a/src/cloud/index.ts b/src/cloud/index.ts index 7f9771f9a..8f398cdbe 100644 --- a/src/cloud/index.ts +++ b/src/cloud/index.ts @@ -4,21 +4,21 @@ * One-click server provisioning for AI agent orchestration. */ -export { createServer } from './server'; -export { getConfig, loadConfig, CloudConfig } from './config'; +export { createServer } from './server.js'; +export { getConfig, loadConfig, CloudConfig } from './config.js'; // Services -export { CredentialVault } from './vault'; -export { WorkspaceProvisioner, ProvisionConfig, Workspace, WorkspaceStatus } from './provisioner'; +export { CredentialVault } from './vault/index.js'; +export { WorkspaceProvisioner, ProvisionConfig, Workspace, WorkspaceStatus } from './provisioner/index.js'; // Billing -export * from './billing'; +export * from './billing/index.js'; // Run if executed directly if (require.main === module) { (async () => { try { - const { createServer } = await import('./server'); + const { createServer } = await import('./server.js'); const server = await createServer(); await server.start(); diff --git a/src/cloud/provisioner/index.ts b/src/cloud/provisioner/index.ts index 1c5c6d2c9..c64485a3e 100644 --- a/src/cloud/provisioner/index.ts +++ b/src/cloud/provisioner/index.ts @@ -4,9 +4,9 @@ * One-click provisioning for compute resources (Fly.io, Railway, Docker). */ -import { getConfig } from '../config'; -import { db, Workspace } from '../db'; -import { vault } from '../vault'; +import { getConfig } from '../config.js'; +import { db, Workspace } from '../db/index.js'; +import { vault } from '../vault/index.js'; export interface ProvisionConfig { userId: string; @@ -139,7 +139,7 @@ class FlyProvisioner implements ComputeProvisioner { throw new Error(`Failed to create Fly machine: ${error}`); } - const machine = await machineResponse.json(); + const machine = await machineResponse.json() as { id: string }; return { computeId: machine.id, @@ -174,7 +174,7 @@ class FlyProvisioner implements ComputeProvisioner { if (!response.ok) return 'error'; - const machine = await response.json(); + const machine = await response.json() as { state: string }; switch (machine.state) { case 'started': @@ -248,7 +248,7 @@ class RailwayProvisioner implements ComputeProvisioner { }), }); - const projectData = await projectResponse.json(); + const projectData = await projectResponse.json() as { data: { projectCreate: { id: string } } }; const projectId = projectData.data.projectCreate.id; // Deploy service @@ -278,7 +278,7 @@ class RailwayProvisioner implements ComputeProvisioner { }), }); - const serviceData = await serviceResponse.json(); + const serviceData = await serviceResponse.json() as { data: { serviceCreate: { id: string } } }; const serviceId = serviceData.data.serviceCreate.id; // Set environment variables @@ -339,7 +339,7 @@ class RailwayProvisioner implements ComputeProvisioner { }), }); - const domainData = await domainResponse.json(); + const domainData = await domainResponse.json() as { data: { serviceDomainCreate: { domain: string } } }; const domain = domainData.data.serviceDomainCreate.domain; return { @@ -399,7 +399,9 @@ class RailwayProvisioner implements ComputeProvisioner { }), }); - const data = await response.json(); + const data = await response.json() as { + data?: { project?: { deployments?: { edges: Array<{ node: { status: string } }> } } } + }; const deployments = data.data?.project?.deployments?.edges; if (!deployments || deployments.length === 0) return 'provisioning'; diff --git a/src/cloud/server.ts b/src/cloud/server.ts index 47e6c4d5e..566168dd7 100644 --- a/src/cloud/server.ts +++ b/src/cloud/server.ts @@ -8,16 +8,16 @@ import cors from 'cors'; import helmet from 'helmet'; import { createClient } from 'redis'; import RedisStore from 'connect-redis'; -import { getConfig } from './config'; +import { getConfig } from './config.js'; // API routers -import { authRouter } from './api/auth'; -import { providersRouter } from './api/providers'; -import { workspacesRouter } from './api/workspaces'; -import { reposRouter } from './api/repos'; -import { onboardingRouter } from './api/onboarding'; -import { teamsRouter } from './api/teams'; -import { billingRouter } from './api/billing'; +import { authRouter } from './api/auth.js'; +import { providersRouter } from './api/providers.js'; +import { workspacesRouter } from './api/workspaces.js'; +import { reposRouter } from './api/repos.js'; +import { onboardingRouter } from './api/onboarding.js'; +import { teamsRouter } from './api/teams.js'; +import { billingRouter } from './api/billing.js'; export interface CloudServer { app: Express; @@ -31,7 +31,7 @@ export async function createServer(): Promise { // Redis client for sessions const redisClient = createClient({ url: config.redisUrl }); - await redisClient.connect(); + await (redisClient as any).connect(); // Middleware app.use(helmet()); @@ -46,7 +46,7 @@ export async function createServer(): Promise { // Session middleware app.use( session({ - store: new RedisStore({ client: redisClient }), + store: new (RedisStore as any)({ client: redisClient }), secret: config.sessionSecret, resave: false, saveUninitialized: false, diff --git a/src/cloud/vault/index.ts b/src/cloud/vault/index.ts index a9ea2f5bf..0b1e82fa0 100644 --- a/src/cloud/vault/index.ts +++ b/src/cloud/vault/index.ts @@ -5,8 +5,8 @@ */ import crypto from 'crypto'; -import { getConfig } from '../config'; -import { db } from '../db'; +import { getConfig } from '../config.js'; +import { db } from '../db/index.js'; const ALGORITHM = 'aes-256-gcm'; const IV_LENGTH = 12; @@ -245,7 +245,11 @@ export class CredentialVault { return false; } - const data = await response.json(); + const data = await response.json() as { + access_token: string; + refresh_token?: string; + expires_in?: number; + }; await this.updateTokens( userId, diff --git a/src/daemon/api.ts b/src/daemon/api.ts index b8bdc2925..19d2f7923 100644 --- a/src/daemon/api.ts +++ b/src/daemon/api.ts @@ -4,14 +4,14 @@ */ import * as http from 'http'; -import * as WebSocket from 'ws'; +import WebSocket, { WebSocketServer, WebSocket as WS } from 'ws'; import { EventEmitter } from 'events'; import { createLogger } from '../resiliency/logger.js'; import { metrics } from '../resiliency/metrics.js'; import { getWorkspaceManager, WorkspaceManager } from './workspace-manager.js'; import { getAgentManager, AgentManager } from './agent-manager.js'; import type { - DaemonConfig, + ApiDaemonConfig, DaemonEvent, UserSession, WorkspacesResponse, @@ -40,14 +40,14 @@ type RouteHandler = (req: ApiRequest) => Promise; export class DaemonApi extends EventEmitter { private server?: http.Server; - private wss?: WebSocket.WebSocketServer; + private wss?: WebSocketServer; private workspaceManager: WorkspaceManager; private agentManager: AgentManager; - private sessions = new Map(); + private sessions = new Map(); private routes = new Map(); - private config: DaemonConfig; + private config: ApiDaemonConfig; - constructor(config: DaemonConfig) { + constructor(config: ApiDaemonConfig) { super(); this.config = config; this.workspaceManager = getWorkspaceManager(config.dataDir); @@ -69,7 +69,7 @@ export class DaemonApi extends EventEmitter { this.server = http.createServer((req, res) => this.handleRequest(req, res)); // Setup WebSocket server - this.wss = new WebSocket.WebSocketServer({ server: this.server }); + this.wss = new WebSocketServer({ server: this.server }); this.wss.on('connection', (ws, req) => this.handleWebSocketConnection(ws, req)); this.server.listen(this.config.port, this.config.host, () => { @@ -403,7 +403,7 @@ export class DaemonApi extends EventEmitter { /** * Handle WebSocket connection */ - private handleWebSocketConnection(ws: WebSocket.WebSocket, req: http.IncomingMessage): void { + private handleWebSocketConnection(ws: WS, req: http.IncomingMessage): void { logger.info('WebSocket client connected', { url: req.url }); // Create session @@ -440,7 +440,7 @@ export class DaemonApi extends EventEmitter { /** * Send initial state to WebSocket client */ - private sendInitialState(ws: WebSocket.WebSocket): void { + private sendInitialState(ws: WS): void { const workspaces = this.workspaceManager.getAll(); const active = this.workspaceManager.getActive(); const agents = this.agentManager.getAll(); @@ -459,7 +459,7 @@ export class DaemonApi extends EventEmitter { * Handle WebSocket message from client */ private handleWebSocketMessage( - ws: WebSocket.WebSocket, + ws: WS, session: UserSession, message: { type: string; data?: unknown } ): void { @@ -489,7 +489,7 @@ export class DaemonApi extends EventEmitter { /** * Send message to WebSocket client */ - private sendToClient(ws: WebSocket.WebSocket, message: unknown): void { + private sendToClient(ws: WS, message: unknown): void { if (ws.readyState === WebSocket.OPEN) { ws.send(JSON.stringify(message)); } diff --git a/src/daemon/types.ts b/src/daemon/types.ts index 69e32ada7..3d5cf010f 100644 --- a/src/daemon/types.ts +++ b/src/daemon/types.ts @@ -92,9 +92,9 @@ export interface UserSession { } /** - * Daemon configuration + * API daemon configuration (for HTTP/WebSocket API) */ -export interface DaemonConfig { +export interface ApiDaemonConfig { /** Port for HTTP/WebSocket API */ port: number; /** Host to bind to */ diff --git a/src/dashboard/react-components/App.tsx b/src/dashboard/react-components/App.tsx index d0a190203..5c854c2a2 100644 --- a/src/dashboard/react-components/App.tsx +++ b/src/dashboard/react-components/App.tsx @@ -270,7 +270,7 @@ export function App({ wsUrl, orchestratorUrl }: AppProps) { try { // Use orchestrator if workspaces are available if (workspaces.length > 0 && activeWorkspaceId) { - await orchestratorSpawnAgent(config.name, config.task, config.command); + await orchestratorSpawnAgent(config.name, undefined, config.command); return true; } diff --git a/src/resiliency/context-persistence.ts b/src/resiliency/context-persistence.ts index 76f938dd0..40dd9d2f1 100644 --- a/src/resiliency/context-persistence.ts +++ b/src/resiliency/context-persistence.ts @@ -12,7 +12,7 @@ import * as fs from 'fs'; import * as path from 'path'; -import { createLogger } from './logger'; +import { createLogger } from './logger.js'; const logger = createLogger('context-persistence'); diff --git a/src/resiliency/index.ts b/src/resiliency/index.ts index d02f1d61b..0a4e16a87 100644 --- a/src/resiliency/index.ts +++ b/src/resiliency/index.ts @@ -61,7 +61,7 @@ export { type AgentHealth, type AgentProcess, type HealthMonitorConfig, -} from './health-monitor'; +} from './health-monitor.js'; export { Logger, @@ -71,16 +71,16 @@ export { type LogLevel, type LogEntry, type LoggerConfig, -} from './logger'; +} from './logger.js'; -export { metrics, type AgentMetrics, type SystemMetrics, type MetricPoint } from './metrics'; +export { metrics, type AgentMetrics, type SystemMetrics, type MetricPoint } from './metrics.js'; export { AgentSupervisor, getSupervisor, type SupervisedAgent, type SupervisorConfig, -} from './supervisor'; +} from './supervisor.js'; export { ContextPersistence, @@ -90,7 +90,7 @@ export { type Artifact, type Handoff, type LedgerEntry, -} from './context-persistence'; +} from './context-persistence.js'; export { createContextHandler, @@ -102,4 +102,4 @@ export { type ProviderContextConfig, type ClaudeHooksConfig, type CodexContextConfig, -} from './provider-context'; +} from './provider-context.js'; diff --git a/src/resiliency/logger.ts b/src/resiliency/logger.ts index 69b9eddc5..5eded863c 100644 --- a/src/resiliency/logger.ts +++ b/src/resiliency/logger.ts @@ -203,12 +203,8 @@ export class Logger extends EventEmitter { let line = `${entry.timestamp} ${color}${levelStr}${RESET} ${componentStr} ${entry.message}`; - // Add context fields - const contextFields = { ...entry }; - delete contextFields.timestamp; - delete contextFields.level; - delete contextFields.component; - delete contextFields.message; + // Add context fields (exclude standard log entry fields) + const { timestamp: _t, level: _l, component: _c, message: _m, ...contextFields } = entry; if (Object.keys(contextFields).length > 0) { line += ` ${JSON.stringify(contextFields)}`; diff --git a/src/resiliency/provider-context.ts b/src/resiliency/provider-context.ts index 6d7067476..bd7349caa 100644 --- a/src/resiliency/provider-context.ts +++ b/src/resiliency/provider-context.ts @@ -9,8 +9,8 @@ import * as fs from 'fs'; import * as path from 'path'; -import { createLogger } from './logger'; -import { ContextPersistence, getContextPersistence, Handoff } from './context-persistence'; +import { createLogger } from './logger.js'; +import { ContextPersistence, getContextPersistence, Handoff } from './context-persistence.js'; const logger = createLogger('provider-context'); @@ -114,7 +114,10 @@ export class ClaudeContextHandler extends ProviderContextHandler { hooks: [{ type: 'command', command: stopHookPath }], }; // Only add if not already present - if (!hooks.Stop.some((h: unknown) => (h as Record).hooks?.[0]?.command === stopHookPath)) { + if (!hooks.Stop.some((h: unknown) => { + const entry = h as { hooks?: Array<{ command?: string }> }; + return entry.hooks?.[0]?.command === stopHookPath; + })) { hooks.Stop.push(stopHookEntry); } } diff --git a/src/resiliency/supervisor.ts b/src/resiliency/supervisor.ts index b866ff2d3..a283f1864 100644 --- a/src/resiliency/supervisor.ts +++ b/src/resiliency/supervisor.ts @@ -6,11 +6,11 @@ */ import { EventEmitter } from 'events'; -import { AgentHealthMonitor, getHealthMonitor, HealthMonitorConfig, AgentProcess } from './health-monitor'; -import { Logger, createLogger, LogLevel } from './logger'; -import { metrics } from './metrics'; -import { ContextPersistence, getContextPersistence } from './context-persistence'; -import { createContextHandler, detectProvider, ProviderType } from './provider-context'; +import { AgentHealthMonitor, getHealthMonitor, HealthMonitorConfig, AgentProcess, AgentHealth } from './health-monitor.js'; +import { Logger, createLogger, LogLevel } from './logger.js'; +import { metrics } from './metrics.js'; +import { ContextPersistence, getContextPersistence } from './context-persistence.js'; +import { createContextHandler, detectProvider, ProviderType } from './provider-context.js'; export interface SupervisedAgent { name: string; @@ -110,7 +110,7 @@ export class AgentSupervisor extends EventEmitter { // Cleanup context handlers Array.from(this.contextHandlers.entries()).forEach(([name, handler]) => { - handler.cleanup().catch((err) => { + handler.cleanup().catch((err: unknown) => { this.logger.error('Error cleaning up context handler', { name, error: String(err) }); }); }); @@ -295,11 +295,11 @@ export class AgentSupervisor extends EventEmitter { * Setup event handlers for health monitor */ private setupHealthMonitorEvents(): void { - this.healthMonitor.on('healthy', ({ name, health }) => { + this.healthMonitor.on('healthy', ({ name, health }: { name: string; health: AgentHealth }) => { this.emit('healthy', { name, health }); }); - this.healthMonitor.on('unhealthy', ({ name, health }) => { + this.healthMonitor.on('unhealthy', ({ name, health }: { name: string; health: AgentHealth }) => { this.logger.warn('Agent unhealthy', { name, consecutiveFailures: health.consecutiveFailures, @@ -307,7 +307,7 @@ export class AgentSupervisor extends EventEmitter { this.emit('unhealthy', { name, health }); }); - this.healthMonitor.on('died', ({ name, reason, restartCount }) => { + this.healthMonitor.on('died', ({ name, reason, restartCount }: { name: string; reason: string; restartCount: number }) => { this.logger.error('Agent died', { name, reason, restartCount }); metrics.recordCrash(name, reason); this.emit('died', { name, reason, restartCount }); @@ -322,7 +322,7 @@ export class AgentSupervisor extends EventEmitter { } }); - this.healthMonitor.on('restarting', ({ name, attempt }) => { + this.healthMonitor.on('restarting', ({ name, attempt }: { name: string; attempt: number }) => { this.logger.info('Restarting agent', { name, attempt }); metrics.recordRestartAttempt(name); @@ -334,7 +334,7 @@ export class AgentSupervisor extends EventEmitter { this.emit('restarting', { name, attempt }); }); - this.healthMonitor.on('restarted', ({ name, pid, attempt }) => { + this.healthMonitor.on('restarted', ({ name, pid, attempt }: { name: string; pid: number; attempt: number }) => { this.logger.info('Agent restarted', { name, pid, attempt }); metrics.recordRestartSuccess(name); @@ -350,7 +350,7 @@ export class AgentSupervisor extends EventEmitter { const handoff = this.contextPersistence?.loadHandoff(name); const contextHandler = this.contextHandlers.get(name); if (handoff && contextHandler) { - contextHandler.injectContext(handoff).catch((err) => { + contextHandler.injectContext(handoff).catch((err: unknown) => { this.logger.error('Failed to inject context after restart', { name, error: String(err), @@ -362,13 +362,13 @@ export class AgentSupervisor extends EventEmitter { this.emit('restarted', { name, pid, attempt }); }); - this.healthMonitor.on('restartFailed', ({ name, error }) => { + this.healthMonitor.on('restartFailed', ({ name, error }: { name: string; error: string }) => { this.logger.error('Restart failed', { name, error }); metrics.recordRestartFailure(name, error); this.emit('restartFailed', { name, error }); }); - this.healthMonitor.on('permanentlyDead', ({ name, health }) => { + this.healthMonitor.on('permanentlyDead', ({ name, health }: { name: string; health: AgentHealth }) => { this.logger.fatal('Agent permanently dead', { name, restartCount: health.restartCount, diff --git a/tsconfig.json b/tsconfig.json index a738df662..9ab1a1030 100644 --- a/tsconfig.json +++ b/tsconfig.json @@ -16,5 +16,5 @@ "sourceMap": true }, "include": ["src/**/*"], - "exclude": ["node_modules", "dist", "src/**/*.test.ts", "src/dashboard/**/*"] + "exclude": ["node_modules", "dist", "src/**/*.test.ts", "src/dashboard/**/*", "src/landing/**/*"] } From 64442a7b3c4b61e6aeb6d40c67ac2c211743f92b Mon Sep 17 00:00:00 2001 From: Claude Date: Tue, 30 Dec 2025 02:53:55 +0000 Subject: [PATCH 22/38] Add Infrastructure as Code for cloud deployment - Add Dockerfile for main cloud service (Railway deployment) - Add railway.json with healthcheck configuration - Add workspace Dockerfile and fly.toml template for Fly.io machines - Add deploy scripts for Railway and Fly.io setup - Add .env.cloud.example with domain configuration template - Update FlyProvisioner with custom domain support: - Support FLY_REGION for workspace placement - Support FLY_WORKSPACE_DOMAIN for custom subdomains (e.g., ws.agent-relay.com) - Auto-provision SSL certificates for custom hostnames - Enable auto-stop/start for cost optimization - Update all provisioners to use consistent image naming --- Dockerfile | 62 +++++++++++++++++++ deploy/.env.cloud.example | 83 ++++++++++++++++++++++++++ deploy/scripts/setup-fly-workspaces.sh | 69 +++++++++++++++++++++ deploy/scripts/setup-railway.sh | 75 +++++++++++++++++++++++ deploy/workspace/Dockerfile | 50 ++++++++++++++++ deploy/workspace/fly.toml | 55 +++++++++++++++++ railway.json | 14 +++++ src/cloud/config.ts | 4 ++ src/cloud/provisioner/index.ts | 63 +++++++++++++++++-- 9 files changed, 469 insertions(+), 6 deletions(-) create mode 100644 Dockerfile create mode 100644 deploy/.env.cloud.example create mode 100644 deploy/scripts/setup-fly-workspaces.sh create mode 100644 deploy/scripts/setup-railway.sh create mode 100644 deploy/workspace/Dockerfile create mode 100644 deploy/workspace/fly.toml create mode 100644 railway.json diff --git a/Dockerfile b/Dockerfile new file mode 100644 index 000000000..a53d3815f --- /dev/null +++ b/Dockerfile @@ -0,0 +1,62 @@ +# Agent Relay Cloud - Control Plane +# Runs the Express API server with PostgreSQL/Redis connections + +FROM node:20-slim AS builder + +WORKDIR /app + +# Install build dependencies +RUN apt-get update && apt-get install -y \ + python3 \ + make \ + g++ \ + && rm -rf /var/lib/apt/lists/* + +# Copy package files +COPY package*.json ./ +COPY src/dashboard/package*.json ./src/dashboard/ + +# Install dependencies +RUN npm ci --include=dev + +# Copy source +COPY . . + +# Build TypeScript +RUN npm run build + +# Build dashboard +RUN cd src/dashboard && npm ci && npm run build + +# Production image +FROM node:20-slim AS runner + +WORKDIR /app + +# Install runtime dependencies only +RUN apt-get update && apt-get install -y \ + ca-certificates \ + && rm -rf /var/lib/apt/lists/* + +# Copy built artifacts +COPY --from=builder /app/dist ./dist +COPY --from=builder /app/src/dashboard/out ./src/dashboard/out +COPY --from=builder /app/node_modules ./node_modules +COPY --from=builder /app/package*.json ./ + +# Create non-root user +RUN useradd -m -u 1001 agentrelay +USER agentrelay + +# Environment +ENV NODE_ENV=production +ENV PORT=3000 + +EXPOSE 3000 + +# Health check +HEALTHCHECK --interval=30s --timeout=10s --start-period=5s --retries=3 \ + CMD node -e "require('http').get('http://localhost:3000/health', (r) => process.exit(r.statusCode === 200 ? 0 : 1))" + +# Start cloud server +CMD ["node", "dist/cloud/index.js"] diff --git a/deploy/.env.cloud.example b/deploy/.env.cloud.example new file mode 100644 index 000000000..d202af1df --- /dev/null +++ b/deploy/.env.cloud.example @@ -0,0 +1,83 @@ +# Agent Relay Cloud - Production Environment Configuration +# Copy to .env.cloud and fill in your values + +# ============================================================================= +# Domain Configuration +# ============================================================================= +# Main domains for your deployment +LANDING_URL=https://agent-relay.com +APP_URL=https://app.agent-relay.com +API_URL=https://api.agent-relay.com +WORKSPACE_DOMAIN=ws.agent-relay.com + +# Public URL (used for OAuth callbacks, etc.) +PUBLIC_URL=https://api.agent-relay.com + +# ============================================================================= +# Server Configuration +# ============================================================================= +PORT=3000 +NODE_ENV=production +SESSION_SECRET=generate-a-32-byte-random-string-here + +# ============================================================================= +# Database (PostgreSQL) +# ============================================================================= +# Railway provides this automatically when you add PostgreSQL +DATABASE_URL=postgresql://user:password@host:5432/agent_relay + +# ============================================================================= +# Redis (Sessions & Caching) +# ============================================================================= +# Railway provides this automatically when you add Redis +REDIS_URL=redis://localhost:6379 + +# ============================================================================= +# GitHub OAuth +# ============================================================================= +# Create a GitHub OAuth App: https://github.com/settings/applications/new +# Homepage URL: https://agent-relay.com +# Callback URL: https://api.agent-relay.com/api/auth/github/callback +GITHUB_CLIENT_ID=your-github-client-id +GITHUB_CLIENT_SECRET=your-github-client-secret + +# ============================================================================= +# Compute Provider (for user workspaces) +# ============================================================================= +# Options: fly, railway, docker +COMPUTE_PROVIDER=fly + +# Fly.io Configuration (recommended for workspaces) +# Get token: fly auth token +FLY_API_TOKEN=your-fly-api-token +FLY_ORG=personal +FLY_REGION=sjc + +# Custom domain for workspaces (CNAME *.ws.agent-relay.com to fly.dev) +FLY_WORKSPACE_DOMAIN=ws.agent-relay.com + +# ============================================================================= +# Stripe Billing +# ============================================================================= +# Get keys from: https://dashboard.stripe.com/apikeys +STRIPE_SECRET_KEY=sk_live_... +STRIPE_PUBLISHABLE_KEY=pk_live_... +STRIPE_WEBHOOK_SECRET=whsec_... + +# Price IDs from Stripe Products +STRIPE_PRICE_PRO_MONTHLY=price_... +STRIPE_PRICE_PRO_YEARLY=price_... +STRIPE_PRICE_TEAM_MONTHLY=price_... +STRIPE_PRICE_TEAM_YEARLY=price_... + +# ============================================================================= +# Encryption (for credential vault) +# ============================================================================= +# Generate with: openssl rand -hex 32 +VAULT_ENCRYPTION_KEY=generate-a-64-character-hex-string + +# ============================================================================= +# Optional: Monitoring & Logging +# ============================================================================= +# SENTRY_DSN=https://xxx@sentry.io/xxx +# LOG_LEVEL=info diff --git a/deploy/scripts/setup-fly-workspaces.sh b/deploy/scripts/setup-fly-workspaces.sh new file mode 100644 index 000000000..a0d2216f8 --- /dev/null +++ b/deploy/scripts/setup-fly-workspaces.sh @@ -0,0 +1,69 @@ +#!/bin/bash +# Setup Fly.io for Agent Relay Workspaces +# Run this from the project root + +set -e + +echo "=== Agent Relay Cloud - Fly.io Workspace Setup ===" +echo "" + +# Check for fly CLI +if ! command -v fly &> /dev/null; then + echo "Error: Fly CLI not found. Install it with:" + echo " curl -L https://fly.io/install.sh | sh" + exit 1 +fi + +# Check if logged in +if ! fly auth whoami &> /dev/null; then + echo "Please log in to Fly.io first:" + fly auth login +fi + +# Get org +FLY_ORG=${FLY_ORG:-personal} +echo "Using Fly.io org: $FLY_ORG" + +echo "" +echo "=== Building Workspace Image ===" +echo "" + +# Build and push the workspace image +cd deploy/workspace + +echo "Building workspace Docker image..." +docker build -t ghcr.io/khaliqgant/agent-relay-workspace:latest . + +echo "" +echo "Pushing to GitHub Container Registry..." +echo "(Make sure you're logged in: docker login ghcr.io)" +docker push ghcr.io/khaliqgant/agent-relay-workspace:latest + +cd ../.. + +echo "" +echo "=== Get Your API Token ===" +echo "" +echo "Run this to get your Fly.io API token:" +echo " fly auth token" +echo "" +echo "Add it to your Railway environment:" +echo " FLY_API_TOKEN=" +echo " FLY_ORG=$FLY_ORG" +echo " COMPUTE_PROVIDER=fly" +echo "" + +echo "=== Custom Domain Setup ===" +echo "" +echo "To use custom workspace domains (e.g., abc123.ws.agent-relay.com):" +echo "" +echo "1. Add a wildcard CNAME record in your DNS:" +echo " *.ws.agent-relay.com CNAME fly.dev" +echo "" +echo "2. Set the domain in Railway:" +echo " FLY_WORKSPACE_DOMAIN=ws.agent-relay.com" +echo "" +echo "3. Each workspace will be accessible at:" +echo " https://{workspace-id}.ws.agent-relay.com" +echo "" +echo "Setup complete!" diff --git a/deploy/scripts/setup-railway.sh b/deploy/scripts/setup-railway.sh new file mode 100644 index 000000000..08dcbf444 --- /dev/null +++ b/deploy/scripts/setup-railway.sh @@ -0,0 +1,75 @@ +#!/bin/bash +# Setup Agent Relay Cloud on Railway +# Run this from the project root + +set -e + +echo "=== Agent Relay Cloud - Railway Setup ===" +echo "" + +# Check for railway CLI +if ! command -v railway &> /dev/null; then + echo "Error: Railway CLI not found. Install it with:" + echo " npm install -g @railway/cli" + exit 1 +fi + +# Check if logged in +if ! railway whoami &> /dev/null; then + echo "Please log in to Railway first:" + railway login +fi + +echo "Creating Railway project..." +railway init --name agent-relay-cloud + +echo "" +echo "Adding PostgreSQL database..." +railway add --plugin postgresql + +echo "" +echo "Adding Redis..." +railway add --plugin redis + +echo "" +echo "=== Required Environment Variables ===" +echo "Please set these in Railway dashboard or via CLI:" +echo "" +echo "Required:" +echo " SESSION_SECRET - openssl rand -hex 32" +echo " GITHUB_CLIENT_ID - From GitHub OAuth App" +echo " GITHUB_CLIENT_SECRET - From GitHub OAuth App" +echo " VAULT_ENCRYPTION_KEY - openssl rand -hex 32" +echo "" +echo "For Fly.io workspaces:" +echo " COMPUTE_PROVIDER=fly" +echo " FLY_API_TOKEN - fly auth token" +echo " FLY_ORG=personal" +echo " FLY_WORKSPACE_DOMAIN - e.g., ws.agent-relay.com" +echo "" +echo "For Stripe billing:" +echo " STRIPE_SECRET_KEY" +echo " STRIPE_PUBLISHABLE_KEY" +echo " STRIPE_WEBHOOK_SECRET" +echo "" + +echo "Set variables with:" +echo " railway variables set KEY=value" +echo "" + +echo "When ready, deploy with:" +echo " railway up" +echo "" + +echo "=== DNS Configuration ===" +echo "After deployment, configure your DNS:" +echo "" +echo "1. Get your Railway domain:" +echo " railway domain" +echo "" +echo "2. Configure DNS records:" +echo " api.agent-relay.com CNAME " +echo " app.agent-relay.com CNAME " +echo " agent-relay.com A " +echo " *.ws.agent-relay.com CNAME fly.dev (for workspaces)" +echo "" diff --git a/deploy/workspace/Dockerfile b/deploy/workspace/Dockerfile new file mode 100644 index 000000000..b2cfccfef --- /dev/null +++ b/deploy/workspace/Dockerfile @@ -0,0 +1,50 @@ +# Agent Relay Workspace +# Runs a user's workspace with the relay daemon and agent orchestration + +FROM node:20-slim + +WORKDIR /app + +# Install system dependencies for AI CLIs +RUN apt-get update && apt-get install -y \ + ca-certificates \ + curl \ + git \ + python3 \ + && rm -rf /var/lib/apt/lists/* + +# Install Claude CLI (if available) +# RUN npm install -g @anthropic-ai/claude-code + +# Copy pre-built agent-relay +COPY --from=ghcr.io/khaliqgant/agent-relay:latest /app/dist ./dist +COPY --from=ghcr.io/khaliqgant/agent-relay:latest /app/node_modules ./node_modules +COPY --from=ghcr.io/khaliqgant/agent-relay:latest /app/package*.json ./ + +# Create workspace directory +RUN mkdir -p /workspace /data + +# Create non-root user +RUN useradd -m -u 1001 workspace +RUN chown -R workspace:workspace /app /workspace /data +USER workspace + +# Environment +ENV NODE_ENV=production +ENV AGENT_RELAY_DATA_DIR=/data +ENV AGENT_RELAY_DASHBOARD_PORT=3888 + +# Expose ports +# 3888 - Dashboard/API +# 3889 - WebSocket (optional) +EXPOSE 3888 3889 + +# Volume for persistent data +VOLUME ["/data", "/workspace"] + +# Health check +HEALTHCHECK --interval=30s --timeout=10s --start-period=10s --retries=3 \ + CMD node -e "require('http').get('http://localhost:3888/health', (r) => process.exit(r.statusCode === 200 ? 0 : 1))" + +# Start relay daemon with dashboard +CMD ["node", "dist/cli/index.js", "up", "--port", "3888"] diff --git a/deploy/workspace/fly.toml b/deploy/workspace/fly.toml new file mode 100644 index 000000000..17d1214e5 --- /dev/null +++ b/deploy/workspace/fly.toml @@ -0,0 +1,55 @@ +# Fly.io configuration for Agent Relay Workspaces +# This is a TEMPLATE - the provisioner creates app-specific configs + +# App name is dynamically set: ar-{workspace_id} +# app = "ar-xxxxxxxx" + +primary_region = "sjc" + +[build] + dockerfile = "Dockerfile" + +[env] + NODE_ENV = "production" + AGENT_RELAY_DATA_DIR = "/data" + AGENT_RELAY_DASHBOARD_PORT = "3888" + +[http_service] + internal_port = 3888 + force_https = true + auto_stop_machines = true + auto_start_machines = true + min_machines_running = 0 + processes = ["app"] + + [http_service.concurrency] + type = "requests" + hard_limit = 250 + soft_limit = 200 + +[[vm]] + cpu_kind = "shared" + cpus = 1 + memory_mb = 512 + +[mounts] + source = "workspace_data" + destination = "/data" + +[checks] + [checks.health] + grace_period = "10s" + interval = "30s" + method = "get" + path = "/health" + port = 3888 + timeout = "5s" + type = "http" + +# Secrets are set via fly secrets set: +# - WORKSPACE_ID +# - CLOUD_API_URL +# - CLOUD_TOKEN +# - GITHUB_TOKEN (user's GitHub access token) +# - ANTHROPIC_API_KEY (if using Claude) +# - OPENAI_API_KEY (if using Codex) diff --git a/railway.json b/railway.json new file mode 100644 index 000000000..5d30c27d5 --- /dev/null +++ b/railway.json @@ -0,0 +1,14 @@ +{ + "$schema": "https://railway.app/railway.schema.json", + "build": { + "builder": "DOCKERFILE", + "dockerfilePath": "Dockerfile" + }, + "deploy": { + "startCommand": "node dist/cloud/index.js", + "healthcheckPath": "/health", + "healthcheckTimeout": 30, + "restartPolicyType": "ON_FAILURE", + "restartPolicyMaxRetries": 3 + } +} diff --git a/src/cloud/config.ts b/src/cloud/config.ts index 5b6304ac8..35c1c739e 100644 --- a/src/cloud/config.ts +++ b/src/cloud/config.ts @@ -42,6 +42,8 @@ export interface CloudConfig { fly?: { apiToken: string; org: string; + region?: string; + workspaceDomain?: string; // e.g., ws.agent-relay.com }; railway?: { apiToken: string; @@ -118,6 +120,8 @@ export function loadConfig(): CloudConfig { ? { apiToken: optionalEnv('FLY_API_TOKEN')!, org: optionalEnv('FLY_ORG') || 'personal', + region: optionalEnv('FLY_REGION') || 'sjc', + workspaceDomain: optionalEnv('FLY_WORKSPACE_DOMAIN'), } : undefined, railway: optionalEnv('RAILWAY_API_TOKEN') diff --git a/src/cloud/provisioner/index.ts b/src/cloud/provisioner/index.ts index c64485a3e..367ed85be 100644 --- a/src/cloud/provisioner/index.ts +++ b/src/cloud/provisioner/index.ts @@ -46,6 +46,8 @@ interface ComputeProvisioner { class FlyProvisioner implements ComputeProvisioner { private apiToken: string; private org: string; + private region: string; + private workspaceDomain?: string; constructor() { const config = getConfig(); @@ -54,6 +56,8 @@ class FlyProvisioner implements ComputeProvisioner { } this.apiToken = config.compute.fly.apiToken; this.org = config.compute.fly.org; + this.region = config.compute.fly.region || 'sjc'; + this.workspaceDomain = config.compute.fly.workspaceDomain; } async provision( @@ -95,7 +99,16 @@ class FlyProvisioner implements ComputeProvisioner { body: JSON.stringify(secrets), }); - // Create machine + // If custom workspace domain is configured, add certificate + const customHostname = this.workspaceDomain + ? `${appName}.${this.workspaceDomain}` + : null; + + if (customHostname) { + await this.allocateCertificate(appName, customHostname); + } + + // Create machine with auto-stop/start for cost optimization const machineResponse = await fetch( `https://api.machines.dev/v1/apps/${appName}/machines`, { @@ -105,8 +118,9 @@ class FlyProvisioner implements ComputeProvisioner { 'Content-Type': 'application/json', }, body: JSON.stringify({ + region: this.region, config: { - image: 'ghcr.io/agent-relay/workspace:latest', + image: 'ghcr.io/khaliqgant/agent-relay-workspace:latest', env: { WORKSPACE_ID: workspace.id, SUPERVISOR_ENABLED: String(workspace.config.supervisorEnabled), @@ -122,6 +136,10 @@ class FlyProvisioner implements ComputeProvisioner { ], protocol: 'tcp', internal_port: 3000, + // Auto-stop after 5 minutes of inactivity + auto_stop_machines: true, + auto_start_machines: true, + min_machines_running: 0, }, ], guest: { @@ -139,14 +157,47 @@ class FlyProvisioner implements ComputeProvisioner { throw new Error(`Failed to create Fly machine: ${error}`); } - const machine = await machineResponse.json() as { id: string }; + const machine = (await machineResponse.json()) as { id: string }; + + // Return custom domain URL if configured, otherwise default fly.dev + const publicUrl = customHostname + ? `https://${customHostname}` + : `https://${appName}.fly.dev`; return { computeId: machine.id, - publicUrl: `https://${appName}.fly.dev`, + publicUrl, }; } + /** + * Allocate SSL certificate for custom domain + */ + private async allocateCertificate( + appName: string, + hostname: string + ): Promise { + const response = await fetch( + `https://api.machines.dev/v1/apps/${appName}/certificates`, + { + method: 'POST', + headers: { + Authorization: `Bearer ${this.apiToken}`, + 'Content-Type': 'application/json', + }, + body: JSON.stringify({ hostname }), + } + ); + + if (!response.ok) { + const error = await response.text(); + // Don't fail if cert already exists + if (!error.includes('already exists')) { + throw new Error(`Failed to allocate certificate for ${hostname}: ${error}`); + } + } + } + async deprovision(workspace: Workspace): Promise { const appName = `ar-${workspace.id.substring(0, 8)}`; @@ -271,7 +322,7 @@ class RailwayProvisioner implements ComputeProvisioner { projectId, name: 'workspace', source: { - image: 'ghcr.io/agent-relay/workspace:latest', + image: 'ghcr.io/khaliqgant/agent-relay-workspace:latest', }, }, }, @@ -477,7 +528,7 @@ class DockerProvisioner implements ComputeProvisioner { try { execSync( - `docker run -d --name ${containerName} -p ${port}:3000 ${envArgs.join(' ')} ghcr.io/agent-relay/workspace:latest`, + `docker run -d --name ${containerName} -p ${port}:3000 ${envArgs.join(' ')} ghcr.io/khaliqgant/agent-relay-workspace:latest`, { stdio: 'pipe' } ); From ba3786474d81ffbe47e8ae81ca3a22d7e083abfc Mon Sep 17 00:00:00 2001 From: Claude Date: Tue, 30 Dec 2025 03:08:16 +0000 Subject: [PATCH 23/38] Add cloud-daemon linking and Drizzle ORM for local dev Cloud-Daemon Sync: - Add /api/daemons endpoints for daemon registration and linking - Implement API key authentication for daemon-to-cloud communication - Add CloudSyncService for heartbeat, agent discovery, and credential sync - Support cross-machine message relay through cloud queue Database: - Add Drizzle ORM schema with full type safety - Create drizzle.ts client with typed query helpers - Add linkedDaemons table for daemon registration - Add subscriptions and usage_records tables for billing Local Development: - Add docker-compose.dev.yml for full local cloud stack - Add init-db.sql for PostgreSQL schema initialization - Add npm scripts: db:generate, db:migrate, db:push, db:studio Architecture: - Each machine gets one API key (not per-project) - Daemon reports all agents from all projects on that machine - Cloud aggregates agents from all linked machines - Messages can be relayed across machines via cloud queue --- deploy/init-db.sql | 137 ++ docker-compose.dev.yml | 128 ++ drizzle.config.ts | 12 + package-lock.json | 3780 +++++++++++++++++++++++++------------- package.json | 8 +- src/cloud/api/daemons.ts | 367 ++++ src/cloud/db/drizzle.ts | 384 ++++ src/cloud/db/index.ts | 226 +++ src/cloud/db/schema.ts | 255 +++ src/daemon/cloud-sync.ts | 356 ++++ 10 files changed, 4329 insertions(+), 1324 deletions(-) create mode 100644 deploy/init-db.sql create mode 100644 docker-compose.dev.yml create mode 100644 drizzle.config.ts create mode 100644 src/cloud/api/daemons.ts create mode 100644 src/cloud/db/drizzle.ts create mode 100644 src/cloud/db/schema.ts create mode 100644 src/daemon/cloud-sync.ts diff --git a/deploy/init-db.sql b/deploy/init-db.sql new file mode 100644 index 000000000..ca6fd7f16 --- /dev/null +++ b/deploy/init-db.sql @@ -0,0 +1,137 @@ +-- Agent Relay Cloud - Database Schema +-- This script initializes the PostgreSQL database for local development + +-- Users table (linked to GitHub OAuth) +CREATE TABLE IF NOT EXISTS users ( + id UUID PRIMARY KEY DEFAULT gen_random_uuid(), + github_id BIGINT UNIQUE NOT NULL, + username VARCHAR(255) NOT NULL, + email VARCHAR(255), + avatar_url TEXT, + created_at TIMESTAMP WITH TIME ZONE DEFAULT NOW(), + updated_at TIMESTAMP WITH TIME ZONE DEFAULT NOW() +); + +-- Teams table +CREATE TABLE IF NOT EXISTS teams ( + id UUID PRIMARY KEY DEFAULT gen_random_uuid(), + name VARCHAR(255) NOT NULL, + slug VARCHAR(255) UNIQUE NOT NULL, + owner_id UUID REFERENCES users(id) ON DELETE CASCADE, + created_at TIMESTAMP WITH TIME ZONE DEFAULT NOW(), + updated_at TIMESTAMP WITH TIME ZONE DEFAULT NOW() +); + +-- Team memberships +CREATE TABLE IF NOT EXISTS team_members ( + team_id UUID REFERENCES teams(id) ON DELETE CASCADE, + user_id UUID REFERENCES users(id) ON DELETE CASCADE, + role VARCHAR(50) DEFAULT 'member', + created_at TIMESTAMP WITH TIME ZONE DEFAULT NOW(), + PRIMARY KEY (team_id, user_id) +); + +-- Provider credentials (encrypted in vault) +CREATE TABLE IF NOT EXISTS provider_credentials ( + id UUID PRIMARY KEY DEFAULT gen_random_uuid(), + user_id UUID REFERENCES users(id) ON DELETE CASCADE, + provider VARCHAR(50) NOT NULL, + encrypted_token TEXT NOT NULL, + token_type VARCHAR(50) DEFAULT 'bearer', + expires_at TIMESTAMP WITH TIME ZONE, + created_at TIMESTAMP WITH TIME ZONE DEFAULT NOW(), + updated_at TIMESTAMP WITH TIME ZONE DEFAULT NOW(), + UNIQUE(user_id, provider) +); + +-- Workspaces (provisioned compute instances) +CREATE TABLE IF NOT EXISTS workspaces ( + id UUID PRIMARY KEY DEFAULT gen_random_uuid(), + user_id UUID REFERENCES users(id) ON DELETE CASCADE, + team_id UUID REFERENCES teams(id) ON DELETE SET NULL, + name VARCHAR(255) NOT NULL, + status VARCHAR(50) DEFAULT 'provisioning', + compute_provider VARCHAR(50) NOT NULL, + compute_id VARCHAR(255), + public_url TEXT, + config JSONB DEFAULT '{}', + error_message TEXT, + created_at TIMESTAMP WITH TIME ZONE DEFAULT NOW(), + updated_at TIMESTAMP WITH TIME ZONE DEFAULT NOW() +); + +-- Linked daemons (local agent-relay instances connected to cloud) +CREATE TABLE IF NOT EXISTS linked_daemons ( + id UUID PRIMARY KEY DEFAULT gen_random_uuid(), + user_id UUID REFERENCES users(id) ON DELETE CASCADE, + name VARCHAR(255) NOT NULL, + machine_id VARCHAR(255) NOT NULL, + api_key_hash VARCHAR(255) NOT NULL, + last_seen_at TIMESTAMP WITH TIME ZONE, + status VARCHAR(50) DEFAULT 'offline', + metadata JSONB DEFAULT '{}', + created_at TIMESTAMP WITH TIME ZONE DEFAULT NOW(), + updated_at TIMESTAMP WITH TIME ZONE DEFAULT NOW(), + UNIQUE(user_id, machine_id) +); + +-- Billing/subscriptions +CREATE TABLE IF NOT EXISTS subscriptions ( + id UUID PRIMARY KEY DEFAULT gen_random_uuid(), + user_id UUID REFERENCES users(id) ON DELETE CASCADE, + team_id UUID REFERENCES teams(id) ON DELETE CASCADE, + stripe_subscription_id VARCHAR(255) UNIQUE, + stripe_customer_id VARCHAR(255), + plan VARCHAR(50) NOT NULL, + status VARCHAR(50) DEFAULT 'active', + current_period_start TIMESTAMP WITH TIME ZONE, + current_period_end TIMESTAMP WITH TIME ZONE, + created_at TIMESTAMP WITH TIME ZONE DEFAULT NOW(), + updated_at TIMESTAMP WITH TIME ZONE DEFAULT NOW() +); + +-- Usage tracking +CREATE TABLE IF NOT EXISTS usage_records ( + id UUID PRIMARY KEY DEFAULT gen_random_uuid(), + user_id UUID REFERENCES users(id) ON DELETE CASCADE, + workspace_id UUID REFERENCES workspaces(id) ON DELETE SET NULL, + metric VARCHAR(100) NOT NULL, + value BIGINT NOT NULL, + recorded_at TIMESTAMP WITH TIME ZONE DEFAULT NOW() +); + +-- Indexes for common queries +CREATE INDEX IF NOT EXISTS idx_workspaces_user ON workspaces(user_id); +CREATE INDEX IF NOT EXISTS idx_workspaces_status ON workspaces(status); +CREATE INDEX IF NOT EXISTS idx_linked_daemons_user ON linked_daemons(user_id); +CREATE INDEX IF NOT EXISTS idx_linked_daemons_status ON linked_daemons(status); +CREATE INDEX IF NOT EXISTS idx_usage_records_user ON usage_records(user_id); +CREATE INDEX IF NOT EXISTS idx_usage_records_recorded ON usage_records(recorded_at); + +-- Updated timestamp trigger +CREATE OR REPLACE FUNCTION update_updated_at() +RETURNS TRIGGER AS $$ +BEGIN + NEW.updated_at = NOW(); + RETURN NEW; +END; +$$ LANGUAGE plpgsql; + +-- Apply trigger to tables +DO $$ +DECLARE + t text; +BEGIN + FOR t IN SELECT table_name FROM information_schema.tables + WHERE table_schema = 'public' + AND table_name IN ('users', 'teams', 'workspaces', 'linked_daemons', 'subscriptions') + LOOP + EXECUTE format(' + DROP TRIGGER IF EXISTS update_%I_updated_at ON %I; + CREATE TRIGGER update_%I_updated_at + BEFORE UPDATE ON %I + FOR EACH ROW EXECUTE FUNCTION update_updated_at(); + ', t, t, t, t); + END LOOP; +END; +$$; diff --git a/docker-compose.dev.yml b/docker-compose.dev.yml new file mode 100644 index 000000000..439ee41d3 --- /dev/null +++ b/docker-compose.dev.yml @@ -0,0 +1,128 @@ +# Agent Relay Cloud - Local Development Setup +# Run with: docker compose -f docker-compose.dev.yml up +# +# This starts the full cloud stack locally: +# - PostgreSQL database +# - Redis for sessions/caching +# - Cloud API server +# - Example workspace (optional) +# +# After starting, access: +# - Landing page: http://localhost:3000 +# - Dashboard: http://localhost:3000/dashboard +# - API: http://localhost:3000/api + +version: '3.8' + +services: + # PostgreSQL database + postgres: + image: postgres:16-alpine + environment: + POSTGRES_USER: agent_relay + POSTGRES_PASSWORD: dev_password + POSTGRES_DB: agent_relay + volumes: + - postgres_data:/var/lib/postgresql/data + - ./deploy/init-db.sql:/docker-entrypoint-initdb.d/init.sql:ro + ports: + - "5432:5432" + healthcheck: + test: ["CMD-SHELL", "pg_isready -U agent_relay"] + interval: 5s + timeout: 5s + retries: 5 + + # Redis for sessions and pub/sub + redis: + image: redis:7-alpine + ports: + - "6379:6379" + volumes: + - redis_data:/data + healthcheck: + test: ["CMD", "redis-cli", "ping"] + interval: 5s + timeout: 5s + retries: 5 + + # Cloud API server + cloud: + build: + context: . + dockerfile: Dockerfile + ports: + - "3000:3000" + environment: + NODE_ENV: development + PORT: 3000 + PUBLIC_URL: http://localhost:3000 + + # Database + DATABASE_URL: postgres://agent_relay:dev_password@postgres:5432/agent_relay + REDIS_URL: redis://redis:6379 + + # Session (generate your own for production!) + SESSION_SECRET: dev-session-secret-change-in-production + + # GitHub OAuth (set these in .env.local) + GITHUB_CLIENT_ID: ${GITHUB_CLIENT_ID:-} + GITHUB_CLIENT_SECRET: ${GITHUB_CLIENT_SECRET:-} + + # Vault master key (generate with: openssl rand -base64 32) + VAULT_MASTER_KEY: ${VAULT_MASTER_KEY:-ZGV2LXZhdWx0LWtleS1jaGFuZ2UtaW4tcHJvZHVjdGlvbg==} + + # Stripe (set in .env.local for billing features) + STRIPE_SECRET_KEY: ${STRIPE_SECRET_KEY:-sk_test_placeholder} + STRIPE_PUBLISHABLE_KEY: ${STRIPE_PUBLISHABLE_KEY:-pk_test_placeholder} + STRIPE_WEBHOOK_SECRET: ${STRIPE_WEBHOOK_SECRET:-whsec_placeholder} + + # Compute provider (docker for local dev) + COMPUTE_PROVIDER: docker + + # Provider OAuth (optional) + GOOGLE_CLIENT_ID: ${GOOGLE_CLIENT_ID:-} + GOOGLE_CLIENT_SECRET: ${GOOGLE_CLIENT_SECRET:-} + depends_on: + postgres: + condition: service_healthy + redis: + condition: service_healthy + volumes: + # Mount docker socket for local workspace provisioning + - /var/run/docker.sock:/var/run/docker.sock + healthcheck: + test: ["CMD", "curl", "-f", "http://localhost:3000/health"] + interval: 10s + timeout: 5s + retries: 3 + + # Optional: Example workspace for testing + workspace: + image: ghcr.io/khaliqgant/agent-relay-workspace:latest + build: + context: ./deploy/workspace + dockerfile: Dockerfile + ports: + - "3888:3888" + - "3889:3889" + environment: + WORKSPACE_ID: local-dev-workspace + SUPERVISOR_ENABLED: "true" + MAX_AGENTS: "10" + volumes: + - workspace_data:/data + - ./:/workspace:ro + profiles: + - workspace + depends_on: + - cloud + +volumes: + postgres_data: + redis_data: + workspace_data: + +networks: + default: + name: agent-relay-dev diff --git a/drizzle.config.ts b/drizzle.config.ts new file mode 100644 index 000000000..c4c81db9f --- /dev/null +++ b/drizzle.config.ts @@ -0,0 +1,12 @@ +import type { Config } from 'drizzle-kit'; + +export default { + schema: './src/cloud/db/schema.ts', + out: './src/cloud/db/migrations', + dialect: 'postgresql', + dbCredentials: { + url: process.env.DATABASE_URL || 'postgres://agent_relay:dev_password@localhost:5432/agent_relay', + }, + verbose: true, + strict: true, +} satisfies Config; diff --git a/package-lock.json b/package-lock.json index 7aff8d1b0..98eb50258 100644 --- a/package-lock.json +++ b/package-lock.json @@ -15,6 +15,7 @@ "commander": "^12.1.0", "compare-versions": "^6.1.1", "dotenv": "^17.2.3", + "drizzle-orm": "^0.45.1", "express": "^5.2.1", "http-proxy-middleware": "^3.0.5", "node-pty": "1.0.0", @@ -39,6 +40,7 @@ "@typescript-eslint/eslint-plugin": "^8.18.2", "@typescript-eslint/parser": "^8.18.2", "@vitest/coverage-v8": "^2.1.8", + "drizzle-kit": "^0.31.8", "esbuild": "^0.24.0", "eslint": "^8.57.1", "jsdom": "^25.0.1", @@ -243,780 +245,1240 @@ "node": ">=18" } }, - "node_modules/@esbuild/aix-ppc64": { - "version": "0.24.2", - "resolved": "https://registry.npmjs.org/@esbuild/aix-ppc64/-/aix-ppc64-0.24.2.tgz", - "integrity": "sha512-thpVCb/rhxE/BnMLQ7GReQLLN8q9qbHmI55F4489/ByVg2aQaQ6kbcLb6FHkocZzQhxc4gx0sCk0tJkKBFzDhA==", - "cpu": [ - "ppc64" - ], + "node_modules/@drizzle-team/brocli": { + "version": "0.10.2", + "resolved": "https://registry.npmjs.org/@drizzle-team/brocli/-/brocli-0.10.2.tgz", + "integrity": "sha512-z33Il7l5dKjUgGULTqBsQBQwckHh5AbIuxhdsIxDDiZAzBOrZO6q9ogcWC65kU382AfynTfgNumVcNIjuIua6w==", "dev": true, - "optional": true, - "os": [ - "aix" - ], - "engines": { - "node": ">=18" + "license": "Apache-2.0" + }, + "node_modules/@esbuild-kit/core-utils": { + "version": "3.3.2", + "resolved": "https://registry.npmjs.org/@esbuild-kit/core-utils/-/core-utils-3.3.2.tgz", + "integrity": "sha512-sPRAnw9CdSsRmEtnsl2WXWdyquogVpB3yZ3dgwJfe8zrOzTsV7cJvmwrKVa+0ma5BoiGJ+BoqkMvawbayKUsqQ==", + "deprecated": "Merged into tsx: https://tsx.is", + "dev": true, + "license": "MIT", + "dependencies": { + "esbuild": "~0.18.20", + "source-map-support": "^0.5.21" } }, - "node_modules/@esbuild/android-arm": { - "version": "0.24.2", - "resolved": "https://registry.npmjs.org/@esbuild/android-arm/-/android-arm-0.24.2.tgz", - "integrity": "sha512-tmwl4hJkCfNHwFB3nBa8z1Uy3ypZpxqxfTQOcHX+xRByyYgunVbZ9MzUUfb0RxaHIMnbHagwAxuTL+tnNM+1/Q==", + "node_modules/@esbuild-kit/core-utils/node_modules/@esbuild/android-arm": { + "version": "0.18.20", + "resolved": "https://registry.npmjs.org/@esbuild/android-arm/-/android-arm-0.18.20.tgz", + "integrity": "sha512-fyi7TDI/ijKKNZTUJAQqiG5T7YjJXgnzkURqmGj13C6dCqckZBLdl4h7bkhHt/t0WP+zO9/zwroDvANaOqO5Sw==", "cpu": [ "arm" ], "dev": true, + "license": "MIT", "optional": true, "os": [ "android" ], "engines": { - "node": ">=18" + "node": ">=12" } }, - "node_modules/@esbuild/android-arm64": { - "version": "0.24.2", - "resolved": "https://registry.npmjs.org/@esbuild/android-arm64/-/android-arm64-0.24.2.tgz", - "integrity": "sha512-cNLgeqCqV8WxfcTIOeL4OAtSmL8JjcN6m09XIgro1Wi7cF4t/THaWEa7eL5CMoMBdjoHOTh/vwTO/o2TRXIyzg==", + "node_modules/@esbuild-kit/core-utils/node_modules/@esbuild/android-arm64": { + "version": "0.18.20", + "resolved": "https://registry.npmjs.org/@esbuild/android-arm64/-/android-arm64-0.18.20.tgz", + "integrity": "sha512-Nz4rJcchGDtENV0eMKUNa6L12zz2zBDXuhj/Vjh18zGqB44Bi7MBMSXjgunJgjRhCmKOjnPuZp4Mb6OKqtMHLQ==", "cpu": [ "arm64" ], "dev": true, + "license": "MIT", "optional": true, "os": [ "android" ], "engines": { - "node": ">=18" + "node": ">=12" } }, - "node_modules/@esbuild/android-x64": { - "version": "0.24.2", - "resolved": "https://registry.npmjs.org/@esbuild/android-x64/-/android-x64-0.24.2.tgz", - "integrity": "sha512-B6Q0YQDqMx9D7rvIcsXfmJfvUYLoP722bgfBlO5cGvNVb5V/+Y7nhBE3mHV9OpxBf4eAS2S68KZztiPaWq4XYw==", + "node_modules/@esbuild-kit/core-utils/node_modules/@esbuild/android-x64": { + "version": "0.18.20", + "resolved": "https://registry.npmjs.org/@esbuild/android-x64/-/android-x64-0.18.20.tgz", + "integrity": "sha512-8GDdlePJA8D6zlZYJV/jnrRAi6rOiNaCC/JclcXpB+KIuvfBN4owLtgzY2bsxnx666XjJx2kDPUmnTtR8qKQUg==", "cpu": [ "x64" ], "dev": true, + "license": "MIT", "optional": true, "os": [ "android" ], "engines": { - "node": ">=18" + "node": ">=12" } }, - "node_modules/@esbuild/darwin-arm64": { - "version": "0.24.2", - "resolved": "https://registry.npmjs.org/@esbuild/darwin-arm64/-/darwin-arm64-0.24.2.tgz", - "integrity": "sha512-kj3AnYWc+CekmZnS5IPu9D+HWtUI49hbnyqk0FLEJDbzCIQt7hg7ucF1SQAilhtYpIujfaHr6O0UHlzzSPdOeA==", + "node_modules/@esbuild-kit/core-utils/node_modules/@esbuild/darwin-arm64": { + "version": "0.18.20", + "resolved": "https://registry.npmjs.org/@esbuild/darwin-arm64/-/darwin-arm64-0.18.20.tgz", + "integrity": "sha512-bxRHW5kHU38zS2lPTPOyuyTm+S+eobPUnTNkdJEfAddYgEcll4xkT8DB9d2008DtTbl7uJag2HuE5NZAZgnNEA==", "cpu": [ "arm64" ], "dev": true, + "license": "MIT", "optional": true, "os": [ "darwin" ], "engines": { - "node": ">=18" + "node": ">=12" } }, - "node_modules/@esbuild/darwin-x64": { - "version": "0.24.2", - "resolved": "https://registry.npmjs.org/@esbuild/darwin-x64/-/darwin-x64-0.24.2.tgz", - "integrity": "sha512-WeSrmwwHaPkNR5H3yYfowhZcbriGqooyu3zI/3GGpF8AyUdsrrP0X6KumITGA9WOyiJavnGZUwPGvxvwfWPHIA==", + "node_modules/@esbuild-kit/core-utils/node_modules/@esbuild/darwin-x64": { + "version": "0.18.20", + "resolved": "https://registry.npmjs.org/@esbuild/darwin-x64/-/darwin-x64-0.18.20.tgz", + "integrity": "sha512-pc5gxlMDxzm513qPGbCbDukOdsGtKhfxD1zJKXjCCcU7ju50O7MeAZ8c4krSJcOIJGFR+qx21yMMVYwiQvyTyQ==", "cpu": [ "x64" ], "dev": true, + "license": "MIT", "optional": true, "os": [ "darwin" ], "engines": { - "node": ">=18" + "node": ">=12" } }, - "node_modules/@esbuild/freebsd-arm64": { - "version": "0.24.2", - "resolved": "https://registry.npmjs.org/@esbuild/freebsd-arm64/-/freebsd-arm64-0.24.2.tgz", - "integrity": "sha512-UN8HXjtJ0k/Mj6a9+5u6+2eZ2ERD7Edt1Q9IZiB5UZAIdPnVKDoG7mdTVGhHJIeEml60JteamR3qhsr1r8gXvg==", + "node_modules/@esbuild-kit/core-utils/node_modules/@esbuild/freebsd-arm64": { + "version": "0.18.20", + "resolved": "https://registry.npmjs.org/@esbuild/freebsd-arm64/-/freebsd-arm64-0.18.20.tgz", + "integrity": "sha512-yqDQHy4QHevpMAaxhhIwYPMv1NECwOvIpGCZkECn8w2WFHXjEwrBn3CeNIYsibZ/iZEUemj++M26W3cNR5h+Tw==", "cpu": [ "arm64" ], "dev": true, + "license": "MIT", "optional": true, "os": [ "freebsd" ], "engines": { - "node": ">=18" + "node": ">=12" } }, - "node_modules/@esbuild/freebsd-x64": { - "version": "0.24.2", - "resolved": "https://registry.npmjs.org/@esbuild/freebsd-x64/-/freebsd-x64-0.24.2.tgz", - "integrity": "sha512-TvW7wE/89PYW+IevEJXZ5sF6gJRDY/14hyIGFXdIucxCsbRmLUcjseQu1SyTko+2idmCw94TgyaEZi9HUSOe3Q==", + "node_modules/@esbuild-kit/core-utils/node_modules/@esbuild/freebsd-x64": { + "version": "0.18.20", + "resolved": "https://registry.npmjs.org/@esbuild/freebsd-x64/-/freebsd-x64-0.18.20.tgz", + "integrity": "sha512-tgWRPPuQsd3RmBZwarGVHZQvtzfEBOreNuxEMKFcd5DaDn2PbBxfwLcj4+aenoh7ctXcbXmOQIn8HI6mCSw5MQ==", "cpu": [ "x64" ], "dev": true, + "license": "MIT", "optional": true, "os": [ "freebsd" ], "engines": { - "node": ">=18" + "node": ">=12" } }, - "node_modules/@esbuild/linux-arm": { - "version": "0.24.2", - "resolved": "https://registry.npmjs.org/@esbuild/linux-arm/-/linux-arm-0.24.2.tgz", - "integrity": "sha512-n0WRM/gWIdU29J57hJyUdIsk0WarGd6To0s+Y+LwvlC55wt+GT/OgkwoXCXvIue1i1sSNWblHEig00GBWiJgfA==", + "node_modules/@esbuild-kit/core-utils/node_modules/@esbuild/linux-arm": { + "version": "0.18.20", + "resolved": "https://registry.npmjs.org/@esbuild/linux-arm/-/linux-arm-0.18.20.tgz", + "integrity": "sha512-/5bHkMWnq1EgKr1V+Ybz3s1hWXok7mDFUMQ4cG10AfW3wL02PSZi5kFpYKrptDsgb2WAJIvRcDm+qIvXf/apvg==", "cpu": [ "arm" ], "dev": true, + "license": "MIT", "optional": true, "os": [ "linux" ], "engines": { - "node": ">=18" + "node": ">=12" } }, - "node_modules/@esbuild/linux-arm64": { - "version": "0.24.2", - "resolved": "https://registry.npmjs.org/@esbuild/linux-arm64/-/linux-arm64-0.24.2.tgz", - "integrity": "sha512-7HnAD6074BW43YvvUmE/35Id9/NB7BeX5EoNkK9obndmZBUk8xmJJeU7DwmUeN7tkysslb2eSl6CTrYz6oEMQg==", + "node_modules/@esbuild-kit/core-utils/node_modules/@esbuild/linux-arm64": { + "version": "0.18.20", + "resolved": "https://registry.npmjs.org/@esbuild/linux-arm64/-/linux-arm64-0.18.20.tgz", + "integrity": "sha512-2YbscF+UL7SQAVIpnWvYwM+3LskyDmPhe31pE7/aoTMFKKzIc9lLbyGUpmmb8a8AixOL61sQ/mFh3jEjHYFvdA==", "cpu": [ "arm64" ], "dev": true, + "license": "MIT", "optional": true, "os": [ "linux" ], "engines": { - "node": ">=18" + "node": ">=12" } }, - "node_modules/@esbuild/linux-ia32": { - "version": "0.24.2", - "resolved": "https://registry.npmjs.org/@esbuild/linux-ia32/-/linux-ia32-0.24.2.tgz", - "integrity": "sha512-sfv0tGPQhcZOgTKO3oBE9xpHuUqguHvSo4jl+wjnKwFpapx+vUDcawbwPNuBIAYdRAvIDBfZVvXprIj3HA+Ugw==", + "node_modules/@esbuild-kit/core-utils/node_modules/@esbuild/linux-ia32": { + "version": "0.18.20", + "resolved": "https://registry.npmjs.org/@esbuild/linux-ia32/-/linux-ia32-0.18.20.tgz", + "integrity": "sha512-P4etWwq6IsReT0E1KHU40bOnzMHoH73aXp96Fs8TIT6z9Hu8G6+0SHSw9i2isWrD2nbx2qo5yUqACgdfVGx7TA==", "cpu": [ "ia32" ], "dev": true, + "license": "MIT", "optional": true, "os": [ "linux" ], "engines": { - "node": ">=18" + "node": ">=12" } }, - "node_modules/@esbuild/linux-loong64": { - "version": "0.24.2", - "resolved": "https://registry.npmjs.org/@esbuild/linux-loong64/-/linux-loong64-0.24.2.tgz", - "integrity": "sha512-CN9AZr8kEndGooS35ntToZLTQLHEjtVB5n7dl8ZcTZMonJ7CCfStrYhrzF97eAecqVbVJ7APOEe18RPI4KLhwQ==", + "node_modules/@esbuild-kit/core-utils/node_modules/@esbuild/linux-loong64": { + "version": "0.18.20", + "resolved": "https://registry.npmjs.org/@esbuild/linux-loong64/-/linux-loong64-0.18.20.tgz", + "integrity": "sha512-nXW8nqBTrOpDLPgPY9uV+/1DjxoQ7DoB2N8eocyq8I9XuqJ7BiAMDMf9n1xZM9TgW0J8zrquIb/A7s3BJv7rjg==", "cpu": [ "loong64" ], "dev": true, + "license": "MIT", "optional": true, "os": [ "linux" ], "engines": { - "node": ">=18" + "node": ">=12" } }, - "node_modules/@esbuild/linux-mips64el": { - "version": "0.24.2", - "resolved": "https://registry.npmjs.org/@esbuild/linux-mips64el/-/linux-mips64el-0.24.2.tgz", - "integrity": "sha512-iMkk7qr/wl3exJATwkISxI7kTcmHKE+BlymIAbHO8xanq/TjHaaVThFF6ipWzPHryoFsesNQJPE/3wFJw4+huw==", + "node_modules/@esbuild-kit/core-utils/node_modules/@esbuild/linux-mips64el": { + "version": "0.18.20", + "resolved": "https://registry.npmjs.org/@esbuild/linux-mips64el/-/linux-mips64el-0.18.20.tgz", + "integrity": "sha512-d5NeaXZcHp8PzYy5VnXV3VSd2D328Zb+9dEq5HE6bw6+N86JVPExrA6O68OPwobntbNJ0pzCpUFZTo3w0GyetQ==", "cpu": [ "mips64el" ], "dev": true, + "license": "MIT", "optional": true, "os": [ "linux" ], "engines": { - "node": ">=18" + "node": ">=12" } }, - "node_modules/@esbuild/linux-ppc64": { - "version": "0.24.2", - "resolved": "https://registry.npmjs.org/@esbuild/linux-ppc64/-/linux-ppc64-0.24.2.tgz", - "integrity": "sha512-shsVrgCZ57Vr2L8mm39kO5PPIb+843FStGt7sGGoqiiWYconSxwTiuswC1VJZLCjNiMLAMh34jg4VSEQb+iEbw==", + "node_modules/@esbuild-kit/core-utils/node_modules/@esbuild/linux-ppc64": { + "version": "0.18.20", + "resolved": "https://registry.npmjs.org/@esbuild/linux-ppc64/-/linux-ppc64-0.18.20.tgz", + "integrity": "sha512-WHPyeScRNcmANnLQkq6AfyXRFr5D6N2sKgkFo2FqguP44Nw2eyDlbTdZwd9GYk98DZG9QItIiTlFLHJHjxP3FA==", "cpu": [ "ppc64" ], "dev": true, + "license": "MIT", "optional": true, "os": [ "linux" ], "engines": { - "node": ">=18" + "node": ">=12" } }, - "node_modules/@esbuild/linux-riscv64": { - "version": "0.24.2", - "resolved": "https://registry.npmjs.org/@esbuild/linux-riscv64/-/linux-riscv64-0.24.2.tgz", - "integrity": "sha512-4eSFWnU9Hhd68fW16GD0TINewo1L6dRrB+oLNNbYyMUAeOD2yCK5KXGK1GH4qD/kT+bTEXjsyTCiJGHPZ3eM9Q==", + "node_modules/@esbuild-kit/core-utils/node_modules/@esbuild/linux-riscv64": { + "version": "0.18.20", + "resolved": "https://registry.npmjs.org/@esbuild/linux-riscv64/-/linux-riscv64-0.18.20.tgz", + "integrity": "sha512-WSxo6h5ecI5XH34KC7w5veNnKkju3zBRLEQNY7mv5mtBmrP/MjNBCAlsM2u5hDBlS3NGcTQpoBvRzqBcRtpq1A==", "cpu": [ "riscv64" ], "dev": true, + "license": "MIT", "optional": true, "os": [ "linux" ], "engines": { - "node": ">=18" + "node": ">=12" } }, - "node_modules/@esbuild/linux-s390x": { - "version": "0.24.2", - "resolved": "https://registry.npmjs.org/@esbuild/linux-s390x/-/linux-s390x-0.24.2.tgz", - "integrity": "sha512-S0Bh0A53b0YHL2XEXC20bHLuGMOhFDO6GN4b3YjRLK//Ep3ql3erpNcPlEFed93hsQAjAQDNsvcK+hV90FubSw==", + "node_modules/@esbuild-kit/core-utils/node_modules/@esbuild/linux-s390x": { + "version": "0.18.20", + "resolved": "https://registry.npmjs.org/@esbuild/linux-s390x/-/linux-s390x-0.18.20.tgz", + "integrity": "sha512-+8231GMs3mAEth6Ja1iK0a1sQ3ohfcpzpRLH8uuc5/KVDFneH6jtAJLFGafpzpMRO6DzJ6AvXKze9LfFMrIHVQ==", "cpu": [ "s390x" ], "dev": true, + "license": "MIT", "optional": true, "os": [ "linux" ], "engines": { - "node": ">=18" + "node": ">=12" } }, - "node_modules/@esbuild/linux-x64": { - "version": "0.24.2", - "resolved": "https://registry.npmjs.org/@esbuild/linux-x64/-/linux-x64-0.24.2.tgz", - "integrity": "sha512-8Qi4nQcCTbLnK9WoMjdC9NiTG6/E38RNICU6sUNqK0QFxCYgoARqVqxdFmWkdonVsvGqWhmm7MO0jyTqLqwj0Q==", + "node_modules/@esbuild-kit/core-utils/node_modules/@esbuild/linux-x64": { + "version": "0.18.20", + "resolved": "https://registry.npmjs.org/@esbuild/linux-x64/-/linux-x64-0.18.20.tgz", + "integrity": "sha512-UYqiqemphJcNsFEskc73jQ7B9jgwjWrSayxawS6UVFZGWrAAtkzjxSqnoclCXxWtfwLdzU+vTpcNYhpn43uP1w==", "cpu": [ "x64" ], "dev": true, + "license": "MIT", "optional": true, "os": [ "linux" ], "engines": { - "node": ">=18" + "node": ">=12" } }, - "node_modules/@esbuild/netbsd-arm64": { - "version": "0.24.2", - "resolved": "https://registry.npmjs.org/@esbuild/netbsd-arm64/-/netbsd-arm64-0.24.2.tgz", - "integrity": "sha512-wuLK/VztRRpMt9zyHSazyCVdCXlpHkKm34WUyinD2lzK07FAHTq0KQvZZlXikNWkDGoT6x3TD51jKQ7gMVpopw==", + "node_modules/@esbuild-kit/core-utils/node_modules/@esbuild/netbsd-x64": { + "version": "0.18.20", + "resolved": "https://registry.npmjs.org/@esbuild/netbsd-x64/-/netbsd-x64-0.18.20.tgz", + "integrity": "sha512-iO1c++VP6xUBUmltHZoMtCUdPlnPGdBom6IrO4gyKPFFVBKioIImVooR5I83nTew5UOYrk3gIJhbZh8X44y06A==", "cpu": [ - "arm64" + "x64" ], "dev": true, + "license": "MIT", "optional": true, "os": [ "netbsd" ], "engines": { - "node": ">=18" + "node": ">=12" } }, - "node_modules/@esbuild/netbsd-x64": { - "version": "0.24.2", - "resolved": "https://registry.npmjs.org/@esbuild/netbsd-x64/-/netbsd-x64-0.24.2.tgz", - "integrity": "sha512-VefFaQUc4FMmJuAxmIHgUmfNiLXY438XrL4GDNV1Y1H/RW3qow68xTwjZKfj/+Plp9NANmzbH5R40Meudu8mmw==", + "node_modules/@esbuild-kit/core-utils/node_modules/@esbuild/openbsd-x64": { + "version": "0.18.20", + "resolved": "https://registry.npmjs.org/@esbuild/openbsd-x64/-/openbsd-x64-0.18.20.tgz", + "integrity": "sha512-e5e4YSsuQfX4cxcygw/UCPIEP6wbIL+se3sxPdCiMbFLBWu0eiZOJ7WoD+ptCLrmjZBK1Wk7I6D/I3NglUGOxg==", "cpu": [ "x64" ], "dev": true, + "license": "MIT", "optional": true, "os": [ - "netbsd" + "openbsd" ], "engines": { - "node": ">=18" + "node": ">=12" } }, - "node_modules/@esbuild/openbsd-arm64": { - "version": "0.24.2", - "resolved": "https://registry.npmjs.org/@esbuild/openbsd-arm64/-/openbsd-arm64-0.24.2.tgz", - "integrity": "sha512-YQbi46SBct6iKnszhSvdluqDmxCJA+Pu280Av9WICNwQmMxV7nLRHZfjQzwbPs3jeWnuAhE9Jy0NrnJ12Oz+0A==", + "node_modules/@esbuild-kit/core-utils/node_modules/@esbuild/sunos-x64": { + "version": "0.18.20", + "resolved": "https://registry.npmjs.org/@esbuild/sunos-x64/-/sunos-x64-0.18.20.tgz", + "integrity": "sha512-kDbFRFp0YpTQVVrqUd5FTYmWo45zGaXe0X8E1G/LKFC0v8x0vWrhOWSLITcCn63lmZIxfOMXtCfti/RxN/0wnQ==", + "cpu": [ + "x64" + ], + "dev": true, + "license": "MIT", + "optional": true, + "os": [ + "sunos" + ], + "engines": { + "node": ">=12" + } + }, + "node_modules/@esbuild-kit/core-utils/node_modules/@esbuild/win32-arm64": { + "version": "0.18.20", + "resolved": "https://registry.npmjs.org/@esbuild/win32-arm64/-/win32-arm64-0.18.20.tgz", + "integrity": "sha512-ddYFR6ItYgoaq4v4JmQQaAI5s7npztfV4Ag6NrhiaW0RrnOXqBkgwZLofVTlq1daVTQNhtI5oieTvkRPfZrePg==", "cpu": [ "arm64" ], "dev": true, + "license": "MIT", "optional": true, "os": [ - "openbsd" + "win32" ], "engines": { - "node": ">=18" + "node": ">=12" } }, - "node_modules/@esbuild/openbsd-x64": { - "version": "0.24.2", - "resolved": "https://registry.npmjs.org/@esbuild/openbsd-x64/-/openbsd-x64-0.24.2.tgz", - "integrity": "sha512-+iDS6zpNM6EnJyWv0bMGLWSWeXGN/HTaF/LXHXHwejGsVi+ooqDfMCCTerNFxEkM3wYVcExkeGXNqshc9iMaOA==", + "node_modules/@esbuild-kit/core-utils/node_modules/@esbuild/win32-ia32": { + "version": "0.18.20", + "resolved": "https://registry.npmjs.org/@esbuild/win32-ia32/-/win32-ia32-0.18.20.tgz", + "integrity": "sha512-Wv7QBi3ID/rROT08SABTS7eV4hX26sVduqDOTe1MvGMjNd3EjOz4b7zeexIR62GTIEKrfJXKL9LFxTYgkyeu7g==", + "cpu": [ + "ia32" + ], + "dev": true, + "license": "MIT", + "optional": true, + "os": [ + "win32" + ], + "engines": { + "node": ">=12" + } + }, + "node_modules/@esbuild-kit/core-utils/node_modules/@esbuild/win32-x64": { + "version": "0.18.20", + "resolved": "https://registry.npmjs.org/@esbuild/win32-x64/-/win32-x64-0.18.20.tgz", + "integrity": "sha512-kTdfRcSiDfQca/y9QIkng02avJ+NCaQvrMejlsB3RRv5sE9rRoeBPISaZpKxHELzRxZyLvNts1P27W3wV+8geQ==", "cpu": [ "x64" ], "dev": true, + "license": "MIT", "optional": true, "os": [ - "openbsd" + "win32" ], "engines": { - "node": ">=18" + "node": ">=12" } }, - "node_modules/@esbuild/sunos-x64": { + "node_modules/@esbuild-kit/core-utils/node_modules/esbuild": { + "version": "0.18.20", + "resolved": "https://registry.npmjs.org/esbuild/-/esbuild-0.18.20.tgz", + "integrity": "sha512-ceqxoedUrcayh7Y7ZX6NdbbDzGROiyVBgC4PriJThBKSVPWnnFHZAkfI1lJT8QFkOwH4qOS2SJkS4wvpGl8BpA==", + "dev": true, + "hasInstallScript": true, + "license": "MIT", + "bin": { + "esbuild": "bin/esbuild" + }, + "engines": { + "node": ">=12" + }, + "optionalDependencies": { + "@esbuild/android-arm": "0.18.20", + "@esbuild/android-arm64": "0.18.20", + "@esbuild/android-x64": "0.18.20", + "@esbuild/darwin-arm64": "0.18.20", + "@esbuild/darwin-x64": "0.18.20", + "@esbuild/freebsd-arm64": "0.18.20", + "@esbuild/freebsd-x64": "0.18.20", + "@esbuild/linux-arm": "0.18.20", + "@esbuild/linux-arm64": "0.18.20", + "@esbuild/linux-ia32": "0.18.20", + "@esbuild/linux-loong64": "0.18.20", + "@esbuild/linux-mips64el": "0.18.20", + "@esbuild/linux-ppc64": "0.18.20", + "@esbuild/linux-riscv64": "0.18.20", + "@esbuild/linux-s390x": "0.18.20", + "@esbuild/linux-x64": "0.18.20", + "@esbuild/netbsd-x64": "0.18.20", + "@esbuild/openbsd-x64": "0.18.20", + "@esbuild/sunos-x64": "0.18.20", + "@esbuild/win32-arm64": "0.18.20", + "@esbuild/win32-ia32": "0.18.20", + "@esbuild/win32-x64": "0.18.20" + } + }, + "node_modules/@esbuild-kit/esm-loader": { + "version": "2.6.5", + "resolved": "https://registry.npmjs.org/@esbuild-kit/esm-loader/-/esm-loader-2.6.5.tgz", + "integrity": "sha512-FxEMIkJKnodyA1OaCUoEvbYRkoZlLZ4d/eXFu9Fh8CbBBgP5EmZxrfTRyN0qpXZ4vOvqnE5YdRdcrmUUXuU+dA==", + "deprecated": "Merged into tsx: https://tsx.is", + "dev": true, + "license": "MIT", + "dependencies": { + "@esbuild-kit/core-utils": "^3.3.2", + "get-tsconfig": "^4.7.0" + } + }, + "node_modules/@esbuild/aix-ppc64": { "version": "0.24.2", - "resolved": "https://registry.npmjs.org/@esbuild/sunos-x64/-/sunos-x64-0.24.2.tgz", - "integrity": "sha512-hTdsW27jcktEvpwNHJU4ZwWFGkz2zRJUz8pvddmXPtXDzVKTTINmlmga3ZzwcuMpUvLw7JkLy9QLKyGpD2Yxig==", + "resolved": "https://registry.npmjs.org/@esbuild/aix-ppc64/-/aix-ppc64-0.24.2.tgz", + "integrity": "sha512-thpVCb/rhxE/BnMLQ7GReQLLN8q9qbHmI55F4489/ByVg2aQaQ6kbcLb6FHkocZzQhxc4gx0sCk0tJkKBFzDhA==", "cpu": [ - "x64" + "ppc64" ], "dev": true, "optional": true, "os": [ - "sunos" + "aix" ], "engines": { "node": ">=18" } }, - "node_modules/@esbuild/win32-arm64": { + "node_modules/@esbuild/android-arm": { "version": "0.24.2", - "resolved": "https://registry.npmjs.org/@esbuild/win32-arm64/-/win32-arm64-0.24.2.tgz", - "integrity": "sha512-LihEQ2BBKVFLOC9ZItT9iFprsE9tqjDjnbulhHoFxYQtQfai7qfluVODIYxt1PgdoyQkz23+01rzwNwYfutxUQ==", + "resolved": "https://registry.npmjs.org/@esbuild/android-arm/-/android-arm-0.24.2.tgz", + "integrity": "sha512-tmwl4hJkCfNHwFB3nBa8z1Uy3ypZpxqxfTQOcHX+xRByyYgunVbZ9MzUUfb0RxaHIMnbHagwAxuTL+tnNM+1/Q==", "cpu": [ - "arm64" + "arm" ], "dev": true, "optional": true, "os": [ - "win32" + "android" ], "engines": { "node": ">=18" } }, - "node_modules/@esbuild/win32-ia32": { + "node_modules/@esbuild/android-arm64": { "version": "0.24.2", - "resolved": "https://registry.npmjs.org/@esbuild/win32-ia32/-/win32-ia32-0.24.2.tgz", - "integrity": "sha512-q+iGUwfs8tncmFC9pcnD5IvRHAzmbwQ3GPS5/ceCyHdjXubwQWI12MKWSNSMYLJMq23/IUCvJMS76PDqXe1fxA==", + "resolved": "https://registry.npmjs.org/@esbuild/android-arm64/-/android-arm64-0.24.2.tgz", + "integrity": "sha512-cNLgeqCqV8WxfcTIOeL4OAtSmL8JjcN6m09XIgro1Wi7cF4t/THaWEa7eL5CMoMBdjoHOTh/vwTO/o2TRXIyzg==", "cpu": [ - "ia32" + "arm64" ], "dev": true, "optional": true, "os": [ - "win32" + "android" ], "engines": { "node": ">=18" } }, - "node_modules/@esbuild/win32-x64": { + "node_modules/@esbuild/android-x64": { "version": "0.24.2", - "resolved": "https://registry.npmjs.org/@esbuild/win32-x64/-/win32-x64-0.24.2.tgz", - "integrity": "sha512-7VTgWzgMGvup6aSqDPLiW5zHaxYJGTO4OokMjIlrCtf+VpEL+cXKtCvg723iguPYI5oaUNdS+/V7OU2gvXVWEg==", + "resolved": "https://registry.npmjs.org/@esbuild/android-x64/-/android-x64-0.24.2.tgz", + "integrity": "sha512-B6Q0YQDqMx9D7rvIcsXfmJfvUYLoP722bgfBlO5cGvNVb5V/+Y7nhBE3mHV9OpxBf4eAS2S68KZztiPaWq4XYw==", "cpu": [ "x64" ], "dev": true, "optional": true, "os": [ - "win32" + "android" ], "engines": { "node": ">=18" } }, - "node_modules/@eslint-community/eslint-utils": { - "version": "4.9.0", - "resolved": "https://registry.npmjs.org/@eslint-community/eslint-utils/-/eslint-utils-4.9.0.tgz", - "integrity": "sha512-ayVFHdtZ+hsq1t2Dy24wCmGXGe4q9Gu3smhLYALJrr473ZH27MsnSL+LKUlimp4BWJqMDMLmPpx/Q9R3OAlL4g==", + "node_modules/@esbuild/darwin-arm64": { + "version": "0.24.2", + "resolved": "https://registry.npmjs.org/@esbuild/darwin-arm64/-/darwin-arm64-0.24.2.tgz", + "integrity": "sha512-kj3AnYWc+CekmZnS5IPu9D+HWtUI49hbnyqk0FLEJDbzCIQt7hg7ucF1SQAilhtYpIujfaHr6O0UHlzzSPdOeA==", + "cpu": [ + "arm64" + ], "dev": true, - "license": "MIT", - "dependencies": { - "eslint-visitor-keys": "^3.4.3" - }, + "optional": true, + "os": [ + "darwin" + ], "engines": { - "node": "^12.22.0 || ^14.17.0 || >=16.0.0" - }, - "funding": { - "url": "https://opencollective.com/eslint" - }, - "peerDependencies": { - "eslint": "^6.0.0 || ^7.0.0 || >=8.0.0" + "node": ">=18" } }, - "node_modules/@eslint-community/regexpp": { - "version": "4.12.2", - "resolved": "https://registry.npmjs.org/@eslint-community/regexpp/-/regexpp-4.12.2.tgz", - "integrity": "sha512-EriSTlt5OC9/7SXkRSCAhfSxxoSUgBm33OH+IkwbdpgoqsSsUg7y3uh+IICI/Qg4BBWr3U2i39RpmycbxMq4ew==", + "node_modules/@esbuild/darwin-x64": { + "version": "0.24.2", + "resolved": "https://registry.npmjs.org/@esbuild/darwin-x64/-/darwin-x64-0.24.2.tgz", + "integrity": "sha512-WeSrmwwHaPkNR5H3yYfowhZcbriGqooyu3zI/3GGpF8AyUdsrrP0X6KumITGA9WOyiJavnGZUwPGvxvwfWPHIA==", + "cpu": [ + "x64" + ], "dev": true, - "license": "MIT", + "optional": true, + "os": [ + "darwin" + ], "engines": { - "node": "^12.0.0 || ^14.0.0 || >=16.0.0" + "node": ">=18" } }, - "node_modules/@eslint/eslintrc": { - "version": "2.1.4", - "resolved": "https://registry.npmjs.org/@eslint/eslintrc/-/eslintrc-2.1.4.tgz", - "integrity": "sha512-269Z39MS6wVJtsoUl10L60WdkhJVdPG24Q4eZTH3nnF6lpvSShEK3wQjDX9JRWAUPvPh7COouPpU9IrqaZFvtQ==", + "node_modules/@esbuild/freebsd-arm64": { + "version": "0.24.2", + "resolved": "https://registry.npmjs.org/@esbuild/freebsd-arm64/-/freebsd-arm64-0.24.2.tgz", + "integrity": "sha512-UN8HXjtJ0k/Mj6a9+5u6+2eZ2ERD7Edt1Q9IZiB5UZAIdPnVKDoG7mdTVGhHJIeEml60JteamR3qhsr1r8gXvg==", + "cpu": [ + "arm64" + ], "dev": true, - "license": "MIT", - "dependencies": { - "ajv": "^6.12.4", - "debug": "^4.3.2", - "espree": "^9.6.0", - "globals": "^13.19.0", - "ignore": "^5.2.0", - "import-fresh": "^3.2.1", - "js-yaml": "^4.1.0", - "minimatch": "^3.1.2", - "strip-json-comments": "^3.1.1" - }, + "optional": true, + "os": [ + "freebsd" + ], "engines": { - "node": "^12.22.0 || ^14.17.0 || >=16.0.0" - }, - "funding": { - "url": "https://opencollective.com/eslint" + "node": ">=18" } }, - "node_modules/@eslint/eslintrc/node_modules/brace-expansion": { - "version": "1.1.12", - "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.12.tgz", - "integrity": "sha512-9T9UjW3r0UW5c1Q7GTwllptXwhvYmEzFhzMfZ9H7FQWt+uZePjZPjBP/W1ZEyZ1twGWom5/56TF4lPcqjnDHcg==", + "node_modules/@esbuild/freebsd-x64": { + "version": "0.24.2", + "resolved": "https://registry.npmjs.org/@esbuild/freebsd-x64/-/freebsd-x64-0.24.2.tgz", + "integrity": "sha512-TvW7wE/89PYW+IevEJXZ5sF6gJRDY/14hyIGFXdIucxCsbRmLUcjseQu1SyTko+2idmCw94TgyaEZi9HUSOe3Q==", + "cpu": [ + "x64" + ], "dev": true, - "license": "MIT", - "dependencies": { - "balanced-match": "^1.0.0", - "concat-map": "0.0.1" + "optional": true, + "os": [ + "freebsd" + ], + "engines": { + "node": ">=18" } }, - "node_modules/@eslint/eslintrc/node_modules/ignore": { - "version": "5.3.2", - "resolved": "https://registry.npmjs.org/ignore/-/ignore-5.3.2.tgz", - "integrity": "sha512-hsBTNUqQTDwkWtcdYI2i06Y/nUBEsNEDJKjWdigLvegy8kDuJAS8uRlpkkcQpyEXL0Z/pjDy5HBmMjRCJ2gq+g==", + "node_modules/@esbuild/linux-arm": { + "version": "0.24.2", + "resolved": "https://registry.npmjs.org/@esbuild/linux-arm/-/linux-arm-0.24.2.tgz", + "integrity": "sha512-n0WRM/gWIdU29J57hJyUdIsk0WarGd6To0s+Y+LwvlC55wt+GT/OgkwoXCXvIue1i1sSNWblHEig00GBWiJgfA==", + "cpu": [ + "arm" + ], "dev": true, - "license": "MIT", + "optional": true, + "os": [ + "linux" + ], "engines": { - "node": ">= 4" + "node": ">=18" } }, - "node_modules/@eslint/eslintrc/node_modules/minimatch": { - "version": "3.1.2", - "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz", - "integrity": "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==", + "node_modules/@esbuild/linux-arm64": { + "version": "0.24.2", + "resolved": "https://registry.npmjs.org/@esbuild/linux-arm64/-/linux-arm64-0.24.2.tgz", + "integrity": "sha512-7HnAD6074BW43YvvUmE/35Id9/NB7BeX5EoNkK9obndmZBUk8xmJJeU7DwmUeN7tkysslb2eSl6CTrYz6oEMQg==", + "cpu": [ + "arm64" + ], "dev": true, - "license": "ISC", - "dependencies": { - "brace-expansion": "^1.1.7" - }, + "optional": true, + "os": [ + "linux" + ], "engines": { - "node": "*" + "node": ">=18" } }, - "node_modules/@eslint/js": { - "version": "8.57.1", - "resolved": "https://registry.npmjs.org/@eslint/js/-/js-8.57.1.tgz", - "integrity": "sha512-d9zaMRSTIKDLhctzH12MtXvJKSSUhaHcjV+2Z+GK+EEY7XKpP5yR4x+N3TAcHTcu963nIr+TMcCb4DBCYX1z6Q==", + "node_modules/@esbuild/linux-ia32": { + "version": "0.24.2", + "resolved": "https://registry.npmjs.org/@esbuild/linux-ia32/-/linux-ia32-0.24.2.tgz", + "integrity": "sha512-sfv0tGPQhcZOgTKO3oBE9xpHuUqguHvSo4jl+wjnKwFpapx+vUDcawbwPNuBIAYdRAvIDBfZVvXprIj3HA+Ugw==", + "cpu": [ + "ia32" + ], "dev": true, - "license": "MIT", + "optional": true, + "os": [ + "linux" + ], "engines": { - "node": "^12.22.0 || ^14.17.0 || >=16.0.0" + "node": ">=18" } }, - "node_modules/@humanwhocodes/config-array": { - "version": "0.13.0", - "resolved": "https://registry.npmjs.org/@humanwhocodes/config-array/-/config-array-0.13.0.tgz", - "integrity": "sha512-DZLEEqFWQFiyK6h5YIeynKx7JlvCYWL0cImfSRXZ9l4Sg2efkFGTuFf6vzXjK1cq6IYkU+Eg/JizXw+TD2vRNw==", - "deprecated": "Use @eslint/config-array instead", + "node_modules/@esbuild/linux-loong64": { + "version": "0.24.2", + "resolved": "https://registry.npmjs.org/@esbuild/linux-loong64/-/linux-loong64-0.24.2.tgz", + "integrity": "sha512-CN9AZr8kEndGooS35ntToZLTQLHEjtVB5n7dl8ZcTZMonJ7CCfStrYhrzF97eAecqVbVJ7APOEe18RPI4KLhwQ==", + "cpu": [ + "loong64" + ], "dev": true, - "license": "Apache-2.0", - "dependencies": { - "@humanwhocodes/object-schema": "^2.0.3", - "debug": "^4.3.1", - "minimatch": "^3.0.5" - }, + "optional": true, + "os": [ + "linux" + ], "engines": { - "node": ">=10.10.0" + "node": ">=18" } }, - "node_modules/@humanwhocodes/config-array/node_modules/brace-expansion": { - "version": "1.1.12", - "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.12.tgz", - "integrity": "sha512-9T9UjW3r0UW5c1Q7GTwllptXwhvYmEzFhzMfZ9H7FQWt+uZePjZPjBP/W1ZEyZ1twGWom5/56TF4lPcqjnDHcg==", + "node_modules/@esbuild/linux-mips64el": { + "version": "0.24.2", + "resolved": "https://registry.npmjs.org/@esbuild/linux-mips64el/-/linux-mips64el-0.24.2.tgz", + "integrity": "sha512-iMkk7qr/wl3exJATwkISxI7kTcmHKE+BlymIAbHO8xanq/TjHaaVThFF6ipWzPHryoFsesNQJPE/3wFJw4+huw==", + "cpu": [ + "mips64el" + ], "dev": true, - "license": "MIT", - "dependencies": { - "balanced-match": "^1.0.0", - "concat-map": "0.0.1" + "optional": true, + "os": [ + "linux" + ], + "engines": { + "node": ">=18" } }, - "node_modules/@humanwhocodes/config-array/node_modules/minimatch": { - "version": "3.1.2", - "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz", - "integrity": "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==", + "node_modules/@esbuild/linux-ppc64": { + "version": "0.24.2", + "resolved": "https://registry.npmjs.org/@esbuild/linux-ppc64/-/linux-ppc64-0.24.2.tgz", + "integrity": "sha512-shsVrgCZ57Vr2L8mm39kO5PPIb+843FStGt7sGGoqiiWYconSxwTiuswC1VJZLCjNiMLAMh34jg4VSEQb+iEbw==", + "cpu": [ + "ppc64" + ], "dev": true, - "license": "ISC", - "dependencies": { - "brace-expansion": "^1.1.7" - }, + "optional": true, + "os": [ + "linux" + ], "engines": { - "node": "*" + "node": ">=18" } }, - "node_modules/@humanwhocodes/module-importer": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/@humanwhocodes/module-importer/-/module-importer-1.0.1.tgz", - "integrity": "sha512-bxveV4V8v5Yb4ncFTT3rPSgZBOpCkjfK0y4oVVVJwIuDVBRMDXrPyXRL988i5ap9m9bnyEEjWfm5WkBmtffLfA==", + "node_modules/@esbuild/linux-riscv64": { + "version": "0.24.2", + "resolved": "https://registry.npmjs.org/@esbuild/linux-riscv64/-/linux-riscv64-0.24.2.tgz", + "integrity": "sha512-4eSFWnU9Hhd68fW16GD0TINewo1L6dRrB+oLNNbYyMUAeOD2yCK5KXGK1GH4qD/kT+bTEXjsyTCiJGHPZ3eM9Q==", + "cpu": [ + "riscv64" + ], "dev": true, - "license": "Apache-2.0", + "optional": true, + "os": [ + "linux" + ], "engines": { - "node": ">=12.22" - }, - "funding": { - "type": "github", - "url": "https://github.com/sponsors/nzakas" + "node": ">=18" } }, - "node_modules/@humanwhocodes/object-schema": { - "version": "2.0.3", - "resolved": "https://registry.npmjs.org/@humanwhocodes/object-schema/-/object-schema-2.0.3.tgz", - "integrity": "sha512-93zYdMES/c1D69yZiKDBj0V24vqNzB/koF26KPaagAfd3P/4gUlh3Dys5ogAK+Exi9QyzlD8x/08Zt7wIKcDcA==", - "deprecated": "Use @eslint/object-schema instead", - "dev": true, - "license": "BSD-3-Clause" - }, - "node_modules/@ioredis/commands": { - "version": "1.4.0", - "resolved": "https://registry.npmjs.org/@ioredis/commands/-/commands-1.4.0.tgz", - "integrity": "sha512-aFT2yemJJo+TZCmieA7qnYGQooOS7QfNmYrzGtsYd3g9j5iDP8AimYYAesf79ohjbLG12XxC4nG5DyEnC88AsQ==", + "node_modules/@esbuild/linux-s390x": { + "version": "0.24.2", + "resolved": "https://registry.npmjs.org/@esbuild/linux-s390x/-/linux-s390x-0.24.2.tgz", + "integrity": "sha512-S0Bh0A53b0YHL2XEXC20bHLuGMOhFDO6GN4b3YjRLK//Ep3ql3erpNcPlEFed93hsQAjAQDNsvcK+hV90FubSw==", + "cpu": [ + "s390x" + ], "dev": true, - "license": "MIT" + "optional": true, + "os": [ + "linux" + ], + "engines": { + "node": ">=18" + } }, - "node_modules/@isaacs/cliui": { - "version": "8.0.2", - "resolved": "https://registry.npmjs.org/@isaacs/cliui/-/cliui-8.0.2.tgz", - "integrity": "sha512-O8jcjabXaleOG9DQ0+ARXWZBTfnP4WNAqzuiJK7ll44AmxGKv/J2M4TPjxjY3znBCfvBXFzucm1twdyFybFqEA==", - "dev": true, - "license": "ISC", - "dependencies": { - "string-width": "^5.1.2", - "string-width-cjs": "npm:string-width@^4.2.0", - "strip-ansi": "^7.0.1", - "strip-ansi-cjs": "npm:strip-ansi@^6.0.1", - "wrap-ansi": "^8.1.0", - "wrap-ansi-cjs": "npm:wrap-ansi@^7.0.0" - }, - "engines": { - "node": ">=12" - } - }, - "node_modules/@isaacs/cliui/node_modules/ansi-regex": { - "version": "6.2.2", - "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-6.2.2.tgz", - "integrity": "sha512-Bq3SmSpyFHaWjPk8If9yc6svM8c56dB5BAtW4Qbw5jHTwwXXcTLoRMkpDJp6VL0XzlWaCHTXrkFURMYmD0sLqg==", - "dev": true, - "license": "MIT", - "engines": { - "node": ">=12" - }, - "funding": { - "url": "https://github.com/chalk/ansi-regex?sponsor=1" - } - }, - "node_modules/@isaacs/cliui/node_modules/strip-ansi": { - "version": "7.1.2", - "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-7.1.2.tgz", - "integrity": "sha512-gmBGslpoQJtgnMAvOVqGZpEz9dyoKTCzy2nfz/n8aIFhN/jCE/rCmcxabB6jOOHV+0WNnylOxaxBQPSvcWklhA==", - "dev": true, - "license": "MIT", - "dependencies": { - "ansi-regex": "^6.0.1" - }, - "engines": { - "node": ">=12" - }, - "funding": { - "url": "https://github.com/chalk/strip-ansi?sponsor=1" - } - }, - "node_modules/@istanbuljs/schema": { - "version": "0.1.3", - "resolved": "https://registry.npmjs.org/@istanbuljs/schema/-/schema-0.1.3.tgz", - "integrity": "sha512-ZXRY4jNvVgSVQ8DL3LTcakaAtXwTVUxE81hslsyD2AtoXW/wVob10HkOJ1X/pAlcI7D+2YoZKg5do8G/w6RYgA==", + "node_modules/@esbuild/linux-x64": { + "version": "0.24.2", + "resolved": "https://registry.npmjs.org/@esbuild/linux-x64/-/linux-x64-0.24.2.tgz", + "integrity": "sha512-8Qi4nQcCTbLnK9WoMjdC9NiTG6/E38RNICU6sUNqK0QFxCYgoARqVqxdFmWkdonVsvGqWhmm7MO0jyTqLqwj0Q==", + "cpu": [ + "x64" + ], "dev": true, - "license": "MIT", + "optional": true, + "os": [ + "linux" + ], "engines": { - "node": ">=8" - } - }, - "node_modules/@jridgewell/gen-mapping": { - "version": "0.3.13", - "resolved": "https://registry.npmjs.org/@jridgewell/gen-mapping/-/gen-mapping-0.3.13.tgz", - "integrity": "sha512-2kkt/7niJ6MgEPxF0bYdQ6etZaA+fQvDcLKckhy1yIQOzaoKjBBjSj63/aLVjYE3qhRt5dvM+uUyfCg6UKCBbA==", - "dev": true, - "license": "MIT", - "dependencies": { - "@jridgewell/sourcemap-codec": "^1.5.0", - "@jridgewell/trace-mapping": "^0.3.24" + "node": ">=18" } }, - "node_modules/@jridgewell/resolve-uri": { - "version": "3.1.2", - "resolved": "https://registry.npmjs.org/@jridgewell/resolve-uri/-/resolve-uri-3.1.2.tgz", - "integrity": "sha512-bRISgCIjP20/tbWSPWMEi54QVPRZExkuD9lJL+UIxUKtwVJA8wW1Trb1jMs1RFXo1CBTNZ/5hpC9QvmKWdopKw==", + "node_modules/@esbuild/netbsd-arm64": { + "version": "0.24.2", + "resolved": "https://registry.npmjs.org/@esbuild/netbsd-arm64/-/netbsd-arm64-0.24.2.tgz", + "integrity": "sha512-wuLK/VztRRpMt9zyHSazyCVdCXlpHkKm34WUyinD2lzK07FAHTq0KQvZZlXikNWkDGoT6x3TD51jKQ7gMVpopw==", + "cpu": [ + "arm64" + ], "dev": true, - "license": "MIT", + "optional": true, + "os": [ + "netbsd" + ], "engines": { - "node": ">=6.0.0" - } - }, - "node_modules/@jridgewell/sourcemap-codec": { - "version": "1.5.5", - "resolved": "https://registry.npmjs.org/@jridgewell/sourcemap-codec/-/sourcemap-codec-1.5.5.tgz", - "integrity": "sha512-cYQ9310grqxueWbl+WuIUIaiUaDcj7WOq5fVhEljNVgRfOUhY9fy2zTvfoqWsnebh8Sl70VScFbICvJnLKB0Og==", - "dev": true - }, - "node_modules/@jridgewell/trace-mapping": { - "version": "0.3.31", - "resolved": "https://registry.npmjs.org/@jridgewell/trace-mapping/-/trace-mapping-0.3.31.tgz", - "integrity": "sha512-zzNR+SdQSDJzc8joaeP8QQoCQr8NuYx2dIIytl1QeBEZHJ9uW6hebsrYgbz8hJwUQao3TWCMtmfV8Nu1twOLAw==", - "dev": true, - "license": "MIT", - "dependencies": { - "@jridgewell/resolve-uri": "^3.1.0", - "@jridgewell/sourcemap-codec": "^1.4.14" + "node": ">=18" } }, - "node_modules/@nodelib/fs.scandir": { - "version": "2.1.5", - "resolved": "https://registry.npmjs.org/@nodelib/fs.scandir/-/fs.scandir-2.1.5.tgz", - "integrity": "sha512-vq24Bq3ym5HEQm2NKCr3yXDwjc7vTsEThRDnkp2DK9p1uqLR+DHurm/NOTo0KG7HYHU7eppKZj3MyqYuMBf62g==", + "node_modules/@esbuild/netbsd-x64": { + "version": "0.24.2", + "resolved": "https://registry.npmjs.org/@esbuild/netbsd-x64/-/netbsd-x64-0.24.2.tgz", + "integrity": "sha512-VefFaQUc4FMmJuAxmIHgUmfNiLXY438XrL4GDNV1Y1H/RW3qow68xTwjZKfj/+Plp9NANmzbH5R40Meudu8mmw==", + "cpu": [ + "x64" + ], "dev": true, - "license": "MIT", - "dependencies": { - "@nodelib/fs.stat": "2.0.5", - "run-parallel": "^1.1.9" - }, + "optional": true, + "os": [ + "netbsd" + ], "engines": { - "node": ">= 8" + "node": ">=18" } }, - "node_modules/@nodelib/fs.stat": { - "version": "2.0.5", - "resolved": "https://registry.npmjs.org/@nodelib/fs.stat/-/fs.stat-2.0.5.tgz", - "integrity": "sha512-RkhPPp2zrqDAQA/2jNhnztcPAlv64XdhIp7a7454A5ovI7Bukxgt7MX7udwAu3zg1DcpPU0rz3VV1SeaqvY4+A==", + "node_modules/@esbuild/openbsd-arm64": { + "version": "0.24.2", + "resolved": "https://registry.npmjs.org/@esbuild/openbsd-arm64/-/openbsd-arm64-0.24.2.tgz", + "integrity": "sha512-YQbi46SBct6iKnszhSvdluqDmxCJA+Pu280Av9WICNwQmMxV7nLRHZfjQzwbPs3jeWnuAhE9Jy0NrnJ12Oz+0A==", + "cpu": [ + "arm64" + ], "dev": true, - "license": "MIT", + "optional": true, + "os": [ + "openbsd" + ], "engines": { - "node": ">= 8" + "node": ">=18" } }, - "node_modules/@nodelib/fs.walk": { - "version": "1.2.8", - "resolved": "https://registry.npmjs.org/@nodelib/fs.walk/-/fs.walk-1.2.8.tgz", - "integrity": "sha512-oGB+UxlgWcgQkgwo8GcEGwemoTFt3FIO9ababBmaGwXIoBKZ+GTy0pP185beGg7Llih/NSHSV2XAs1lnznocSg==", + "node_modules/@esbuild/openbsd-x64": { + "version": "0.24.2", + "resolved": "https://registry.npmjs.org/@esbuild/openbsd-x64/-/openbsd-x64-0.24.2.tgz", + "integrity": "sha512-+iDS6zpNM6EnJyWv0bMGLWSWeXGN/HTaF/LXHXHwejGsVi+ooqDfMCCTerNFxEkM3wYVcExkeGXNqshc9iMaOA==", + "cpu": [ + "x64" + ], "dev": true, - "license": "MIT", - "dependencies": { - "@nodelib/fs.scandir": "2.1.5", - "fastq": "^1.6.0" - }, + "optional": true, + "os": [ + "openbsd" + ], "engines": { - "node": ">= 8" + "node": ">=18" } }, - "node_modules/@pkgjs/parseargs": { - "version": "0.11.0", - "resolved": "https://registry.npmjs.org/@pkgjs/parseargs/-/parseargs-0.11.0.tgz", - "integrity": "sha512-+1VkjdD0QBLPodGrJUeqarH8VAIvQODIbwh9XpP5Syisf7YoQgsJKPNFoqqLQlu+VQ/tVSshMR6loPMn8U+dPg==", + "node_modules/@esbuild/openharmony-arm64": { + "version": "0.25.12", + "resolved": "https://registry.npmjs.org/@esbuild/openharmony-arm64/-/openharmony-arm64-0.25.12.tgz", + "integrity": "sha512-rm0YWsqUSRrjncSXGA7Zv78Nbnw4XL6/dzr20cyrQf7ZmRcsovpcRBdhD43Nuk3y7XIoW2OxMVvwuRvk9XdASg==", + "cpu": [ + "arm64" + ], "dev": true, "license": "MIT", "optional": true, + "os": [ + "openharmony" + ], "engines": { - "node": ">=14" + "node": ">=18" } }, - "node_modules/@rollup/rollup-android-arm-eabi": { - "version": "4.53.5", - "resolved": "https://registry.npmjs.org/@rollup/rollup-android-arm-eabi/-/rollup-android-arm-eabi-4.53.5.tgz", - "integrity": "sha512-iDGS/h7D8t7tvZ1t6+WPK04KD0MwzLZrG0se1hzBjSi5fyxlsiggoJHwh18PCFNn7tG43OWb6pdZ6Y+rMlmyNQ==", + "node_modules/@esbuild/sunos-x64": { + "version": "0.24.2", + "resolved": "https://registry.npmjs.org/@esbuild/sunos-x64/-/sunos-x64-0.24.2.tgz", + "integrity": "sha512-hTdsW27jcktEvpwNHJU4ZwWFGkz2zRJUz8pvddmXPtXDzVKTTINmlmga3ZzwcuMpUvLw7JkLy9QLKyGpD2Yxig==", "cpu": [ - "arm" + "x64" ], "dev": true, "optional": true, "os": [ - "android" - ] + "sunos" + ], + "engines": { + "node": ">=18" + } }, - "node_modules/@rollup/rollup-android-arm64": { - "version": "4.53.5", - "resolved": "https://registry.npmjs.org/@rollup/rollup-android-arm64/-/rollup-android-arm64-4.53.5.tgz", - "integrity": "sha512-wrSAViWvZHBMMlWk6EJhvg8/rjxzyEhEdgfMMjREHEq11EtJ6IP6yfcCH57YAEca2Oe3FNCE9DSTgU70EIGmVw==", + "node_modules/@esbuild/win32-arm64": { + "version": "0.24.2", + "resolved": "https://registry.npmjs.org/@esbuild/win32-arm64/-/win32-arm64-0.24.2.tgz", + "integrity": "sha512-LihEQ2BBKVFLOC9ZItT9iFprsE9tqjDjnbulhHoFxYQtQfai7qfluVODIYxt1PgdoyQkz23+01rzwNwYfutxUQ==", "cpu": [ "arm64" ], "dev": true, "optional": true, "os": [ - "android" - ] + "win32" + ], + "engines": { + "node": ">=18" + } }, - "node_modules/@rollup/rollup-darwin-arm64": { - "version": "4.53.5", - "resolved": "https://registry.npmjs.org/@rollup/rollup-darwin-arm64/-/rollup-darwin-arm64-4.53.5.tgz", - "integrity": "sha512-S87zZPBmRO6u1YXQLwpveZm4JfPpAa6oHBX7/ghSiGH3rz/KDgAu1rKdGutV+WUI6tKDMbaBJomhnT30Y2t4VQ==", + "node_modules/@esbuild/win32-ia32": { + "version": "0.24.2", + "resolved": "https://registry.npmjs.org/@esbuild/win32-ia32/-/win32-ia32-0.24.2.tgz", + "integrity": "sha512-q+iGUwfs8tncmFC9pcnD5IvRHAzmbwQ3GPS5/ceCyHdjXubwQWI12MKWSNSMYLJMq23/IUCvJMS76PDqXe1fxA==", "cpu": [ - "arm64" + "ia32" ], "dev": true, "optional": true, "os": [ - "darwin" - ] + "win32" + ], + "engines": { + "node": ">=18" + } }, - "node_modules/@rollup/rollup-darwin-x64": { - "version": "4.53.5", - "resolved": "https://registry.npmjs.org/@rollup/rollup-darwin-x64/-/rollup-darwin-x64-4.53.5.tgz", - "integrity": "sha512-YTbnsAaHo6VrAczISxgpTva8EkfQus0VPEVJCEaboHtZRIb6h6j0BNxRBOwnDciFTZLDPW5r+ZBmhL/+YpTZgA==", + "node_modules/@esbuild/win32-x64": { + "version": "0.24.2", + "resolved": "https://registry.npmjs.org/@esbuild/win32-x64/-/win32-x64-0.24.2.tgz", + "integrity": "sha512-7VTgWzgMGvup6aSqDPLiW5zHaxYJGTO4OokMjIlrCtf+VpEL+cXKtCvg723iguPYI5oaUNdS+/V7OU2gvXVWEg==", "cpu": [ "x64" ], "dev": true, "optional": true, "os": [ - "darwin" - ] - }, - "node_modules/@rollup/rollup-freebsd-arm64": { - "version": "4.53.5", - "resolved": "https://registry.npmjs.org/@rollup/rollup-freebsd-arm64/-/rollup-freebsd-arm64-4.53.5.tgz", - "integrity": "sha512-1T8eY2J8rKJWzaznV7zedfdhD1BqVs1iqILhmHDq/bqCUZsrMt+j8VCTHhP0vdfbHK3e1IQ7VYx3jlKqwlf+vw==", - "cpu": [ - "arm64" + "win32" ], - "dev": true, - "optional": true, - "os": [ - "freebsd" - ] + "engines": { + "node": ">=18" + } + }, + "node_modules/@eslint-community/eslint-utils": { + "version": "4.9.0", + "resolved": "https://registry.npmjs.org/@eslint-community/eslint-utils/-/eslint-utils-4.9.0.tgz", + "integrity": "sha512-ayVFHdtZ+hsq1t2Dy24wCmGXGe4q9Gu3smhLYALJrr473ZH27MsnSL+LKUlimp4BWJqMDMLmPpx/Q9R3OAlL4g==", + "dev": true, + "license": "MIT", + "dependencies": { + "eslint-visitor-keys": "^3.4.3" + }, + "engines": { + "node": "^12.22.0 || ^14.17.0 || >=16.0.0" + }, + "funding": { + "url": "https://opencollective.com/eslint" + }, + "peerDependencies": { + "eslint": "^6.0.0 || ^7.0.0 || >=8.0.0" + } + }, + "node_modules/@eslint-community/regexpp": { + "version": "4.12.2", + "resolved": "https://registry.npmjs.org/@eslint-community/regexpp/-/regexpp-4.12.2.tgz", + "integrity": "sha512-EriSTlt5OC9/7SXkRSCAhfSxxoSUgBm33OH+IkwbdpgoqsSsUg7y3uh+IICI/Qg4BBWr3U2i39RpmycbxMq4ew==", + "dev": true, + "license": "MIT", + "engines": { + "node": "^12.0.0 || ^14.0.0 || >=16.0.0" + } + }, + "node_modules/@eslint/eslintrc": { + "version": "2.1.4", + "resolved": "https://registry.npmjs.org/@eslint/eslintrc/-/eslintrc-2.1.4.tgz", + "integrity": "sha512-269Z39MS6wVJtsoUl10L60WdkhJVdPG24Q4eZTH3nnF6lpvSShEK3wQjDX9JRWAUPvPh7COouPpU9IrqaZFvtQ==", + "dev": true, + "license": "MIT", + "dependencies": { + "ajv": "^6.12.4", + "debug": "^4.3.2", + "espree": "^9.6.0", + "globals": "^13.19.0", + "ignore": "^5.2.0", + "import-fresh": "^3.2.1", + "js-yaml": "^4.1.0", + "minimatch": "^3.1.2", + "strip-json-comments": "^3.1.1" + }, + "engines": { + "node": "^12.22.0 || ^14.17.0 || >=16.0.0" + }, + "funding": { + "url": "https://opencollective.com/eslint" + } + }, + "node_modules/@eslint/eslintrc/node_modules/brace-expansion": { + "version": "1.1.12", + "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.12.tgz", + "integrity": "sha512-9T9UjW3r0UW5c1Q7GTwllptXwhvYmEzFhzMfZ9H7FQWt+uZePjZPjBP/W1ZEyZ1twGWom5/56TF4lPcqjnDHcg==", + "dev": true, + "license": "MIT", + "dependencies": { + "balanced-match": "^1.0.0", + "concat-map": "0.0.1" + } + }, + "node_modules/@eslint/eslintrc/node_modules/ignore": { + "version": "5.3.2", + "resolved": "https://registry.npmjs.org/ignore/-/ignore-5.3.2.tgz", + "integrity": "sha512-hsBTNUqQTDwkWtcdYI2i06Y/nUBEsNEDJKjWdigLvegy8kDuJAS8uRlpkkcQpyEXL0Z/pjDy5HBmMjRCJ2gq+g==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">= 4" + } + }, + "node_modules/@eslint/eslintrc/node_modules/minimatch": { + "version": "3.1.2", + "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz", + "integrity": "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==", + "dev": true, + "license": "ISC", + "dependencies": { + "brace-expansion": "^1.1.7" + }, + "engines": { + "node": "*" + } + }, + "node_modules/@eslint/js": { + "version": "8.57.1", + "resolved": "https://registry.npmjs.org/@eslint/js/-/js-8.57.1.tgz", + "integrity": "sha512-d9zaMRSTIKDLhctzH12MtXvJKSSUhaHcjV+2Z+GK+EEY7XKpP5yR4x+N3TAcHTcu963nIr+TMcCb4DBCYX1z6Q==", + "dev": true, + "license": "MIT", + "engines": { + "node": "^12.22.0 || ^14.17.0 || >=16.0.0" + } + }, + "node_modules/@humanwhocodes/config-array": { + "version": "0.13.0", + "resolved": "https://registry.npmjs.org/@humanwhocodes/config-array/-/config-array-0.13.0.tgz", + "integrity": "sha512-DZLEEqFWQFiyK6h5YIeynKx7JlvCYWL0cImfSRXZ9l4Sg2efkFGTuFf6vzXjK1cq6IYkU+Eg/JizXw+TD2vRNw==", + "deprecated": "Use @eslint/config-array instead", + "dev": true, + "license": "Apache-2.0", + "dependencies": { + "@humanwhocodes/object-schema": "^2.0.3", + "debug": "^4.3.1", + "minimatch": "^3.0.5" + }, + "engines": { + "node": ">=10.10.0" + } + }, + "node_modules/@humanwhocodes/config-array/node_modules/brace-expansion": { + "version": "1.1.12", + "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.12.tgz", + "integrity": "sha512-9T9UjW3r0UW5c1Q7GTwllptXwhvYmEzFhzMfZ9H7FQWt+uZePjZPjBP/W1ZEyZ1twGWom5/56TF4lPcqjnDHcg==", + "dev": true, + "license": "MIT", + "dependencies": { + "balanced-match": "^1.0.0", + "concat-map": "0.0.1" + } + }, + "node_modules/@humanwhocodes/config-array/node_modules/minimatch": { + "version": "3.1.2", + "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz", + "integrity": "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==", + "dev": true, + "license": "ISC", + "dependencies": { + "brace-expansion": "^1.1.7" + }, + "engines": { + "node": "*" + } + }, + "node_modules/@humanwhocodes/module-importer": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/@humanwhocodes/module-importer/-/module-importer-1.0.1.tgz", + "integrity": "sha512-bxveV4V8v5Yb4ncFTT3rPSgZBOpCkjfK0y4oVVVJwIuDVBRMDXrPyXRL988i5ap9m9bnyEEjWfm5WkBmtffLfA==", + "dev": true, + "license": "Apache-2.0", + "engines": { + "node": ">=12.22" + }, + "funding": { + "type": "github", + "url": "https://github.com/sponsors/nzakas" + } + }, + "node_modules/@humanwhocodes/object-schema": { + "version": "2.0.3", + "resolved": "https://registry.npmjs.org/@humanwhocodes/object-schema/-/object-schema-2.0.3.tgz", + "integrity": "sha512-93zYdMES/c1D69yZiKDBj0V24vqNzB/koF26KPaagAfd3P/4gUlh3Dys5ogAK+Exi9QyzlD8x/08Zt7wIKcDcA==", + "deprecated": "Use @eslint/object-schema instead", + "dev": true, + "license": "BSD-3-Clause" + }, + "node_modules/@ioredis/commands": { + "version": "1.4.0", + "resolved": "https://registry.npmjs.org/@ioredis/commands/-/commands-1.4.0.tgz", + "integrity": "sha512-aFT2yemJJo+TZCmieA7qnYGQooOS7QfNmYrzGtsYd3g9j5iDP8AimYYAesf79ohjbLG12XxC4nG5DyEnC88AsQ==", + "dev": true, + "license": "MIT" + }, + "node_modules/@isaacs/cliui": { + "version": "8.0.2", + "resolved": "https://registry.npmjs.org/@isaacs/cliui/-/cliui-8.0.2.tgz", + "integrity": "sha512-O8jcjabXaleOG9DQ0+ARXWZBTfnP4WNAqzuiJK7ll44AmxGKv/J2M4TPjxjY3znBCfvBXFzucm1twdyFybFqEA==", + "dev": true, + "license": "ISC", + "dependencies": { + "string-width": "^5.1.2", + "string-width-cjs": "npm:string-width@^4.2.0", + "strip-ansi": "^7.0.1", + "strip-ansi-cjs": "npm:strip-ansi@^6.0.1", + "wrap-ansi": "^8.1.0", + "wrap-ansi-cjs": "npm:wrap-ansi@^7.0.0" + }, + "engines": { + "node": ">=12" + } + }, + "node_modules/@isaacs/cliui/node_modules/ansi-regex": { + "version": "6.2.2", + "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-6.2.2.tgz", + "integrity": "sha512-Bq3SmSpyFHaWjPk8If9yc6svM8c56dB5BAtW4Qbw5jHTwwXXcTLoRMkpDJp6VL0XzlWaCHTXrkFURMYmD0sLqg==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=12" + }, + "funding": { + "url": "https://github.com/chalk/ansi-regex?sponsor=1" + } + }, + "node_modules/@isaacs/cliui/node_modules/strip-ansi": { + "version": "7.1.2", + "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-7.1.2.tgz", + "integrity": "sha512-gmBGslpoQJtgnMAvOVqGZpEz9dyoKTCzy2nfz/n8aIFhN/jCE/rCmcxabB6jOOHV+0WNnylOxaxBQPSvcWklhA==", + "dev": true, + "license": "MIT", + "dependencies": { + "ansi-regex": "^6.0.1" + }, + "engines": { + "node": ">=12" + }, + "funding": { + "url": "https://github.com/chalk/strip-ansi?sponsor=1" + } + }, + "node_modules/@istanbuljs/schema": { + "version": "0.1.3", + "resolved": "https://registry.npmjs.org/@istanbuljs/schema/-/schema-0.1.3.tgz", + "integrity": "sha512-ZXRY4jNvVgSVQ8DL3LTcakaAtXwTVUxE81hslsyD2AtoXW/wVob10HkOJ1X/pAlcI7D+2YoZKg5do8G/w6RYgA==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=8" + } + }, + "node_modules/@jridgewell/gen-mapping": { + "version": "0.3.13", + "resolved": "https://registry.npmjs.org/@jridgewell/gen-mapping/-/gen-mapping-0.3.13.tgz", + "integrity": "sha512-2kkt/7niJ6MgEPxF0bYdQ6etZaA+fQvDcLKckhy1yIQOzaoKjBBjSj63/aLVjYE3qhRt5dvM+uUyfCg6UKCBbA==", + "dev": true, + "license": "MIT", + "dependencies": { + "@jridgewell/sourcemap-codec": "^1.5.0", + "@jridgewell/trace-mapping": "^0.3.24" + } + }, + "node_modules/@jridgewell/resolve-uri": { + "version": "3.1.2", + "resolved": "https://registry.npmjs.org/@jridgewell/resolve-uri/-/resolve-uri-3.1.2.tgz", + "integrity": "sha512-bRISgCIjP20/tbWSPWMEi54QVPRZExkuD9lJL+UIxUKtwVJA8wW1Trb1jMs1RFXo1CBTNZ/5hpC9QvmKWdopKw==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=6.0.0" + } + }, + "node_modules/@jridgewell/sourcemap-codec": { + "version": "1.5.5", + "resolved": "https://registry.npmjs.org/@jridgewell/sourcemap-codec/-/sourcemap-codec-1.5.5.tgz", + "integrity": "sha512-cYQ9310grqxueWbl+WuIUIaiUaDcj7WOq5fVhEljNVgRfOUhY9fy2zTvfoqWsnebh8Sl70VScFbICvJnLKB0Og==", + "dev": true + }, + "node_modules/@jridgewell/trace-mapping": { + "version": "0.3.31", + "resolved": "https://registry.npmjs.org/@jridgewell/trace-mapping/-/trace-mapping-0.3.31.tgz", + "integrity": "sha512-zzNR+SdQSDJzc8joaeP8QQoCQr8NuYx2dIIytl1QeBEZHJ9uW6hebsrYgbz8hJwUQao3TWCMtmfV8Nu1twOLAw==", + "dev": true, + "license": "MIT", + "dependencies": { + "@jridgewell/resolve-uri": "^3.1.0", + "@jridgewell/sourcemap-codec": "^1.4.14" + } + }, + "node_modules/@nodelib/fs.scandir": { + "version": "2.1.5", + "resolved": "https://registry.npmjs.org/@nodelib/fs.scandir/-/fs.scandir-2.1.5.tgz", + "integrity": "sha512-vq24Bq3ym5HEQm2NKCr3yXDwjc7vTsEThRDnkp2DK9p1uqLR+DHurm/NOTo0KG7HYHU7eppKZj3MyqYuMBf62g==", + "dev": true, + "license": "MIT", + "dependencies": { + "@nodelib/fs.stat": "2.0.5", + "run-parallel": "^1.1.9" + }, + "engines": { + "node": ">= 8" + } + }, + "node_modules/@nodelib/fs.stat": { + "version": "2.0.5", + "resolved": "https://registry.npmjs.org/@nodelib/fs.stat/-/fs.stat-2.0.5.tgz", + "integrity": "sha512-RkhPPp2zrqDAQA/2jNhnztcPAlv64XdhIp7a7454A5ovI7Bukxgt7MX7udwAu3zg1DcpPU0rz3VV1SeaqvY4+A==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">= 8" + } + }, + "node_modules/@nodelib/fs.walk": { + "version": "1.2.8", + "resolved": "https://registry.npmjs.org/@nodelib/fs.walk/-/fs.walk-1.2.8.tgz", + "integrity": "sha512-oGB+UxlgWcgQkgwo8GcEGwemoTFt3FIO9ababBmaGwXIoBKZ+GTy0pP185beGg7Llih/NSHSV2XAs1lnznocSg==", + "dev": true, + "license": "MIT", + "dependencies": { + "@nodelib/fs.scandir": "2.1.5", + "fastq": "^1.6.0" + }, + "engines": { + "node": ">= 8" + } + }, + "node_modules/@pkgjs/parseargs": { + "version": "0.11.0", + "resolved": "https://registry.npmjs.org/@pkgjs/parseargs/-/parseargs-0.11.0.tgz", + "integrity": "sha512-+1VkjdD0QBLPodGrJUeqarH8VAIvQODIbwh9XpP5Syisf7YoQgsJKPNFoqqLQlu+VQ/tVSshMR6loPMn8U+dPg==", + "dev": true, + "license": "MIT", + "optional": true, + "engines": { + "node": ">=14" + } + }, + "node_modules/@rollup/rollup-android-arm-eabi": { + "version": "4.53.5", + "resolved": "https://registry.npmjs.org/@rollup/rollup-android-arm-eabi/-/rollup-android-arm-eabi-4.53.5.tgz", + "integrity": "sha512-iDGS/h7D8t7tvZ1t6+WPK04KD0MwzLZrG0se1hzBjSi5fyxlsiggoJHwh18PCFNn7tG43OWb6pdZ6Y+rMlmyNQ==", + "cpu": [ + "arm" + ], + "dev": true, + "optional": true, + "os": [ + "android" + ] + }, + "node_modules/@rollup/rollup-android-arm64": { + "version": "4.53.5", + "resolved": "https://registry.npmjs.org/@rollup/rollup-android-arm64/-/rollup-android-arm64-4.53.5.tgz", + "integrity": "sha512-wrSAViWvZHBMMlWk6EJhvg8/rjxzyEhEdgfMMjREHEq11EtJ6IP6yfcCH57YAEca2Oe3FNCE9DSTgU70EIGmVw==", + "cpu": [ + "arm64" + ], + "dev": true, + "optional": true, + "os": [ + "android" + ] + }, + "node_modules/@rollup/rollup-darwin-arm64": { + "version": "4.53.5", + "resolved": "https://registry.npmjs.org/@rollup/rollup-darwin-arm64/-/rollup-darwin-arm64-4.53.5.tgz", + "integrity": "sha512-S87zZPBmRO6u1YXQLwpveZm4JfPpAa6oHBX7/ghSiGH3rz/KDgAu1rKdGutV+WUI6tKDMbaBJomhnT30Y2t4VQ==", + "cpu": [ + "arm64" + ], + "dev": true, + "optional": true, + "os": [ + "darwin" + ] + }, + "node_modules/@rollup/rollup-darwin-x64": { + "version": "4.53.5", + "resolved": "https://registry.npmjs.org/@rollup/rollup-darwin-x64/-/rollup-darwin-x64-4.53.5.tgz", + "integrity": "sha512-YTbnsAaHo6VrAczISxgpTva8EkfQus0VPEVJCEaboHtZRIb6h6j0BNxRBOwnDciFTZLDPW5r+ZBmhL/+YpTZgA==", + "cpu": [ + "x64" + ], + "dev": true, + "optional": true, + "os": [ + "darwin" + ] + }, + "node_modules/@rollup/rollup-freebsd-arm64": { + "version": "4.53.5", + "resolved": "https://registry.npmjs.org/@rollup/rollup-freebsd-arm64/-/rollup-freebsd-arm64-4.53.5.tgz", + "integrity": "sha512-1T8eY2J8rKJWzaznV7zedfdhD1BqVs1iqILhmHDq/bqCUZsrMt+j8VCTHhP0vdfbHK3e1IQ7VYx3jlKqwlf+vw==", + "cpu": [ + "arm64" + ], + "dev": true, + "optional": true, + "os": [ + "freebsd" + ] }, "node_modules/@rollup/rollup-freebsd-x64": { "version": "4.53.5", @@ -1174,1282 +1636,1897 @@ "linux" ] }, - "node_modules/@rollup/rollup-openharmony-arm64": { - "version": "4.53.5", - "resolved": "https://registry.npmjs.org/@rollup/rollup-openharmony-arm64/-/rollup-openharmony-arm64-4.53.5.tgz", - "integrity": "sha512-3DFiLPnTxiOQV993fMc+KO8zXHTcIjgaInrqlG8zDp1TlhYl6WgrOHuJkJQ6M8zHEcntSJsUp1XFZSY8C1DYbg==", - "cpu": [ - "arm64" - ], + "node_modules/@rollup/rollup-openharmony-arm64": { + "version": "4.53.5", + "resolved": "https://registry.npmjs.org/@rollup/rollup-openharmony-arm64/-/rollup-openharmony-arm64-4.53.5.tgz", + "integrity": "sha512-3DFiLPnTxiOQV993fMc+KO8zXHTcIjgaInrqlG8zDp1TlhYl6WgrOHuJkJQ6M8zHEcntSJsUp1XFZSY8C1DYbg==", + "cpu": [ + "arm64" + ], + "dev": true, + "optional": true, + "os": [ + "openharmony" + ] + }, + "node_modules/@rollup/rollup-win32-arm64-msvc": { + "version": "4.53.5", + "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-arm64-msvc/-/rollup-win32-arm64-msvc-4.53.5.tgz", + "integrity": "sha512-nggc/wPpNTgjGg75hu+Q/3i32R00Lq1B6N1DO7MCU340MRKL3WZJMjA9U4K4gzy3dkZPXm9E1Nc81FItBVGRlA==", + "cpu": [ + "arm64" + ], + "dev": true, + "optional": true, + "os": [ + "win32" + ] + }, + "node_modules/@rollup/rollup-win32-ia32-msvc": { + "version": "4.53.5", + "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-ia32-msvc/-/rollup-win32-ia32-msvc-4.53.5.tgz", + "integrity": "sha512-U/54pTbdQpPLBdEzCT6NBCFAfSZMvmjr0twhnD9f4EIvlm9wy3jjQ38yQj1AGznrNO65EWQMgm/QUjuIVrYF9w==", + "cpu": [ + "ia32" + ], + "dev": true, + "optional": true, + "os": [ + "win32" + ] + }, + "node_modules/@rollup/rollup-win32-x64-gnu": { + "version": "4.53.5", + "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-x64-gnu/-/rollup-win32-x64-gnu-4.53.5.tgz", + "integrity": "sha512-2NqKgZSuLH9SXBBV2dWNRCZmocgSOx8OJSdpRaEcRlIfX8YrKxUT6z0F1NpvDVhOsl190UFTRh2F2WDWWCYp3A==", + "cpu": [ + "x64" + ], + "dev": true, + "optional": true, + "os": [ + "win32" + ] + }, + "node_modules/@rollup/rollup-win32-x64-msvc": { + "version": "4.53.5", + "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-x64-msvc/-/rollup-win32-x64-msvc-4.53.5.tgz", + "integrity": "sha512-JRpZUhCfhZ4keB5v0fe02gQJy05GqboPOaxvjugW04RLSYYoB/9t2lx2u/tMs/Na/1NXfY8QYjgRljRpN+MjTQ==", + "cpu": [ + "x64" + ], + "dev": true, + "optional": true, + "os": [ + "win32" + ] + }, + "node_modules/@types/better-sqlite3": { + "version": "7.6.13", + "resolved": "https://registry.npmjs.org/@types/better-sqlite3/-/better-sqlite3-7.6.13.tgz", + "integrity": "sha512-NMv9ASNARoKksWtsq/SHakpYAYnhBrQgGD8zkLYk/jaK8jUGn08CfEdTRgYhMypUQAfzSP8W6gNLe0q19/t4VA==", + "devOptional": true, + "license": "MIT", + "dependencies": { + "@types/node": "*" + } + }, + "node_modules/@types/body-parser": { + "version": "1.19.6", + "resolved": "https://registry.npmjs.org/@types/body-parser/-/body-parser-1.19.6.tgz", + "integrity": "sha512-HLFeCYgz89uk22N5Qg3dvGvsv46B8GLvKKo1zKG4NybA8U2DiEO3w9lqGg29t/tfLRJpJ6iQxnVw4OnB7MoM9g==", + "dev": true, + "license": "MIT", + "dependencies": { + "@types/connect": "*", + "@types/node": "*" + } + }, + "node_modules/@types/connect": { + "version": "3.4.38", + "resolved": "https://registry.npmjs.org/@types/connect/-/connect-3.4.38.tgz", + "integrity": "sha512-K6uROf1LD88uDQqJCktA4yzL1YYAK6NgfsI0v/mTgyPKWsX1CnJ0XPSDhViejru1GcRkLWb8RlzFYJRqGUbaug==", + "dev": true, + "license": "MIT", + "dependencies": { + "@types/node": "*" + } + }, + "node_modules/@types/connect-redis": { + "version": "0.0.23", + "resolved": "https://registry.npmjs.org/@types/connect-redis/-/connect-redis-0.0.23.tgz", + "integrity": "sha512-+yKa9EQJ7YZIWjTKbCdXhqYSpirGf7Cc0o5QTFrkWORneFHVu3QOopRUi6E/ye41QGMom+cj1/kvWFHamHTADA==", + "dev": true, + "license": "MIT", + "dependencies": { + "@types/express": "*", + "@types/express-session": "*", + "@types/node": "*", + "@types/redis": "^2.8.0", + "ioredis": "^5.3.0" + } + }, + "node_modules/@types/cors": { + "version": "2.8.19", + "resolved": "https://registry.npmjs.org/@types/cors/-/cors-2.8.19.tgz", + "integrity": "sha512-mFNylyeyqN93lfe/9CSxOGREz8cpzAhH+E93xJ4xWQf62V8sQ/24reV2nyzUWM6H6Xji+GGHpkbLe7pVoUEskg==", + "dev": true, + "license": "MIT", + "dependencies": { + "@types/node": "*" + } + }, + "node_modules/@types/estree": { + "version": "1.0.8", + "resolved": "https://registry.npmjs.org/@types/estree/-/estree-1.0.8.tgz", + "integrity": "sha512-dWHzHa2WqEXI/O1E9OjrocMTKJl2mSrEolh1Iomrv6U+JuNwaHXsXx9bLu5gG7BUWFIN0skIQJQ/L1rIex4X6w==", + "dev": true + }, + "node_modules/@types/express": { + "version": "5.0.6", + "resolved": "https://registry.npmjs.org/@types/express/-/express-5.0.6.tgz", + "integrity": "sha512-sKYVuV7Sv9fbPIt/442koC7+IIwK5olP1KWeD88e/idgoJqDm3JV/YUiPwkoKK92ylff2MGxSz1CSjsXelx0YA==", + "dev": true, + "license": "MIT", + "dependencies": { + "@types/body-parser": "*", + "@types/express-serve-static-core": "^5.0.0", + "@types/serve-static": "^2" + } + }, + "node_modules/@types/express-serve-static-core": { + "version": "5.1.0", + "resolved": "https://registry.npmjs.org/@types/express-serve-static-core/-/express-serve-static-core-5.1.0.tgz", + "integrity": "sha512-jnHMsrd0Mwa9Cf4IdOzbz543y4XJepXrbia2T4b6+spXC2We3t1y6K44D3mR8XMFSXMCf3/l7rCgddfx7UNVBA==", + "dev": true, + "license": "MIT", + "dependencies": { + "@types/node": "*", + "@types/qs": "*", + "@types/range-parser": "*", + "@types/send": "*" + } + }, + "node_modules/@types/express-session": { + "version": "1.18.2", + "resolved": "https://registry.npmjs.org/@types/express-session/-/express-session-1.18.2.tgz", + "integrity": "sha512-k+I0BxwVXsnEU2hV77cCobC08kIsn4y44C3gC0b46uxZVMaXA04lSPgRLR/bSL2w0t0ShJiG8o4jPzRG/nscFg==", + "dev": true, + "license": "MIT", + "dependencies": { + "@types/express": "*" + } + }, + "node_modules/@types/helmet": { + "version": "0.0.48", + "resolved": "https://registry.npmjs.org/@types/helmet/-/helmet-0.0.48.tgz", + "integrity": "sha512-C7MpnvSDrunS1q2Oy1VWCY7CDWHozqSnM8P4tFeRTuzwqni+PYOjEredwcqWG+kLpYcgLsgcY3orHB54gbx2Jw==", + "dev": true, + "license": "MIT", + "dependencies": { + "@types/express": "*" + } + }, + "node_modules/@types/http-errors": { + "version": "2.0.5", + "resolved": "https://registry.npmjs.org/@types/http-errors/-/http-errors-2.0.5.tgz", + "integrity": "sha512-r8Tayk8HJnX0FztbZN7oVqGccWgw98T/0neJphO91KkmOzug1KkofZURD4UaD5uH8AqcFLfdPErnBod0u71/qg==", + "dev": true, + "license": "MIT" + }, + "node_modules/@types/http-proxy": { + "version": "1.17.17", + "resolved": "https://registry.npmjs.org/@types/http-proxy/-/http-proxy-1.17.17.tgz", + "integrity": "sha512-ED6LB+Z1AVylNTu7hdzuBqOgMnvG/ld6wGCG8wFnAzKX5uyW2K3WD52v0gnLCTK/VLpXtKckgWuyScYK6cSPaw==", + "dependencies": { + "@types/node": "*" + } + }, + "node_modules/@types/node": { + "version": "22.19.3", + "resolved": "https://registry.npmjs.org/@types/node/-/node-22.19.3.tgz", + "integrity": "sha512-1N9SBnWYOJTrNZCdh/yJE+t910Y128BoyY+zBLWhL3r0TYzlTmFdXrPwHL9DyFZmlEXNQQolTZh3KHV31QDhyA==", + "license": "MIT", + "dependencies": { + "undici-types": "~6.21.0" + } + }, + "node_modules/@types/pg": { + "version": "8.16.0", + "resolved": "https://registry.npmjs.org/@types/pg/-/pg-8.16.0.tgz", + "integrity": "sha512-RmhMd/wD+CF8Dfo+cVIy3RR5cl8CyfXQ0tGgW6XBL8L4LM/UTEbNXYRbLwU6w+CgrKBNbrQWt4FUtTfaU5jSYQ==", + "devOptional": true, + "license": "MIT", + "dependencies": { + "@types/node": "*", + "pg-protocol": "*", + "pg-types": "^2.2.0" + } + }, + "node_modules/@types/qs": { + "version": "6.14.0", + "resolved": "https://registry.npmjs.org/@types/qs/-/qs-6.14.0.tgz", + "integrity": "sha512-eOunJqu0K1923aExK6y8p6fsihYEn/BYuQ4g0CxAAgFc4b/ZLN4CrsRZ55srTdqoiLzU2B2evC+apEIxprEzkQ==", "dev": true, - "optional": true, - "os": [ - "openharmony" - ] + "license": "MIT" }, - "node_modules/@rollup/rollup-win32-arm64-msvc": { - "version": "4.53.5", - "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-arm64-msvc/-/rollup-win32-arm64-msvc-4.53.5.tgz", - "integrity": "sha512-nggc/wPpNTgjGg75hu+Q/3i32R00Lq1B6N1DO7MCU340MRKL3WZJMjA9U4K4gzy3dkZPXm9E1Nc81FItBVGRlA==", - "cpu": [ - "arm64" - ], + "node_modules/@types/range-parser": { + "version": "1.2.7", + "resolved": "https://registry.npmjs.org/@types/range-parser/-/range-parser-1.2.7.tgz", + "integrity": "sha512-hKormJbkJqzQGhziax5PItDUTMAM9uE2XXQmM37dyd4hVM+5aVl7oVxMVUiVQn2oCQFN/LKCZdvSM0pFRqbSmQ==", "dev": true, - "optional": true, - "os": [ - "win32" - ] + "license": "MIT" }, - "node_modules/@rollup/rollup-win32-ia32-msvc": { - "version": "4.53.5", - "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-ia32-msvc/-/rollup-win32-ia32-msvc-4.53.5.tgz", - "integrity": "sha512-U/54pTbdQpPLBdEzCT6NBCFAfSZMvmjr0twhnD9f4EIvlm9wy3jjQ38yQj1AGznrNO65EWQMgm/QUjuIVrYF9w==", - "cpu": [ - "ia32" - ], + "node_modules/@types/redis": { + "version": "2.8.32", + "resolved": "https://registry.npmjs.org/@types/redis/-/redis-2.8.32.tgz", + "integrity": "sha512-7jkMKxcGq9p242exlbsVzuJb57KqHRhNl4dHoQu2Y5v9bCAbtIXXH0R3HleSQW4CTOqpHIYUW3t6tpUj4BVQ+w==", "dev": true, - "optional": true, - "os": [ - "win32" - ] + "license": "MIT", + "dependencies": { + "@types/node": "*" + } }, - "node_modules/@rollup/rollup-win32-x64-gnu": { - "version": "4.53.5", - "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-x64-gnu/-/rollup-win32-x64-gnu-4.53.5.tgz", - "integrity": "sha512-2NqKgZSuLH9SXBBV2dWNRCZmocgSOx8OJSdpRaEcRlIfX8YrKxUT6z0F1NpvDVhOsl190UFTRh2F2WDWWCYp3A==", - "cpu": [ - "x64" - ], + "node_modules/@types/send": { + "version": "1.2.1", + "resolved": "https://registry.npmjs.org/@types/send/-/send-1.2.1.tgz", + "integrity": "sha512-arsCikDvlU99zl1g69TcAB3mzZPpxgw0UQnaHeC1Nwb015xp8bknZv5rIfri9xTOcMuaVgvabfIRA7PSZVuZIQ==", "dev": true, - "optional": true, - "os": [ - "win32" - ] + "license": "MIT", + "dependencies": { + "@types/node": "*" + } }, - "node_modules/@rollup/rollup-win32-x64-msvc": { - "version": "4.53.5", - "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-x64-msvc/-/rollup-win32-x64-msvc-4.53.5.tgz", - "integrity": "sha512-JRpZUhCfhZ4keB5v0fe02gQJy05GqboPOaxvjugW04RLSYYoB/9t2lx2u/tMs/Na/1NXfY8QYjgRljRpN+MjTQ==", - "cpu": [ - "x64" - ], + "node_modules/@types/serve-static": { + "version": "2.2.0", + "resolved": "https://registry.npmjs.org/@types/serve-static/-/serve-static-2.2.0.tgz", + "integrity": "sha512-8mam4H1NHLtu7nmtalF7eyBH14QyOASmcxHhSfEoRyr0nP/YdoesEtU+uSRvMe96TW/HPTtkoKqQLl53N7UXMQ==", "dev": true, - "optional": true, - "os": [ - "win32" - ] + "license": "MIT", + "dependencies": { + "@types/http-errors": "*", + "@types/node": "*" + } }, - "node_modules/@types/better-sqlite3": { - "version": "7.6.13", - "resolved": "https://registry.npmjs.org/@types/better-sqlite3/-/better-sqlite3-7.6.13.tgz", - "integrity": "sha512-NMv9ASNARoKksWtsq/SHakpYAYnhBrQgGD8zkLYk/jaK8jUGn08CfEdTRgYhMypUQAfzSP8W6gNLe0q19/t4VA==", + "node_modules/@types/uuid": { + "version": "10.0.0", + "resolved": "https://registry.npmjs.org/@types/uuid/-/uuid-10.0.0.tgz", + "integrity": "sha512-7gqG38EyHgyP1S+7+xomFtL+ZNHcKv6DwNaCZmJmo1vgMugyF3TCnXVg4t1uk89mLNwnLtnY3TpOpCOyp1/xHQ==", + "dev": true + }, + "node_modules/@types/ws": { + "version": "8.18.1", + "resolved": "https://registry.npmjs.org/@types/ws/-/ws-8.18.1.tgz", + "integrity": "sha512-ThVF6DCVhA8kUGy+aazFQ4kXQ7E1Ty7A3ypFOe0IcJV8O/M511G99AW24irKrW56Wt44yG9+ij8FaqoBGkuBXg==", "dev": true, "license": "MIT", "dependencies": { "@types/node": "*" } }, - "node_modules/@types/body-parser": { - "version": "1.19.6", - "resolved": "https://registry.npmjs.org/@types/body-parser/-/body-parser-1.19.6.tgz", - "integrity": "sha512-HLFeCYgz89uk22N5Qg3dvGvsv46B8GLvKKo1zKG4NybA8U2DiEO3w9lqGg29t/tfLRJpJ6iQxnVw4OnB7MoM9g==", + "node_modules/@typescript-eslint/eslint-plugin": { + "version": "8.50.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-8.50.0.tgz", + "integrity": "sha512-O7QnmOXYKVtPrfYzMolrCTfkezCJS9+ljLdKW/+DCvRsc3UAz+sbH6Xcsv7p30+0OwUbeWfUDAQE0vpabZ3QLg==", "dev": true, "license": "MIT", "dependencies": { - "@types/connect": "*", - "@types/node": "*" + "@eslint-community/regexpp": "^4.10.0", + "@typescript-eslint/scope-manager": "8.50.0", + "@typescript-eslint/type-utils": "8.50.0", + "@typescript-eslint/utils": "8.50.0", + "@typescript-eslint/visitor-keys": "8.50.0", + "ignore": "^7.0.0", + "natural-compare": "^1.4.0", + "ts-api-utils": "^2.1.0" + }, + "engines": { + "node": "^18.18.0 || ^20.9.0 || >=21.1.0" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/typescript-eslint" + }, + "peerDependencies": { + "@typescript-eslint/parser": "^8.50.0", + "eslint": "^8.57.0 || ^9.0.0", + "typescript": ">=4.8.4 <6.0.0" } }, - "node_modules/@types/connect": { - "version": "3.4.38", - "resolved": "https://registry.npmjs.org/@types/connect/-/connect-3.4.38.tgz", - "integrity": "sha512-K6uROf1LD88uDQqJCktA4yzL1YYAK6NgfsI0v/mTgyPKWsX1CnJ0XPSDhViejru1GcRkLWb8RlzFYJRqGUbaug==", + "node_modules/@typescript-eslint/parser": { + "version": "8.50.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-8.50.0.tgz", + "integrity": "sha512-6/cmF2piao+f6wSxUsJLZjck7OQsYyRtcOZS02k7XINSNlz93v6emM8WutDQSXnroG2xwYlEVHJI+cPA7CPM3Q==", "dev": true, "license": "MIT", "dependencies": { - "@types/node": "*" + "@typescript-eslint/scope-manager": "8.50.0", + "@typescript-eslint/types": "8.50.0", + "@typescript-eslint/typescript-estree": "8.50.0", + "@typescript-eslint/visitor-keys": "8.50.0", + "debug": "^4.3.4" + }, + "engines": { + "node": "^18.18.0 || ^20.9.0 || >=21.1.0" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/typescript-eslint" + }, + "peerDependencies": { + "eslint": "^8.57.0 || ^9.0.0", + "typescript": ">=4.8.4 <6.0.0" } }, - "node_modules/@types/connect-redis": { - "version": "0.0.23", - "resolved": "https://registry.npmjs.org/@types/connect-redis/-/connect-redis-0.0.23.tgz", - "integrity": "sha512-+yKa9EQJ7YZIWjTKbCdXhqYSpirGf7Cc0o5QTFrkWORneFHVu3QOopRUi6E/ye41QGMom+cj1/kvWFHamHTADA==", + "node_modules/@typescript-eslint/project-service": { + "version": "8.50.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/project-service/-/project-service-8.50.0.tgz", + "integrity": "sha512-Cg/nQcL1BcoTijEWyx4mkVC56r8dj44bFDvBdygifuS20f3OZCHmFbjF34DPSi07kwlFvqfv/xOLnJ5DquxSGQ==", "dev": true, "license": "MIT", "dependencies": { - "@types/express": "*", - "@types/express-session": "*", - "@types/node": "*", - "@types/redis": "^2.8.0", - "ioredis": "^5.3.0" + "@typescript-eslint/tsconfig-utils": "^8.50.0", + "@typescript-eslint/types": "^8.50.0", + "debug": "^4.3.4" + }, + "engines": { + "node": "^18.18.0 || ^20.9.0 || >=21.1.0" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/typescript-eslint" + }, + "peerDependencies": { + "typescript": ">=4.8.4 <6.0.0" } }, - "node_modules/@types/cors": { - "version": "2.8.19", - "resolved": "https://registry.npmjs.org/@types/cors/-/cors-2.8.19.tgz", - "integrity": "sha512-mFNylyeyqN93lfe/9CSxOGREz8cpzAhH+E93xJ4xWQf62V8sQ/24reV2nyzUWM6H6Xji+GGHpkbLe7pVoUEskg==", + "node_modules/@typescript-eslint/scope-manager": { + "version": "8.50.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-8.50.0.tgz", + "integrity": "sha512-xCwfuCZjhIqy7+HKxBLrDVT5q/iq7XBVBXLn57RTIIpelLtEIZHXAF/Upa3+gaCpeV1NNS5Z9A+ID6jn50VD4A==", "dev": true, "license": "MIT", "dependencies": { - "@types/node": "*" + "@typescript-eslint/types": "8.50.0", + "@typescript-eslint/visitor-keys": "8.50.0" + }, + "engines": { + "node": "^18.18.0 || ^20.9.0 || >=21.1.0" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/typescript-eslint" } }, - "node_modules/@types/estree": { - "version": "1.0.8", - "resolved": "https://registry.npmjs.org/@types/estree/-/estree-1.0.8.tgz", - "integrity": "sha512-dWHzHa2WqEXI/O1E9OjrocMTKJl2mSrEolh1Iomrv6U+JuNwaHXsXx9bLu5gG7BUWFIN0skIQJQ/L1rIex4X6w==", - "dev": true + "node_modules/@typescript-eslint/tsconfig-utils": { + "version": "8.50.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/tsconfig-utils/-/tsconfig-utils-8.50.0.tgz", + "integrity": "sha512-vxd3G/ybKTSlm31MOA96gqvrRGv9RJ7LGtZCn2Vrc5htA0zCDvcMqUkifcjrWNNKXHUU3WCkYOzzVSFBd0wa2w==", + "dev": true, + "license": "MIT", + "engines": { + "node": "^18.18.0 || ^20.9.0 || >=21.1.0" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/typescript-eslint" + }, + "peerDependencies": { + "typescript": ">=4.8.4 <6.0.0" + } }, - "node_modules/@types/express": { - "version": "5.0.6", - "resolved": "https://registry.npmjs.org/@types/express/-/express-5.0.6.tgz", - "integrity": "sha512-sKYVuV7Sv9fbPIt/442koC7+IIwK5olP1KWeD88e/idgoJqDm3JV/YUiPwkoKK92ylff2MGxSz1CSjsXelx0YA==", + "node_modules/@typescript-eslint/type-utils": { + "version": "8.50.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/type-utils/-/type-utils-8.50.0.tgz", + "integrity": "sha512-7OciHT2lKCewR0mFoBrvZJ4AXTMe/sYOe87289WAViOocEmDjjv8MvIOT2XESuKj9jp8u3SZYUSh89QA4S1kQw==", + "dev": true, + "license": "MIT", + "dependencies": { + "@typescript-eslint/types": "8.50.0", + "@typescript-eslint/typescript-estree": "8.50.0", + "@typescript-eslint/utils": "8.50.0", + "debug": "^4.3.4", + "ts-api-utils": "^2.1.0" + }, + "engines": { + "node": "^18.18.0 || ^20.9.0 || >=21.1.0" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/typescript-eslint" + }, + "peerDependencies": { + "eslint": "^8.57.0 || ^9.0.0", + "typescript": ">=4.8.4 <6.0.0" + } + }, + "node_modules/@typescript-eslint/types": { + "version": "8.50.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-8.50.0.tgz", + "integrity": "sha512-iX1mgmGrXdANhhITbpp2QQM2fGehBse9LbTf0sidWK6yg/NE+uhV5dfU1g6EYPlcReYmkE9QLPq/2irKAmtS9w==", "dev": true, "license": "MIT", - "dependencies": { - "@types/body-parser": "*", - "@types/express-serve-static-core": "^5.0.0", - "@types/serve-static": "^2" + "engines": { + "node": "^18.18.0 || ^20.9.0 || >=21.1.0" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/typescript-eslint" } }, - "node_modules/@types/express-serve-static-core": { - "version": "5.1.0", - "resolved": "https://registry.npmjs.org/@types/express-serve-static-core/-/express-serve-static-core-5.1.0.tgz", - "integrity": "sha512-jnHMsrd0Mwa9Cf4IdOzbz543y4XJepXrbia2T4b6+spXC2We3t1y6K44D3mR8XMFSXMCf3/l7rCgddfx7UNVBA==", + "node_modules/@typescript-eslint/typescript-estree": { + "version": "8.50.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-8.50.0.tgz", + "integrity": "sha512-W7SVAGBR/IX7zm1t70Yujpbk+zdPq/u4soeFSknWFdXIFuWsBGBOUu/Tn/I6KHSKvSh91OiMuaSnYp3mtPt5IQ==", "dev": true, "license": "MIT", "dependencies": { - "@types/node": "*", - "@types/qs": "*", - "@types/range-parser": "*", - "@types/send": "*" + "@typescript-eslint/project-service": "8.50.0", + "@typescript-eslint/tsconfig-utils": "8.50.0", + "@typescript-eslint/types": "8.50.0", + "@typescript-eslint/visitor-keys": "8.50.0", + "debug": "^4.3.4", + "minimatch": "^9.0.4", + "semver": "^7.6.0", + "tinyglobby": "^0.2.15", + "ts-api-utils": "^2.1.0" + }, + "engines": { + "node": "^18.18.0 || ^20.9.0 || >=21.1.0" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/typescript-eslint" + }, + "peerDependencies": { + "typescript": ">=4.8.4 <6.0.0" } }, - "node_modules/@types/express-session": { - "version": "1.18.2", - "resolved": "https://registry.npmjs.org/@types/express-session/-/express-session-1.18.2.tgz", - "integrity": "sha512-k+I0BxwVXsnEU2hV77cCobC08kIsn4y44C3gC0b46uxZVMaXA04lSPgRLR/bSL2w0t0ShJiG8o4jPzRG/nscFg==", + "node_modules/@typescript-eslint/utils": { + "version": "8.50.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-8.50.0.tgz", + "integrity": "sha512-87KgUXET09CRjGCi2Ejxy3PULXna63/bMYv72tCAlDJC3Yqwln0HiFJ3VJMst2+mEtNtZu5oFvX4qJGjKsnAgg==", "dev": true, "license": "MIT", "dependencies": { - "@types/express": "*" + "@eslint-community/eslint-utils": "^4.7.0", + "@typescript-eslint/scope-manager": "8.50.0", + "@typescript-eslint/types": "8.50.0", + "@typescript-eslint/typescript-estree": "8.50.0" + }, + "engines": { + "node": "^18.18.0 || ^20.9.0 || >=21.1.0" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/typescript-eslint" + }, + "peerDependencies": { + "eslint": "^8.57.0 || ^9.0.0", + "typescript": ">=4.8.4 <6.0.0" } }, - "node_modules/@types/helmet": { - "version": "0.0.48", - "resolved": "https://registry.npmjs.org/@types/helmet/-/helmet-0.0.48.tgz", - "integrity": "sha512-C7MpnvSDrunS1q2Oy1VWCY7CDWHozqSnM8P4tFeRTuzwqni+PYOjEredwcqWG+kLpYcgLsgcY3orHB54gbx2Jw==", + "node_modules/@typescript-eslint/visitor-keys": { + "version": "8.50.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-8.50.0.tgz", + "integrity": "sha512-Xzmnb58+Db78gT/CCj/PVCvK+zxbnsw6F+O1oheYszJbBSdEjVhQi3C/Xttzxgi/GLmpvOggRs1RFpiJ8+c34Q==", "dev": true, "license": "MIT", "dependencies": { - "@types/express": "*" + "@typescript-eslint/types": "8.50.0", + "eslint-visitor-keys": "^4.2.1" + }, + "engines": { + "node": "^18.18.0 || ^20.9.0 || >=21.1.0" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/typescript-eslint" } }, - "node_modules/@types/http-errors": { - "version": "2.0.5", - "resolved": "https://registry.npmjs.org/@types/http-errors/-/http-errors-2.0.5.tgz", - "integrity": "sha512-r8Tayk8HJnX0FztbZN7oVqGccWgw98T/0neJphO91KkmOzug1KkofZURD4UaD5uH8AqcFLfdPErnBod0u71/qg==", + "node_modules/@typescript-eslint/visitor-keys/node_modules/eslint-visitor-keys": { + "version": "4.2.1", + "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-4.2.1.tgz", + "integrity": "sha512-Uhdk5sfqcee/9H/rCOJikYz67o0a2Tw2hGRPOG2Y1R2dg7brRe1uG0yaNQDHu+TO/uQPF/5eCapvYSmHUjt7JQ==", "dev": true, - "license": "MIT" - }, - "node_modules/@types/http-proxy": { - "version": "1.17.17", - "resolved": "https://registry.npmjs.org/@types/http-proxy/-/http-proxy-1.17.17.tgz", - "integrity": "sha512-ED6LB+Z1AVylNTu7hdzuBqOgMnvG/ld6wGCG8wFnAzKX5uyW2K3WD52v0gnLCTK/VLpXtKckgWuyScYK6cSPaw==", - "dependencies": { - "@types/node": "*" + "license": "Apache-2.0", + "engines": { + "node": "^18.18.0 || ^20.9.0 || >=21.1.0" + }, + "funding": { + "url": "https://opencollective.com/eslint" } }, - "node_modules/@types/node": { - "version": "22.19.3", - "resolved": "https://registry.npmjs.org/@types/node/-/node-22.19.3.tgz", - "integrity": "sha512-1N9SBnWYOJTrNZCdh/yJE+t910Y128BoyY+zBLWhL3r0TYzlTmFdXrPwHL9DyFZmlEXNQQolTZh3KHV31QDhyA==", - "license": "MIT", - "dependencies": { - "undici-types": "~6.21.0" - } + "node_modules/@ungap/structured-clone": { + "version": "1.3.0", + "resolved": "https://registry.npmjs.org/@ungap/structured-clone/-/structured-clone-1.3.0.tgz", + "integrity": "sha512-WmoN8qaIAo7WTYWbAZuG8PYEhn5fkz7dZrqTBZ7dtt//lL2Gwms1IcnQ5yHqjDfX8Ft5j4YzDM23f87zBfDe9g==", + "dev": true, + "license": "ISC" }, - "node_modules/@types/pg": { - "version": "8.16.0", - "resolved": "https://registry.npmjs.org/@types/pg/-/pg-8.16.0.tgz", - "integrity": "sha512-RmhMd/wD+CF8Dfo+cVIy3RR5cl8CyfXQ0tGgW6XBL8L4LM/UTEbNXYRbLwU6w+CgrKBNbrQWt4FUtTfaU5jSYQ==", + "node_modules/@vitest/coverage-v8": { + "version": "2.1.9", + "resolved": "https://registry.npmjs.org/@vitest/coverage-v8/-/coverage-v8-2.1.9.tgz", + "integrity": "sha512-Z2cOr0ksM00MpEfyVE8KXIYPEcBFxdbLSs56L8PO0QQMxt/6bDj45uQfxoc96v05KW3clk7vvgP0qfDit9DmfQ==", "dev": true, "license": "MIT", "dependencies": { - "@types/node": "*", - "pg-protocol": "*", - "pg-types": "^2.2.0" + "@ampproject/remapping": "^2.3.0", + "@bcoe/v8-coverage": "^0.2.3", + "debug": "^4.3.7", + "istanbul-lib-coverage": "^3.2.2", + "istanbul-lib-report": "^3.0.1", + "istanbul-lib-source-maps": "^5.0.6", + "istanbul-reports": "^3.1.7", + "magic-string": "^0.30.12", + "magicast": "^0.3.5", + "std-env": "^3.8.0", + "test-exclude": "^7.0.1", + "tinyrainbow": "^1.2.0" + }, + "funding": { + "url": "https://opencollective.com/vitest" + }, + "peerDependencies": { + "@vitest/browser": "2.1.9", + "vitest": "2.1.9" + }, + "peerDependenciesMeta": { + "@vitest/browser": { + "optional": true + } } }, - "node_modules/@types/qs": { - "version": "6.14.0", - "resolved": "https://registry.npmjs.org/@types/qs/-/qs-6.14.0.tgz", - "integrity": "sha512-eOunJqu0K1923aExK6y8p6fsihYEn/BYuQ4g0CxAAgFc4b/ZLN4CrsRZ55srTdqoiLzU2B2evC+apEIxprEzkQ==", - "dev": true, - "license": "MIT" - }, - "node_modules/@types/range-parser": { - "version": "1.2.7", - "resolved": "https://registry.npmjs.org/@types/range-parser/-/range-parser-1.2.7.tgz", - "integrity": "sha512-hKormJbkJqzQGhziax5PItDUTMAM9uE2XXQmM37dyd4hVM+5aVl7oVxMVUiVQn2oCQFN/LKCZdvSM0pFRqbSmQ==", + "node_modules/@vitest/expect": { + "version": "2.1.9", + "resolved": "https://registry.npmjs.org/@vitest/expect/-/expect-2.1.9.tgz", + "integrity": "sha512-UJCIkTBenHeKT1TTlKMJWy1laZewsRIzYighyYiJKZreqtdxSos/S1t+ktRMQWu2CKqaarrkeszJx1cgC5tGZw==", "dev": true, - "license": "MIT" + "dependencies": { + "@vitest/spy": "2.1.9", + "@vitest/utils": "2.1.9", + "chai": "^5.1.2", + "tinyrainbow": "^1.2.0" + }, + "funding": { + "url": "https://opencollective.com/vitest" + } }, - "node_modules/@types/redis": { - "version": "2.8.32", - "resolved": "https://registry.npmjs.org/@types/redis/-/redis-2.8.32.tgz", - "integrity": "sha512-7jkMKxcGq9p242exlbsVzuJb57KqHRhNl4dHoQu2Y5v9bCAbtIXXH0R3HleSQW4CTOqpHIYUW3t6tpUj4BVQ+w==", + "node_modules/@vitest/mocker": { + "version": "2.1.9", + "resolved": "https://registry.npmjs.org/@vitest/mocker/-/mocker-2.1.9.tgz", + "integrity": "sha512-tVL6uJgoUdi6icpxmdrn5YNo3g3Dxv+IHJBr0GXHaEdTcw3F+cPKnsXFhli6nO+f/6SDKPHEK1UN+k+TQv0Ehg==", "dev": true, - "license": "MIT", "dependencies": { - "@types/node": "*" + "@vitest/spy": "2.1.9", + "estree-walker": "^3.0.3", + "magic-string": "^0.30.12" + }, + "funding": { + "url": "https://opencollective.com/vitest" + }, + "peerDependencies": { + "msw": "^2.4.9", + "vite": "^5.0.0" + }, + "peerDependenciesMeta": { + "msw": { + "optional": true + }, + "vite": { + "optional": true + } } }, - "node_modules/@types/send": { - "version": "1.2.1", - "resolved": "https://registry.npmjs.org/@types/send/-/send-1.2.1.tgz", - "integrity": "sha512-arsCikDvlU99zl1g69TcAB3mzZPpxgw0UQnaHeC1Nwb015xp8bknZv5rIfri9xTOcMuaVgvabfIRA7PSZVuZIQ==", + "node_modules/@vitest/pretty-format": { + "version": "2.1.9", + "resolved": "https://registry.npmjs.org/@vitest/pretty-format/-/pretty-format-2.1.9.tgz", + "integrity": "sha512-KhRIdGV2U9HOUzxfiHmY8IFHTdqtOhIzCpd8WRdJiE7D/HUcZVD0EgQCVjm+Q9gkUXWgBvMmTtZgIG48wq7sOQ==", "dev": true, - "license": "MIT", "dependencies": { - "@types/node": "*" + "tinyrainbow": "^1.2.0" + }, + "funding": { + "url": "https://opencollective.com/vitest" } }, - "node_modules/@types/serve-static": { - "version": "2.2.0", - "resolved": "https://registry.npmjs.org/@types/serve-static/-/serve-static-2.2.0.tgz", - "integrity": "sha512-8mam4H1NHLtu7nmtalF7eyBH14QyOASmcxHhSfEoRyr0nP/YdoesEtU+uSRvMe96TW/HPTtkoKqQLl53N7UXMQ==", + "node_modules/@vitest/runner": { + "version": "2.1.9", + "resolved": "https://registry.npmjs.org/@vitest/runner/-/runner-2.1.9.tgz", + "integrity": "sha512-ZXSSqTFIrzduD63btIfEyOmNcBmQvgOVsPNPe0jYtESiXkhd8u2erDLnMxmGrDCwHCCHE7hxwRDCT3pt0esT4g==", "dev": true, - "license": "MIT", "dependencies": { - "@types/http-errors": "*", - "@types/node": "*" + "@vitest/utils": "2.1.9", + "pathe": "^1.1.2" + }, + "funding": { + "url": "https://opencollective.com/vitest" } }, - "node_modules/@types/uuid": { - "version": "10.0.0", - "resolved": "https://registry.npmjs.org/@types/uuid/-/uuid-10.0.0.tgz", - "integrity": "sha512-7gqG38EyHgyP1S+7+xomFtL+ZNHcKv6DwNaCZmJmo1vgMugyF3TCnXVg4t1uk89mLNwnLtnY3TpOpCOyp1/xHQ==", - "dev": true - }, - "node_modules/@types/ws": { - "version": "8.18.1", - "resolved": "https://registry.npmjs.org/@types/ws/-/ws-8.18.1.tgz", - "integrity": "sha512-ThVF6DCVhA8kUGy+aazFQ4kXQ7E1Ty7A3ypFOe0IcJV8O/M511G99AW24irKrW56Wt44yG9+ij8FaqoBGkuBXg==", + "node_modules/@vitest/snapshot": { + "version": "2.1.9", + "resolved": "https://registry.npmjs.org/@vitest/snapshot/-/snapshot-2.1.9.tgz", + "integrity": "sha512-oBO82rEjsxLNJincVhLhaxxZdEtV0EFHMK5Kmx5sJ6H9L183dHECjiefOAdnqpIgT5eZwT04PoggUnW88vOBNQ==", "dev": true, - "license": "MIT", "dependencies": { - "@types/node": "*" + "@vitest/pretty-format": "2.1.9", + "magic-string": "^0.30.12", + "pathe": "^1.1.2" + }, + "funding": { + "url": "https://opencollective.com/vitest" } }, - "node_modules/@typescript-eslint/eslint-plugin": { - "version": "8.50.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-8.50.0.tgz", - "integrity": "sha512-O7QnmOXYKVtPrfYzMolrCTfkezCJS9+ljLdKW/+DCvRsc3UAz+sbH6Xcsv7p30+0OwUbeWfUDAQE0vpabZ3QLg==", + "node_modules/@vitest/spy": { + "version": "2.1.9", + "resolved": "https://registry.npmjs.org/@vitest/spy/-/spy-2.1.9.tgz", + "integrity": "sha512-E1B35FwzXXTs9FHNK6bDszs7mtydNi5MIfUWpceJ8Xbfb1gBMscAnwLbEu+B44ed6W3XjL9/ehLPHR1fkf1KLQ==", "dev": true, - "license": "MIT", "dependencies": { - "@eslint-community/regexpp": "^4.10.0", - "@typescript-eslint/scope-manager": "8.50.0", - "@typescript-eslint/type-utils": "8.50.0", - "@typescript-eslint/utils": "8.50.0", - "@typescript-eslint/visitor-keys": "8.50.0", - "ignore": "^7.0.0", - "natural-compare": "^1.4.0", - "ts-api-utils": "^2.1.0" - }, - "engines": { - "node": "^18.18.0 || ^20.9.0 || >=21.1.0" + "tinyspy": "^3.0.2" }, "funding": { - "type": "opencollective", - "url": "https://opencollective.com/typescript-eslint" - }, - "peerDependencies": { - "@typescript-eslint/parser": "^8.50.0", - "eslint": "^8.57.0 || ^9.0.0", - "typescript": ">=4.8.4 <6.0.0" + "url": "https://opencollective.com/vitest" } }, - "node_modules/@typescript-eslint/parser": { - "version": "8.50.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-8.50.0.tgz", - "integrity": "sha512-6/cmF2piao+f6wSxUsJLZjck7OQsYyRtcOZS02k7XINSNlz93v6emM8WutDQSXnroG2xwYlEVHJI+cPA7CPM3Q==", + "node_modules/@vitest/utils": { + "version": "2.1.9", + "resolved": "https://registry.npmjs.org/@vitest/utils/-/utils-2.1.9.tgz", + "integrity": "sha512-v0psaMSkNJ3A2NMrUEHFRzJtDPFn+/VWZ5WxImB21T9fjucJRmS7xCS3ppEnARb9y11OAzaD+P2Ps+b+BGX5iQ==", "dev": true, - "license": "MIT", "dependencies": { - "@typescript-eslint/scope-manager": "8.50.0", - "@typescript-eslint/types": "8.50.0", - "@typescript-eslint/typescript-estree": "8.50.0", - "@typescript-eslint/visitor-keys": "8.50.0", - "debug": "^4.3.4" - }, - "engines": { - "node": "^18.18.0 || ^20.9.0 || >=21.1.0" + "@vitest/pretty-format": "2.1.9", + "loupe": "^3.1.2", + "tinyrainbow": "^1.2.0" }, "funding": { - "type": "opencollective", - "url": "https://opencollective.com/typescript-eslint" - }, - "peerDependencies": { - "eslint": "^8.57.0 || ^9.0.0", - "typescript": ">=4.8.4 <6.0.0" + "url": "https://opencollective.com/vitest" } }, - "node_modules/@typescript-eslint/project-service": { - "version": "8.50.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/project-service/-/project-service-8.50.0.tgz", - "integrity": "sha512-Cg/nQcL1BcoTijEWyx4mkVC56r8dj44bFDvBdygifuS20f3OZCHmFbjF34DPSi07kwlFvqfv/xOLnJ5DquxSGQ==", - "dev": true, + "node_modules/accepts": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/accepts/-/accepts-2.0.0.tgz", + "integrity": "sha512-5cvg6CtKwfgdmVqY1WIiXKc3Q1bkRqGLi+2W/6ao+6Y7gu/RCwRuAhGEzh5B4KlszSuTLgZYuqFqo5bImjNKng==", "license": "MIT", "dependencies": { - "@typescript-eslint/tsconfig-utils": "^8.50.0", - "@typescript-eslint/types": "^8.50.0", - "debug": "^4.3.4" + "mime-types": "^3.0.0", + "negotiator": "^1.0.0" }, "engines": { - "node": "^18.18.0 || ^20.9.0 || >=21.1.0" - }, - "funding": { - "type": "opencollective", - "url": "https://opencollective.com/typescript-eslint" - }, - "peerDependencies": { - "typescript": ">=4.8.4 <6.0.0" + "node": ">= 0.6" } }, - "node_modules/@typescript-eslint/scope-manager": { - "version": "8.50.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-8.50.0.tgz", - "integrity": "sha512-xCwfuCZjhIqy7+HKxBLrDVT5q/iq7XBVBXLn57RTIIpelLtEIZHXAF/Upa3+gaCpeV1NNS5Z9A+ID6jn50VD4A==", + "node_modules/acorn": { + "version": "8.15.0", + "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.15.0.tgz", + "integrity": "sha512-NZyJarBfL7nWwIq+FDL6Zp/yHEhePMNnnJ0y3qfieCrmNvYct8uvtiV41UvlSe6apAfk0fY1FbWx+NwfmpvtTg==", "dev": true, "license": "MIT", - "dependencies": { - "@typescript-eslint/types": "8.50.0", - "@typescript-eslint/visitor-keys": "8.50.0" + "bin": { + "acorn": "bin/acorn" }, "engines": { - "node": "^18.18.0 || ^20.9.0 || >=21.1.0" - }, - "funding": { - "type": "opencollective", - "url": "https://opencollective.com/typescript-eslint" + "node": ">=0.4.0" } }, - "node_modules/@typescript-eslint/tsconfig-utils": { - "version": "8.50.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/tsconfig-utils/-/tsconfig-utils-8.50.0.tgz", - "integrity": "sha512-vxd3G/ybKTSlm31MOA96gqvrRGv9RJ7LGtZCn2Vrc5htA0zCDvcMqUkifcjrWNNKXHUU3WCkYOzzVSFBd0wa2w==", + "node_modules/acorn-jsx": { + "version": "5.3.2", + "resolved": "https://registry.npmjs.org/acorn-jsx/-/acorn-jsx-5.3.2.tgz", + "integrity": "sha512-rq9s+JNhf0IChjtDXxllJ7g41oZk5SlXtp0LHwyA5cejwn7vKmKp4pPri6YEePv2PU65sAsegbXtIinmDFDXgQ==", "dev": true, "license": "MIT", - "engines": { - "node": "^18.18.0 || ^20.9.0 || >=21.1.0" - }, - "funding": { - "type": "opencollective", - "url": "https://opencollective.com/typescript-eslint" - }, "peerDependencies": { - "typescript": ">=4.8.4 <6.0.0" + "acorn": "^6.0.0 || ^7.0.0 || ^8.0.0" } }, - "node_modules/@typescript-eslint/type-utils": { - "version": "8.50.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/type-utils/-/type-utils-8.50.0.tgz", - "integrity": "sha512-7OciHT2lKCewR0mFoBrvZJ4AXTMe/sYOe87289WAViOocEmDjjv8MvIOT2XESuKj9jp8u3SZYUSh89QA4S1kQw==", + "node_modules/agent-base": { + "version": "7.1.4", + "resolved": "https://registry.npmjs.org/agent-base/-/agent-base-7.1.4.tgz", + "integrity": "sha512-MnA+YT8fwfJPgBx3m60MNqakm30XOkyIoH1y6huTQvC0PwZG7ki8NacLBcrPbNoo8vEZy7Jpuk7+jMO+CUovTQ==", + "dev": true, + "engines": { + "node": ">= 14" + } + }, + "node_modules/ajv": { + "version": "6.12.6", + "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.6.tgz", + "integrity": "sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==", "dev": true, "license": "MIT", "dependencies": { - "@typescript-eslint/types": "8.50.0", - "@typescript-eslint/typescript-estree": "8.50.0", - "@typescript-eslint/utils": "8.50.0", - "debug": "^4.3.4", - "ts-api-utils": "^2.1.0" - }, - "engines": { - "node": "^18.18.0 || ^20.9.0 || >=21.1.0" + "fast-deep-equal": "^3.1.1", + "fast-json-stable-stringify": "^2.0.0", + "json-schema-traverse": "^0.4.1", + "uri-js": "^4.2.2" }, "funding": { - "type": "opencollective", - "url": "https://opencollective.com/typescript-eslint" - }, - "peerDependencies": { - "eslint": "^8.57.0 || ^9.0.0", - "typescript": ">=4.8.4 <6.0.0" + "type": "github", + "url": "https://github.com/sponsors/epoberezkin" } }, - "node_modules/@typescript-eslint/types": { - "version": "8.50.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-8.50.0.tgz", - "integrity": "sha512-iX1mgmGrXdANhhITbpp2QQM2fGehBse9LbTf0sidWK6yg/NE+uhV5dfU1g6EYPlcReYmkE9QLPq/2irKAmtS9w==", + "node_modules/ansi-regex": { + "version": "5.0.1", + "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz", + "integrity": "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==", "dev": true, "license": "MIT", "engines": { - "node": "^18.18.0 || ^20.9.0 || >=21.1.0" - }, - "funding": { - "type": "opencollective", - "url": "https://opencollective.com/typescript-eslint" + "node": ">=8" } }, - "node_modules/@typescript-eslint/typescript-estree": { - "version": "8.50.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-8.50.0.tgz", - "integrity": "sha512-W7SVAGBR/IX7zm1t70Yujpbk+zdPq/u4soeFSknWFdXIFuWsBGBOUu/Tn/I6KHSKvSh91OiMuaSnYp3mtPt5IQ==", + "node_modules/ansi-styles": { + "version": "4.3.0", + "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz", + "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==", "dev": true, "license": "MIT", "dependencies": { - "@typescript-eslint/project-service": "8.50.0", - "@typescript-eslint/tsconfig-utils": "8.50.0", - "@typescript-eslint/types": "8.50.0", - "@typescript-eslint/visitor-keys": "8.50.0", - "debug": "^4.3.4", - "minimatch": "^9.0.4", - "semver": "^7.6.0", - "tinyglobby": "^0.2.15", - "ts-api-utils": "^2.1.0" + "color-convert": "^2.0.1" }, "engines": { - "node": "^18.18.0 || ^20.9.0 || >=21.1.0" + "node": ">=8" }, "funding": { - "type": "opencollective", - "url": "https://opencollective.com/typescript-eslint" - }, - "peerDependencies": { - "typescript": ">=4.8.4 <6.0.0" + "url": "https://github.com/chalk/ansi-styles?sponsor=1" + } + }, + "node_modules/argparse": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/argparse/-/argparse-2.0.1.tgz", + "integrity": "sha512-8+9WqebbFzpX9OR+Wa6O29asIogeRMzcGtAINdpMHHyAg10f05aSFVBbcEqGf/PXw1EjAZ+q2/bEBg3DvurK3Q==", + "dev": true, + "license": "Python-2.0" + }, + "node_modules/assertion-error": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/assertion-error/-/assertion-error-2.0.1.tgz", + "integrity": "sha512-Izi8RQcffqCeNVgFigKli1ssklIbpHnCYc6AknXGYoB6grJqyeby7jv12JUQgmTAnIDnbck1uxksT4dzN3PWBA==", + "dev": true, + "engines": { + "node": ">=12" + } + }, + "node_modules/asynckit": { + "version": "0.4.0", + "resolved": "https://registry.npmjs.org/asynckit/-/asynckit-0.4.0.tgz", + "integrity": "sha512-Oei9OH4tRh0YqU3GxhX79dM/mwVgvbZJaSNaRk+bshkj0S5cfHcgYakreBjrHwatXKbz+IoIdYLxrKim2MjW0Q==", + "dev": true + }, + "node_modules/balanced-match": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.2.tgz", + "integrity": "sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw==", + "dev": true, + "license": "MIT" + }, + "node_modules/base64-js": { + "version": "1.5.1", + "resolved": "https://registry.npmjs.org/base64-js/-/base64-js-1.5.1.tgz", + "integrity": "sha512-AKpaYlHn8t4SVbOHCy+b5+KKgvR4vrsD8vbvrbiQJps7fKDTkjkDry6ji0rUJjC0kzbNePLwzxq8iypo41qeWA==", + "funding": [ + { + "type": "github", + "url": "https://github.com/sponsors/feross" + }, + { + "type": "patreon", + "url": "https://www.patreon.com/feross" + }, + { + "type": "consulting", + "url": "https://feross.org/support" + } + ], + "license": "MIT" + }, + "node_modules/better-sqlite3": { + "version": "9.6.0", + "resolved": "https://registry.npmjs.org/better-sqlite3/-/better-sqlite3-9.6.0.tgz", + "integrity": "sha512-yR5HATnqeYNVnkaUTf4bOP2dJSnyhP4puJN/QPRyx4YkBEEUxib422n2XzPqDEHjQQqazoYoADdAm5vE15+dAQ==", + "hasInstallScript": true, + "license": "MIT", + "dependencies": { + "bindings": "^1.5.0", + "prebuild-install": "^7.1.1" } }, - "node_modules/@typescript-eslint/utils": { - "version": "8.50.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-8.50.0.tgz", - "integrity": "sha512-87KgUXET09CRjGCi2Ejxy3PULXna63/bMYv72tCAlDJC3Yqwln0HiFJ3VJMst2+mEtNtZu5oFvX4qJGjKsnAgg==", - "dev": true, + "node_modules/bindings": { + "version": "1.5.0", + "resolved": "https://registry.npmjs.org/bindings/-/bindings-1.5.0.tgz", + "integrity": "sha512-p2q/t/mhvuOj/UeLlV6566GD/guowlr0hHxClI0W9m7MWYkL1F0hLo+0Aexs9HSPCtR1SXQ0TD3MMKrXZajbiQ==", "license": "MIT", "dependencies": { - "@eslint-community/eslint-utils": "^4.7.0", - "@typescript-eslint/scope-manager": "8.50.0", - "@typescript-eslint/types": "8.50.0", - "@typescript-eslint/typescript-estree": "8.50.0" - }, - "engines": { - "node": "^18.18.0 || ^20.9.0 || >=21.1.0" - }, - "funding": { - "type": "opencollective", - "url": "https://opencollective.com/typescript-eslint" - }, - "peerDependencies": { - "eslint": "^8.57.0 || ^9.0.0", - "typescript": ">=4.8.4 <6.0.0" + "file-uri-to-path": "1.0.0" } }, - "node_modules/@typescript-eslint/visitor-keys": { - "version": "8.50.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-8.50.0.tgz", - "integrity": "sha512-Xzmnb58+Db78gT/CCj/PVCvK+zxbnsw6F+O1oheYszJbBSdEjVhQi3C/Xttzxgi/GLmpvOggRs1RFpiJ8+c34Q==", - "dev": true, + "node_modules/bl": { + "version": "4.1.0", + "resolved": "https://registry.npmjs.org/bl/-/bl-4.1.0.tgz", + "integrity": "sha512-1W07cM9gS6DcLperZfFSj+bWLtaPGSOHWhPiGzXmvVJbRLdG82sH/Kn8EtW1VqWVA54AKf2h5k5BbnIbwF3h6w==", "license": "MIT", "dependencies": { - "@typescript-eslint/types": "8.50.0", - "eslint-visitor-keys": "^4.2.1" - }, - "engines": { - "node": "^18.18.0 || ^20.9.0 || >=21.1.0" - }, - "funding": { - "type": "opencollective", - "url": "https://opencollective.com/typescript-eslint" + "buffer": "^5.5.0", + "inherits": "^2.0.4", + "readable-stream": "^3.4.0" } }, - "node_modules/@typescript-eslint/visitor-keys/node_modules/eslint-visitor-keys": { - "version": "4.2.1", - "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-4.2.1.tgz", - "integrity": "sha512-Uhdk5sfqcee/9H/rCOJikYz67o0a2Tw2hGRPOG2Y1R2dg7brRe1uG0yaNQDHu+TO/uQPF/5eCapvYSmHUjt7JQ==", - "dev": true, - "license": "Apache-2.0", + "node_modules/body-parser": { + "version": "2.2.1", + "resolved": "https://registry.npmjs.org/body-parser/-/body-parser-2.2.1.tgz", + "integrity": "sha512-nfDwkulwiZYQIGwxdy0RUmowMhKcFVcYXUU7m4QlKYim1rUtg83xm2yjZ40QjDuc291AJjjeSc9b++AWHSgSHw==", + "license": "MIT", + "dependencies": { + "bytes": "^3.1.2", + "content-type": "^1.0.5", + "debug": "^4.4.3", + "http-errors": "^2.0.0", + "iconv-lite": "^0.7.0", + "on-finished": "^2.4.1", + "qs": "^6.14.0", + "raw-body": "^3.0.1", + "type-is": "^2.0.1" + }, "engines": { - "node": "^18.18.0 || ^20.9.0 || >=21.1.0" + "node": ">=18" }, "funding": { - "url": "https://opencollective.com/eslint" + "type": "opencollective", + "url": "https://opencollective.com/express" } }, - "node_modules/@ungap/structured-clone": { - "version": "1.3.0", - "resolved": "https://registry.npmjs.org/@ungap/structured-clone/-/structured-clone-1.3.0.tgz", - "integrity": "sha512-WmoN8qaIAo7WTYWbAZuG8PYEhn5fkz7dZrqTBZ7dtt//lL2Gwms1IcnQ5yHqjDfX8Ft5j4YzDM23f87zBfDe9g==", - "dev": true, - "license": "ISC" - }, - "node_modules/@vitest/coverage-v8": { - "version": "2.1.9", - "resolved": "https://registry.npmjs.org/@vitest/coverage-v8/-/coverage-v8-2.1.9.tgz", - "integrity": "sha512-Z2cOr0ksM00MpEfyVE8KXIYPEcBFxdbLSs56L8PO0QQMxt/6bDj45uQfxoc96v05KW3clk7vvgP0qfDit9DmfQ==", + "node_modules/brace-expansion": { + "version": "2.0.2", + "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.0.2.tgz", + "integrity": "sha512-Jt0vHyM+jmUBqojB7E1NIYadt0vI0Qxjxd2TErW94wDz+E2LAm5vKMXXwg6ZZBTHPuUlDgQHKXvjGBdfcF1ZDQ==", "dev": true, "license": "MIT", "dependencies": { - "@ampproject/remapping": "^2.3.0", - "@bcoe/v8-coverage": "^0.2.3", - "debug": "^4.3.7", - "istanbul-lib-coverage": "^3.2.2", - "istanbul-lib-report": "^3.0.1", - "istanbul-lib-source-maps": "^5.0.6", - "istanbul-reports": "^3.1.7", - "magic-string": "^0.30.12", - "magicast": "^0.3.5", - "std-env": "^3.8.0", - "test-exclude": "^7.0.1", - "tinyrainbow": "^1.2.0" - }, - "funding": { - "url": "https://opencollective.com/vitest" - }, - "peerDependencies": { - "@vitest/browser": "2.1.9", - "vitest": "2.1.9" - }, - "peerDependenciesMeta": { - "@vitest/browser": { - "optional": true - } + "balanced-match": "^1.0.0" } }, - "node_modules/@vitest/expect": { - "version": "2.1.9", - "resolved": "https://registry.npmjs.org/@vitest/expect/-/expect-2.1.9.tgz", - "integrity": "sha512-UJCIkTBenHeKT1TTlKMJWy1laZewsRIzYighyYiJKZreqtdxSos/S1t+ktRMQWu2CKqaarrkeszJx1cgC5tGZw==", - "dev": true, + "node_modules/braces": { + "version": "3.0.3", + "resolved": "https://registry.npmjs.org/braces/-/braces-3.0.3.tgz", + "integrity": "sha512-yQbXgO/OSZVD2IsiLlro+7Hf6Q18EJrKSEsdoMzKePKXct3gvD8oLcOQdIzGupr5Fj+EDe8gO/lxc1BzfMpxvA==", "dependencies": { - "@vitest/spy": "2.1.9", - "@vitest/utils": "2.1.9", - "chai": "^5.1.2", - "tinyrainbow": "^1.2.0" + "fill-range": "^7.1.1" }, - "funding": { - "url": "https://opencollective.com/vitest" + "engines": { + "node": ">=8" } }, - "node_modules/@vitest/mocker": { - "version": "2.1.9", - "resolved": "https://registry.npmjs.org/@vitest/mocker/-/mocker-2.1.9.tgz", - "integrity": "sha512-tVL6uJgoUdi6icpxmdrn5YNo3g3Dxv+IHJBr0GXHaEdTcw3F+cPKnsXFhli6nO+f/6SDKPHEK1UN+k+TQv0Ehg==", - "dev": true, - "dependencies": { - "@vitest/spy": "2.1.9", - "estree-walker": "^3.0.3", - "magic-string": "^0.30.12" - }, - "funding": { - "url": "https://opencollective.com/vitest" - }, - "peerDependencies": { - "msw": "^2.4.9", - "vite": "^5.0.0" - }, - "peerDependenciesMeta": { - "msw": { - "optional": true + "node_modules/buffer": { + "version": "5.7.1", + "resolved": "https://registry.npmjs.org/buffer/-/buffer-5.7.1.tgz", + "integrity": "sha512-EHcyIPBQ4BSGlvjB16k5KgAJ27CIsHY/2JBmCRReo48y9rQ3MaUzWX3KVlBa4U7MyX02HdVj0K7C3WaB3ju7FQ==", + "funding": [ + { + "type": "github", + "url": "https://github.com/sponsors/feross" }, - "vite": { - "optional": true + { + "type": "patreon", + "url": "https://www.patreon.com/feross" + }, + { + "type": "consulting", + "url": "https://feross.org/support" } - } - }, - "node_modules/@vitest/pretty-format": { - "version": "2.1.9", - "resolved": "https://registry.npmjs.org/@vitest/pretty-format/-/pretty-format-2.1.9.tgz", - "integrity": "sha512-KhRIdGV2U9HOUzxfiHmY8IFHTdqtOhIzCpd8WRdJiE7D/HUcZVD0EgQCVjm+Q9gkUXWgBvMmTtZgIG48wq7sOQ==", - "dev": true, + ], + "license": "MIT", "dependencies": { - "tinyrainbow": "^1.2.0" - }, - "funding": { - "url": "https://opencollective.com/vitest" + "base64-js": "^1.3.1", + "ieee754": "^1.1.13" } }, - "node_modules/@vitest/runner": { - "version": "2.1.9", - "resolved": "https://registry.npmjs.org/@vitest/runner/-/runner-2.1.9.tgz", - "integrity": "sha512-ZXSSqTFIrzduD63btIfEyOmNcBmQvgOVsPNPe0jYtESiXkhd8u2erDLnMxmGrDCwHCCHE7hxwRDCT3pt0esT4g==", + "node_modules/buffer-from": { + "version": "1.1.2", + "resolved": "https://registry.npmjs.org/buffer-from/-/buffer-from-1.1.2.tgz", + "integrity": "sha512-E+XQCRwSbaaiChtv6k6Dwgc+bx+Bs6vuKJHHl5kox/BaKbhiXzqQOwK4cO22yElGp2OCmjwVhT3HmxgyPGnJfQ==", "dev": true, - "dependencies": { - "@vitest/utils": "2.1.9", - "pathe": "^1.1.2" - }, - "funding": { - "url": "https://opencollective.com/vitest" + "license": "MIT" + }, + "node_modules/bytes": { + "version": "3.1.2", + "resolved": "https://registry.npmjs.org/bytes/-/bytes-3.1.2.tgz", + "integrity": "sha512-/Nf7TyzTx6S3yRJObOAV7956r8cr2+Oj8AC5dt8wSP3BQAoeX58NoHyCU8P8zGkNXStjTSi6fzO6F0pBdcYbEg==", + "license": "MIT", + "engines": { + "node": ">= 0.8" } }, - "node_modules/@vitest/snapshot": { - "version": "2.1.9", - "resolved": "https://registry.npmjs.org/@vitest/snapshot/-/snapshot-2.1.9.tgz", - "integrity": "sha512-oBO82rEjsxLNJincVhLhaxxZdEtV0EFHMK5Kmx5sJ6H9L183dHECjiefOAdnqpIgT5eZwT04PoggUnW88vOBNQ==", + "node_modules/cac": { + "version": "6.7.14", + "resolved": "https://registry.npmjs.org/cac/-/cac-6.7.14.tgz", + "integrity": "sha512-b6Ilus+c3RrdDk+JhLKUAQfzzgLEPy6wcXqS7f/xe1EETvsDP6GORG7SFuOs6cID5YkqchW/LXZbX5bc8j7ZcQ==", "dev": true, - "dependencies": { - "@vitest/pretty-format": "2.1.9", - "magic-string": "^0.30.12", - "pathe": "^1.1.2" - }, - "funding": { - "url": "https://opencollective.com/vitest" + "engines": { + "node": ">=8" } }, - "node_modules/@vitest/spy": { - "version": "2.1.9", - "resolved": "https://registry.npmjs.org/@vitest/spy/-/spy-2.1.9.tgz", - "integrity": "sha512-E1B35FwzXXTs9FHNK6bDszs7mtydNi5MIfUWpceJ8Xbfb1gBMscAnwLbEu+B44ed6W3XjL9/ehLPHR1fkf1KLQ==", - "dev": true, + "node_modules/call-bind-apply-helpers": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/call-bind-apply-helpers/-/call-bind-apply-helpers-1.0.2.tgz", + "integrity": "sha512-Sp1ablJ0ivDkSzjcaJdxEunN5/XvksFJ2sMBFfq6x0ryhQV/2b/KwFe21cMpmHtPOSij8K99/wSfoEuTObmuMQ==", + "license": "MIT", "dependencies": { - "tinyspy": "^3.0.2" + "es-errors": "^1.3.0", + "function-bind": "^1.1.2" }, - "funding": { - "url": "https://opencollective.com/vitest" + "engines": { + "node": ">= 0.4" } }, - "node_modules/@vitest/utils": { - "version": "2.1.9", - "resolved": "https://registry.npmjs.org/@vitest/utils/-/utils-2.1.9.tgz", - "integrity": "sha512-v0psaMSkNJ3A2NMrUEHFRzJtDPFn+/VWZ5WxImB21T9fjucJRmS7xCS3ppEnARb9y11OAzaD+P2Ps+b+BGX5iQ==", - "dev": true, + "node_modules/call-bound": { + "version": "1.0.4", + "resolved": "https://registry.npmjs.org/call-bound/-/call-bound-1.0.4.tgz", + "integrity": "sha512-+ys997U96po4Kx/ABpBCqhA9EuxJaQWDQg7295H4hBphv3IZg0boBKuwYpt4YXp6MZ5AmZQnU/tyMTlRpaSejg==", + "license": "MIT", "dependencies": { - "@vitest/pretty-format": "2.1.9", - "loupe": "^3.1.2", - "tinyrainbow": "^1.2.0" + "call-bind-apply-helpers": "^1.0.2", + "get-intrinsic": "^1.3.0" + }, + "engines": { + "node": ">= 0.4" }, "funding": { - "url": "https://opencollective.com/vitest" + "url": "https://github.com/sponsors/ljharb" } }, - "node_modules/accepts": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/accepts/-/accepts-2.0.0.tgz", - "integrity": "sha512-5cvg6CtKwfgdmVqY1WIiXKc3Q1bkRqGLi+2W/6ao+6Y7gu/RCwRuAhGEzh5B4KlszSuTLgZYuqFqo5bImjNKng==", + "node_modules/callsites": { + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/callsites/-/callsites-3.1.0.tgz", + "integrity": "sha512-P8BjAsXvZS+VIDUI11hHCQEv74YT67YUi5JJFNWIqL235sBmjX4+qx9Muvls5ivyNENctx46xQLQ3aTuE7ssaQ==", + "dev": true, "license": "MIT", - "dependencies": { - "mime-types": "^3.0.0", - "negotiator": "^1.0.0" - }, "engines": { - "node": ">= 0.6" + "node": ">=6" } }, - "node_modules/acorn": { - "version": "8.15.0", - "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.15.0.tgz", - "integrity": "sha512-NZyJarBfL7nWwIq+FDL6Zp/yHEhePMNnnJ0y3qfieCrmNvYct8uvtiV41UvlSe6apAfk0fY1FbWx+NwfmpvtTg==", + "node_modules/chai": { + "version": "5.3.3", + "resolved": "https://registry.npmjs.org/chai/-/chai-5.3.3.tgz", + "integrity": "sha512-4zNhdJD/iOjSH0A05ea+Ke6MU5mmpQcbQsSOkgdaUMJ9zTlDTD/GYlwohmIE2u0gaxHYiVHEn1Fw9mZ/ktJWgw==", "dev": true, - "license": "MIT", - "bin": { - "acorn": "bin/acorn" + "dependencies": { + "assertion-error": "^2.0.1", + "check-error": "^2.1.1", + "deep-eql": "^5.0.1", + "loupe": "^3.1.0", + "pathval": "^2.0.0" }, "engines": { - "node": ">=0.4.0" + "node": ">=18" } }, - "node_modules/acorn-jsx": { - "version": "5.3.2", - "resolved": "https://registry.npmjs.org/acorn-jsx/-/acorn-jsx-5.3.2.tgz", - "integrity": "sha512-rq9s+JNhf0IChjtDXxllJ7g41oZk5SlXtp0LHwyA5cejwn7vKmKp4pPri6YEePv2PU65sAsegbXtIinmDFDXgQ==", + "node_modules/chalk": { + "version": "4.1.2", + "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz", + "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==", "dev": true, "license": "MIT", - "peerDependencies": { - "acorn": "^6.0.0 || ^7.0.0 || ^8.0.0" + "dependencies": { + "ansi-styles": "^4.1.0", + "supports-color": "^7.1.0" + }, + "engines": { + "node": ">=10" + }, + "funding": { + "url": "https://github.com/chalk/chalk?sponsor=1" } }, - "node_modules/agent-base": { - "version": "7.1.4", - "resolved": "https://registry.npmjs.org/agent-base/-/agent-base-7.1.4.tgz", - "integrity": "sha512-MnA+YT8fwfJPgBx3m60MNqakm30XOkyIoH1y6huTQvC0PwZG7ki8NacLBcrPbNoo8vEZy7Jpuk7+jMO+CUovTQ==", + "node_modules/check-error": { + "version": "2.1.1", + "resolved": "https://registry.npmjs.org/check-error/-/check-error-2.1.1.tgz", + "integrity": "sha512-OAlb+T7V4Op9OwdkjmguYRqncdlx5JiofwOAUkmTF+jNdHwzTaTs4sRAGpzLF3oOz5xAyDGrPgeIDFQmDOTiJw==", "dev": true, "engines": { - "node": ">= 14" + "node": ">= 16" } }, - "node_modules/ajv": { - "version": "6.12.6", - "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.6.tgz", - "integrity": "sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==", - "dev": true, + "node_modules/chokidar": { + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-5.0.0.tgz", + "integrity": "sha512-TQMmc3w+5AxjpL8iIiwebF73dRDF4fBIieAqGn9RGCWaEVwQ6Fb2cGe31Yns0RRIzii5goJ1Y7xbMwo1TxMplw==", "license": "MIT", "dependencies": { - "fast-deep-equal": "^3.1.1", - "fast-json-stable-stringify": "^2.0.0", - "json-schema-traverse": "^0.4.1", - "uri-js": "^4.2.2" + "readdirp": "^5.0.0" + }, + "engines": { + "node": ">= 20.19.0" }, "funding": { - "type": "github", - "url": "https://github.com/sponsors/epoberezkin" + "url": "https://paulmillr.com/funding/" } }, - "node_modules/ansi-regex": { - "version": "5.0.1", - "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz", - "integrity": "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==", + "node_modules/chownr": { + "version": "1.1.4", + "resolved": "https://registry.npmjs.org/chownr/-/chownr-1.1.4.tgz", + "integrity": "sha512-jJ0bqzaylmJtVnNgzTeSOs8DPavpbYgEr/b0YL8/2GO3xJEhInFmhKMUnEJQjZumK7KXGFhUy89PrsJWlakBVg==", + "license": "ISC" + }, + "node_modules/cluster-key-slot": { + "version": "1.1.2", + "resolved": "https://registry.npmjs.org/cluster-key-slot/-/cluster-key-slot-1.1.2.tgz", + "integrity": "sha512-RMr0FhtfXemyinomL4hrWcYJxmX6deFdCxpJzhDttxgO1+bcCnkk+9drydLVDmAMG7NE6aN/fl4F7ucU/90gAA==", "dev": true, - "license": "MIT", + "license": "Apache-2.0", "engines": { - "node": ">=8" + "node": ">=0.10.0" } }, - "node_modules/ansi-styles": { - "version": "4.3.0", - "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz", - "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==", + "node_modules/color-convert": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz", + "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==", "dev": true, "license": "MIT", "dependencies": { - "color-convert": "^2.0.1" + "color-name": "~1.1.4" }, "engines": { - "node": ">=8" - }, - "funding": { - "url": "https://github.com/chalk/ansi-styles?sponsor=1" + "node": ">=7.0.0" } }, - "node_modules/argparse": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/argparse/-/argparse-2.0.1.tgz", - "integrity": "sha512-8+9WqebbFzpX9OR+Wa6O29asIogeRMzcGtAINdpMHHyAg10f05aSFVBbcEqGf/PXw1EjAZ+q2/bEBg3DvurK3Q==", + "node_modules/color-name": { + "version": "1.1.4", + "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz", + "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==", "dev": true, - "license": "Python-2.0" + "license": "MIT" }, - "node_modules/assertion-error": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/assertion-error/-/assertion-error-2.0.1.tgz", - "integrity": "sha512-Izi8RQcffqCeNVgFigKli1ssklIbpHnCYc6AknXGYoB6grJqyeby7jv12JUQgmTAnIDnbck1uxksT4dzN3PWBA==", + "node_modules/combined-stream": { + "version": "1.0.8", + "resolved": "https://registry.npmjs.org/combined-stream/-/combined-stream-1.0.8.tgz", + "integrity": "sha512-FQN4MRfuJeHf7cBbBMJFXhKSDq+2kAArBlmRBvcvFE5BB1HZKXtSFASDhdlz9zOYwxh8lDdnvmMOe/+5cdoEdg==", "dev": true, + "dependencies": { + "delayed-stream": "~1.0.0" + }, "engines": { - "node": ">=12" + "node": ">= 0.8" } }, - "node_modules/asynckit": { - "version": "0.4.0", - "resolved": "https://registry.npmjs.org/asynckit/-/asynckit-0.4.0.tgz", - "integrity": "sha512-Oei9OH4tRh0YqU3GxhX79dM/mwVgvbZJaSNaRk+bshkj0S5cfHcgYakreBjrHwatXKbz+IoIdYLxrKim2MjW0Q==", - "dev": true + "node_modules/commander": { + "version": "12.1.0", + "resolved": "https://registry.npmjs.org/commander/-/commander-12.1.0.tgz", + "integrity": "sha512-Vw8qHK3bZM9y/P10u3Vib8o/DdkvA2OtPtZvD871QKjy74Wj1WSKFILMPRPSdUSx5RFK1arlJzEtA4PkFgnbuA==", + "engines": { + "node": ">=18" + } }, - "node_modules/balanced-match": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.2.tgz", - "integrity": "sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw==", - "dev": true, + "node_modules/compare-versions": { + "version": "6.1.1", + "resolved": "https://registry.npmjs.org/compare-versions/-/compare-versions-6.1.1.tgz", + "integrity": "sha512-4hm4VPpIecmlg59CHXnRDnqGplJFrbLG4aFEl5vl6cK1u76ws3LLvX7ikFnTDl5vo39sjWD6AaDPYodJp/NNHg==", "license": "MIT" }, - "node_modules/base64-js": { - "version": "1.5.1", - "resolved": "https://registry.npmjs.org/base64-js/-/base64-js-1.5.1.tgz", - "integrity": "sha512-AKpaYlHn8t4SVbOHCy+b5+KKgvR4vrsD8vbvrbiQJps7fKDTkjkDry6ji0rUJjC0kzbNePLwzxq8iypo41qeWA==", - "funding": [ - { - "type": "github", - "url": "https://github.com/sponsors/feross" - }, - { - "type": "patreon", - "url": "https://www.patreon.com/feross" - }, - { - "type": "consulting", - "url": "https://feross.org/support" - } - ], + "node_modules/concat-map": { + "version": "0.0.1", + "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz", + "integrity": "sha512-/Srv4dswyQNBfohGpz9o6Yb3Gz3SrUDqBH5rTuhGR7ahtlbYKnVxw2bCFMRljaA7EXHaXZ8wsHdodFvbkhKmqg==", + "dev": true, "license": "MIT" }, - "node_modules/better-sqlite3": { - "version": "9.6.0", - "resolved": "https://registry.npmjs.org/better-sqlite3/-/better-sqlite3-9.6.0.tgz", - "integrity": "sha512-yR5HATnqeYNVnkaUTf4bOP2dJSnyhP4puJN/QPRyx4YkBEEUxib422n2XzPqDEHjQQqazoYoADdAm5vE15+dAQ==", - "hasInstallScript": true, + "node_modules/content-disposition": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/content-disposition/-/content-disposition-1.0.1.tgz", + "integrity": "sha512-oIXISMynqSqm241k6kcQ5UwttDILMK4BiurCfGEREw6+X9jkkpEe5T9FZaApyLGGOnFuyMWZpdolTXMtvEJ08Q==", + "license": "MIT", + "engines": { + "node": ">=18" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/express" + } + }, + "node_modules/content-type": { + "version": "1.0.5", + "resolved": "https://registry.npmjs.org/content-type/-/content-type-1.0.5.tgz", + "integrity": "sha512-nTjqfcBFEipKdXCv4YDQWCfmcLZKm81ldF0pAopTvyrFGVbcR6P/VAAd5G7N+0tTr8QqiU0tFadD6FK4NtJwOA==", + "license": "MIT", + "engines": { + "node": ">= 0.6" + } + }, + "node_modules/cookie": { + "version": "0.7.2", + "resolved": "https://registry.npmjs.org/cookie/-/cookie-0.7.2.tgz", + "integrity": "sha512-yki5XnKuf750l50uGTllt6kKILY4nQ1eNIQatoXEByZ5dWgnKqbnqmTrBE5B4N7lrMJKQ2ytWMiTO2o0v6Ew/w==", + "license": "MIT", + "engines": { + "node": ">= 0.6" + } + }, + "node_modules/cookie-signature": { + "version": "1.2.2", + "resolved": "https://registry.npmjs.org/cookie-signature/-/cookie-signature-1.2.2.tgz", + "integrity": "sha512-D76uU73ulSXrD1UXF4KE2TMxVVwhsnCgfAyTg9k8P6KGZjlXKrOLe4dJQKI3Bxi5wjesZoFXJWElNWBjPZMbhg==", + "license": "MIT", + "engines": { + "node": ">=6.6.0" + } + }, + "node_modules/cross-spawn": { + "version": "7.0.6", + "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.6.tgz", + "integrity": "sha512-uV2QOWP2nWzsy2aMp8aRibhi9dlzF5Hgh5SHaB9OiTGEyDTiJJyx0uy51QXdyWbtAHNua4XJzUKca3OzKUd3vA==", + "dev": true, "license": "MIT", "dependencies": { - "bindings": "^1.5.0", - "prebuild-install": "^7.1.1" + "path-key": "^3.1.0", + "shebang-command": "^2.0.0", + "which": "^2.0.1" + }, + "engines": { + "node": ">= 8" + } + }, + "node_modules/cssstyle": { + "version": "4.6.0", + "resolved": "https://registry.npmjs.org/cssstyle/-/cssstyle-4.6.0.tgz", + "integrity": "sha512-2z+rWdzbbSZv6/rhtvzvqeZQHrBaqgogqt85sqFNbabZOuFbCVFb8kPeEtZjiKkbrm395irpNKiYeFeLiQnFPg==", + "dev": true, + "dependencies": { + "@asamuzakjp/css-color": "^3.2.0", + "rrweb-cssom": "^0.8.0" + }, + "engines": { + "node": ">=18" } }, - "node_modules/bindings": { - "version": "1.5.0", - "resolved": "https://registry.npmjs.org/bindings/-/bindings-1.5.0.tgz", - "integrity": "sha512-p2q/t/mhvuOj/UeLlV6566GD/guowlr0hHxClI0W9m7MWYkL1F0hLo+0Aexs9HSPCtR1SXQ0TD3MMKrXZajbiQ==", - "license": "MIT", + "node_modules/cssstyle/node_modules/rrweb-cssom": { + "version": "0.8.0", + "resolved": "https://registry.npmjs.org/rrweb-cssom/-/rrweb-cssom-0.8.0.tgz", + "integrity": "sha512-guoltQEx+9aMf2gDZ0s62EcV8lsXR+0w8915TC3ITdn2YueuNjdAYh/levpU9nFaoChh9RUS5ZdQMrKfVEN9tw==", + "dev": true + }, + "node_modules/data-urls": { + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/data-urls/-/data-urls-5.0.0.tgz", + "integrity": "sha512-ZYP5VBHshaDAiVZxjbRVcFJpc+4xGgT0bK3vzy1HLN8jTO975HEbuYzZJcHoQEY5K1a0z8YayJkyVETa08eNTg==", + "dev": true, "dependencies": { - "file-uri-to-path": "1.0.0" + "whatwg-mimetype": "^4.0.0", + "whatwg-url": "^14.0.0" + }, + "engines": { + "node": ">=18" } }, - "node_modules/bl": { - "version": "4.1.0", - "resolved": "https://registry.npmjs.org/bl/-/bl-4.1.0.tgz", - "integrity": "sha512-1W07cM9gS6DcLperZfFSj+bWLtaPGSOHWhPiGzXmvVJbRLdG82sH/Kn8EtW1VqWVA54AKf2h5k5BbnIbwF3h6w==", - "license": "MIT", + "node_modules/debug": { + "version": "4.4.3", + "resolved": "https://registry.npmjs.org/debug/-/debug-4.4.3.tgz", + "integrity": "sha512-RGwwWnwQvkVfavKVt22FGLw+xYSdzARwm0ru6DhTVA3umU5hZc28V3kO4stgYryrTlLpuvgI9GiijltAjNbcqA==", "dependencies": { - "buffer": "^5.5.0", - "inherits": "^2.0.4", - "readable-stream": "^3.4.0" + "ms": "^2.1.3" + }, + "engines": { + "node": ">=6.0" + }, + "peerDependenciesMeta": { + "supports-color": { + "optional": true + } } }, - "node_modules/body-parser": { - "version": "2.2.1", - "resolved": "https://registry.npmjs.org/body-parser/-/body-parser-2.2.1.tgz", - "integrity": "sha512-nfDwkulwiZYQIGwxdy0RUmowMhKcFVcYXUU7m4QlKYim1rUtg83xm2yjZ40QjDuc291AJjjeSc9b++AWHSgSHw==", + "node_modules/decimal.js": { + "version": "10.6.0", + "resolved": "https://registry.npmjs.org/decimal.js/-/decimal.js-10.6.0.tgz", + "integrity": "sha512-YpgQiITW3JXGntzdUmyUR1V812Hn8T1YVXhCu+wO3OpS4eU9l4YdD3qjyiKdV6mvV29zapkMeD390UVEf2lkUg==", + "dev": true + }, + "node_modules/decompress-response": { + "version": "6.0.0", + "resolved": "https://registry.npmjs.org/decompress-response/-/decompress-response-6.0.0.tgz", + "integrity": "sha512-aW35yZM6Bb/4oJlZncMH2LCoZtJXTRxES17vE3hoRiowU2kWHaJKFkSBDnDR+cm9J+9QhXmREyIfv0pji9ejCQ==", "license": "MIT", "dependencies": { - "bytes": "^3.1.2", - "content-type": "^1.0.5", - "debug": "^4.4.3", - "http-errors": "^2.0.0", - "iconv-lite": "^0.7.0", - "on-finished": "^2.4.1", - "qs": "^6.14.0", - "raw-body": "^3.0.1", - "type-is": "^2.0.1" + "mimic-response": "^3.1.0" }, "engines": { - "node": ">=18" + "node": ">=10" }, "funding": { - "type": "opencollective", - "url": "https://opencollective.com/express" + "url": "https://github.com/sponsors/sindresorhus" } }, - "node_modules/brace-expansion": { - "version": "2.0.2", - "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.0.2.tgz", - "integrity": "sha512-Jt0vHyM+jmUBqojB7E1NIYadt0vI0Qxjxd2TErW94wDz+E2LAm5vKMXXwg6ZZBTHPuUlDgQHKXvjGBdfcF1ZDQ==", + "node_modules/deep-eql": { + "version": "5.0.2", + "resolved": "https://registry.npmjs.org/deep-eql/-/deep-eql-5.0.2.tgz", + "integrity": "sha512-h5k/5U50IJJFpzfL6nO9jaaumfjO/f2NjK/oYB2Djzm4p9L+3T9qWpZqZ2hAbLPuuYq9wrU08WQyBTL5GbPk5Q==", "dev": true, + "engines": { + "node": ">=6" + } + }, + "node_modules/deep-extend": { + "version": "0.6.0", + "resolved": "https://registry.npmjs.org/deep-extend/-/deep-extend-0.6.0.tgz", + "integrity": "sha512-LOHxIOaPYdHlJRtCQfDIVZtfw/ufM8+rVj649RIHzcm/vGwQRXFt6OPqIFWsm2XEMrNIEtWR64sY1LEKD2vAOA==", "license": "MIT", - "dependencies": { - "balanced-match": "^1.0.0" + "engines": { + "node": ">=4.0.0" } }, - "node_modules/braces": { - "version": "3.0.3", - "resolved": "https://registry.npmjs.org/braces/-/braces-3.0.3.tgz", - "integrity": "sha512-yQbXgO/OSZVD2IsiLlro+7Hf6Q18EJrKSEsdoMzKePKXct3gvD8oLcOQdIzGupr5Fj+EDe8gO/lxc1BzfMpxvA==", - "dependencies": { - "fill-range": "^7.1.1" - }, + "node_modules/deep-is": { + "version": "0.1.4", + "resolved": "https://registry.npmjs.org/deep-is/-/deep-is-0.1.4.tgz", + "integrity": "sha512-oIPzksmTg4/MriiaYGO+okXDT7ztn/w3Eptv/+gSIdMdKsJo0u4CfYNFJPy+4SKMuCqGw2wxnA+URMg3t8a/bQ==", + "dev": true, + "license": "MIT" + }, + "node_modules/delayed-stream": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/delayed-stream/-/delayed-stream-1.0.0.tgz", + "integrity": "sha512-ZySD7Nf91aLB0RxL4KGrKHBXl7Eds1DAmEdcoVawXnLD7SDhpNgtuII2aAkg7a7QS41jxPSZ17p4VdGnMHk3MQ==", + "dev": true, "engines": { - "node": ">=8" + "node": ">=0.4.0" } }, - "node_modules/buffer": { - "version": "5.7.1", - "resolved": "https://registry.npmjs.org/buffer/-/buffer-5.7.1.tgz", - "integrity": "sha512-EHcyIPBQ4BSGlvjB16k5KgAJ27CIsHY/2JBmCRReo48y9rQ3MaUzWX3KVlBa4U7MyX02HdVj0K7C3WaB3ju7FQ==", - "funding": [ - { - "type": "github", - "url": "https://github.com/sponsors/feross" - }, - { - "type": "patreon", - "url": "https://www.patreon.com/feross" - }, - { - "type": "consulting", - "url": "https://feross.org/support" - } - ], - "license": "MIT", - "dependencies": { - "base64-js": "^1.3.1", - "ieee754": "^1.1.13" + "node_modules/denque": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/denque/-/denque-2.1.0.tgz", + "integrity": "sha512-HVQE3AAb/pxF8fQAoiqpvg9i3evqug3hoiwakOyZAwJm+6vZehbkYXZ0l4JxS+I3QxM97v5aaRNhj8v5oBhekw==", + "dev": true, + "license": "Apache-2.0", + "engines": { + "node": ">=0.10" } }, - "node_modules/bytes": { - "version": "3.1.2", - "resolved": "https://registry.npmjs.org/bytes/-/bytes-3.1.2.tgz", - "integrity": "sha512-/Nf7TyzTx6S3yRJObOAV7956r8cr2+Oj8AC5dt8wSP3BQAoeX58NoHyCU8P8zGkNXStjTSi6fzO6F0pBdcYbEg==", + "node_modules/depd": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/depd/-/depd-2.0.0.tgz", + "integrity": "sha512-g7nH6P6dyDioJogAAGprGpCtVImJhpPk/roCzdb3fIh61/s/nPsfR6onyMwkCAR/OlC3yBC0lESvUoQEAssIrw==", "license": "MIT", "engines": { "node": ">= 0.8" } }, - "node_modules/cac": { - "version": "6.7.14", - "resolved": "https://registry.npmjs.org/cac/-/cac-6.7.14.tgz", - "integrity": "sha512-b6Ilus+c3RrdDk+JhLKUAQfzzgLEPy6wcXqS7f/xe1EETvsDP6GORG7SFuOs6cID5YkqchW/LXZbX5bc8j7ZcQ==", - "dev": true, + "node_modules/detect-libc": { + "version": "2.1.2", + "resolved": "https://registry.npmjs.org/detect-libc/-/detect-libc-2.1.2.tgz", + "integrity": "sha512-Btj2BOOO83o3WyH59e8MgXsxEQVcarkUOpEYrubB0urwnN10yQ364rsiByU11nZlqWYZm05i/of7io4mzihBtQ==", + "license": "Apache-2.0", "engines": { "node": ">=8" } }, - "node_modules/call-bind-apply-helpers": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/call-bind-apply-helpers/-/call-bind-apply-helpers-1.0.2.tgz", - "integrity": "sha512-Sp1ablJ0ivDkSzjcaJdxEunN5/XvksFJ2sMBFfq6x0ryhQV/2b/KwFe21cMpmHtPOSij8K99/wSfoEuTObmuMQ==", - "license": "MIT", + "node_modules/doctrine": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/doctrine/-/doctrine-3.0.0.tgz", + "integrity": "sha512-yS+Q5i3hBf7GBkd4KG8a7eBNNWNGLTaEwwYWUijIYM7zrlYDM0BFXHjjPWlWZ1Rg7UaddZeIDmi9jF3HmqiQ2w==", + "dev": true, + "license": "Apache-2.0", "dependencies": { - "es-errors": "^1.3.0", - "function-bind": "^1.1.2" + "esutils": "^2.0.2" }, "engines": { - "node": ">= 0.4" + "node": ">=6.0.0" } }, - "node_modules/call-bound": { - "version": "1.0.4", - "resolved": "https://registry.npmjs.org/call-bound/-/call-bound-1.0.4.tgz", - "integrity": "sha512-+ys997U96po4Kx/ABpBCqhA9EuxJaQWDQg7295H4hBphv3IZg0boBKuwYpt4YXp6MZ5AmZQnU/tyMTlRpaSejg==", - "license": "MIT", - "dependencies": { - "call-bind-apply-helpers": "^1.0.2", - "get-intrinsic": "^1.3.0" - }, + "node_modules/dotenv": { + "version": "17.2.3", + "resolved": "https://registry.npmjs.org/dotenv/-/dotenv-17.2.3.tgz", + "integrity": "sha512-JVUnt+DUIzu87TABbhPmNfVdBDt18BLOWjMUFJMSi/Qqg7NTYtabbvSNJGOJ7afbRuv9D/lngizHtP7QyLQ+9w==", + "license": "BSD-2-Clause", "engines": { - "node": ">= 0.4" + "node": ">=12" }, "funding": { - "url": "https://github.com/sponsors/ljharb" + "url": "https://dotenvx.com" } }, - "node_modules/callsites": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/callsites/-/callsites-3.1.0.tgz", - "integrity": "sha512-P8BjAsXvZS+VIDUI11hHCQEv74YT67YUi5JJFNWIqL235sBmjX4+qx9Muvls5ivyNENctx46xQLQ3aTuE7ssaQ==", + "node_modules/drizzle-kit": { + "version": "0.31.8", + "resolved": "https://registry.npmjs.org/drizzle-kit/-/drizzle-kit-0.31.8.tgz", + "integrity": "sha512-O9EC/miwdnRDY10qRxM8P3Pg8hXe3LyU4ZipReKOgTwn4OqANmftj8XJz1UPUAS6NMHf0E2htjsbQujUTkncCg==", "dev": true, "license": "MIT", - "engines": { - "node": ">=6" + "dependencies": { + "@drizzle-team/brocli": "^0.10.2", + "@esbuild-kit/esm-loader": "^2.5.5", + "esbuild": "^0.25.4", + "esbuild-register": "^3.5.0" + }, + "bin": { + "drizzle-kit": "bin.cjs" } }, - "node_modules/chai": { - "version": "5.3.3", - "resolved": "https://registry.npmjs.org/chai/-/chai-5.3.3.tgz", - "integrity": "sha512-4zNhdJD/iOjSH0A05ea+Ke6MU5mmpQcbQsSOkgdaUMJ9zTlDTD/GYlwohmIE2u0gaxHYiVHEn1Fw9mZ/ktJWgw==", + "node_modules/drizzle-kit/node_modules/@esbuild/aix-ppc64": { + "version": "0.25.12", + "resolved": "https://registry.npmjs.org/@esbuild/aix-ppc64/-/aix-ppc64-0.25.12.tgz", + "integrity": "sha512-Hhmwd6CInZ3dwpuGTF8fJG6yoWmsToE+vYgD4nytZVxcu1ulHpUQRAB1UJ8+N1Am3Mz4+xOByoQoSZf4D+CpkA==", + "cpu": [ + "ppc64" + ], "dev": true, - "dependencies": { - "assertion-error": "^2.0.1", - "check-error": "^2.1.1", - "deep-eql": "^5.0.1", - "loupe": "^3.1.0", - "pathval": "^2.0.0" - }, + "license": "MIT", + "optional": true, + "os": [ + "aix" + ], "engines": { "node": ">=18" } }, - "node_modules/chalk": { - "version": "4.1.2", - "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz", - "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==", + "node_modules/drizzle-kit/node_modules/@esbuild/android-arm": { + "version": "0.25.12", + "resolved": "https://registry.npmjs.org/@esbuild/android-arm/-/android-arm-0.25.12.tgz", + "integrity": "sha512-VJ+sKvNA/GE7Ccacc9Cha7bpS8nyzVv0jdVgwNDaR4gDMC/2TTRc33Ip8qrNYUcpkOHUT5OZ0bUcNNVZQ9RLlg==", + "cpu": [ + "arm" + ], "dev": true, "license": "MIT", - "dependencies": { - "ansi-styles": "^4.1.0", - "supports-color": "^7.1.0" - }, + "optional": true, + "os": [ + "android" + ], "engines": { - "node": ">=10" - }, - "funding": { - "url": "https://github.com/chalk/chalk?sponsor=1" + "node": ">=18" } }, - "node_modules/check-error": { - "version": "2.1.1", - "resolved": "https://registry.npmjs.org/check-error/-/check-error-2.1.1.tgz", - "integrity": "sha512-OAlb+T7V4Op9OwdkjmguYRqncdlx5JiofwOAUkmTF+jNdHwzTaTs4sRAGpzLF3oOz5xAyDGrPgeIDFQmDOTiJw==", + "node_modules/drizzle-kit/node_modules/@esbuild/android-arm64": { + "version": "0.25.12", + "resolved": "https://registry.npmjs.org/@esbuild/android-arm64/-/android-arm64-0.25.12.tgz", + "integrity": "sha512-6AAmLG7zwD1Z159jCKPvAxZd4y/VTO0VkprYy+3N2FtJ8+BQWFXU+OxARIwA46c5tdD9SsKGZ/1ocqBS/gAKHg==", + "cpu": [ + "arm64" + ], "dev": true, + "license": "MIT", + "optional": true, + "os": [ + "android" + ], "engines": { - "node": ">= 16" + "node": ">=18" } }, - "node_modules/chokidar": { - "version": "5.0.0", - "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-5.0.0.tgz", - "integrity": "sha512-TQMmc3w+5AxjpL8iIiwebF73dRDF4fBIieAqGn9RGCWaEVwQ6Fb2cGe31Yns0RRIzii5goJ1Y7xbMwo1TxMplw==", + "node_modules/drizzle-kit/node_modules/@esbuild/android-x64": { + "version": "0.25.12", + "resolved": "https://registry.npmjs.org/@esbuild/android-x64/-/android-x64-0.25.12.tgz", + "integrity": "sha512-5jbb+2hhDHx5phYR2By8GTWEzn6I9UqR11Kwf22iKbNpYrsmRB18aX/9ivc5cabcUiAT/wM+YIZ6SG9QO6a8kg==", + "cpu": [ + "x64" + ], + "dev": true, "license": "MIT", - "dependencies": { - "readdirp": "^5.0.0" - }, + "optional": true, + "os": [ + "android" + ], "engines": { - "node": ">= 20.19.0" - }, - "funding": { - "url": "https://paulmillr.com/funding/" + "node": ">=18" } }, - "node_modules/chownr": { - "version": "1.1.4", - "resolved": "https://registry.npmjs.org/chownr/-/chownr-1.1.4.tgz", - "integrity": "sha512-jJ0bqzaylmJtVnNgzTeSOs8DPavpbYgEr/b0YL8/2GO3xJEhInFmhKMUnEJQjZumK7KXGFhUy89PrsJWlakBVg==", - "license": "ISC" - }, - "node_modules/cluster-key-slot": { - "version": "1.1.2", - "resolved": "https://registry.npmjs.org/cluster-key-slot/-/cluster-key-slot-1.1.2.tgz", - "integrity": "sha512-RMr0FhtfXemyinomL4hrWcYJxmX6deFdCxpJzhDttxgO1+bcCnkk+9drydLVDmAMG7NE6aN/fl4F7ucU/90gAA==", + "node_modules/drizzle-kit/node_modules/@esbuild/darwin-arm64": { + "version": "0.25.12", + "resolved": "https://registry.npmjs.org/@esbuild/darwin-arm64/-/darwin-arm64-0.25.12.tgz", + "integrity": "sha512-N3zl+lxHCifgIlcMUP5016ESkeQjLj/959RxxNYIthIg+CQHInujFuXeWbWMgnTo4cp5XVHqFPmpyu9J65C1Yg==", + "cpu": [ + "arm64" + ], "dev": true, - "license": "Apache-2.0", + "license": "MIT", + "optional": true, + "os": [ + "darwin" + ], "engines": { - "node": ">=0.10.0" + "node": ">=18" } }, - "node_modules/color-convert": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz", - "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==", + "node_modules/drizzle-kit/node_modules/@esbuild/darwin-x64": { + "version": "0.25.12", + "resolved": "https://registry.npmjs.org/@esbuild/darwin-x64/-/darwin-x64-0.25.12.tgz", + "integrity": "sha512-HQ9ka4Kx21qHXwtlTUVbKJOAnmG1ipXhdWTmNXiPzPfWKpXqASVcWdnf2bnL73wgjNrFXAa3yYvBSd9pzfEIpA==", + "cpu": [ + "x64" + ], "dev": true, "license": "MIT", - "dependencies": { - "color-name": "~1.1.4" - }, + "optional": true, + "os": [ + "darwin" + ], "engines": { - "node": ">=7.0.0" + "node": ">=18" } }, - "node_modules/color-name": { - "version": "1.1.4", - "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz", - "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==", - "dev": true, - "license": "MIT" - }, - "node_modules/combined-stream": { - "version": "1.0.8", - "resolved": "https://registry.npmjs.org/combined-stream/-/combined-stream-1.0.8.tgz", - "integrity": "sha512-FQN4MRfuJeHf7cBbBMJFXhKSDq+2kAArBlmRBvcvFE5BB1HZKXtSFASDhdlz9zOYwxh8lDdnvmMOe/+5cdoEdg==", + "node_modules/drizzle-kit/node_modules/@esbuild/freebsd-arm64": { + "version": "0.25.12", + "resolved": "https://registry.npmjs.org/@esbuild/freebsd-arm64/-/freebsd-arm64-0.25.12.tgz", + "integrity": "sha512-gA0Bx759+7Jve03K1S0vkOu5Lg/85dou3EseOGUes8flVOGxbhDDh/iZaoek11Y8mtyKPGF3vP8XhnkDEAmzeg==", + "cpu": [ + "arm64" + ], "dev": true, - "dependencies": { - "delayed-stream": "~1.0.0" - }, + "license": "MIT", + "optional": true, + "os": [ + "freebsd" + ], "engines": { - "node": ">= 0.8" + "node": ">=18" } }, - "node_modules/commander": { - "version": "12.1.0", - "resolved": "https://registry.npmjs.org/commander/-/commander-12.1.0.tgz", - "integrity": "sha512-Vw8qHK3bZM9y/P10u3Vib8o/DdkvA2OtPtZvD871QKjy74Wj1WSKFILMPRPSdUSx5RFK1arlJzEtA4PkFgnbuA==", + "node_modules/drizzle-kit/node_modules/@esbuild/freebsd-x64": { + "version": "0.25.12", + "resolved": "https://registry.npmjs.org/@esbuild/freebsd-x64/-/freebsd-x64-0.25.12.tgz", + "integrity": "sha512-TGbO26Yw2xsHzxtbVFGEXBFH0FRAP7gtcPE7P5yP7wGy7cXK2oO7RyOhL5NLiqTlBh47XhmIUXuGciXEqYFfBQ==", + "cpu": [ + "x64" + ], + "dev": true, + "license": "MIT", + "optional": true, + "os": [ + "freebsd" + ], "engines": { "node": ">=18" } }, - "node_modules/compare-versions": { - "version": "6.1.1", - "resolved": "https://registry.npmjs.org/compare-versions/-/compare-versions-6.1.1.tgz", - "integrity": "sha512-4hm4VPpIecmlg59CHXnRDnqGplJFrbLG4aFEl5vl6cK1u76ws3LLvX7ikFnTDl5vo39sjWD6AaDPYodJp/NNHg==", - "license": "MIT" - }, - "node_modules/concat-map": { - "version": "0.0.1", - "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz", - "integrity": "sha512-/Srv4dswyQNBfohGpz9o6Yb3Gz3SrUDqBH5rTuhGR7ahtlbYKnVxw2bCFMRljaA7EXHaXZ8wsHdodFvbkhKmqg==", + "node_modules/drizzle-kit/node_modules/@esbuild/linux-arm": { + "version": "0.25.12", + "resolved": "https://registry.npmjs.org/@esbuild/linux-arm/-/linux-arm-0.25.12.tgz", + "integrity": "sha512-lPDGyC1JPDou8kGcywY0YILzWlhhnRjdof3UlcoqYmS9El818LLfJJc3PXXgZHrHCAKs/Z2SeZtDJr5MrkxtOw==", + "cpu": [ + "arm" + ], "dev": true, - "license": "MIT" - }, - "node_modules/content-disposition": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/content-disposition/-/content-disposition-1.0.1.tgz", - "integrity": "sha512-oIXISMynqSqm241k6kcQ5UwttDILMK4BiurCfGEREw6+X9jkkpEe5T9FZaApyLGGOnFuyMWZpdolTXMtvEJ08Q==", "license": "MIT", + "optional": true, + "os": [ + "linux" + ], "engines": { "node": ">=18" - }, - "funding": { - "type": "opencollective", - "url": "https://opencollective.com/express" } }, - "node_modules/content-type": { - "version": "1.0.5", - "resolved": "https://registry.npmjs.org/content-type/-/content-type-1.0.5.tgz", - "integrity": "sha512-nTjqfcBFEipKdXCv4YDQWCfmcLZKm81ldF0pAopTvyrFGVbcR6P/VAAd5G7N+0tTr8QqiU0tFadD6FK4NtJwOA==", + "node_modules/drizzle-kit/node_modules/@esbuild/linux-arm64": { + "version": "0.25.12", + "resolved": "https://registry.npmjs.org/@esbuild/linux-arm64/-/linux-arm64-0.25.12.tgz", + "integrity": "sha512-8bwX7a8FghIgrupcxb4aUmYDLp8pX06rGh5HqDT7bB+8Rdells6mHvrFHHW2JAOPZUbnjUpKTLg6ECyzvas2AQ==", + "cpu": [ + "arm64" + ], + "dev": true, "license": "MIT", + "optional": true, + "os": [ + "linux" + ], "engines": { - "node": ">= 0.6" + "node": ">=18" } }, - "node_modules/cookie": { - "version": "0.7.2", - "resolved": "https://registry.npmjs.org/cookie/-/cookie-0.7.2.tgz", - "integrity": "sha512-yki5XnKuf750l50uGTllt6kKILY4nQ1eNIQatoXEByZ5dWgnKqbnqmTrBE5B4N7lrMJKQ2ytWMiTO2o0v6Ew/w==", + "node_modules/drizzle-kit/node_modules/@esbuild/linux-ia32": { + "version": "0.25.12", + "resolved": "https://registry.npmjs.org/@esbuild/linux-ia32/-/linux-ia32-0.25.12.tgz", + "integrity": "sha512-0y9KrdVnbMM2/vG8KfU0byhUN+EFCny9+8g202gYqSSVMonbsCfLjUO+rCci7pM0WBEtz+oK/PIwHkzxkyharA==", + "cpu": [ + "ia32" + ], + "dev": true, "license": "MIT", + "optional": true, + "os": [ + "linux" + ], "engines": { - "node": ">= 0.6" + "node": ">=18" } }, - "node_modules/cookie-signature": { - "version": "1.2.2", - "resolved": "https://registry.npmjs.org/cookie-signature/-/cookie-signature-1.2.2.tgz", - "integrity": "sha512-D76uU73ulSXrD1UXF4KE2TMxVVwhsnCgfAyTg9k8P6KGZjlXKrOLe4dJQKI3Bxi5wjesZoFXJWElNWBjPZMbhg==", + "node_modules/drizzle-kit/node_modules/@esbuild/linux-loong64": { + "version": "0.25.12", + "resolved": "https://registry.npmjs.org/@esbuild/linux-loong64/-/linux-loong64-0.25.12.tgz", + "integrity": "sha512-h///Lr5a9rib/v1GGqXVGzjL4TMvVTv+s1DPoxQdz7l/AYv6LDSxdIwzxkrPW438oUXiDtwM10o9PmwS/6Z0Ng==", + "cpu": [ + "loong64" + ], + "dev": true, "license": "MIT", + "optional": true, + "os": [ + "linux" + ], "engines": { - "node": ">=6.6.0" + "node": ">=18" } }, - "node_modules/cross-spawn": { - "version": "7.0.6", - "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.6.tgz", - "integrity": "sha512-uV2QOWP2nWzsy2aMp8aRibhi9dlzF5Hgh5SHaB9OiTGEyDTiJJyx0uy51QXdyWbtAHNua4XJzUKca3OzKUd3vA==", + "node_modules/drizzle-kit/node_modules/@esbuild/linux-mips64el": { + "version": "0.25.12", + "resolved": "https://registry.npmjs.org/@esbuild/linux-mips64el/-/linux-mips64el-0.25.12.tgz", + "integrity": "sha512-iyRrM1Pzy9GFMDLsXn1iHUm18nhKnNMWscjmp4+hpafcZjrr2WbT//d20xaGljXDBYHqRcl8HnxbX6uaA/eGVw==", + "cpu": [ + "mips64el" + ], "dev": true, "license": "MIT", - "dependencies": { - "path-key": "^3.1.0", - "shebang-command": "^2.0.0", - "which": "^2.0.1" - }, + "optional": true, + "os": [ + "linux" + ], "engines": { - "node": ">= 8" + "node": ">=18" } }, - "node_modules/cssstyle": { - "version": "4.6.0", - "resolved": "https://registry.npmjs.org/cssstyle/-/cssstyle-4.6.0.tgz", - "integrity": "sha512-2z+rWdzbbSZv6/rhtvzvqeZQHrBaqgogqt85sqFNbabZOuFbCVFb8kPeEtZjiKkbrm395irpNKiYeFeLiQnFPg==", + "node_modules/drizzle-kit/node_modules/@esbuild/linux-ppc64": { + "version": "0.25.12", + "resolved": "https://registry.npmjs.org/@esbuild/linux-ppc64/-/linux-ppc64-0.25.12.tgz", + "integrity": "sha512-9meM/lRXxMi5PSUqEXRCtVjEZBGwB7P/D4yT8UG/mwIdze2aV4Vo6U5gD3+RsoHXKkHCfSxZKzmDssVlRj1QQA==", + "cpu": [ + "ppc64" + ], "dev": true, - "dependencies": { - "@asamuzakjp/css-color": "^3.2.0", - "rrweb-cssom": "^0.8.0" - }, + "license": "MIT", + "optional": true, + "os": [ + "linux" + ], "engines": { "node": ">=18" } }, - "node_modules/cssstyle/node_modules/rrweb-cssom": { - "version": "0.8.0", - "resolved": "https://registry.npmjs.org/rrweb-cssom/-/rrweb-cssom-0.8.0.tgz", - "integrity": "sha512-guoltQEx+9aMf2gDZ0s62EcV8lsXR+0w8915TC3ITdn2YueuNjdAYh/levpU9nFaoChh9RUS5ZdQMrKfVEN9tw==", - "dev": true - }, - "node_modules/data-urls": { - "version": "5.0.0", - "resolved": "https://registry.npmjs.org/data-urls/-/data-urls-5.0.0.tgz", - "integrity": "sha512-ZYP5VBHshaDAiVZxjbRVcFJpc+4xGgT0bK3vzy1HLN8jTO975HEbuYzZJcHoQEY5K1a0z8YayJkyVETa08eNTg==", + "node_modules/drizzle-kit/node_modules/@esbuild/linux-riscv64": { + "version": "0.25.12", + "resolved": "https://registry.npmjs.org/@esbuild/linux-riscv64/-/linux-riscv64-0.25.12.tgz", + "integrity": "sha512-Zr7KR4hgKUpWAwb1f3o5ygT04MzqVrGEGXGLnj15YQDJErYu/BGg+wmFlIDOdJp0PmB0lLvxFIOXZgFRrdjR0w==", + "cpu": [ + "riscv64" + ], "dev": true, - "dependencies": { - "whatwg-mimetype": "^4.0.0", - "whatwg-url": "^14.0.0" - }, + "license": "MIT", + "optional": true, + "os": [ + "linux" + ], "engines": { "node": ">=18" } }, - "node_modules/debug": { - "version": "4.4.3", - "resolved": "https://registry.npmjs.org/debug/-/debug-4.4.3.tgz", - "integrity": "sha512-RGwwWnwQvkVfavKVt22FGLw+xYSdzARwm0ru6DhTVA3umU5hZc28V3kO4stgYryrTlLpuvgI9GiijltAjNbcqA==", - "dependencies": { - "ms": "^2.1.3" - }, + "node_modules/drizzle-kit/node_modules/@esbuild/linux-s390x": { + "version": "0.25.12", + "resolved": "https://registry.npmjs.org/@esbuild/linux-s390x/-/linux-s390x-0.25.12.tgz", + "integrity": "sha512-MsKncOcgTNvdtiISc/jZs/Zf8d0cl/t3gYWX8J9ubBnVOwlk65UIEEvgBORTiljloIWnBzLs4qhzPkJcitIzIg==", + "cpu": [ + "s390x" + ], + "dev": true, + "license": "MIT", + "optional": true, + "os": [ + "linux" + ], "engines": { - "node": ">=6.0" - }, - "peerDependenciesMeta": { - "supports-color": { - "optional": true - } + "node": ">=18" } - }, - "node_modules/decimal.js": { - "version": "10.6.0", - "resolved": "https://registry.npmjs.org/decimal.js/-/decimal.js-10.6.0.tgz", - "integrity": "sha512-YpgQiITW3JXGntzdUmyUR1V812Hn8T1YVXhCu+wO3OpS4eU9l4YdD3qjyiKdV6mvV29zapkMeD390UVEf2lkUg==", - "dev": true - }, - "node_modules/decompress-response": { - "version": "6.0.0", - "resolved": "https://registry.npmjs.org/decompress-response/-/decompress-response-6.0.0.tgz", - "integrity": "sha512-aW35yZM6Bb/4oJlZncMH2LCoZtJXTRxES17vE3hoRiowU2kWHaJKFkSBDnDR+cm9J+9QhXmREyIfv0pji9ejCQ==", + }, + "node_modules/drizzle-kit/node_modules/@esbuild/linux-x64": { + "version": "0.25.12", + "resolved": "https://registry.npmjs.org/@esbuild/linux-x64/-/linux-x64-0.25.12.tgz", + "integrity": "sha512-uqZMTLr/zR/ed4jIGnwSLkaHmPjOjJvnm6TVVitAa08SLS9Z0VM8wIRx7gWbJB5/J54YuIMInDquWyYvQLZkgw==", + "cpu": [ + "x64" + ], + "dev": true, "license": "MIT", - "dependencies": { - "mimic-response": "^3.1.0" - }, + "optional": true, + "os": [ + "linux" + ], "engines": { - "node": ">=10" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" + "node": ">=18" } }, - "node_modules/deep-eql": { - "version": "5.0.2", - "resolved": "https://registry.npmjs.org/deep-eql/-/deep-eql-5.0.2.tgz", - "integrity": "sha512-h5k/5U50IJJFpzfL6nO9jaaumfjO/f2NjK/oYB2Djzm4p9L+3T9qWpZqZ2hAbLPuuYq9wrU08WQyBTL5GbPk5Q==", + "node_modules/drizzle-kit/node_modules/@esbuild/netbsd-arm64": { + "version": "0.25.12", + "resolved": "https://registry.npmjs.org/@esbuild/netbsd-arm64/-/netbsd-arm64-0.25.12.tgz", + "integrity": "sha512-xXwcTq4GhRM7J9A8Gv5boanHhRa/Q9KLVmcyXHCTaM4wKfIpWkdXiMog/KsnxzJ0A1+nD+zoecuzqPmCRyBGjg==", + "cpu": [ + "arm64" + ], "dev": true, + "license": "MIT", + "optional": true, + "os": [ + "netbsd" + ], "engines": { - "node": ">=6" + "node": ">=18" } }, - "node_modules/deep-extend": { - "version": "0.6.0", - "resolved": "https://registry.npmjs.org/deep-extend/-/deep-extend-0.6.0.tgz", - "integrity": "sha512-LOHxIOaPYdHlJRtCQfDIVZtfw/ufM8+rVj649RIHzcm/vGwQRXFt6OPqIFWsm2XEMrNIEtWR64sY1LEKD2vAOA==", + "node_modules/drizzle-kit/node_modules/@esbuild/netbsd-x64": { + "version": "0.25.12", + "resolved": "https://registry.npmjs.org/@esbuild/netbsd-x64/-/netbsd-x64-0.25.12.tgz", + "integrity": "sha512-Ld5pTlzPy3YwGec4OuHh1aCVCRvOXdH8DgRjfDy/oumVovmuSzWfnSJg+VtakB9Cm0gxNO9BzWkj6mtO1FMXkQ==", + "cpu": [ + "x64" + ], + "dev": true, "license": "MIT", + "optional": true, + "os": [ + "netbsd" + ], "engines": { - "node": ">=4.0.0" + "node": ">=18" } }, - "node_modules/deep-is": { - "version": "0.1.4", - "resolved": "https://registry.npmjs.org/deep-is/-/deep-is-0.1.4.tgz", - "integrity": "sha512-oIPzksmTg4/MriiaYGO+okXDT7ztn/w3Eptv/+gSIdMdKsJo0u4CfYNFJPy+4SKMuCqGw2wxnA+URMg3t8a/bQ==", + "node_modules/drizzle-kit/node_modules/@esbuild/openbsd-arm64": { + "version": "0.25.12", + "resolved": "https://registry.npmjs.org/@esbuild/openbsd-arm64/-/openbsd-arm64-0.25.12.tgz", + "integrity": "sha512-fF96T6KsBo/pkQI950FARU9apGNTSlZGsv1jZBAlcLL1MLjLNIWPBkj5NlSz8aAzYKg+eNqknrUJ24QBybeR5A==", + "cpu": [ + "arm64" + ], "dev": true, - "license": "MIT" + "license": "MIT", + "optional": true, + "os": [ + "openbsd" + ], + "engines": { + "node": ">=18" + } }, - "node_modules/delayed-stream": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/delayed-stream/-/delayed-stream-1.0.0.tgz", - "integrity": "sha512-ZySD7Nf91aLB0RxL4KGrKHBXl7Eds1DAmEdcoVawXnLD7SDhpNgtuII2aAkg7a7QS41jxPSZ17p4VdGnMHk3MQ==", + "node_modules/drizzle-kit/node_modules/@esbuild/openbsd-x64": { + "version": "0.25.12", + "resolved": "https://registry.npmjs.org/@esbuild/openbsd-x64/-/openbsd-x64-0.25.12.tgz", + "integrity": "sha512-MZyXUkZHjQxUvzK7rN8DJ3SRmrVrke8ZyRusHlP+kuwqTcfWLyqMOE3sScPPyeIXN/mDJIfGXvcMqCgYKekoQw==", + "cpu": [ + "x64" + ], "dev": true, + "license": "MIT", + "optional": true, + "os": [ + "openbsd" + ], "engines": { - "node": ">=0.4.0" + "node": ">=18" } }, - "node_modules/denque": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/denque/-/denque-2.1.0.tgz", - "integrity": "sha512-HVQE3AAb/pxF8fQAoiqpvg9i3evqug3hoiwakOyZAwJm+6vZehbkYXZ0l4JxS+I3QxM97v5aaRNhj8v5oBhekw==", + "node_modules/drizzle-kit/node_modules/@esbuild/sunos-x64": { + "version": "0.25.12", + "resolved": "https://registry.npmjs.org/@esbuild/sunos-x64/-/sunos-x64-0.25.12.tgz", + "integrity": "sha512-3wGSCDyuTHQUzt0nV7bocDy72r2lI33QL3gkDNGkod22EsYl04sMf0qLb8luNKTOmgF/eDEDP5BFNwoBKH441w==", + "cpu": [ + "x64" + ], "dev": true, - "license": "Apache-2.0", + "license": "MIT", + "optional": true, + "os": [ + "sunos" + ], "engines": { - "node": ">=0.10" + "node": ">=18" } }, - "node_modules/depd": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/depd/-/depd-2.0.0.tgz", - "integrity": "sha512-g7nH6P6dyDioJogAAGprGpCtVImJhpPk/roCzdb3fIh61/s/nPsfR6onyMwkCAR/OlC3yBC0lESvUoQEAssIrw==", + "node_modules/drizzle-kit/node_modules/@esbuild/win32-arm64": { + "version": "0.25.12", + "resolved": "https://registry.npmjs.org/@esbuild/win32-arm64/-/win32-arm64-0.25.12.tgz", + "integrity": "sha512-rMmLrur64A7+DKlnSuwqUdRKyd3UE7oPJZmnljqEptesKM8wx9J8gx5u0+9Pq0fQQW8vqeKebwNXdfOyP+8Bsg==", + "cpu": [ + "arm64" + ], + "dev": true, "license": "MIT", + "optional": true, + "os": [ + "win32" + ], "engines": { - "node": ">= 0.8" + "node": ">=18" } }, - "node_modules/detect-libc": { - "version": "2.1.2", - "resolved": "https://registry.npmjs.org/detect-libc/-/detect-libc-2.1.2.tgz", - "integrity": "sha512-Btj2BOOO83o3WyH59e8MgXsxEQVcarkUOpEYrubB0urwnN10yQ364rsiByU11nZlqWYZm05i/of7io4mzihBtQ==", - "license": "Apache-2.0", + "node_modules/drizzle-kit/node_modules/@esbuild/win32-ia32": { + "version": "0.25.12", + "resolved": "https://registry.npmjs.org/@esbuild/win32-ia32/-/win32-ia32-0.25.12.tgz", + "integrity": "sha512-HkqnmmBoCbCwxUKKNPBixiWDGCpQGVsrQfJoVGYLPT41XWF8lHuE5N6WhVia2n4o5QK5M4tYr21827fNhi4byQ==", + "cpu": [ + "ia32" + ], + "dev": true, + "license": "MIT", + "optional": true, + "os": [ + "win32" + ], "engines": { - "node": ">=8" + "node": ">=18" } }, - "node_modules/doctrine": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/doctrine/-/doctrine-3.0.0.tgz", - "integrity": "sha512-yS+Q5i3hBf7GBkd4KG8a7eBNNWNGLTaEwwYWUijIYM7zrlYDM0BFXHjjPWlWZ1Rg7UaddZeIDmi9jF3HmqiQ2w==", + "node_modules/drizzle-kit/node_modules/@esbuild/win32-x64": { + "version": "0.25.12", + "resolved": "https://registry.npmjs.org/@esbuild/win32-x64/-/win32-x64-0.25.12.tgz", + "integrity": "sha512-alJC0uCZpTFrSL0CCDjcgleBXPnCrEAhTBILpeAp7M/OFgoqtAetfBzX0xM00MUsVVPpVjlPuMbREqnZCXaTnA==", + "cpu": [ + "x64" + ], "dev": true, - "license": "Apache-2.0", - "dependencies": { - "esutils": "^2.0.2" - }, + "license": "MIT", + "optional": true, + "os": [ + "win32" + ], "engines": { - "node": ">=6.0.0" + "node": ">=18" } }, - "node_modules/dotenv": { - "version": "17.2.3", - "resolved": "https://registry.npmjs.org/dotenv/-/dotenv-17.2.3.tgz", - "integrity": "sha512-JVUnt+DUIzu87TABbhPmNfVdBDt18BLOWjMUFJMSi/Qqg7NTYtabbvSNJGOJ7afbRuv9D/lngizHtP7QyLQ+9w==", - "license": "BSD-2-Clause", + "node_modules/drizzle-kit/node_modules/esbuild": { + "version": "0.25.12", + "resolved": "https://registry.npmjs.org/esbuild/-/esbuild-0.25.12.tgz", + "integrity": "sha512-bbPBYYrtZbkt6Os6FiTLCTFxvq4tt3JKall1vRwshA3fdVztsLAatFaZobhkBC8/BrPetoa0oksYoKXoG4ryJg==", + "dev": true, + "hasInstallScript": true, + "license": "MIT", + "bin": { + "esbuild": "bin/esbuild" + }, "engines": { - "node": ">=12" + "node": ">=18" }, - "funding": { - "url": "https://dotenvx.com" + "optionalDependencies": { + "@esbuild/aix-ppc64": "0.25.12", + "@esbuild/android-arm": "0.25.12", + "@esbuild/android-arm64": "0.25.12", + "@esbuild/android-x64": "0.25.12", + "@esbuild/darwin-arm64": "0.25.12", + "@esbuild/darwin-x64": "0.25.12", + "@esbuild/freebsd-arm64": "0.25.12", + "@esbuild/freebsd-x64": "0.25.12", + "@esbuild/linux-arm": "0.25.12", + "@esbuild/linux-arm64": "0.25.12", + "@esbuild/linux-ia32": "0.25.12", + "@esbuild/linux-loong64": "0.25.12", + "@esbuild/linux-mips64el": "0.25.12", + "@esbuild/linux-ppc64": "0.25.12", + "@esbuild/linux-riscv64": "0.25.12", + "@esbuild/linux-s390x": "0.25.12", + "@esbuild/linux-x64": "0.25.12", + "@esbuild/netbsd-arm64": "0.25.12", + "@esbuild/netbsd-x64": "0.25.12", + "@esbuild/openbsd-arm64": "0.25.12", + "@esbuild/openbsd-x64": "0.25.12", + "@esbuild/openharmony-arm64": "0.25.12", + "@esbuild/sunos-x64": "0.25.12", + "@esbuild/win32-arm64": "0.25.12", + "@esbuild/win32-ia32": "0.25.12", + "@esbuild/win32-x64": "0.25.12" + } + }, + "node_modules/drizzle-orm": { + "version": "0.45.1", + "resolved": "https://registry.npmjs.org/drizzle-orm/-/drizzle-orm-0.45.1.tgz", + "integrity": "sha512-Te0FOdKIistGNPMq2jscdqngBRfBpC8uMFVwqjf6gtTVJHIQ/dosgV/CLBU2N4ZJBsXL5savCba9b0YJskKdcA==", + "license": "Apache-2.0", + "peerDependencies": { + "@aws-sdk/client-rds-data": ">=3", + "@cloudflare/workers-types": ">=4", + "@electric-sql/pglite": ">=0.2.0", + "@libsql/client": ">=0.10.0", + "@libsql/client-wasm": ">=0.10.0", + "@neondatabase/serverless": ">=0.10.0", + "@op-engineering/op-sqlite": ">=2", + "@opentelemetry/api": "^1.4.1", + "@planetscale/database": ">=1.13", + "@prisma/client": "*", + "@tidbcloud/serverless": "*", + "@types/better-sqlite3": "*", + "@types/pg": "*", + "@types/sql.js": "*", + "@upstash/redis": ">=1.34.7", + "@vercel/postgres": ">=0.8.0", + "@xata.io/client": "*", + "better-sqlite3": ">=7", + "bun-types": "*", + "expo-sqlite": ">=14.0.0", + "gel": ">=2", + "knex": "*", + "kysely": "*", + "mysql2": ">=2", + "pg": ">=8", + "postgres": ">=3", + "sql.js": ">=1", + "sqlite3": ">=5" + }, + "peerDependenciesMeta": { + "@aws-sdk/client-rds-data": { + "optional": true + }, + "@cloudflare/workers-types": { + "optional": true + }, + "@electric-sql/pglite": { + "optional": true + }, + "@libsql/client": { + "optional": true + }, + "@libsql/client-wasm": { + "optional": true + }, + "@neondatabase/serverless": { + "optional": true + }, + "@op-engineering/op-sqlite": { + "optional": true + }, + "@opentelemetry/api": { + "optional": true + }, + "@planetscale/database": { + "optional": true + }, + "@prisma/client": { + "optional": true + }, + "@tidbcloud/serverless": { + "optional": true + }, + "@types/better-sqlite3": { + "optional": true + }, + "@types/pg": { + "optional": true + }, + "@types/sql.js": { + "optional": true + }, + "@upstash/redis": { + "optional": true + }, + "@vercel/postgres": { + "optional": true + }, + "@xata.io/client": { + "optional": true + }, + "better-sqlite3": { + "optional": true + }, + "bun-types": { + "optional": true + }, + "expo-sqlite": { + "optional": true + }, + "gel": { + "optional": true + }, + "knex": { + "optional": true + }, + "kysely": { + "optional": true + }, + "mysql2": { + "optional": true + }, + "pg": { + "optional": true + }, + "postgres": { + "optional": true + }, + "prisma": { + "optional": true + }, + "sql.js": { + "optional": true + }, + "sqlite3": { + "optional": true + } } }, "node_modules/dunder-proto": { @@ -2607,6 +3684,19 @@ "@esbuild/win32-x64": "0.24.2" } }, + "node_modules/esbuild-register": { + "version": "3.6.0", + "resolved": "https://registry.npmjs.org/esbuild-register/-/esbuild-register-3.6.0.tgz", + "integrity": "sha512-H2/S7Pm8a9CL1uhp9OvjwrBh5Pvx0H8qVOxNu8Wed9Y7qv56MPtq+GGM8RJpq6glYJn9Wspr8uw7l55uyinNeg==", + "dev": true, + "license": "MIT", + "dependencies": { + "debug": "^4.3.4" + }, + "peerDependencies": { + "esbuild": ">=0.12 <1" + } + }, "node_modules/escape-html": { "version": "1.0.3", "resolved": "https://registry.npmjs.org/escape-html/-/escape-html-1.0.3.tgz", @@ -3198,6 +4288,19 @@ "node": ">= 0.4" } }, + "node_modules/get-tsconfig": { + "version": "4.13.0", + "resolved": "https://registry.npmjs.org/get-tsconfig/-/get-tsconfig-4.13.0.tgz", + "integrity": "sha512-1VKTZJCwBrvbd+Wn3AOgQP/2Av+TfTCOlE4AcRJE72W1ksZXbAx8PPBR9RzgTeSPzlPMHrbANMH3LbltH73wxQ==", + "dev": true, + "license": "MIT", + "dependencies": { + "resolve-pkg-maps": "^1.0.0" + }, + "funding": { + "url": "https://github.com/privatenumber/get-tsconfig?sponsor=1" + } + }, "node_modules/github-from-package": { "version": "0.0.0", "resolved": "https://registry.npmjs.org/github-from-package/-/github-from-package-0.0.0.tgz", @@ -4311,7 +5414,7 @@ "version": "1.0.1", "resolved": "https://registry.npmjs.org/pg-int8/-/pg-int8-1.0.1.tgz", "integrity": "sha512-WCtabS6t3c8SkpDBUlb1kjOs7l66xsGdKpIPZsg4wR+B3+u9UAum2odSsF9tnvxg80h4ZxLWMy4pRjOsFIqQpw==", - "dev": true, + "devOptional": true, "license": "ISC", "engines": { "node": ">=4.0.0" @@ -4321,14 +5424,14 @@ "version": "1.10.3", "resolved": "https://registry.npmjs.org/pg-protocol/-/pg-protocol-1.10.3.tgz", "integrity": "sha512-6DIBgBQaTKDJyxnXaLiLR8wBpQQcGWuAESkRBX/t6OwA8YsqP+iVSiond2EDy6Y/dsGk8rh/jtax3js5NeV7JQ==", - "dev": true, + "devOptional": true, "license": "MIT" }, "node_modules/pg-types": { "version": "2.2.0", "resolved": "https://registry.npmjs.org/pg-types/-/pg-types-2.2.0.tgz", "integrity": "sha512-qTAAlrEsl8s4OiEQY69wDvcMIdQN6wdz5ojQiOy6YRMuynxenON0O5oCpJI6lshc6scgAY8qvJ2On/p+CXY0GA==", - "dev": true, + "devOptional": true, "license": "MIT", "dependencies": { "pg-int8": "1.0.1", @@ -4392,7 +5495,7 @@ "version": "2.0.0", "resolved": "https://registry.npmjs.org/postgres-array/-/postgres-array-2.0.0.tgz", "integrity": "sha512-VpZrUqU5A69eQyW2c5CA1jtLecCsN2U/bD6VilrFDWq5+5UIEVO7nazS3TEcHf1zuPYO/sqGvUvW62g86RXZuA==", - "dev": true, + "devOptional": true, "license": "MIT", "engines": { "node": ">=4" @@ -4402,7 +5505,7 @@ "version": "1.0.1", "resolved": "https://registry.npmjs.org/postgres-bytea/-/postgres-bytea-1.0.1.tgz", "integrity": "sha512-5+5HqXnsZPE65IJZSMkZtURARZelel2oXUEO8rH83VS/hxH5vv1uHquPg5wZs8yMAfdv971IU+kcPUczi7NVBQ==", - "dev": true, + "devOptional": true, "license": "MIT", "engines": { "node": ">=0.10.0" @@ -4412,7 +5515,7 @@ "version": "1.0.7", "resolved": "https://registry.npmjs.org/postgres-date/-/postgres-date-1.0.7.tgz", "integrity": "sha512-suDmjLVQg78nMK2UZ454hAG+OAW+HQPZ6n++TNDUX+L0+uUlLywnoxJKDou51Zm+zTCjrCl0Nq6J9C5hP9vK/Q==", - "dev": true, + "devOptional": true, "license": "MIT", "engines": { "node": ">=0.10.0" @@ -4422,7 +5525,7 @@ "version": "1.2.0", "resolved": "https://registry.npmjs.org/postgres-interval/-/postgres-interval-1.2.0.tgz", "integrity": "sha512-9ZhXKM/rw350N1ovuWHbGxnGh/SNJ4cnxHiM0rxE4VN41wsg8P8zWn9hv/buK00RP4WvlOyr/RBDiptyxVbkZQ==", - "dev": true, + "devOptional": true, "license": "MIT", "dependencies": { "xtend": "^4.0.0" @@ -4649,6 +5752,16 @@ "node": ">=4" } }, + "node_modules/resolve-pkg-maps": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/resolve-pkg-maps/-/resolve-pkg-maps-1.0.0.tgz", + "integrity": "sha512-seS2Tj26TBVOC2NIc2rOe2y2ZO7efxITtLZcGSOnHHNOQ7CkiUBfw0Iw2ck6xkIhPwLhKNLS8BO+hEpngQlqzw==", + "dev": true, + "license": "MIT", + "funding": { + "url": "https://github.com/privatenumber/resolve-pkg-maps?sponsor=1" + } + }, "node_modules/reusify": { "version": "1.1.0", "resolved": "https://registry.npmjs.org/reusify/-/reusify-1.1.0.tgz", @@ -5024,6 +6137,16 @@ "simple-concat": "^1.0.0" } }, + "node_modules/source-map": { + "version": "0.6.1", + "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz", + "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==", + "dev": true, + "license": "BSD-3-Clause", + "engines": { + "node": ">=0.10.0" + } + }, "node_modules/source-map-js": { "version": "1.2.1", "resolved": "https://registry.npmjs.org/source-map-js/-/source-map-js-1.2.1.tgz", @@ -5033,6 +6156,17 @@ "node": ">=0.10.0" } }, + "node_modules/source-map-support": { + "version": "0.5.21", + "resolved": "https://registry.npmjs.org/source-map-support/-/source-map-support-0.5.21.tgz", + "integrity": "sha512-uBHU3L3czsIyYXKX88fdrGovxdSCoTGDRZ6SYXtSRxLZUzHg5P/66Ht6uoUlHu9EZod+inXhKo3qQgwXUT/y1w==", + "dev": true, + "license": "MIT", + "dependencies": { + "buffer-from": "^1.0.0", + "source-map": "^0.6.0" + } + }, "node_modules/stackback": { "version": "0.0.2", "resolved": "https://registry.npmjs.org/stackback/-/stackback-0.0.2.tgz", @@ -6345,7 +7479,7 @@ "version": "4.0.2", "resolved": "https://registry.npmjs.org/xtend/-/xtend-4.0.2.tgz", "integrity": "sha512-LKYU1iAXJXUgAXn9URjiu+MWhyUXHsvfp7mcuYm9dSUKK0/CjtrUwFAxD82/mCWbtLsGjFIad0wIsod4zrTAEQ==", - "dev": true, + "devOptional": true, "license": "MIT", "engines": { "node": ">=0.4" diff --git a/package.json b/package.json index 522664bb2..f5652af92 100644 --- a/package.json +++ b/package.json @@ -38,7 +38,11 @@ "test:coverage": "vitest run --coverage", "test:watch": "vitest", "lint": "eslint src --ext .ts", - "clean": "rm -rf dist" + "clean": "rm -rf dist", + "db:generate": "drizzle-kit generate", + "db:migrate": "drizzle-kit migrate", + "db:push": "drizzle-kit push", + "db:studio": "drizzle-kit studio" }, "keywords": [ "agent", @@ -66,6 +70,7 @@ "commander": "^12.1.0", "compare-versions": "^6.1.1", "dotenv": "^17.2.3", + "drizzle-orm": "^0.45.1", "express": "^5.2.1", "http-proxy-middleware": "^3.0.5", "node-pty": "1.0.0", @@ -87,6 +92,7 @@ "@typescript-eslint/eslint-plugin": "^8.18.2", "@typescript-eslint/parser": "^8.18.2", "@vitest/coverage-v8": "^2.1.8", + "drizzle-kit": "^0.31.8", "esbuild": "^0.24.0", "eslint": "^8.57.1", "jsdom": "^25.0.1", diff --git a/src/cloud/api/daemons.ts b/src/cloud/api/daemons.ts new file mode 100644 index 000000000..b5a5f5763 --- /dev/null +++ b/src/cloud/api/daemons.ts @@ -0,0 +1,367 @@ +/** + * Linked Daemons API Routes + * + * Allows local agent-relay instances to register and link with cloud. + * This enables: + * - Credential sync from cloud to local + * - Remote monitoring of local agents + * - Cross-machine agent discovery + * - Centralized dashboard for all instances + */ + +import { Router, Request, Response } from 'express'; +import { randomBytes, createHash } from 'crypto'; +import { requireAuth } from './auth.js'; +import { db } from '../db/index.js'; +import { vault } from '../vault/index.js'; + +export const daemonsRouter = Router(); + +/** + * Generate a secure API key + */ +function generateApiKey(): string { + // Format: ar_live_<32 random bytes as hex> + const random = randomBytes(32).toString('hex'); + return `ar_live_${random}`; +} + +/** + * Hash an API key for storage + */ +function hashApiKey(apiKey: string): string { + return createHash('sha256').update(apiKey).digest('hex'); +} + +/** + * POST /api/daemons/link + * Register a local daemon with the cloud (requires browser auth first) + * + * Flow: + * 1. User runs `agent-relay cloud link` in terminal + * 2. CLI opens browser to /cloud/link?code= + * 3. User authenticates (or is already logged in) + * 4. Browser shows confirmation, user clicks "Link" + * 5. Server generates API key and returns to CLI via the temp code + */ +daemonsRouter.post('/link', requireAuth, async (req: Request, res: Response) => { + const userId = req.session.userId!; + const { name, machineId, metadata } = req.body; + + if (!machineId || typeof machineId !== 'string') { + return res.status(400).json({ error: 'machineId is required' }); + } + + try { + // Check if this machine is already linked + const existing = await db.linkedDaemons.findByMachineId(userId, machineId); + + if (existing) { + // Regenerate API key for existing link + const apiKey = generateApiKey(); + const apiKeyHash = hashApiKey(apiKey); + + await db.linkedDaemons.update(existing.id, { + name: name || existing.name, + apiKeyHash, + metadata: metadata || existing.metadata, + status: 'online', + lastSeenAt: new Date(), + }); + + return res.json({ + success: true, + daemonId: existing.id, + apiKey, // Only returned once! + message: 'Daemon re-linked with new API key', + }); + } + + // Create new linked daemon + const apiKey = generateApiKey(); + const apiKeyHash = hashApiKey(apiKey); + + const daemon = await db.linkedDaemons.create({ + userId, + name: name || `Daemon on ${machineId.substring(0, 8)}`, + machineId, + apiKeyHash, + status: 'online', + metadata: metadata || {}, + }); + + res.status(201).json({ + success: true, + daemonId: daemon.id, + apiKey, // Only returned once - user must save this! + message: 'Daemon linked successfully. Save your API key - it cannot be retrieved later.', + }); + } catch (error) { + console.error('Error linking daemon:', error); + res.status(500).json({ error: 'Failed to link daemon' }); + } +}); + +/** + * GET /api/daemons + * List user's linked daemons + */ +daemonsRouter.get('/', requireAuth, async (req: Request, res: Response) => { + const userId = req.session.userId!; + + try { + const daemons = await db.linkedDaemons.findByUserId(userId); + + res.json({ + daemons: daemons.map((d) => ({ + id: d.id, + name: d.name, + machineId: d.machineId, + status: d.status, + lastSeenAt: d.lastSeenAt, + metadata: d.metadata, + createdAt: d.createdAt, + })), + }); + } catch (error) { + console.error('Error listing daemons:', error); + res.status(500).json({ error: 'Failed to list daemons' }); + } +}); + +/** + * DELETE /api/daemons/:id + * Unlink a daemon + */ +daemonsRouter.delete('/:id', requireAuth, async (req: Request, res: Response) => { + const userId = req.session.userId!; + const { id } = req.params; + + try { + const daemon = await db.linkedDaemons.findById(id); + + if (!daemon) { + return res.status(404).json({ error: 'Daemon not found' }); + } + + if (daemon.userId !== userId) { + return res.status(403).json({ error: 'Unauthorized' }); + } + + await db.linkedDaemons.delete(id); + + res.json({ success: true, message: 'Daemon unlinked' }); + } catch (error) { + console.error('Error unlinking daemon:', error); + res.status(500).json({ error: 'Failed to unlink daemon' }); + } +}); + +// ============================================================================ +// Daemon API (authenticated with API key, not session) +// These endpoints are called by local daemons, not browsers +// ============================================================================ + +/** + * Middleware to authenticate daemon by API key + */ +async function requireDaemonAuth( + req: Request, + res: Response, + next: () => void +): Promise { + const authHeader = req.headers.authorization; + + if (!authHeader || !authHeader.startsWith('Bearer ar_live_')) { + res.status(401).json({ error: 'Invalid API key format' }); + return; + } + + const apiKey = authHeader.replace('Bearer ', ''); + const apiKeyHash = hashApiKey(apiKey); + + try { + const daemon = await db.linkedDaemons.findByApiKeyHash(apiKeyHash); + + if (!daemon) { + res.status(401).json({ error: 'Invalid API key' }); + return; + } + + // Update last seen + await db.linkedDaemons.updateLastSeen(daemon.id); + + // Attach daemon info to request + (req as any).daemon = daemon; + next(); + } catch (error) { + console.error('Daemon auth error:', error); + res.status(500).json({ error: 'Authentication failed' }); + } +} + +/** + * POST /api/daemons/heartbeat + * Daemon heartbeat - reports status and gets any pending commands + */ +daemonsRouter.post('/heartbeat', requireDaemonAuth as any, async (req: Request, res: Response) => { + const daemon = (req as any).daemon; + const { agents, metrics } = req.body; + + try { + // Update daemon status with agent info + await db.linkedDaemons.update(daemon.id, { + status: 'online', + metadata: { + ...daemon.metadata, + agents: agents || [], + metrics: metrics || {}, + lastHeartbeat: new Date().toISOString(), + }, + }); + + // Check for any pending commands (credential updates, etc.) + const pendingUpdates = await db.linkedDaemons.getPendingUpdates(daemon.id); + + res.json({ + success: true, + commands: pendingUpdates, + }); + } catch (error) { + console.error('Error processing heartbeat:', error); + res.status(500).json({ error: 'Failed to process heartbeat' }); + } +}); + +/** + * GET /api/daemons/credentials + * Get credentials for the daemon's user (syncs cloud credentials to local) + */ +daemonsRouter.get('/credentials', requireDaemonAuth as any, async (req: Request, res: Response) => { + const daemon = (req as any).daemon; + + try { + // Get all decrypted credentials for the user via vault + const credentialsMap = await vault.getUserCredentials(daemon.userId); + + // Convert Map to array format for API response + const credentials = Array.from(credentialsMap.entries()).map(([provider, cred]) => ({ + provider, + accessToken: cred.accessToken, + tokenType: 'bearer', + expiresAt: cred.tokenExpiresAt, + })); + + res.json({ credentials }); + } catch (error) { + console.error('Error fetching credentials:', error); + res.status(500).json({ error: 'Failed to fetch credentials' }); + } +}); + +/** + * POST /api/daemons/agents + * Report agent list to cloud (for cross-machine discovery) + */ +daemonsRouter.post('/agents', requireDaemonAuth as any, async (req: Request, res: Response) => { + const daemon = (req as any).daemon; + const { agents } = req.body; + + if (!agents || !Array.isArray(agents)) { + return res.status(400).json({ error: 'agents array is required' }); + } + + try { + // Store agent list in daemon metadata + await db.linkedDaemons.update(daemon.id, { + metadata: { + ...daemon.metadata, + agents, + lastAgentSync: new Date().toISOString(), + }, + }); + + // Get agents from all linked daemons for this user (cross-machine discovery) + const allDaemons = await db.linkedDaemons.findByUserId(daemon.userId); + const allAgents = allDaemons.flatMap((d) => { + const metadata = d.metadata as Record | null; + const dAgents = (metadata?.agents as Array<{ name: string; status: string }>) || []; + return dAgents.map((a) => ({ + ...a, + daemonId: d.id, + daemonName: d.name, + machineId: d.machineId, + })); + }); + + res.json({ + success: true, + allAgents, // Return all agents across all linked daemons + }); + } catch (error) { + console.error('Error syncing agents:', error); + res.status(500).json({ error: 'Failed to sync agents' }); + } +}); + +/** + * POST /api/daemons/message + * Send message to an agent on another machine (cross-machine relay) + */ +daemonsRouter.post('/message', requireDaemonAuth as any, async (req: Request, res: Response) => { + const daemon = (req as any).daemon; + const { targetDaemonId, targetAgent, message } = req.body; + + if (!targetDaemonId || !targetAgent || !message) { + return res.status(400).json({ error: 'targetDaemonId, targetAgent, and message are required' }); + } + + try { + // Verify target daemon belongs to same user + const targetDaemon = await db.linkedDaemons.findById(targetDaemonId); + + if (!targetDaemon || targetDaemon.userId !== daemon.userId) { + return res.status(404).json({ error: 'Target daemon not found' }); + } + + // Queue message for delivery + await db.linkedDaemons.queueMessage(targetDaemonId, { + from: { + daemonId: daemon.id, + daemonName: daemon.name, + agent: message.from, + }, + to: targetAgent, + content: message.content, + metadata: message.metadata, + timestamp: new Date().toISOString(), + }); + + res.json({ success: true, message: 'Message queued for delivery' }); + } catch (error) { + console.error('Error sending cross-machine message:', error); + res.status(500).json({ error: 'Failed to send message' }); + } +}); + +/** + * GET /api/daemons/messages + * Get pending messages for this daemon (cross-machine messages) + */ +daemonsRouter.get('/messages', requireDaemonAuth as any, async (req: Request, res: Response) => { + const daemon = (req as any).daemon; + + try { + const messages = await db.linkedDaemons.getQueuedMessages(daemon.id); + + // Clear the queue after fetching + if (messages.length > 0) { + await db.linkedDaemons.clearMessageQueue(daemon.id); + } + + res.json({ messages }); + } catch (error) { + console.error('Error fetching messages:', error); + res.status(500).json({ error: 'Failed to fetch messages' }); + } +}); diff --git a/src/cloud/db/drizzle.ts b/src/cloud/db/drizzle.ts new file mode 100644 index 000000000..6ba8faece --- /dev/null +++ b/src/cloud/db/drizzle.ts @@ -0,0 +1,384 @@ +/** + * Agent Relay Cloud - Drizzle Database Client + * + * Type-safe database access using Drizzle ORM. + * Use this instead of the raw pg client for new code. + */ + +import { drizzle } from 'drizzle-orm/node-postgres'; +import { Pool } from 'pg'; +import { eq, and, sql, desc, lt, isNull, isNotNull } from 'drizzle-orm'; +import * as schema from './schema.js'; +import { getConfig } from '../config.js'; + +// Types +export type { + User, + NewUser, + Credential, + NewCredential, + Workspace, + NewWorkspace, + WorkspaceMember, + NewWorkspaceMember, + Repository, + NewRepository, + LinkedDaemon, + NewLinkedDaemon, + Subscription, + NewSubscription, + UsageRecord, + NewUsageRecord, +} from './schema.js'; + +// Re-export schema for direct table access +export * from './schema.js'; + +// Initialize pool and drizzle lazily +let pool: Pool | null = null; +let drizzleDb: ReturnType | null = null; + +function getPool(): Pool { + if (!pool) { + const config = getConfig(); + pool = new Pool({ connectionString: config.databaseUrl }); + } + return pool; +} + +export function getDb() { + if (!drizzleDb) { + drizzleDb = drizzle(getPool(), { schema }); + } + return drizzleDb; +} + +// ============================================================================ +// User Queries +// ============================================================================ + +export const userQueries = { + async findById(id: string) { + const db = getDb(); + const result = await db.select().from(schema.users).where(eq(schema.users.id, id)); + return result[0] ?? null; + }, + + async findByGithubId(githubId: string) { + const db = getDb(); + const result = await db.select().from(schema.users).where(eq(schema.users.githubId, githubId)); + return result[0] ?? null; + }, + + async findByEmail(email: string) { + const db = getDb(); + const result = await db.select().from(schema.users).where(eq(schema.users.email, email)); + return result[0] ?? null; + }, + + async upsert(data: schema.NewUser) { + const db = getDb(); + const result = await db + .insert(schema.users) + .values(data) + .onConflictDoUpdate({ + target: schema.users.githubId, + set: { + githubUsername: data.githubUsername, + email: data.email, + avatarUrl: data.avatarUrl, + updatedAt: new Date(), + }, + }) + .returning(); + return result[0]; + }, + + async completeOnboarding(userId: string) { + const db = getDb(); + await db + .update(schema.users) + .set({ onboardingCompletedAt: new Date(), updatedAt: new Date() }) + .where(eq(schema.users.id, userId)); + }, +}; + +// ============================================================================ +// Credential Queries +// ============================================================================ + +export const credentialQueries = { + async findByUserId(userId: string) { + const db = getDb(); + return db.select().from(schema.credentials).where(eq(schema.credentials.userId, userId)); + }, + + async findByUserAndProvider(userId: string, provider: string) { + const db = getDb(); + const result = await db + .select() + .from(schema.credentials) + .where(and(eq(schema.credentials.userId, userId), eq(schema.credentials.provider, provider))); + return result[0] ?? null; + }, + + async upsert(data: schema.NewCredential) { + const db = getDb(); + const result = await db + .insert(schema.credentials) + .values(data) + .onConflictDoUpdate({ + target: [schema.credentials.userId, schema.credentials.provider], + set: { + accessToken: data.accessToken, + refreshToken: data.refreshToken ?? sql`credentials.refresh_token`, + tokenExpiresAt: data.tokenExpiresAt, + scopes: data.scopes, + providerAccountId: data.providerAccountId, + providerAccountEmail: data.providerAccountEmail, + updatedAt: new Date(), + }, + }) + .returning(); + return result[0]; + }, + + async delete(userId: string, provider: string) { + const db = getDb(); + await db + .delete(schema.credentials) + .where(and(eq(schema.credentials.userId, userId), eq(schema.credentials.provider, provider))); + }, +}; + +// ============================================================================ +// Workspace Queries +// ============================================================================ + +export const workspaceQueries = { + async findById(id: string) { + const db = getDb(); + const result = await db.select().from(schema.workspaces).where(eq(schema.workspaces.id, id)); + return result[0] ?? null; + }, + + async findByUserId(userId: string) { + const db = getDb(); + return db + .select() + .from(schema.workspaces) + .where(eq(schema.workspaces.userId, userId)) + .orderBy(desc(schema.workspaces.createdAt)); + }, + + async findByCustomDomain(domain: string) { + const db = getDb(); + const result = await db + .select() + .from(schema.workspaces) + .where(eq(schema.workspaces.customDomain, domain)); + return result[0] ?? null; + }, + + async create(data: schema.NewWorkspace) { + const db = getDb(); + const result = await db.insert(schema.workspaces).values(data).returning(); + return result[0]; + }, + + async updateStatus( + id: string, + status: string, + options?: { computeId?: string; publicUrl?: string; errorMessage?: string } + ) { + const db = getDb(); + await db + .update(schema.workspaces) + .set({ + status, + computeId: options?.computeId, + publicUrl: options?.publicUrl, + errorMessage: options?.errorMessage, + updatedAt: new Date(), + }) + .where(eq(schema.workspaces.id, id)); + }, + + async delete(id: string) { + const db = getDb(); + await db.delete(schema.workspaces).where(eq(schema.workspaces.id, id)); + }, +}; + +// ============================================================================ +// Linked Daemon Queries +// ============================================================================ + +export const linkedDaemonQueries = { + async findById(id: string) { + const db = getDb(); + const result = await db.select().from(schema.linkedDaemons).where(eq(schema.linkedDaemons.id, id)); + return result[0] ?? null; + }, + + async findByUserId(userId: string) { + const db = getDb(); + return db + .select() + .from(schema.linkedDaemons) + .where(eq(schema.linkedDaemons.userId, userId)) + .orderBy(desc(schema.linkedDaemons.lastSeenAt)); + }, + + async findByMachineId(userId: string, machineId: string) { + const db = getDb(); + const result = await db + .select() + .from(schema.linkedDaemons) + .where( + and(eq(schema.linkedDaemons.userId, userId), eq(schema.linkedDaemons.machineId, machineId)) + ); + return result[0] ?? null; + }, + + async findByApiKeyHash(apiKeyHash: string) { + const db = getDb(); + const result = await db + .select() + .from(schema.linkedDaemons) + .where(eq(schema.linkedDaemons.apiKeyHash, apiKeyHash)); + return result[0] ?? null; + }, + + async create(data: schema.NewLinkedDaemon) { + const db = getDb(); + const result = await db + .insert(schema.linkedDaemons) + .values({ ...data, lastSeenAt: new Date() }) + .returning(); + return result[0]; + }, + + async update(id: string, data: Partial) { + const db = getDb(); + await db + .update(schema.linkedDaemons) + .set({ ...data, updatedAt: new Date() }) + .where(eq(schema.linkedDaemons.id, id)); + }, + + async updateLastSeen(id: string) { + const db = getDb(); + await db + .update(schema.linkedDaemons) + .set({ lastSeenAt: new Date(), status: 'online', updatedAt: new Date() }) + .where(eq(schema.linkedDaemons.id, id)); + }, + + async delete(id: string) { + const db = getDb(); + await db.delete(schema.linkedDaemons).where(eq(schema.linkedDaemons.id, id)); + }, + + async markStale() { + const db = getDb(); + const twoMinutesAgo = new Date(Date.now() - 2 * 60 * 1000); + const result = await db + .update(schema.linkedDaemons) + .set({ status: 'offline' }) + .where( + and( + eq(schema.linkedDaemons.status, 'online'), + lt(schema.linkedDaemons.lastSeenAt, twoMinutesAgo) + ) + ); + return result.rowCount ?? 0; + }, + + // Get all agents from all daemons for a user (cross-machine discovery) + async getAllAgentsForUser(userId: string): Promise< + Array<{ + daemonId: string; + daemonName: string; + machineId: string; + agents: Array<{ name: string; status: string }>; + }> + > { + const db = getDb(); + const daemons = await db + .select() + .from(schema.linkedDaemons) + .where(eq(schema.linkedDaemons.userId, userId)); + + return daemons.map((d) => ({ + daemonId: d.id, + daemonName: d.name, + machineId: d.machineId, + agents: ((d.metadata as any)?.agents as Array<{ name: string; status: string }>) || [], + })); + }, +}; + +// ============================================================================ +// Repository Queries +// ============================================================================ + +export const repositoryQueries = { + async findByUserId(userId: string) { + const db = getDb(); + return db + .select() + .from(schema.repositories) + .where(eq(schema.repositories.userId, userId)) + .orderBy(schema.repositories.githubFullName); + }, + + async findByWorkspaceId(workspaceId: string) { + const db = getDb(); + return db + .select() + .from(schema.repositories) + .where(eq(schema.repositories.workspaceId, workspaceId)); + }, + + async upsert(data: schema.NewRepository) { + const db = getDb(); + const result = await db + .insert(schema.repositories) + .values(data) + .onConflictDoUpdate({ + target: [schema.repositories.userId, schema.repositories.githubFullName], + set: { + githubId: data.githubId, + defaultBranch: data.defaultBranch, + isPrivate: data.isPrivate, + updatedAt: new Date(), + }, + }) + .returning(); + return result[0]; + }, +}; + +// ============================================================================ +// Migration helper +// ============================================================================ + +export async function runMigrations() { + const { migrate } = await import('drizzle-orm/node-postgres/migrator'); + const db = getDb(); + await migrate(db, { migrationsFolder: './src/cloud/db/migrations' }); + console.log('Migrations complete'); +} + +// ============================================================================ +// Close connections +// ============================================================================ + +export async function closeDb() { + if (pool) { + await pool.end(); + pool = null; + drizzleDb = null; + } +} diff --git a/src/cloud/db/index.ts b/src/cloud/db/index.ts index a4de52a54..2438a97a6 100644 --- a/src/cloud/db/index.ts +++ b/src/cloud/db/index.ts @@ -102,6 +102,21 @@ export interface Repository { updatedAt: Date; } +export interface LinkedDaemon { + id: string; + userId: string; + name: string; + machineId: string; + apiKeyHash: string; + status: 'online' | 'offline'; + lastSeenAt?: Date; + metadata: Record; + pendingUpdates?: Array<{ type: string; payload: unknown }>; + messageQueue?: Array>; + createdAt: Date; + updatedAt: Date; +} + // User queries export const users = { async findById(id: string): Promise { @@ -517,6 +532,180 @@ export const repositories = { }, }; +// LinkedDaemon queries +export const linkedDaemons = { + async findById(id: string): Promise { + const { rows } = await getPool().query( + 'SELECT * FROM linked_daemons WHERE id = $1', + [id] + ); + return rows[0] ? mapLinkedDaemon(rows[0]) : null; + }, + + async findByUserId(userId: string): Promise { + const { rows } = await getPool().query( + 'SELECT * FROM linked_daemons WHERE user_id = $1 ORDER BY last_seen_at DESC NULLS LAST', + [userId] + ); + return rows.map(mapLinkedDaemon); + }, + + async findByMachineId(userId: string, machineId: string): Promise { + const { rows } = await getPool().query( + 'SELECT * FROM linked_daemons WHERE user_id = $1 AND machine_id = $2', + [userId, machineId] + ); + return rows[0] ? mapLinkedDaemon(rows[0]) : null; + }, + + async findByApiKeyHash(apiKeyHash: string): Promise { + const { rows } = await getPool().query( + 'SELECT * FROM linked_daemons WHERE api_key_hash = $1', + [apiKeyHash] + ); + return rows[0] ? mapLinkedDaemon(rows[0]) : null; + }, + + async create(data: { + userId: string; + name: string; + machineId: string; + apiKeyHash: string; + status?: 'online' | 'offline'; + metadata?: Record; + }): Promise { + const { rows } = await getPool().query( + `INSERT INTO linked_daemons (user_id, name, machine_id, api_key_hash, status, metadata, last_seen_at) + VALUES ($1, $2, $3, $4, $5, $6, NOW()) + RETURNING *`, + [ + data.userId, + data.name, + data.machineId, + data.apiKeyHash, + data.status || 'online', + JSON.stringify(data.metadata || {}), + ] + ); + return mapLinkedDaemon(rows[0]); + }, + + async update( + id: string, + data: Partial<{ + name: string; + apiKeyHash: string; + status: 'online' | 'offline'; + metadata: Record; + lastSeenAt: Date; + }> + ): Promise { + const updates: string[] = []; + const values: unknown[] = [id]; + let paramCount = 1; + + if (data.name !== undefined) { + updates.push(`name = $${++paramCount}`); + values.push(data.name); + } + if (data.apiKeyHash !== undefined) { + updates.push(`api_key_hash = $${++paramCount}`); + values.push(data.apiKeyHash); + } + if (data.status !== undefined) { + updates.push(`status = $${++paramCount}`); + values.push(data.status); + } + if (data.metadata !== undefined) { + updates.push(`metadata = $${++paramCount}`); + values.push(JSON.stringify(data.metadata)); + } + if (data.lastSeenAt !== undefined) { + updates.push(`last_seen_at = $${++paramCount}`); + values.push(data.lastSeenAt); + } + + if (updates.length > 0) { + updates.push('updated_at = NOW()'); + await getPool().query( + `UPDATE linked_daemons SET ${updates.join(', ')} WHERE id = $1`, + values + ); + } + }, + + async updateLastSeen(id: string): Promise { + await getPool().query( + `UPDATE linked_daemons SET last_seen_at = NOW(), status = 'online', updated_at = NOW() WHERE id = $1`, + [id] + ); + }, + + async delete(id: string): Promise { + await getPool().query('DELETE FROM linked_daemons WHERE id = $1', [id]); + }, + + async getPendingUpdates(id: string): Promise> { + const { rows } = await getPool().query( + 'SELECT pending_updates FROM linked_daemons WHERE id = $1', + [id] + ); + const updates = rows[0]?.pending_updates || []; + // Clear after reading + if (updates.length > 0) { + await getPool().query( + `UPDATE linked_daemons SET pending_updates = '[]'::jsonb WHERE id = $1`, + [id] + ); + } + return updates; + }, + + async queueUpdate(id: string, update: { type: string; payload: unknown }): Promise { + await getPool().query( + `UPDATE linked_daemons SET + pending_updates = COALESCE(pending_updates, '[]'::jsonb) || $2::jsonb, + updated_at = NOW() + WHERE id = $1`, + [id, JSON.stringify([update])] + ); + }, + + async queueMessage(id: string, message: Record): Promise { + await getPool().query( + `UPDATE linked_daemons SET + message_queue = COALESCE(message_queue, '[]'::jsonb) || $2::jsonb, + updated_at = NOW() + WHERE id = $1`, + [id, JSON.stringify([message])] + ); + }, + + async getQueuedMessages(id: string): Promise>> { + const { rows } = await getPool().query( + 'SELECT message_queue FROM linked_daemons WHERE id = $1', + [id] + ); + return rows[0]?.message_queue || []; + }, + + async clearMessageQueue(id: string): Promise { + await getPool().query( + `UPDATE linked_daemons SET message_queue = '[]'::jsonb WHERE id = $1`, + [id] + ); + }, + + // Mark offline daemons that haven't sent heartbeat in 2 minutes + async markStale(): Promise { + const { rowCount } = await getPool().query( + `UPDATE linked_daemons SET status = 'offline' + WHERE status = 'online' AND last_seen_at < NOW() - INTERVAL '2 minutes'` + ); + return rowCount ?? 0; + }, +}; + // Row mappers function mapUser(row: any): User { return { @@ -599,6 +788,23 @@ function mapRepository(row: any): Repository { }; } +function mapLinkedDaemon(row: any): LinkedDaemon { + return { + id: row.id, + userId: row.user_id, + name: row.name, + machineId: row.machine_id, + apiKeyHash: row.api_key_hash, + status: row.status, + lastSeenAt: row.last_seen_at, + metadata: row.metadata || {}, + pendingUpdates: row.pending_updates || [], + messageQueue: row.message_queue || [], + createdAt: row.created_at, + updatedAt: row.updated_at, + }; +} + // Database initialization export async function initializeDatabase(): Promise { const client = await getPool().connect(); @@ -673,6 +879,22 @@ export async function initializeDatabase(): Promise { UNIQUE(workspace_id, user_id) ); + CREATE TABLE IF NOT EXISTS linked_daemons ( + id UUID PRIMARY KEY DEFAULT gen_random_uuid(), + user_id UUID NOT NULL REFERENCES users(id) ON DELETE CASCADE, + name VARCHAR(255) NOT NULL, + machine_id VARCHAR(255) NOT NULL, + api_key_hash VARCHAR(255) NOT NULL, + status VARCHAR(50) NOT NULL DEFAULT 'offline', + last_seen_at TIMESTAMP, + metadata JSONB NOT NULL DEFAULT '{}', + pending_updates JSONB NOT NULL DEFAULT '[]', + message_queue JSONB NOT NULL DEFAULT '[]', + created_at TIMESTAMP DEFAULT NOW(), + updated_at TIMESTAMP DEFAULT NOW(), + UNIQUE(user_id, machine_id) + ); + CREATE INDEX IF NOT EXISTS idx_credentials_user_id ON credentials(user_id); CREATE INDEX IF NOT EXISTS idx_workspaces_user_id ON workspaces(user_id); CREATE INDEX IF NOT EXISTS idx_workspaces_custom_domain ON workspaces(custom_domain) WHERE custom_domain IS NOT NULL; @@ -680,6 +902,9 @@ export async function initializeDatabase(): Promise { CREATE INDEX IF NOT EXISTS idx_repositories_workspace_id ON repositories(workspace_id); CREATE INDEX IF NOT EXISTS idx_workspace_members_workspace_id ON workspace_members(workspace_id); CREATE INDEX IF NOT EXISTS idx_workspace_members_user_id ON workspace_members(user_id); + CREATE INDEX IF NOT EXISTS idx_linked_daemons_user_id ON linked_daemons(user_id); + CREATE INDEX IF NOT EXISTS idx_linked_daemons_api_key_hash ON linked_daemons(api_key_hash); + CREATE INDEX IF NOT EXISTS idx_linked_daemons_status ON linked_daemons(status); `); } finally { client.release(); @@ -693,6 +918,7 @@ export const db = { workspaces, workspaceMembers, repositories, + linkedDaemons, initialize: initializeDatabase, getPool, }; diff --git a/src/cloud/db/schema.ts b/src/cloud/db/schema.ts new file mode 100644 index 000000000..8304f8666 --- /dev/null +++ b/src/cloud/db/schema.ts @@ -0,0 +1,255 @@ +/** + * Agent Relay Cloud - Drizzle Schema + * + * Type-safe database schema with PostgreSQL support. + * Generate migrations: npm run db:generate + * Run migrations: npm run db:migrate + */ + +import { + pgTable, + uuid, + varchar, + text, + timestamp, + boolean, + bigint, + jsonb, + unique, + index, +} from 'drizzle-orm/pg-core'; +import { relations } from 'drizzle-orm'; + +// ============================================================================ +// Users +// ============================================================================ + +export const users = pgTable('users', { + id: uuid('id').primaryKey().defaultRandom(), + githubId: varchar('github_id', { length: 255 }).unique().notNull(), + githubUsername: varchar('github_username', { length: 255 }).notNull(), + email: varchar('email', { length: 255 }), + avatarUrl: varchar('avatar_url', { length: 512 }), + plan: varchar('plan', { length: 50 }).notNull().default('free'), + onboardingCompletedAt: timestamp('onboarding_completed_at'), + createdAt: timestamp('created_at').defaultNow().notNull(), + updatedAt: timestamp('updated_at').defaultNow().notNull(), +}); + +export const usersRelations = relations(users, ({ many }) => ({ + credentials: many(credentials), + workspaces: many(workspaces), + repositories: many(repositories), + linkedDaemons: many(linkedDaemons), +})); + +// ============================================================================ +// Credentials (provider tokens) +// ============================================================================ + +export const credentials = pgTable('credentials', { + id: uuid('id').primaryKey().defaultRandom(), + userId: uuid('user_id').notNull().references(() => users.id, { onDelete: 'cascade' }), + provider: varchar('provider', { length: 50 }).notNull(), + accessToken: text('access_token').notNull(), + refreshToken: text('refresh_token'), + tokenExpiresAt: timestamp('token_expires_at'), + scopes: text('scopes').array(), + providerAccountId: varchar('provider_account_id', { length: 255 }), + providerAccountEmail: varchar('provider_account_email', { length: 255 }), + createdAt: timestamp('created_at').defaultNow().notNull(), + updatedAt: timestamp('updated_at').defaultNow().notNull(), +}, (table) => ({ + userProviderIdx: unique('credentials_user_provider_unique').on(table.userId, table.provider), + userIdIdx: index('idx_credentials_user_id').on(table.userId), +})); + +export const credentialsRelations = relations(credentials, ({ one }) => ({ + user: one(users, { + fields: [credentials.userId], + references: [users.id], + }), +})); + +// ============================================================================ +// Workspaces +// ============================================================================ + +export const workspaces = pgTable('workspaces', { + id: uuid('id').primaryKey().defaultRandom(), + userId: uuid('user_id').notNull().references(() => users.id, { onDelete: 'cascade' }), + name: varchar('name', { length: 255 }).notNull(), + status: varchar('status', { length: 50 }).notNull().default('provisioning'), + computeProvider: varchar('compute_provider', { length: 50 }).notNull(), + computeId: varchar('compute_id', { length: 255 }), + publicUrl: varchar('public_url', { length: 255 }), + customDomain: varchar('custom_domain', { length: 255 }), + customDomainStatus: varchar('custom_domain_status', { length: 50 }), + config: jsonb('config').notNull().default({}), + errorMessage: text('error_message'), + createdAt: timestamp('created_at').defaultNow().notNull(), + updatedAt: timestamp('updated_at').defaultNow().notNull(), +}, (table) => ({ + userIdIdx: index('idx_workspaces_user_id').on(table.userId), + customDomainIdx: index('idx_workspaces_custom_domain').on(table.customDomain), +})); + +export const workspacesRelations = relations(workspaces, ({ one, many }) => ({ + user: one(users, { + fields: [workspaces.userId], + references: [users.id], + }), + members: many(workspaceMembers), + repositories: many(repositories), +})); + +// ============================================================================ +// Workspace Members +// ============================================================================ + +export const workspaceMembers = pgTable('workspace_members', { + id: uuid('id').primaryKey().defaultRandom(), + workspaceId: uuid('workspace_id').notNull().references(() => workspaces.id, { onDelete: 'cascade' }), + userId: uuid('user_id').notNull().references(() => users.id, { onDelete: 'cascade' }), + role: varchar('role', { length: 50 }).notNull().default('member'), + invitedBy: uuid('invited_by').references(() => users.id), + invitedAt: timestamp('invited_at').defaultNow(), + acceptedAt: timestamp('accepted_at'), +}, (table) => ({ + workspaceUserIdx: unique('workspace_members_workspace_user_unique').on(table.workspaceId, table.userId), + workspaceIdIdx: index('idx_workspace_members_workspace_id').on(table.workspaceId), + userIdIdx: index('idx_workspace_members_user_id').on(table.userId), +})); + +export const workspaceMembersRelations = relations(workspaceMembers, ({ one }) => ({ + workspace: one(workspaces, { + fields: [workspaceMembers.workspaceId], + references: [workspaces.id], + }), + user: one(users, { + fields: [workspaceMembers.userId], + references: [users.id], + }), + inviter: one(users, { + fields: [workspaceMembers.invitedBy], + references: [users.id], + }), +})); + +// ============================================================================ +// Repositories +// ============================================================================ + +export const repositories = pgTable('repositories', { + id: uuid('id').primaryKey().defaultRandom(), + userId: uuid('user_id').notNull().references(() => users.id, { onDelete: 'cascade' }), + workspaceId: uuid('workspace_id').references(() => workspaces.id, { onDelete: 'set null' }), + githubFullName: varchar('github_full_name', { length: 255 }).notNull(), + githubId: bigint('github_id', { mode: 'number' }).notNull(), + defaultBranch: varchar('default_branch', { length: 255 }).notNull().default('main'), + isPrivate: boolean('is_private').notNull().default(false), + syncStatus: varchar('sync_status', { length: 50 }).notNull().default('pending'), + lastSyncedAt: timestamp('last_synced_at'), + createdAt: timestamp('created_at').defaultNow().notNull(), + updatedAt: timestamp('updated_at').defaultNow().notNull(), +}, (table) => ({ + userGithubIdx: unique('repositories_user_github_unique').on(table.userId, table.githubFullName), + userIdIdx: index('idx_repositories_user_id').on(table.userId), + workspaceIdIdx: index('idx_repositories_workspace_id').on(table.workspaceId), +})); + +export const repositoriesRelations = relations(repositories, ({ one }) => ({ + user: one(users, { + fields: [repositories.userId], + references: [users.id], + }), + workspace: one(workspaces, { + fields: [repositories.workspaceId], + references: [workspaces.id], + }), +})); + +// ============================================================================ +// Linked Daemons (local agent-relay instances) +// ============================================================================ + +export const linkedDaemons = pgTable('linked_daemons', { + id: uuid('id').primaryKey().defaultRandom(), + userId: uuid('user_id').notNull().references(() => users.id, { onDelete: 'cascade' }), + name: varchar('name', { length: 255 }).notNull(), + machineId: varchar('machine_id', { length: 255 }).notNull(), + apiKeyHash: varchar('api_key_hash', { length: 255 }).notNull(), + status: varchar('status', { length: 50 }).notNull().default('offline'), + lastSeenAt: timestamp('last_seen_at'), + metadata: jsonb('metadata').notNull().default({}), + pendingUpdates: jsonb('pending_updates').notNull().default([]), + messageQueue: jsonb('message_queue').notNull().default([]), + createdAt: timestamp('created_at').defaultNow().notNull(), + updatedAt: timestamp('updated_at').defaultNow().notNull(), +}, (table) => ({ + userMachineIdx: unique('linked_daemons_user_machine_unique').on(table.userId, table.machineId), + userIdIdx: index('idx_linked_daemons_user_id').on(table.userId), + apiKeyHashIdx: index('idx_linked_daemons_api_key_hash').on(table.apiKeyHash), + statusIdx: index('idx_linked_daemons_status').on(table.status), +})); + +export const linkedDaemonsRelations = relations(linkedDaemons, ({ one }) => ({ + user: one(users, { + fields: [linkedDaemons.userId], + references: [users.id], + }), +})); + +// ============================================================================ +// Subscriptions (billing) +// ============================================================================ + +export const subscriptions = pgTable('subscriptions', { + id: uuid('id').primaryKey().defaultRandom(), + userId: uuid('user_id').references(() => users.id, { onDelete: 'cascade' }), + stripeSubscriptionId: varchar('stripe_subscription_id', { length: 255 }).unique(), + stripeCustomerId: varchar('stripe_customer_id', { length: 255 }), + plan: varchar('plan', { length: 50 }).notNull(), + status: varchar('status', { length: 50 }).notNull().default('active'), + currentPeriodStart: timestamp('current_period_start'), + currentPeriodEnd: timestamp('current_period_end'), + createdAt: timestamp('created_at').defaultNow().notNull(), + updatedAt: timestamp('updated_at').defaultNow().notNull(), +}); + +// ============================================================================ +// Usage Records +// ============================================================================ + +export const usageRecords = pgTable('usage_records', { + id: uuid('id').primaryKey().defaultRandom(), + userId: uuid('user_id').references(() => users.id, { onDelete: 'cascade' }), + workspaceId: uuid('workspace_id').references(() => workspaces.id, { onDelete: 'set null' }), + metric: varchar('metric', { length: 100 }).notNull(), + value: bigint('value', { mode: 'number' }).notNull(), + recordedAt: timestamp('recorded_at').defaultNow().notNull(), +}, (table) => ({ + userIdIdx: index('idx_usage_records_user_id').on(table.userId), + recordedAtIdx: index('idx_usage_records_recorded_at').on(table.recordedAt), +})); + +// ============================================================================ +// Type exports +// ============================================================================ + +export type User = typeof users.$inferSelect; +export type NewUser = typeof users.$inferInsert; +export type Credential = typeof credentials.$inferSelect; +export type NewCredential = typeof credentials.$inferInsert; +export type Workspace = typeof workspaces.$inferSelect; +export type NewWorkspace = typeof workspaces.$inferInsert; +export type WorkspaceMember = typeof workspaceMembers.$inferSelect; +export type NewWorkspaceMember = typeof workspaceMembers.$inferInsert; +export type Repository = typeof repositories.$inferSelect; +export type NewRepository = typeof repositories.$inferInsert; +export type LinkedDaemon = typeof linkedDaemons.$inferSelect; +export type NewLinkedDaemon = typeof linkedDaemons.$inferInsert; +export type Subscription = typeof subscriptions.$inferSelect; +export type NewSubscription = typeof subscriptions.$inferInsert; +export type UsageRecord = typeof usageRecords.$inferSelect; +export type NewUsageRecord = typeof usageRecords.$inferInsert; diff --git a/src/daemon/cloud-sync.ts b/src/daemon/cloud-sync.ts new file mode 100644 index 000000000..0099c9bde --- /dev/null +++ b/src/daemon/cloud-sync.ts @@ -0,0 +1,356 @@ +/** + * Cloud Sync Service + * + * Handles automatic bridging between local daemons via the cloud: + * - Heartbeat to report status + * - Agent discovery across machines + * - Cross-machine message relay + * - Credential sync from cloud + */ + +import { EventEmitter } from 'events'; +import * as fs from 'fs'; +import * as path from 'path'; +import * as os from 'os'; + +export interface CloudSyncConfig { + apiKey?: string; + cloudUrl: string; + heartbeatInterval: number; // ms + enabled: boolean; +} + +export interface RemoteAgent { + name: string; + status: string; + daemonId: string; + daemonName: string; + machineId: string; +} + +export interface CrossMachineMessage { + from: { + daemonId: string; + daemonName: string; + agent: string; + }; + to: string; + content: string; + metadata?: Record; + timestamp: string; +} + +export class CloudSyncService extends EventEmitter { + private config: CloudSyncConfig; + private heartbeatTimer?: NodeJS.Timeout; + private machineId: string; + private localAgents: Map = new Map(); + private remoteAgents: RemoteAgent[] = []; + private connected = false; + + constructor(config: Partial = {}) { + super(); + + this.config = { + apiKey: config.apiKey || process.env.AGENT_RELAY_API_KEY, + cloudUrl: config.cloudUrl || process.env.AGENT_RELAY_CLOUD_URL || 'https://api.agent-relay.com', + heartbeatInterval: config.heartbeatInterval || 30000, // 30 seconds + enabled: config.enabled ?? true, + }; + + // Generate or load machine ID for consistent identification + this.machineId = this.getMachineId(); + } + + /** + * Get or create a persistent machine ID + */ + private getMachineId(): string { + const dataDir = process.env.AGENT_RELAY_DATA_DIR || + path.join(os.homedir(), '.local', 'share', 'agent-relay'); + + const machineIdPath = path.join(dataDir, 'machine-id'); + + try { + if (fs.existsSync(machineIdPath)) { + return fs.readFileSync(machineIdPath, 'utf-8').trim(); + } + + // Generate new machine ID + const { randomBytes } = require('crypto'); + const machineId = `${os.hostname()}-${randomBytes(8).toString('hex')}`; + + fs.mkdirSync(dataDir, { recursive: true }); + fs.writeFileSync(machineIdPath, machineId); + + return machineId; + } catch { + // Fallback: generate ephemeral ID + return `${os.hostname()}-${Date.now().toString(36)}`; + } + } + + /** + * Start the cloud sync service + */ + async start(): Promise { + if (!this.config.enabled || !this.config.apiKey) { + console.log('[cloud-sync] Disabled (no API key configured)'); + console.log('[cloud-sync] Run `agent-relay cloud link` to connect to cloud'); + return; + } + + console.log(`[cloud-sync] Starting cloud sync to ${this.config.cloudUrl}`); + + // Initial heartbeat + await this.sendHeartbeat(); + + // Start periodic heartbeat + this.heartbeatTimer = setInterval( + () => this.sendHeartbeat().catch(console.error), + this.config.heartbeatInterval + ); + + this.connected = true; + this.emit('connected'); + } + + /** + * Stop the cloud sync service + */ + stop(): void { + if (this.heartbeatTimer) { + clearInterval(this.heartbeatTimer); + this.heartbeatTimer = undefined; + } + this.connected = false; + this.emit('disconnected'); + } + + /** + * Update local agent list (called by daemon when agents change) + */ + updateAgents(agents: Array<{ name: string; status: string }>): void { + this.localAgents.clear(); + for (const agent of agents) { + this.localAgents.set(agent.name, agent); + } + + // Trigger immediate sync if connected + if (this.connected) { + this.syncAgents().catch(console.error); + } + } + + /** + * Get all remote agents (from other machines) + */ + getRemoteAgents(): RemoteAgent[] { + return this.remoteAgents; + } + + /** + * Send a message to an agent on another machine + */ + async sendCrossMachineMessage( + targetDaemonId: string, + targetAgent: string, + fromAgent: string, + content: string, + metadata?: Record + ): Promise { + if (!this.connected) { + throw new Error('Not connected to cloud'); + } + + const response = await fetch(`${this.config.cloudUrl}/api/daemons/message`, { + method: 'POST', + headers: { + Authorization: `Bearer ${this.config.apiKey}`, + 'Content-Type': 'application/json', + }, + body: JSON.stringify({ + targetDaemonId, + targetAgent, + message: { + from: fromAgent, + content, + metadata, + }, + }), + }); + + if (!response.ok) { + const error = await response.text(); + throw new Error(`Failed to send cross-machine message: ${error}`); + } + } + + /** + * Send heartbeat to cloud + */ + private async sendHeartbeat(): Promise { + try { + const agents = Array.from(this.localAgents.entries()).map(([name, info]) => ({ + name, + status: info.status, + })); + + const response = await fetch(`${this.config.cloudUrl}/api/daemons/heartbeat`, { + method: 'POST', + headers: { + Authorization: `Bearer ${this.config.apiKey}`, + 'Content-Type': 'application/json', + }, + body: JSON.stringify({ + agents, + metrics: { + uptime: process.uptime(), + memoryUsage: process.memoryUsage(), + }, + }), + }); + + if (!response.ok) { + if (response.status === 401) { + console.error('[cloud-sync] Invalid API key. Run `agent-relay cloud link` to re-authenticate.'); + this.stop(); + return; + } + throw new Error(`Heartbeat failed: ${response.status}`); + } + + const data = await response.json() as { commands?: Array<{ type: string; payload: unknown }> }; + + // Process any pending commands from cloud + if (data.commands && data.commands.length > 0) { + for (const cmd of data.commands) { + this.emit('command', cmd); + } + } + + // Fetch messages and sync agents + await Promise.all([ + this.fetchMessages(), + this.syncAgents(), + ]); + } catch (error) { + console.error('[cloud-sync] Heartbeat error:', error); + this.emit('error', error); + } + } + + /** + * Sync agents with cloud and get remote agents + */ + private async syncAgents(): Promise { + const agents = Array.from(this.localAgents.entries()).map(([name, info]) => ({ + name, + status: info.status, + })); + + const response = await fetch(`${this.config.cloudUrl}/api/daemons/agents`, { + method: 'POST', + headers: { + Authorization: `Bearer ${this.config.apiKey}`, + 'Content-Type': 'application/json', + }, + body: JSON.stringify({ agents }), + }); + + if (!response.ok) { + throw new Error(`Agent sync failed: ${response.status}`); + } + + const data = await response.json() as { allAgents: RemoteAgent[] }; + + // Filter out our own agents + this.remoteAgents = data.allAgents.filter( + (a) => !this.localAgents.has(a.name) + ); + + if (this.remoteAgents.length > 0) { + this.emit('remote-agents-updated', this.remoteAgents); + } + } + + /** + * Fetch queued messages from cloud + */ + private async fetchMessages(): Promise { + const response = await fetch(`${this.config.cloudUrl}/api/daemons/messages`, { + headers: { + Authorization: `Bearer ${this.config.apiKey}`, + }, + }); + + if (!response.ok) { + throw new Error(`Message fetch failed: ${response.status}`); + } + + const data = await response.json() as { messages: CrossMachineMessage[] }; + + for (const msg of data.messages) { + this.emit('cross-machine-message', msg); + } + } + + /** + * Sync credentials from cloud (pull latest tokens) + */ + async syncCredentials(): Promise> { + if (!this.connected) { + throw new Error('Not connected to cloud'); + } + + const response = await fetch(`${this.config.cloudUrl}/api/daemons/credentials`, { + headers: { + Authorization: `Bearer ${this.config.apiKey}`, + }, + }); + + if (!response.ok) { + throw new Error(`Credential sync failed: ${response.status}`); + } + + const data = await response.json() as { + credentials: Array<{ + provider: string; + accessToken: string; + tokenType?: string; + expiresAt?: string; + }>; + }; + + return data.credentials; + } + + /** + * Check if connected to cloud + */ + isConnected(): boolean { + return this.connected; + } + + /** + * Get machine ID + */ + getMachineIdentifier(): string { + return this.machineId; + } +} + +// Singleton instance +let _cloudSync: CloudSyncService | null = null; + +export function getCloudSync(config?: Partial): CloudSyncService { + if (!_cloudSync) { + _cloudSync = new CloudSyncService(config); + } + return _cloudSync; +} From 25c622de82cb1eee8fcac000b0bf35e5daf66121 Mon Sep 17 00:00:00 2001 From: Claude Date: Tue, 30 Dec 2025 03:15:31 +0000 Subject: [PATCH 24/38] Add cloud CLI commands and convert CSS to Tailwind CLI Commands: - Add `agent-relay cloud link` to connect machine to cloud - Add `agent-relay cloud unlink` to disconnect from cloud - Add `agent-relay cloud status` to show sync status - Add `agent-relay cloud sync` to manually sync credentials - Implements browser-based OAuth flow with API key verification - Stores config securely in ~/.local/share/agent-relay/ CSS to Tailwind: - Convert sidebar-container CSS classes to Tailwind utilities - Convert workspace-selector-container to Tailwind classes - Remove appStyles CSS export (kept empty for backwards compat) - Use Tailwind theme tokens (bg-sidebar-bg, border-sidebar-border) --- src/cli/index.ts | 290 +++++++++++++++++++++++++ src/dashboard/react-components/App.tsx | 41 +--- 2 files changed, 295 insertions(+), 36 deletions(-) diff --git a/src/cli/index.ts b/src/cli/index.ts index 8fd61e092..5e5bd53e7 100644 --- a/src/cli/index.ts +++ b/src/cli/index.ts @@ -1412,4 +1412,294 @@ program } }); +// ============================================================================ +// Cloud commands +// ============================================================================ + +const cloudCommand = program + .command('cloud') + .description('Cloud account and sync commands'); + +cloudCommand + .command('link') + .description('Link this machine to your Agent Relay Cloud account') + .option('--name ', 'Name for this machine') + .option('--cloud-url ', 'Cloud API URL', process.env.AGENT_RELAY_CLOUD_URL || 'https://api.agent-relay.com') + .action(async (options) => { + const os = await import('node:os'); + const crypto = await import('node:crypto'); + const readline = await import('node:readline'); + + const cloudUrl = options.cloudUrl; + const machineName = options.name || os.hostname(); + + // Generate machine ID + const dataDir = process.env.AGENT_RELAY_DATA_DIR || + path.join(os.homedir(), '.local', 'share', 'agent-relay'); + const machineIdPath = path.join(dataDir, 'machine-id'); + const configPath = path.join(dataDir, 'cloud-config.json'); + + let machineId: string; + if (fs.existsSync(machineIdPath)) { + machineId = fs.readFileSync(machineIdPath, 'utf-8').trim(); + } else { + machineId = `${os.hostname()}-${crypto.randomBytes(8).toString('hex')}`; + fs.mkdirSync(dataDir, { recursive: true }); + fs.writeFileSync(machineIdPath, machineId); + } + + console.log(''); + console.log('🔗 Agent Relay Cloud - Link Machine'); + console.log(''); + console.log(`Machine: ${machineName}`); + console.log(`ID: ${machineId}`); + console.log(''); + + // Generate a temporary code for the browser auth flow + const tempCode = crypto.randomBytes(16).toString('hex'); + + // Store temp code for callback + const tempCodePath = path.join(dataDir, '.link-code'); + fs.writeFileSync(tempCodePath, tempCode); + + const authUrl = `${cloudUrl.replace('/api', '')}/cloud/link?code=${tempCode}&machine=${encodeURIComponent(machineId)}&name=${encodeURIComponent(machineName)}`; + + console.log('Open this URL in your browser to authenticate:'); + console.log(''); + console.log(` ${authUrl}`); + console.log(''); + + // Try to open browser automatically + try { + const openCommand = process.platform === 'darwin' ? 'open' : + process.platform === 'win32' ? 'start' : 'xdg-open'; + await execAsync(`${openCommand} "${authUrl}"`); + console.log('(Browser opened automatically)'); + } catch { + console.log('(Copy the URL above and paste it in your browser)'); + } + + console.log(''); + console.log('After authenticating, paste your API key here:'); + + const rl = readline.createInterface({ + input: process.stdin, + output: process.stdout, + }); + + const apiKey = await new Promise((resolve) => { + rl.question('API Key: ', (answer) => { + rl.close(); + resolve(answer.trim()); + }); + }); + + if (!apiKey || !apiKey.startsWith('ar_live_')) { + console.error(''); + console.error('Invalid API key format. Expected ar_live_...'); + process.exit(1); + } + + // Verify the API key works + console.log(''); + console.log('Verifying API key...'); + + try { + const response = await fetch(`${cloudUrl}/api/daemons/heartbeat`, { + method: 'POST', + headers: { + 'Authorization': `Bearer ${apiKey}`, + 'Content-Type': 'application/json', + }, + body: JSON.stringify({ + agents: [], + metrics: { linkedAt: new Date().toISOString() }, + }), + }); + + if (!response.ok) { + const error = await response.text(); + console.error(`Failed to verify API key: ${error}`); + process.exit(1); + } + + // Save config + const config = { + apiKey, + cloudUrl, + machineId, + machineName, + linkedAt: new Date().toISOString(), + }; + + fs.writeFileSync(configPath, JSON.stringify(config, null, 2)); + fs.chmodSync(configPath, 0o600); // Secure the file + + // Clean up temp code + if (fs.existsSync(tempCodePath)) { + fs.unlinkSync(tempCodePath); + } + + console.log(''); + console.log('✓ Machine linked successfully!'); + console.log(''); + console.log('Your daemon will now sync with Agent Relay Cloud.'); + console.log('Run `agent-relay up` to start with cloud sync enabled.'); + console.log(''); + } catch (err: any) { + console.error(`Failed to connect to cloud: ${err.message}`); + process.exit(1); + } + }); + +cloudCommand + .command('unlink') + .description('Unlink this machine from Agent Relay Cloud') + .action(async () => { + const os = await import('node:os'); + + const dataDir = process.env.AGENT_RELAY_DATA_DIR || + path.join(os.homedir(), '.local', 'share', 'agent-relay'); + const configPath = path.join(dataDir, 'cloud-config.json'); + + if (!fs.existsSync(configPath)) { + console.log('This machine is not linked to Agent Relay Cloud.'); + return; + } + + // Read current config + const config = JSON.parse(fs.readFileSync(configPath, 'utf-8')); + + // Delete config file + fs.unlinkSync(configPath); + + console.log(''); + console.log('✓ Machine unlinked from Agent Relay Cloud'); + console.log(''); + console.log(`Machine ID: ${config.machineId}`); + console.log(`Was linked since: ${config.linkedAt}`); + console.log(''); + console.log('Note: The API key has been removed locally. To fully revoke access,'); + console.log('visit your Agent Relay Cloud dashboard and remove this machine.'); + console.log(''); + }); + +cloudCommand + .command('status') + .description('Show cloud sync status') + .action(async () => { + const os = await import('node:os'); + + const dataDir = process.env.AGENT_RELAY_DATA_DIR || + path.join(os.homedir(), '.local', 'share', 'agent-relay'); + const configPath = path.join(dataDir, 'cloud-config.json'); + + if (!fs.existsSync(configPath)) { + console.log(''); + console.log('Cloud sync: Not configured'); + console.log(''); + console.log('Run `agent-relay cloud link` to connect to Agent Relay Cloud.'); + console.log(''); + return; + } + + const config = JSON.parse(fs.readFileSync(configPath, 'utf-8')); + + console.log(''); + console.log('Cloud sync: Enabled'); + console.log(''); + console.log(` Machine: ${config.machineName}`); + console.log(` ID: ${config.machineId}`); + console.log(` Cloud URL: ${config.cloudUrl}`); + console.log(` Linked: ${new Date(config.linkedAt).toLocaleString()}`); + console.log(''); + + // Check if daemon is running and connected + const { getProjectPaths } = await import('../utils/project-namespace.js'); + const paths = getProjectPaths(); + + if (fs.existsSync(paths.socketPath)) { + console.log(' Daemon: Running'); + + // Try to get cloud sync status from daemon + try { + const response = await fetch(`${config.cloudUrl}/api/daemons/heartbeat`, { + method: 'POST', + headers: { + 'Authorization': `Bearer ${config.apiKey}`, + 'Content-Type': 'application/json', + }, + body: JSON.stringify({ agents: [], metrics: {} }), + }); + + if (response.ok) { + console.log(' Cloud connection: Online'); + } else { + console.log(' Cloud connection: Error (API key may be invalid)'); + } + } catch (err: any) { + console.log(` Cloud connection: Offline (${err.message})`); + } + } else { + console.log(' Daemon: Not running'); + console.log(' Cloud connection: Offline (daemon not started)'); + } + + console.log(''); + }); + +cloudCommand + .command('sync') + .description('Manually sync credentials from cloud') + .action(async () => { + const os = await import('node:os'); + + const dataDir = process.env.AGENT_RELAY_DATA_DIR || + path.join(os.homedir(), '.local', 'share', 'agent-relay'); + const configPath = path.join(dataDir, 'cloud-config.json'); + + if (!fs.existsSync(configPath)) { + console.error('Not linked to cloud. Run `agent-relay cloud link` first.'); + process.exit(1); + } + + const config = JSON.parse(fs.readFileSync(configPath, 'utf-8')); + + console.log('Syncing credentials from cloud...'); + + try { + const response = await fetch(`${config.cloudUrl}/api/daemons/credentials`, { + headers: { + 'Authorization': `Bearer ${config.apiKey}`, + }, + }); + + if (!response.ok) { + const error = await response.text(); + console.error(`Failed to sync: ${error}`); + process.exit(1); + } + + const data = await response.json() as { credentials: Array<{ provider: string; accessToken: string }> }; + + console.log(''); + console.log(`Synced ${data.credentials.length} provider credentials:`); + for (const cred of data.credentials) { + console.log(` - ${cred.provider}`); + } + + // Save credentials locally for daemon to use + const credentialsPath = path.join(dataDir, 'cloud-credentials.json'); + fs.writeFileSync(credentialsPath, JSON.stringify(data.credentials, null, 2)); + fs.chmodSync(credentialsPath, 0o600); + + console.log(''); + console.log('✓ Credentials synced successfully'); + console.log(''); + } catch (err: any) { + console.error(`Failed to sync: ${err.message}`); + process.exit(1); + } + }); + program.parse(); diff --git a/src/dashboard/react-components/App.tsx b/src/dashboard/react-components/App.tsx index 5c854c2a2..ab193b2a0 100644 --- a/src/dashboard/react-components/App.tsx +++ b/src/dashboard/react-components/App.tsx @@ -395,9 +395,9 @@ export function App({ wsUrl, orchestratorUrl }: AppProps) { /> {/* Sidebar with Workspace Selector */} -
+
{/* Workspace Selector */} -
+
Date: Tue, 30 Dec 2025 03:43:05 +0000 Subject: [PATCH 25/38] Add session invalidation detection for cloud dashboard - Add CloudSessionProvider to wrap the dashboard with session management - Add useSession hook for detecting expired sessions - Add SessionExpiredModal component for re-login prompts - Add cloudApi client with automatic session expiration detection - Update auth.ts with session endpoint and error codes - Add ProjectGroup schema with coordinator agent configuration - Refactor db layer to use Drizzle ORM with strong typing - Add WorkspaceMemberQueries for team management - Fix null/undefined type conversions in vault --- src/cloud/api/auth.ts | 51 +- src/cloud/api/teams.ts | 34 +- src/cloud/db/drizzle.ts | 595 +++++++++- src/cloud/db/index.ts | 1001 ++--------------- src/cloud/db/schema.ts | 66 +- src/cloud/provisioner/index.ts | 24 +- src/cloud/vault/index.ts | 16 +- src/dashboard/lib/cloudApi.ts | 303 +++++ .../react-components/CloudSessionProvider.tsx | 130 +++ .../react-components/SessionExpiredModal.tsx | 128 +++ src/dashboard/react-components/hooks/index.ts | 7 + .../react-components/hooks/useSession.ts | 205 ++++ src/dashboard/react-components/index.ts | 12 + 13 files changed, 1588 insertions(+), 984 deletions(-) create mode 100644 src/dashboard/lib/cloudApi.ts create mode 100644 src/dashboard/react-components/CloudSessionProvider.tsx create mode 100644 src/dashboard/react-components/SessionExpiredModal.tsx create mode 100644 src/dashboard/react-components/hooks/useSession.ts diff --git a/src/cloud/api/auth.ts b/src/cloud/api/auth.ts index 145ccee6f..baf8f78db 100644 --- a/src/cloud/api/auth.ts +++ b/src/cloud/api/auth.ts @@ -204,7 +204,56 @@ authRouter.get('/me', async (req: Request, res: Response) => { */ export function requireAuth(req: Request, res: Response, next: () => void) { if (!req.session.userId) { - return res.status(401).json({ error: 'Authentication required' }); + return res.status(401).json({ + error: 'Authentication required', + code: 'SESSION_EXPIRED', + message: 'Your session has expired. Please log in again.', + }); } next(); } + +/** + * GET /api/auth/session + * Check if current session is valid + */ +authRouter.get('/session', async (req: Request, res: Response) => { + if (!req.session.userId) { + return res.json({ + authenticated: false, + code: 'SESSION_EXPIRED', + message: 'Your session has expired. Please log in again.', + }); + } + + try { + // Verify user still exists + const user = await db.users.findById(req.session.userId); + if (!user) { + req.session.destroy(() => {}); + return res.json({ + authenticated: false, + code: 'USER_NOT_FOUND', + message: 'User account not found. Please log in again.', + }); + } + + res.json({ + authenticated: true, + user: { + id: user.id, + githubUsername: user.githubUsername, + email: user.email, + avatarUrl: user.avatarUrl, + plan: user.plan, + }, + }); + } catch (error) { + console.error('Session check error:', error); + res.status(500).json({ + authenticated: false, + code: 'SESSION_ERROR', + message: 'An error occurred while checking your session.', + }); + } +}); diff --git a/src/cloud/api/teams.ts b/src/cloud/api/teams.ts index e2255b481..a71b7a35d 100644 --- a/src/cloud/api/teams.ts +++ b/src/cloud/api/teams.ts @@ -34,17 +34,29 @@ teamsRouter.get('/workspaces/:workspaceId/members', async (req: Request, res: Re const members = await db.workspaceMembers.findByWorkspaceId(workspaceId); - res.json({ - members: members.map((m) => ({ - id: m.id, - userId: m.userId, - role: m.role, - invitedAt: m.invitedAt, - acceptedAt: m.acceptedAt, - isPending: !m.acceptedAt, - user: m.user, - })), - }); + // Fetch user info for each member + const membersWithUsers = await Promise.all( + members.map(async (m) => { + const user = await db.users.findById(m.userId); + return { + id: m.id, + userId: m.userId, + role: m.role, + invitedAt: m.invitedAt, + acceptedAt: m.acceptedAt, + isPending: !m.acceptedAt, + user: user + ? { + githubUsername: user.githubUsername, + email: user.email ?? undefined, + avatarUrl: user.avatarUrl ?? undefined, + } + : undefined, + }; + }) + ); + + res.json({ members: membersWithUsers }); } catch (error) { console.error('Error listing members:', error); res.status(500).json({ error: 'Failed to list members' }); diff --git a/src/cloud/db/drizzle.ts b/src/cloud/db/drizzle.ts index 6ba8faece..fe9f15f5d 100644 --- a/src/cloud/db/drizzle.ts +++ b/src/cloud/db/drizzle.ts @@ -19,8 +19,13 @@ export type { NewCredential, Workspace, NewWorkspace, + WorkspaceConfig, WorkspaceMember, NewWorkspaceMember, + ProjectGroup, + NewProjectGroup, + CoordinatorAgentConfig, + ProjectAgentConfig, Repository, NewRepository, LinkedDaemon, @@ -57,26 +62,41 @@ export function getDb() { // User Queries // ============================================================================ -export const userQueries = { - async findById(id: string) { +export interface UserQueries { + findById(id: string): Promise; + findByGithubId(githubId: string): Promise; + findByGithubUsername(username: string): Promise; + findByEmail(email: string): Promise; + upsert(data: schema.NewUser): Promise; + completeOnboarding(userId: string): Promise; +} + +export const userQueries: UserQueries = { + async findById(id: string): Promise { const db = getDb(); const result = await db.select().from(schema.users).where(eq(schema.users.id, id)); return result[0] ?? null; }, - async findByGithubId(githubId: string) { + async findByGithubId(githubId: string): Promise { const db = getDb(); const result = await db.select().from(schema.users).where(eq(schema.users.githubId, githubId)); return result[0] ?? null; }, - async findByEmail(email: string) { + async findByGithubUsername(username: string): Promise { + const db = getDb(); + const result = await db.select().from(schema.users).where(eq(schema.users.githubUsername, username)); + return result[0] ?? null; + }, + + async findByEmail(email: string): Promise { const db = getDb(); const result = await db.select().from(schema.users).where(eq(schema.users.email, email)); return result[0] ?? null; }, - async upsert(data: schema.NewUser) { + async upsert(data: schema.NewUser): Promise { const db = getDb(); const result = await db .insert(schema.users) @@ -94,7 +114,7 @@ export const userQueries = { return result[0]; }, - async completeOnboarding(userId: string) { + async completeOnboarding(userId: string): Promise { const db = getDb(); await db .update(schema.users) @@ -107,13 +127,21 @@ export const userQueries = { // Credential Queries // ============================================================================ -export const credentialQueries = { - async findByUserId(userId: string) { +export interface CredentialQueries { + findByUserId(userId: string): Promise; + findByUserAndProvider(userId: string, provider: string): Promise; + upsert(data: schema.NewCredential): Promise; + updateTokens(userId: string, provider: string, accessToken: string, refreshToken?: string, expiresAt?: Date): Promise; + delete(userId: string, provider: string): Promise; +} + +export const credentialQueries: CredentialQueries = { + async findByUserId(userId: string): Promise { const db = getDb(); return db.select().from(schema.credentials).where(eq(schema.credentials.userId, userId)); }, - async findByUserAndProvider(userId: string, provider: string) { + async findByUserAndProvider(userId: string, provider: string): Promise { const db = getDb(); const result = await db .select() @@ -122,7 +150,7 @@ export const credentialQueries = { return result[0] ?? null; }, - async upsert(data: schema.NewCredential) { + async upsert(data: schema.NewCredential): Promise { const db = getDb(); const result = await db .insert(schema.credentials) @@ -143,7 +171,31 @@ export const credentialQueries = { return result[0]; }, - async delete(userId: string, provider: string) { + async updateTokens( + userId: string, + provider: string, + accessToken: string, + refreshToken?: string, + expiresAt?: Date + ): Promise { + const db = getDb(); + const updates: Record = { + accessToken, + updatedAt: new Date(), + }; + if (refreshToken !== undefined) { + updates.refreshToken = refreshToken; + } + if (expiresAt !== undefined) { + updates.tokenExpiresAt = expiresAt; + } + await db + .update(schema.credentials) + .set(updates) + .where(and(eq(schema.credentials.userId, userId), eq(schema.credentials.provider, provider))); + }, + + async delete(userId: string, provider: string): Promise { const db = getDb(); await db .delete(schema.credentials) @@ -155,14 +207,30 @@ export const credentialQueries = { // Workspace Queries // ============================================================================ -export const workspaceQueries = { - async findById(id: string) { +export interface WorkspaceQueries { + findById(id: string): Promise; + findByUserId(userId: string): Promise; + findByCustomDomain(domain: string): Promise; + create(data: schema.NewWorkspace): Promise; + updateStatus( + id: string, + status: string, + options?: { computeId?: string; publicUrl?: string; errorMessage?: string } + ): Promise; + setCustomDomain(id: string, customDomain: string, status?: string): Promise; + updateCustomDomainStatus(id: string, status: string): Promise; + removeCustomDomain(id: string): Promise; + delete(id: string): Promise; +} + +export const workspaceQueries: WorkspaceQueries = { + async findById(id: string): Promise { const db = getDb(); const result = await db.select().from(schema.workspaces).where(eq(schema.workspaces.id, id)); return result[0] ?? null; }, - async findByUserId(userId: string) { + async findByUserId(userId: string): Promise { const db = getDb(); return db .select() @@ -171,7 +239,7 @@ export const workspaceQueries = { .orderBy(desc(schema.workspaces.createdAt)); }, - async findByCustomDomain(domain: string) { + async findByCustomDomain(domain: string): Promise { const db = getDb(); const result = await db .select() @@ -180,7 +248,7 @@ export const workspaceQueries = { return result[0] ?? null; }, - async create(data: schema.NewWorkspace) { + async create(data: schema.NewWorkspace): Promise { const db = getDb(); const result = await db.insert(schema.workspaces).values(data).returning(); return result[0]; @@ -190,7 +258,7 @@ export const workspaceQueries = { id: string, status: string, options?: { computeId?: string; publicUrl?: string; errorMessage?: string } - ) { + ): Promise { const db = getDb(); await db .update(schema.workspaces) @@ -204,24 +272,214 @@ export const workspaceQueries = { .where(eq(schema.workspaces.id, id)); }, - async delete(id: string) { + async setCustomDomain(id: string, customDomain: string, status = 'pending'): Promise { + const db = getDb(); + await db + .update(schema.workspaces) + .set({ customDomain, customDomainStatus: status, updatedAt: new Date() }) + .where(eq(schema.workspaces.id, id)); + }, + + async updateCustomDomainStatus(id: string, status: string): Promise { + const db = getDb(); + await db + .update(schema.workspaces) + .set({ customDomainStatus: status, updatedAt: new Date() }) + .where(eq(schema.workspaces.id, id)); + }, + + async removeCustomDomain(id: string): Promise { + const db = getDb(); + await db + .update(schema.workspaces) + .set({ customDomain: null, customDomainStatus: null, updatedAt: new Date() }) + .where(eq(schema.workspaces.id, id)); + }, + + async delete(id: string): Promise { const db = getDb(); await db.delete(schema.workspaces).where(eq(schema.workspaces.id, id)); }, }; +// ============================================================================ +// Workspace Member Queries +// ============================================================================ + +export interface WorkspaceMemberQueries { + findByWorkspaceId(workspaceId: string): Promise; + findByUserId(userId: string): Promise; + findMembership(workspaceId: string, userId: string): Promise; + addMember(data: { workspaceId: string; userId: string; role: string; invitedBy: string }): Promise; + acceptInvite(workspaceId: string, userId: string): Promise; + updateRole(workspaceId: string, userId: string, role: string): Promise; + removeMember(workspaceId: string, userId: string): Promise; + getPendingInvites(userId: string): Promise; + isOwner(workspaceId: string, userId: string): Promise; + canEdit(workspaceId: string, userId: string): Promise; + canView(workspaceId: string, userId: string): Promise; +} + +export const workspaceMemberQueries: WorkspaceMemberQueries = { + async findByWorkspaceId(workspaceId: string): Promise { + const db = getDb(); + return db + .select() + .from(schema.workspaceMembers) + .where(eq(schema.workspaceMembers.workspaceId, workspaceId)); + }, + + async findByUserId(userId: string): Promise { + const db = getDb(); + return db + .select() + .from(schema.workspaceMembers) + .where(and(eq(schema.workspaceMembers.userId, userId), isNotNull(schema.workspaceMembers.acceptedAt))); + }, + + async findMembership(workspaceId: string, userId: string): Promise { + const db = getDb(); + const result = await db + .select() + .from(schema.workspaceMembers) + .where(and(eq(schema.workspaceMembers.workspaceId, workspaceId), eq(schema.workspaceMembers.userId, userId))); + return result[0] ?? null; + }, + + async addMember(data: { workspaceId: string; userId: string; role: string; invitedBy: string }): Promise { + const db = getDb(); + const result = await db + .insert(schema.workspaceMembers) + .values({ + workspaceId: data.workspaceId, + userId: data.userId, + role: data.role, + invitedBy: data.invitedBy, + }) + .returning(); + return result[0]; + }, + + async acceptInvite(workspaceId: string, userId: string): Promise { + const db = getDb(); + await db + .update(schema.workspaceMembers) + .set({ acceptedAt: new Date() }) + .where(and(eq(schema.workspaceMembers.workspaceId, workspaceId), eq(schema.workspaceMembers.userId, userId))); + }, + + async updateRole(workspaceId: string, userId: string, role: string): Promise { + const db = getDb(); + await db + .update(schema.workspaceMembers) + .set({ role }) + .where(and(eq(schema.workspaceMembers.workspaceId, workspaceId), eq(schema.workspaceMembers.userId, userId))); + }, + + async removeMember(workspaceId: string, userId: string): Promise { + const db = getDb(); + await db + .delete(schema.workspaceMembers) + .where(and(eq(schema.workspaceMembers.workspaceId, workspaceId), eq(schema.workspaceMembers.userId, userId))); + }, + + async getPendingInvites(userId: string): Promise { + const db = getDb(); + return db + .select() + .from(schema.workspaceMembers) + .where(and(eq(schema.workspaceMembers.userId, userId), isNull(schema.workspaceMembers.acceptedAt))); + }, + + async isOwner(workspaceId: string, userId: string): Promise { + const db = getDb(); + const result = await db + .select() + .from(schema.workspaceMembers) + .where( + and( + eq(schema.workspaceMembers.workspaceId, workspaceId), + eq(schema.workspaceMembers.userId, userId), + eq(schema.workspaceMembers.role, 'owner') + ) + ); + return result.length > 0; + }, + + async canEdit(workspaceId: string, userId: string): Promise { + const db = getDb(); + const result = await db + .select() + .from(schema.workspaceMembers) + .where( + and( + eq(schema.workspaceMembers.workspaceId, workspaceId), + eq(schema.workspaceMembers.userId, userId), + isNotNull(schema.workspaceMembers.acceptedAt) + ) + ); + const member = result[0]; + return !!member && ['owner', 'admin', 'member'].includes(member.role); + }, + + async canView(workspaceId: string, userId: string): Promise { + const db = getDb(); + const result = await db + .select() + .from(schema.workspaceMembers) + .where( + and( + eq(schema.workspaceMembers.workspaceId, workspaceId), + eq(schema.workspaceMembers.userId, userId), + isNotNull(schema.workspaceMembers.acceptedAt) + ) + ); + return result.length > 0; + }, +}; + // ============================================================================ // Linked Daemon Queries // ============================================================================ -export const linkedDaemonQueries = { - async findById(id: string) { +export interface DaemonAgentInfo { + daemonId: string; + daemonName: string; + machineId: string; + agents: Array<{ name: string; status: string }>; +} + +export interface DaemonUpdate { + type: string; + payload: unknown; +} + +export interface LinkedDaemonQueries { + findById(id: string): Promise; + findByUserId(userId: string): Promise; + findByMachineId(userId: string, machineId: string): Promise; + findByApiKeyHash(apiKeyHash: string): Promise; + create(data: schema.NewLinkedDaemon): Promise; + update(id: string, data: Partial): Promise; + updateLastSeen(id: string): Promise; + delete(id: string): Promise; + markStale(): Promise; + getAllAgentsForUser(userId: string): Promise; + getPendingUpdates(id: string): Promise; + queueUpdate(id: string, update: DaemonUpdate): Promise; + queueMessage(id: string, message: Record): Promise; + getQueuedMessages(id: string): Promise>>; + clearMessageQueue(id: string): Promise; +} + +export const linkedDaemonQueries: LinkedDaemonQueries = { + async findById(id: string): Promise { const db = getDb(); const result = await db.select().from(schema.linkedDaemons).where(eq(schema.linkedDaemons.id, id)); return result[0] ?? null; }, - async findByUserId(userId: string) { + async findByUserId(userId: string): Promise { const db = getDb(); return db .select() @@ -230,7 +488,7 @@ export const linkedDaemonQueries = { .orderBy(desc(schema.linkedDaemons.lastSeenAt)); }, - async findByMachineId(userId: string, machineId: string) { + async findByMachineId(userId: string, machineId: string): Promise { const db = getDb(); const result = await db .select() @@ -241,7 +499,7 @@ export const linkedDaemonQueries = { return result[0] ?? null; }, - async findByApiKeyHash(apiKeyHash: string) { + async findByApiKeyHash(apiKeyHash: string): Promise { const db = getDb(); const result = await db .select() @@ -250,7 +508,7 @@ export const linkedDaemonQueries = { return result[0] ?? null; }, - async create(data: schema.NewLinkedDaemon) { + async create(data: schema.NewLinkedDaemon): Promise { const db = getDb(); const result = await db .insert(schema.linkedDaemons) @@ -259,7 +517,7 @@ export const linkedDaemonQueries = { return result[0]; }, - async update(id: string, data: Partial) { + async update(id: string, data: Partial): Promise { const db = getDb(); await db .update(schema.linkedDaemons) @@ -267,7 +525,7 @@ export const linkedDaemonQueries = { .where(eq(schema.linkedDaemons.id, id)); }, - async updateLastSeen(id: string) { + async updateLastSeen(id: string): Promise { const db = getDb(); await db .update(schema.linkedDaemons) @@ -275,12 +533,12 @@ export const linkedDaemonQueries = { .where(eq(schema.linkedDaemons.id, id)); }, - async delete(id: string) { + async delete(id: string): Promise { const db = getDb(); await db.delete(schema.linkedDaemons).where(eq(schema.linkedDaemons.id, id)); }, - async markStale() { + async markStale(): Promise { const db = getDb(); const twoMinutesAgo = new Date(Date.now() - 2 * 60 * 1000); const result = await db @@ -295,15 +553,7 @@ export const linkedDaemonQueries = { return result.rowCount ?? 0; }, - // Get all agents from all daemons for a user (cross-machine discovery) - async getAllAgentsForUser(userId: string): Promise< - Array<{ - daemonId: string; - daemonName: string; - machineId: string; - agents: Array<{ name: string; status: string }>; - }> - > { + async getAllAgentsForUser(userId: string): Promise { const db = getDb(); const daemons = await db .select() @@ -314,17 +564,228 @@ export const linkedDaemonQueries = { daemonId: d.id, daemonName: d.name, machineId: d.machineId, - agents: ((d.metadata as any)?.agents as Array<{ name: string; status: string }>) || [], + agents: ((d.metadata as Record)?.agents as Array<{ name: string; status: string }>) || [], })); }, + + async getPendingUpdates(id: string): Promise { + const db = getDb(); + const result = await db.select().from(schema.linkedDaemons).where(eq(schema.linkedDaemons.id, id)); + const daemon = result[0]; + if (!daemon) return []; + const updates = (daemon.pendingUpdates as DaemonUpdate[]) || []; + // Clear after reading + if (updates.length > 0) { + await db + .update(schema.linkedDaemons) + .set({ pendingUpdates: [] }) + .where(eq(schema.linkedDaemons.id, id)); + } + return updates; + }, + + async queueUpdate(id: string, update: DaemonUpdate): Promise { + const db = getDb(); + const result = await db.select().from(schema.linkedDaemons).where(eq(schema.linkedDaemons.id, id)); + const daemon = result[0]; + if (!daemon) return; + const existing = (daemon.pendingUpdates as DaemonUpdate[]) || []; + await db + .update(schema.linkedDaemons) + .set({ pendingUpdates: [...existing, update], updatedAt: new Date() }) + .where(eq(schema.linkedDaemons.id, id)); + }, + + async queueMessage(id: string, message: Record): Promise { + const db = getDb(); + const result = await db.select().from(schema.linkedDaemons).where(eq(schema.linkedDaemons.id, id)); + const daemon = result[0]; + if (!daemon) return; + const existing = (daemon.messageQueue as Array>) || []; + await db + .update(schema.linkedDaemons) + .set({ messageQueue: [...existing, message], updatedAt: new Date() }) + .where(eq(schema.linkedDaemons.id, id)); + }, + + async getQueuedMessages(id: string): Promise>> { + const db = getDb(); + const result = await db.select().from(schema.linkedDaemons).where(eq(schema.linkedDaemons.id, id)); + const daemon = result[0]; + return (daemon?.messageQueue as Array>) || []; + }, + + async clearMessageQueue(id: string): Promise { + const db = getDb(); + await db + .update(schema.linkedDaemons) + .set({ messageQueue: [] }) + .where(eq(schema.linkedDaemons.id, id)); + }, +}; + +// ============================================================================ +// Project Group Queries +// ============================================================================ + +export interface ProjectGroupWithRepositories extends schema.ProjectGroup { + repositories: schema.Repository[]; +} + +export interface AllGroupsResult { + groups: ProjectGroupWithRepositories[]; + ungroupedRepositories: schema.Repository[]; +} + +export interface ProjectGroupQueries { + findById(id: string): Promise; + findByUserId(userId: string): Promise; + findByName(userId: string, name: string): Promise; + create(data: schema.NewProjectGroup): Promise; + update(id: string, data: Partial>): Promise; + delete(id: string): Promise; + findWithRepositories(id: string): Promise; + findAllWithRepositories(userId: string): Promise; + updateCoordinatorAgent(id: string, config: schema.CoordinatorAgentConfig): Promise; + reorder(userId: string, orderedIds: string[]): Promise; +} + +export const projectGroupQueries: ProjectGroupQueries = { + async findById(id: string): Promise { + const db = getDb(); + const result = await db.select().from(schema.projectGroups).where(eq(schema.projectGroups.id, id)); + return result[0] ?? null; + }, + + async findByUserId(userId: string): Promise { + const db = getDb(); + return db + .select() + .from(schema.projectGroups) + .where(eq(schema.projectGroups.userId, userId)) + .orderBy(schema.projectGroups.sortOrder, schema.projectGroups.name); + }, + + async findByName(userId: string, name: string): Promise { + const db = getDb(); + const result = await db + .select() + .from(schema.projectGroups) + .where(and(eq(schema.projectGroups.userId, userId), eq(schema.projectGroups.name, name))); + return result[0] ?? null; + }, + + async create(data: schema.NewProjectGroup): Promise { + const db = getDb(); + const result = await db.insert(schema.projectGroups).values(data).returning(); + return result[0]; + }, + + async update(id: string, data: Partial>): Promise { + const db = getDb(); + await db + .update(schema.projectGroups) + .set({ ...data, updatedAt: new Date() }) + .where(eq(schema.projectGroups.id, id)); + }, + + async delete(id: string): Promise { + const db = getDb(); + // Repositories in this group will have projectGroupId set to null (ON DELETE SET NULL) + await db.delete(schema.projectGroups).where(eq(schema.projectGroups.id, id)); + }, + + async findWithRepositories(id: string): Promise { + const db = getDb(); + const group = await db.select().from(schema.projectGroups).where(eq(schema.projectGroups.id, id)); + if (!group[0]) return null; + + const repos = await db + .select() + .from(schema.repositories) + .where(eq(schema.repositories.projectGroupId, id)) + .orderBy(schema.repositories.githubFullName); + + return { ...group[0], repositories: repos }; + }, + + async findAllWithRepositories(userId: string): Promise { + const db = getDb(); + const groups = await db + .select() + .from(schema.projectGroups) + .where(eq(schema.projectGroups.userId, userId)) + .orderBy(schema.projectGroups.sortOrder, schema.projectGroups.name); + + // Get repositories for each group + const result = await Promise.all( + groups.map(async (group) => { + const repos = await db + .select() + .from(schema.repositories) + .where(eq(schema.repositories.projectGroupId, group.id)) + .orderBy(schema.repositories.githubFullName); + return { ...group, repositories: repos }; + }) + ); + + // Also get ungrouped repositories + const ungroupedRepos = await db + .select() + .from(schema.repositories) + .where(and(eq(schema.repositories.userId, userId), isNull(schema.repositories.projectGroupId))) + .orderBy(schema.repositories.githubFullName); + + return { groups: result, ungroupedRepositories: ungroupedRepos }; + }, + + async updateCoordinatorAgent(id: string, config: schema.CoordinatorAgentConfig): Promise { + const db = getDb(); + await db + .update(schema.projectGroups) + .set({ coordinatorAgent: config, updatedAt: new Date() }) + .where(eq(schema.projectGroups.id, id)); + }, + + async reorder(userId: string, orderedIds: string[]): Promise { + const db = getDb(); + // Update sort_order for each group + await Promise.all( + orderedIds.map((id, index) => + db + .update(schema.projectGroups) + .set({ sortOrder: index, updatedAt: new Date() }) + .where(and(eq(schema.projectGroups.id, id), eq(schema.projectGroups.userId, userId))) + ) + ); + }, }; // ============================================================================ // Repository Queries // ============================================================================ -export const repositoryQueries = { - async findByUserId(userId: string) { +export interface RepositoryQueries { + findById(id: string): Promise; + findByUserId(userId: string): Promise; + findByWorkspaceId(workspaceId: string): Promise; + findByProjectGroupId(projectGroupId: string): Promise; + upsert(data: schema.NewRepository): Promise; + assignToWorkspace(repoId: string, workspaceId: string): Promise; + assignToGroup(repoId: string, projectGroupId: string | null): Promise; + updateProjectAgent(id: string, config: schema.ProjectAgentConfig): Promise; + updateSyncStatus(id: string, status: string, lastSyncedAt?: Date): Promise; + delete(id: string): Promise; +} + +export const repositoryQueries: RepositoryQueries = { + async findById(id: string): Promise { + const db = getDb(); + const result = await db.select().from(schema.repositories).where(eq(schema.repositories.id, id)); + return result[0] ?? null; + }, + + async findByUserId(userId: string): Promise { const db = getDb(); return db .select() @@ -333,7 +794,7 @@ export const repositoryQueries = { .orderBy(schema.repositories.githubFullName); }, - async findByWorkspaceId(workspaceId: string) { + async findByWorkspaceId(workspaceId: string): Promise { const db = getDb(); return db .select() @@ -341,7 +802,16 @@ export const repositoryQueries = { .where(eq(schema.repositories.workspaceId, workspaceId)); }, - async upsert(data: schema.NewRepository) { + async findByProjectGroupId(projectGroupId: string): Promise { + const db = getDb(); + return db + .select() + .from(schema.repositories) + .where(eq(schema.repositories.projectGroupId, projectGroupId)) + .orderBy(schema.repositories.githubFullName); + }, + + async upsert(data: schema.NewRepository): Promise { const db = getDb(); const result = await db .insert(schema.repositories) @@ -358,6 +828,47 @@ export const repositoryQueries = { .returning(); return result[0]; }, + + async assignToWorkspace(repoId: string, workspaceId: string): Promise { + const db = getDb(); + await db + .update(schema.repositories) + .set({ workspaceId, updatedAt: new Date() }) + .where(eq(schema.repositories.id, repoId)); + }, + + async assignToGroup(repoId: string, projectGroupId: string | null): Promise { + const db = getDb(); + await db + .update(schema.repositories) + .set({ projectGroupId, updatedAt: new Date() }) + .where(eq(schema.repositories.id, repoId)); + }, + + async updateProjectAgent(id: string, config: schema.ProjectAgentConfig): Promise { + const db = getDb(); + await db + .update(schema.repositories) + .set({ projectAgent: config, updatedAt: new Date() }) + .where(eq(schema.repositories.id, id)); + }, + + async updateSyncStatus(id: string, status: string, lastSyncedAt?: Date): Promise { + const db = getDb(); + const updates: Record = { syncStatus: status, updatedAt: new Date() }; + if (lastSyncedAt) { + updates.lastSyncedAt = lastSyncedAt; + } + await db + .update(schema.repositories) + .set(updates) + .where(eq(schema.repositories.id, id)); + }, + + async delete(id: string): Promise { + const db = getDb(); + await db.delete(schema.repositories).where(eq(schema.repositories.id, id)); + }, }; // ============================================================================ diff --git a/src/cloud/db/index.ts b/src/cloud/db/index.ts index 2438a97a6..d1e432fe7 100644 --- a/src/cloud/db/index.ts +++ b/src/cloud/db/index.ts @@ -1,924 +1,107 @@ /** * Agent Relay Cloud - Database Layer * - * PostgreSQL database access for users, credentials, workspaces, and repos. + * Re-exports Drizzle ORM queries and types. + * All database access should go through Drizzle for type safety. + * + * Generate migrations: npm run db:generate + * Run migrations: npm run db:migrate */ -import { Pool } from 'pg'; -import { getConfig } from '../config.js'; - -// Initialize pool lazily -let pool: Pool | null = null; - -function getPool(): Pool { - if (!pool) { - const config = getConfig(); - pool = new Pool({ connectionString: config.databaseUrl }); - } - return pool; -} - -// Types +// Re-export all types from schema +export type { + User, + NewUser, + Credential, + NewCredential, + Workspace, + NewWorkspace, + WorkspaceConfig, + WorkspaceMember, + NewWorkspaceMember, + ProjectGroup, + NewProjectGroup, + CoordinatorAgentConfig, + ProjectAgentConfig, + Repository, + NewRepository, + LinkedDaemon, + NewLinkedDaemon, + Subscription, + NewSubscription, + UsageRecord, + NewUsageRecord, +} from './schema.js'; + +// Re-export schema tables for direct access if needed +export { + users as usersTable, + credentials as credentialsTable, + workspaces as workspacesTable, + workspaceMembers as workspaceMembersTable, + projectGroups as projectGroupsTable, + repositories as repositoriesTable, + linkedDaemons as linkedDaemonsTable, + subscriptions as subscriptionsTable, + usageRecords as usageRecordsTable, +} from './schema.js'; + +// Import query modules +import { + getDb, + closeDb, + runMigrations, + userQueries, + credentialQueries, + workspaceQueries, + workspaceMemberQueries, + linkedDaemonQueries, + projectGroupQueries, + repositoryQueries, +} from './drizzle.js'; + +// Legacy type aliases for backwards compatibility export type PlanType = 'free' | 'pro' | 'team' | 'enterprise'; - -export interface User { - id: string; - githubId: string; - githubUsername: string; - email?: string; - avatarUrl?: string; - plan: PlanType; - onboardingCompletedAt?: Date; - createdAt: Date; - updatedAt: Date; -} - -export interface Credential { - id: string; - userId: string; - provider: string; - accessToken: string; // Encrypted - refreshToken?: string; // Encrypted - tokenExpiresAt?: Date; - scopes?: string[]; - providerAccountId?: string; - providerAccountEmail?: string; - createdAt: Date; - updatedAt: Date; -} - -export interface Workspace { - id: string; - userId: string; - name: string; - status: 'provisioning' | 'running' | 'stopped' | 'error'; - computeProvider: 'fly' | 'railway' | 'docker'; - computeId?: string; // External ID from compute provider - publicUrl?: string; // Default URL (e.g., workspace-abc.agentrelay.dev) - customDomain?: string; // User's custom domain (e.g., agents.acme.com) - customDomainStatus?: 'pending' | 'verifying' | 'active' | 'error'; - config: WorkspaceConfig; - errorMessage?: string; - createdAt: Date; - updatedAt: Date; -} - -export interface WorkspaceConfig { - providers: string[]; - repositories: string[]; - supervisorEnabled: boolean; - maxAgents: number; -} - export type WorkspaceMemberRole = 'owner' | 'admin' | 'member' | 'viewer'; -export interface WorkspaceMember { - id: string; - workspaceId: string; - userId: string; - role: WorkspaceMemberRole; - invitedBy?: string; - invitedAt: Date; - acceptedAt?: Date; - // Denormalized for easy display - user?: { - githubUsername: string; - email?: string; - avatarUrl?: string; - }; -} - -export interface Repository { - id: string; - userId: string; - workspaceId?: string; - githubFullName: string; // e.g., "owner/repo" - githubId: number; - defaultBranch: string; - isPrivate: boolean; - syncStatus: 'pending' | 'syncing' | 'synced' | 'error'; - lastSyncedAt?: Date; - createdAt: Date; - updatedAt: Date; -} - -export interface LinkedDaemon { - id: string; - userId: string; - name: string; - machineId: string; - apiKeyHash: string; - status: 'online' | 'offline'; - lastSeenAt?: Date; - metadata: Record; - pendingUpdates?: Array<{ type: string; payload: unknown }>; - messageQueue?: Array>; - createdAt: Date; - updatedAt: Date; -} - -// User queries -export const users = { - async findById(id: string): Promise { - const { rows } = await getPool().query( - 'SELECT * FROM users WHERE id = $1', - [id] - ); - return rows[0] || null; - }, - - async findByGithubId(githubId: string): Promise { - const { rows } = await getPool().query( - 'SELECT * FROM users WHERE github_id = $1', - [githubId] - ); - return rows[0] ? mapUser(rows[0]) : null; - }, - - async findByGithubUsername(username: string): Promise { - const { rows } = await getPool().query( - 'SELECT * FROM users WHERE github_username = $1', - [username] - ); - return rows[0] ? mapUser(rows[0]) : null; - }, - - async findByEmail(email: string): Promise { - const { rows } = await getPool().query( - 'SELECT * FROM users WHERE email = $1', - [email] - ); - return rows[0] ? mapUser(rows[0]) : null; - }, - - async upsert(data: { - githubId: string; - githubUsername: string; - email?: string; - avatarUrl?: string; - }): Promise { - const { rows } = await getPool().query( - `INSERT INTO users (github_id, github_username, email, avatar_url) - VALUES ($1, $2, $3, $4) - ON CONFLICT (github_id) DO UPDATE SET - github_username = EXCLUDED.github_username, - email = COALESCE(EXCLUDED.email, users.email), - avatar_url = COALESCE(EXCLUDED.avatar_url, users.avatar_url), - updated_at = NOW() - RETURNING *`, - [data.githubId, data.githubUsername, data.email, data.avatarUrl] - ); - return mapUser(rows[0]); - }, - - async completeOnboarding(userId: string): Promise { - await getPool().query( - 'UPDATE users SET onboarding_completed_at = NOW(), updated_at = NOW() WHERE id = $1', - [userId] - ); - }, -}; - -// Credential queries -export const credentials = { - async findByUserId(userId: string): Promise { - const { rows } = await getPool().query( - 'SELECT * FROM credentials WHERE user_id = $1', - [userId] - ); - return rows.map(mapCredential); - }, - - async findByUserAndProvider(userId: string, provider: string): Promise { - const { rows } = await getPool().query( - 'SELECT * FROM credentials WHERE user_id = $1 AND provider = $2', - [userId, provider] - ); - return rows[0] ? mapCredential(rows[0]) : null; - }, - - async upsert(data: { - userId: string; - provider: string; - accessToken: string; - refreshToken?: string; - tokenExpiresAt?: Date; - scopes?: string[]; - providerAccountId?: string; - providerAccountEmail?: string; - }): Promise { - const { rows } = await getPool().query( - `INSERT INTO credentials (user_id, provider, access_token, refresh_token, token_expires_at, scopes, provider_account_id, provider_account_email) - VALUES ($1, $2, $3, $4, $5, $6, $7, $8) - ON CONFLICT (user_id, provider) DO UPDATE SET - access_token = EXCLUDED.access_token, - refresh_token = COALESCE(EXCLUDED.refresh_token, credentials.refresh_token), - token_expires_at = EXCLUDED.token_expires_at, - scopes = EXCLUDED.scopes, - provider_account_id = EXCLUDED.provider_account_id, - provider_account_email = EXCLUDED.provider_account_email, - updated_at = NOW() - RETURNING *`, - [ - data.userId, - data.provider, - data.accessToken, - data.refreshToken, - data.tokenExpiresAt, - data.scopes, - data.providerAccountId, - data.providerAccountEmail, - ] - ); - return mapCredential(rows[0]); - }, - - async delete(userId: string, provider: string): Promise { - await getPool().query( - 'DELETE FROM credentials WHERE user_id = $1 AND provider = $2', - [userId, provider] - ); - }, - - async updateTokens( - userId: string, - provider: string, - accessToken: string, - refreshToken?: string, - expiresAt?: Date - ): Promise { - await getPool().query( - `UPDATE credentials SET - access_token = $3, - refresh_token = COALESCE($4, refresh_token), - token_expires_at = $5, - updated_at = NOW() - WHERE user_id = $1 AND provider = $2`, - [userId, provider, accessToken, refreshToken, expiresAt] - ); - }, -}; - -// Workspace queries -export const workspaces = { - async findById(id: string): Promise { - const { rows } = await getPool().query( - 'SELECT * FROM workspaces WHERE id = $1', - [id] - ); - return rows[0] ? mapWorkspace(rows[0]) : null; - }, - - async findByUserId(userId: string): Promise { - const { rows } = await getPool().query( - 'SELECT * FROM workspaces WHERE user_id = $1 ORDER BY created_at DESC', - [userId] - ); - return rows.map(mapWorkspace); - }, - - async create(data: { - userId: string; - name: string; - computeProvider: 'fly' | 'railway' | 'docker'; - config: WorkspaceConfig; - }): Promise { - const { rows } = await getPool().query( - `INSERT INTO workspaces (user_id, name, status, compute_provider, config) - VALUES ($1, $2, 'provisioning', $3, $4) - RETURNING *`, - [data.userId, data.name, data.computeProvider, JSON.stringify(data.config)] - ); - return mapWorkspace(rows[0]); - }, - - async updateStatus( - id: string, - status: Workspace['status'], - options?: { computeId?: string; publicUrl?: string; errorMessage?: string } - ): Promise { - await getPool().query( - `UPDATE workspaces SET - status = $2, - compute_id = COALESCE($3, compute_id), - public_url = COALESCE($4, public_url), - error_message = $5, - updated_at = NOW() - WHERE id = $1`, - [id, status, options?.computeId, options?.publicUrl, options?.errorMessage] - ); - }, - - async delete(id: string): Promise { - await getPool().query('DELETE FROM workspaces WHERE id = $1', [id]); - }, - - async setCustomDomain( - id: string, - customDomain: string, - status: Workspace['customDomainStatus'] = 'pending' - ): Promise { - await getPool().query( - `UPDATE workspaces SET - custom_domain = $2, - custom_domain_status = $3, - updated_at = NOW() - WHERE id = $1`, - [id, customDomain, status] - ); - }, - - async updateCustomDomainStatus( - id: string, - status: Workspace['customDomainStatus'] - ): Promise { - await getPool().query( - `UPDATE workspaces SET custom_domain_status = $2, updated_at = NOW() WHERE id = $1`, - [id, status] - ); - }, - - async removeCustomDomain(id: string): Promise { - await getPool().query( - `UPDATE workspaces SET custom_domain = NULL, custom_domain_status = NULL, updated_at = NOW() WHERE id = $1`, - [id] - ); - }, - - async findByCustomDomain(domain: string): Promise { - const { rows } = await getPool().query( - 'SELECT * FROM workspaces WHERE custom_domain = $1', - [domain] - ); - return rows[0] ? mapWorkspace(rows[0]) : null; - }, -}; - -// Workspace member queries -export const workspaceMembers = { - async findByWorkspaceId(workspaceId: string): Promise { - const { rows } = await getPool().query( - `SELECT wm.*, u.github_username, u.email - FROM workspace_members wm - JOIN users u ON u.id = wm.user_id - WHERE wm.workspace_id = $1 - ORDER BY wm.role, wm.invited_at`, - [workspaceId] - ); - return rows.map(mapWorkspaceMember); - }, - - async findByUserId(userId: string): Promise { - const { rows } = await getPool().query( - `SELECT wm.*, u.github_username, u.email - FROM workspace_members wm - JOIN users u ON u.id = wm.user_id - WHERE wm.user_id = $1 AND wm.accepted_at IS NOT NULL`, - [userId] - ); - return rows.map(mapWorkspaceMember); - }, - - async findMembership(workspaceId: string, userId: string): Promise { - const { rows } = await getPool().query( - `SELECT wm.*, u.github_username, u.email - FROM workspace_members wm - JOIN users u ON u.id = wm.user_id - WHERE wm.workspace_id = $1 AND wm.user_id = $2`, - [workspaceId, userId] - ); - return rows[0] ? mapWorkspaceMember(rows[0]) : null; - }, - - async addMember(data: { - workspaceId: string; - userId: string; - role: WorkspaceMemberRole; - invitedBy: string; - }): Promise { - const { rows } = await getPool().query( - `INSERT INTO workspace_members (workspace_id, user_id, role, invited_by) - VALUES ($1, $2, $3, $4) - RETURNING *`, - [data.workspaceId, data.userId, data.role, data.invitedBy] - ); - return mapWorkspaceMember(rows[0]); - }, - - async acceptInvite(workspaceId: string, userId: string): Promise { - await getPool().query( - `UPDATE workspace_members SET accepted_at = NOW() WHERE workspace_id = $1 AND user_id = $2`, - [workspaceId, userId] - ); - }, - - async updateRole(workspaceId: string, userId: string, role: WorkspaceMemberRole): Promise { - await getPool().query( - `UPDATE workspace_members SET role = $3 WHERE workspace_id = $1 AND user_id = $2`, - [workspaceId, userId, role] - ); - }, - - async removeMember(workspaceId: string, userId: string): Promise { - await getPool().query( - `DELETE FROM workspace_members WHERE workspace_id = $1 AND user_id = $2`, - [workspaceId, userId] - ); - }, - - async getPendingInvites(userId: string): Promise { - const { rows } = await getPool().query( - `SELECT wm.*, w.name as workspace_name, u.github_username as inviter_username - FROM workspace_members wm - JOIN workspaces w ON w.id = wm.workspace_id - JOIN users u ON u.id = wm.invited_by - WHERE wm.user_id = $1 AND wm.accepted_at IS NULL`, - [userId] - ); - return rows.map(mapWorkspaceMember); - }, - - async isOwner(workspaceId: string, userId: string): Promise { - const { rows } = await getPool().query( - `SELECT 1 FROM workspace_members WHERE workspace_id = $1 AND user_id = $2 AND role = 'owner'`, - [workspaceId, userId] - ); - return rows.length > 0; - }, - - async canEdit(workspaceId: string, userId: string): Promise { - const { rows } = await getPool().query( - `SELECT 1 FROM workspace_members - WHERE workspace_id = $1 AND user_id = $2 AND role IN ('owner', 'admin', 'member') - AND accepted_at IS NOT NULL`, - [workspaceId, userId] - ); - return rows.length > 0; - }, - - async canView(workspaceId: string, userId: string): Promise { - const { rows } = await getPool().query( - `SELECT 1 FROM workspace_members - WHERE workspace_id = $1 AND user_id = $2 AND accepted_at IS NOT NULL`, - [workspaceId, userId] - ); - return rows.length > 0; - }, -}; - -// Repository queries -export const repositories = { - async findByUserId(userId: string): Promise { - const { rows } = await getPool().query( - 'SELECT * FROM repositories WHERE user_id = $1 ORDER BY github_full_name', - [userId] - ); - return rows.map(mapRepository); - }, - - async findByWorkspaceId(workspaceId: string): Promise { - const { rows } = await getPool().query( - 'SELECT * FROM repositories WHERE workspace_id = $1', - [workspaceId] - ); - return rows.map(mapRepository); - }, - - async upsert(data: { - userId: string; - githubFullName: string; - githubId: number; - defaultBranch: string; - isPrivate: boolean; - }): Promise { - const { rows } = await getPool().query( - `INSERT INTO repositories (user_id, github_full_name, github_id, default_branch, is_private) - VALUES ($1, $2, $3, $4, $5) - ON CONFLICT (user_id, github_full_name) DO UPDATE SET - github_id = EXCLUDED.github_id, - default_branch = EXCLUDED.default_branch, - is_private = EXCLUDED.is_private, - updated_at = NOW() - RETURNING *`, - [data.userId, data.githubFullName, data.githubId, data.defaultBranch, data.isPrivate] - ); - return mapRepository(rows[0]); - }, - - async assignToWorkspace(repoId: string, workspaceId: string): Promise { - await getPool().query( - 'UPDATE repositories SET workspace_id = $2, updated_at = NOW() WHERE id = $1', - [repoId, workspaceId] - ); - }, - - async updateSyncStatus( - id: string, - status: Repository['syncStatus'], - lastSyncedAt?: Date - ): Promise { - await getPool().query( - `UPDATE repositories SET - sync_status = $2, - last_synced_at = COALESCE($3, last_synced_at), - updated_at = NOW() - WHERE id = $1`, - [id, status, lastSyncedAt] - ); - }, - - async delete(id: string): Promise { - await getPool().query('DELETE FROM repositories WHERE id = $1', [id]); - }, +// Export the db object with all query namespaces +export const db = { + // User operations + users: userQueries, + // Credential operations + credentials: credentialQueries, + // Workspace operations + workspaces: workspaceQueries, + // Workspace member operations + workspaceMembers: workspaceMemberQueries, + // Project group operations (for grouping repositories) + projectGroups: projectGroupQueries, + // Repository operations + repositories: repositoryQueries, + // Linked daemon operations (for local agent-relay instances) + linkedDaemons: linkedDaemonQueries, + // Database utilities + getDb, + close: closeDb, + runMigrations, }; -// LinkedDaemon queries -export const linkedDaemons = { - async findById(id: string): Promise { - const { rows } = await getPool().query( - 'SELECT * FROM linked_daemons WHERE id = $1', - [id] - ); - return rows[0] ? mapLinkedDaemon(rows[0]) : null; - }, - - async findByUserId(userId: string): Promise { - const { rows } = await getPool().query( - 'SELECT * FROM linked_daemons WHERE user_id = $1 ORDER BY last_seen_at DESC NULLS LAST', - [userId] - ); - return rows.map(mapLinkedDaemon); - }, - - async findByMachineId(userId: string, machineId: string): Promise { - const { rows } = await getPool().query( - 'SELECT * FROM linked_daemons WHERE user_id = $1 AND machine_id = $2', - [userId, machineId] - ); - return rows[0] ? mapLinkedDaemon(rows[0]) : null; - }, - - async findByApiKeyHash(apiKeyHash: string): Promise { - const { rows } = await getPool().query( - 'SELECT * FROM linked_daemons WHERE api_key_hash = $1', - [apiKeyHash] - ); - return rows[0] ? mapLinkedDaemon(rows[0]) : null; - }, - - async create(data: { - userId: string; - name: string; - machineId: string; - apiKeyHash: string; - status?: 'online' | 'offline'; - metadata?: Record; - }): Promise { - const { rows } = await getPool().query( - `INSERT INTO linked_daemons (user_id, name, machine_id, api_key_hash, status, metadata, last_seen_at) - VALUES ($1, $2, $3, $4, $5, $6, NOW()) - RETURNING *`, - [ - data.userId, - data.name, - data.machineId, - data.apiKeyHash, - data.status || 'online', - JSON.stringify(data.metadata || {}), - ] - ); - return mapLinkedDaemon(rows[0]); - }, - - async update( - id: string, - data: Partial<{ - name: string; - apiKeyHash: string; - status: 'online' | 'offline'; - metadata: Record; - lastSeenAt: Date; - }> - ): Promise { - const updates: string[] = []; - const values: unknown[] = [id]; - let paramCount = 1; - - if (data.name !== undefined) { - updates.push(`name = $${++paramCount}`); - values.push(data.name); - } - if (data.apiKeyHash !== undefined) { - updates.push(`api_key_hash = $${++paramCount}`); - values.push(data.apiKeyHash); - } - if (data.status !== undefined) { - updates.push(`status = $${++paramCount}`); - values.push(data.status); - } - if (data.metadata !== undefined) { - updates.push(`metadata = $${++paramCount}`); - values.push(JSON.stringify(data.metadata)); - } - if (data.lastSeenAt !== undefined) { - updates.push(`last_seen_at = $${++paramCount}`); - values.push(data.lastSeenAt); - } - - if (updates.length > 0) { - updates.push('updated_at = NOW()'); - await getPool().query( - `UPDATE linked_daemons SET ${updates.join(', ')} WHERE id = $1`, - values - ); - } - }, - - async updateLastSeen(id: string): Promise { - await getPool().query( - `UPDATE linked_daemons SET last_seen_at = NOW(), status = 'online', updated_at = NOW() WHERE id = $1`, - [id] - ); - }, - - async delete(id: string): Promise { - await getPool().query('DELETE FROM linked_daemons WHERE id = $1', [id]); - }, - - async getPendingUpdates(id: string): Promise> { - const { rows } = await getPool().query( - 'SELECT pending_updates FROM linked_daemons WHERE id = $1', - [id] - ); - const updates = rows[0]?.pending_updates || []; - // Clear after reading - if (updates.length > 0) { - await getPool().query( - `UPDATE linked_daemons SET pending_updates = '[]'::jsonb WHERE id = $1`, - [id] - ); - } - return updates; - }, - - async queueUpdate(id: string, update: { type: string; payload: unknown }): Promise { - await getPool().query( - `UPDATE linked_daemons SET - pending_updates = COALESCE(pending_updates, '[]'::jsonb) || $2::jsonb, - updated_at = NOW() - WHERE id = $1`, - [id, JSON.stringify([update])] - ); - }, - - async queueMessage(id: string, message: Record): Promise { - await getPool().query( - `UPDATE linked_daemons SET - message_queue = COALESCE(message_queue, '[]'::jsonb) || $2::jsonb, - updated_at = NOW() - WHERE id = $1`, - [id, JSON.stringify([message])] - ); - }, - - async getQueuedMessages(id: string): Promise>> { - const { rows } = await getPool().query( - 'SELECT message_queue FROM linked_daemons WHERE id = $1', - [id] - ); - return rows[0]?.message_queue || []; - }, - - async clearMessageQueue(id: string): Promise { - await getPool().query( - `UPDATE linked_daemons SET message_queue = '[]'::jsonb WHERE id = $1`, - [id] - ); - }, - - // Mark offline daemons that haven't sent heartbeat in 2 minutes - async markStale(): Promise { - const { rowCount } = await getPool().query( - `UPDATE linked_daemons SET status = 'offline' - WHERE status = 'online' AND last_seen_at < NOW() - INTERVAL '2 minutes'` - ); - return rowCount ?? 0; - }, +// Export query objects for direct import +export { + userQueries, + credentialQueries, + workspaceQueries, + workspaceMemberQueries, + projectGroupQueries, + repositoryQueries, + linkedDaemonQueries, }; -// Row mappers -function mapUser(row: any): User { - return { - id: row.id, - githubId: row.github_id, - githubUsername: row.github_username, - email: row.email, - avatarUrl: row.avatar_url, - plan: row.plan || 'free', - onboardingCompletedAt: row.onboarding_completed_at, - createdAt: row.created_at, - updatedAt: row.updated_at, - }; -} - -function mapWorkspaceMember(row: any): WorkspaceMember { - return { - id: row.id, - workspaceId: row.workspace_id, - userId: row.user_id, - role: row.role, - invitedBy: row.invited_by, - invitedAt: row.invited_at, - acceptedAt: row.accepted_at, - user: row.github_username ? { - githubUsername: row.github_username, - email: row.email, - avatarUrl: row.avatar_url, - } : undefined, - }; -} - -function mapCredential(row: any): Credential { - return { - id: row.id, - userId: row.user_id, - provider: row.provider, - accessToken: row.access_token, - refreshToken: row.refresh_token, - tokenExpiresAt: row.token_expires_at, - scopes: row.scopes, - providerAccountId: row.provider_account_id, - providerAccountEmail: row.provider_account_email, - createdAt: row.created_at, - updatedAt: row.updated_at, - }; -} - -function mapWorkspace(row: any): Workspace { - return { - id: row.id, - userId: row.user_id, - name: row.name, - status: row.status, - computeProvider: row.compute_provider, - computeId: row.compute_id, - publicUrl: row.public_url, - customDomain: row.custom_domain, - customDomainStatus: row.custom_domain_status, - config: row.config, - errorMessage: row.error_message, - createdAt: row.created_at, - updatedAt: row.updated_at, - }; -} - -function mapRepository(row: any): Repository { - return { - id: row.id, - userId: row.user_id, - workspaceId: row.workspace_id, - githubFullName: row.github_full_name, - githubId: row.github_id, - defaultBranch: row.default_branch, - isPrivate: row.is_private, - syncStatus: row.sync_status, - lastSyncedAt: row.last_synced_at, - createdAt: row.created_at, - updatedAt: row.updated_at, - }; -} - -function mapLinkedDaemon(row: any): LinkedDaemon { - return { - id: row.id, - userId: row.user_id, - name: row.name, - machineId: row.machine_id, - apiKeyHash: row.api_key_hash, - status: row.status, - lastSeenAt: row.last_seen_at, - metadata: row.metadata || {}, - pendingUpdates: row.pending_updates || [], - messageQueue: row.message_queue || [], - createdAt: row.created_at, - updatedAt: row.updated_at, - }; -} +// Export database utilities +export { getDb, closeDb, runMigrations }; -// Database initialization +// Legacy function - use runMigrations instead export async function initializeDatabase(): Promise { - const client = await getPool().connect(); - try { - await client.query(` - CREATE TABLE IF NOT EXISTS users ( - id UUID PRIMARY KEY DEFAULT gen_random_uuid(), - github_id VARCHAR(255) UNIQUE NOT NULL, - github_username VARCHAR(255) NOT NULL, - email VARCHAR(255), - avatar_url VARCHAR(512), - plan VARCHAR(50) NOT NULL DEFAULT 'free', - onboarding_completed_at TIMESTAMP, - created_at TIMESTAMP DEFAULT NOW(), - updated_at TIMESTAMP DEFAULT NOW() - ); - - CREATE TABLE IF NOT EXISTS credentials ( - id UUID PRIMARY KEY DEFAULT gen_random_uuid(), - user_id UUID NOT NULL REFERENCES users(id) ON DELETE CASCADE, - provider VARCHAR(50) NOT NULL, - access_token TEXT NOT NULL, - refresh_token TEXT, - token_expires_at TIMESTAMP, - scopes TEXT[], - provider_account_id VARCHAR(255), - provider_account_email VARCHAR(255), - created_at TIMESTAMP DEFAULT NOW(), - updated_at TIMESTAMP DEFAULT NOW(), - UNIQUE(user_id, provider) - ); - - CREATE TABLE IF NOT EXISTS workspaces ( - id UUID PRIMARY KEY DEFAULT gen_random_uuid(), - user_id UUID NOT NULL REFERENCES users(id) ON DELETE CASCADE, - name VARCHAR(255) NOT NULL, - status VARCHAR(50) NOT NULL DEFAULT 'provisioning', - compute_provider VARCHAR(50) NOT NULL, - compute_id VARCHAR(255), - public_url VARCHAR(255), - custom_domain VARCHAR(255), - custom_domain_status VARCHAR(50), - config JSONB NOT NULL DEFAULT '{}', - error_message TEXT, - created_at TIMESTAMP DEFAULT NOW(), - updated_at TIMESTAMP DEFAULT NOW() - ); - - CREATE TABLE IF NOT EXISTS repositories ( - id UUID PRIMARY KEY DEFAULT gen_random_uuid(), - user_id UUID NOT NULL REFERENCES users(id) ON DELETE CASCADE, - workspace_id UUID REFERENCES workspaces(id) ON DELETE SET NULL, - github_full_name VARCHAR(255) NOT NULL, - github_id BIGINT NOT NULL, - default_branch VARCHAR(255) NOT NULL DEFAULT 'main', - is_private BOOLEAN NOT NULL DEFAULT false, - sync_status VARCHAR(50) NOT NULL DEFAULT 'pending', - last_synced_at TIMESTAMP, - created_at TIMESTAMP DEFAULT NOW(), - updated_at TIMESTAMP DEFAULT NOW(), - UNIQUE(user_id, github_full_name) - ); - - CREATE TABLE IF NOT EXISTS workspace_members ( - id UUID PRIMARY KEY DEFAULT gen_random_uuid(), - workspace_id UUID NOT NULL REFERENCES workspaces(id) ON DELETE CASCADE, - user_id UUID NOT NULL REFERENCES users(id) ON DELETE CASCADE, - role VARCHAR(50) NOT NULL DEFAULT 'member', - invited_by UUID REFERENCES users(id), - invited_at TIMESTAMP DEFAULT NOW(), - accepted_at TIMESTAMP, - UNIQUE(workspace_id, user_id) - ); - - CREATE TABLE IF NOT EXISTS linked_daemons ( - id UUID PRIMARY KEY DEFAULT gen_random_uuid(), - user_id UUID NOT NULL REFERENCES users(id) ON DELETE CASCADE, - name VARCHAR(255) NOT NULL, - machine_id VARCHAR(255) NOT NULL, - api_key_hash VARCHAR(255) NOT NULL, - status VARCHAR(50) NOT NULL DEFAULT 'offline', - last_seen_at TIMESTAMP, - metadata JSONB NOT NULL DEFAULT '{}', - pending_updates JSONB NOT NULL DEFAULT '[]', - message_queue JSONB NOT NULL DEFAULT '[]', - created_at TIMESTAMP DEFAULT NOW(), - updated_at TIMESTAMP DEFAULT NOW(), - UNIQUE(user_id, machine_id) - ); - - CREATE INDEX IF NOT EXISTS idx_credentials_user_id ON credentials(user_id); - CREATE INDEX IF NOT EXISTS idx_workspaces_user_id ON workspaces(user_id); - CREATE INDEX IF NOT EXISTS idx_workspaces_custom_domain ON workspaces(custom_domain) WHERE custom_domain IS NOT NULL; - CREATE INDEX IF NOT EXISTS idx_repositories_user_id ON repositories(user_id); - CREATE INDEX IF NOT EXISTS idx_repositories_workspace_id ON repositories(workspace_id); - CREATE INDEX IF NOT EXISTS idx_workspace_members_workspace_id ON workspace_members(workspace_id); - CREATE INDEX IF NOT EXISTS idx_workspace_members_user_id ON workspace_members(user_id); - CREATE INDEX IF NOT EXISTS idx_linked_daemons_user_id ON linked_daemons(user_id); - CREATE INDEX IF NOT EXISTS idx_linked_daemons_api_key_hash ON linked_daemons(api_key_hash); - CREATE INDEX IF NOT EXISTS idx_linked_daemons_status ON linked_daemons(status); - `); - } finally { - client.release(); - } + console.warn('initializeDatabase() is deprecated. Use runMigrations() instead.'); + await runMigrations(); } - -// Export db object for convenience -export const db = { - users, - credentials, - workspaces, - workspaceMembers, - repositories, - linkedDaemons, - initialize: initializeDatabase, - getPool, -}; diff --git a/src/cloud/db/schema.ts b/src/cloud/db/schema.ts index 8304f8666..c4c0c80ac 100644 --- a/src/cloud/db/schema.ts +++ b/src/cloud/db/schema.ts @@ -39,6 +39,7 @@ export const users = pgTable('users', { export const usersRelations = relations(users, ({ many }) => ({ credentials: many(credentials), workspaces: many(workspaces), + projectGroups: many(projectGroups), repositories: many(repositories), linkedDaemons: many(linkedDaemons), })); @@ -75,6 +76,14 @@ export const credentialsRelations = relations(credentials, ({ one }) => ({ // Workspaces // ============================================================================ +// Workspace configuration type +export interface WorkspaceConfig { + providers?: string[]; + repositories?: string[]; + supervisorEnabled?: boolean; + maxAgents?: number; +} + export const workspaces = pgTable('workspaces', { id: uuid('id').primaryKey().defaultRandom(), userId: uuid('user_id').notNull().references(() => users.id, { onDelete: 'cascade' }), @@ -85,7 +94,7 @@ export const workspaces = pgTable('workspaces', { publicUrl: varchar('public_url', { length: 255 }), customDomain: varchar('custom_domain', { length: 255 }), customDomainStatus: varchar('custom_domain_status', { length: 50 }), - config: jsonb('config').notNull().default({}), + config: jsonb('config').$type().notNull().default({}), errorMessage: text('error_message'), createdAt: timestamp('created_at').defaultNow().notNull(), updatedAt: timestamp('updated_at').defaultNow().notNull(), @@ -136,6 +145,42 @@ export const workspaceMembersRelations = relations(workspaceMembers, ({ one }) = }), })); +// ============================================================================ +// Project Groups (grouping of related repositories) +// ============================================================================ + +export const projectGroups = pgTable('project_groups', { + id: uuid('id').primaryKey().defaultRandom(), + userId: uuid('user_id').notNull().references(() => users.id, { onDelete: 'cascade' }), + name: varchar('name', { length: 255 }).notNull(), + description: text('description'), + color: varchar('color', { length: 7 }), // Hex color for UI (e.g., "#3B82F6") + icon: varchar('icon', { length: 50 }), // Icon name for UI + // Coordinator agent configuration - this agent oversees all repos in the group + coordinatorAgent: jsonb('coordinator_agent').$type<{ + enabled: boolean; + name?: string; // Agent name (e.g., "PRPM Lead") + model?: string; // AI model to use + systemPrompt?: string; // Custom instructions for coordinator + capabilities?: string[]; // What the coordinator can do + }>().default({ enabled: false }), + // Display order for user's groups + sortOrder: bigint('sort_order', { mode: 'number' }).notNull().default(0), + createdAt: timestamp('created_at').defaultNow().notNull(), + updatedAt: timestamp('updated_at').defaultNow().notNull(), +}, (table) => ({ + userIdIdx: index('idx_project_groups_user_id').on(table.userId), + userNameIdx: unique('project_groups_user_name_unique').on(table.userId, table.name), +})); + +export const projectGroupsRelations = relations(projectGroups, ({ one, many }) => ({ + user: one(users, { + fields: [projectGroups.userId], + references: [users.id], + }), + repositories: many(repositories), +})); + // ============================================================================ // Repositories // ============================================================================ @@ -144,18 +189,27 @@ export const repositories = pgTable('repositories', { id: uuid('id').primaryKey().defaultRandom(), userId: uuid('user_id').notNull().references(() => users.id, { onDelete: 'cascade' }), workspaceId: uuid('workspace_id').references(() => workspaces.id, { onDelete: 'set null' }), + projectGroupId: uuid('project_group_id').references(() => projectGroups.id, { onDelete: 'set null' }), githubFullName: varchar('github_full_name', { length: 255 }).notNull(), githubId: bigint('github_id', { mode: 'number' }).notNull(), defaultBranch: varchar('default_branch', { length: 255 }).notNull().default('main'), isPrivate: boolean('is_private').notNull().default(false), syncStatus: varchar('sync_status', { length: 50 }).notNull().default('pending'), lastSyncedAt: timestamp('last_synced_at'), + // Project-level agent configuration (optional) + projectAgent: jsonb('project_agent').$type<{ + enabled: boolean; + name?: string; // Agent name (e.g., "beads-agent") + model?: string; + systemPrompt?: string; + }>().default({ enabled: false }), createdAt: timestamp('created_at').defaultNow().notNull(), updatedAt: timestamp('updated_at').defaultNow().notNull(), }, (table) => ({ userGithubIdx: unique('repositories_user_github_unique').on(table.userId, table.githubFullName), userIdIdx: index('idx_repositories_user_id').on(table.userId), workspaceIdIdx: index('idx_repositories_workspace_id').on(table.workspaceId), + projectGroupIdIdx: index('idx_repositories_project_group_id').on(table.projectGroupId), })); export const repositoriesRelations = relations(repositories, ({ one }) => ({ @@ -167,6 +221,10 @@ export const repositoriesRelations = relations(repositories, ({ one }) => ({ fields: [repositories.workspaceId], references: [workspaces.id], }), + projectGroup: one(projectGroups, { + fields: [repositories.projectGroupId], + references: [projectGroups.id], + }), })); // ============================================================================ @@ -245,6 +303,8 @@ export type Workspace = typeof workspaces.$inferSelect; export type NewWorkspace = typeof workspaces.$inferInsert; export type WorkspaceMember = typeof workspaceMembers.$inferSelect; export type NewWorkspaceMember = typeof workspaceMembers.$inferInsert; +export type ProjectGroup = typeof projectGroups.$inferSelect; +export type NewProjectGroup = typeof projectGroups.$inferInsert; export type Repository = typeof repositories.$inferSelect; export type NewRepository = typeof repositories.$inferInsert; export type LinkedDaemon = typeof linkedDaemons.$inferSelect; @@ -253,3 +313,7 @@ export type Subscription = typeof subscriptions.$inferSelect; export type NewSubscription = typeof subscriptions.$inferInsert; export type UsageRecord = typeof usageRecords.$inferSelect; export type NewUsageRecord = typeof usageRecords.$inferInsert; + +// Agent configuration types +export type CoordinatorAgentConfig = NonNullable; +export type ProjectAgentConfig = NonNullable; diff --git a/src/cloud/provisioner/index.ts b/src/cloud/provisioner/index.ts index 367ed85be..1984b4129 100644 --- a/src/cloud/provisioner/index.ts +++ b/src/cloud/provisioner/index.ts @@ -123,10 +123,10 @@ class FlyProvisioner implements ComputeProvisioner { image: 'ghcr.io/khaliqgant/agent-relay-workspace:latest', env: { WORKSPACE_ID: workspace.id, - SUPERVISOR_ENABLED: String(workspace.config.supervisorEnabled), - MAX_AGENTS: String(workspace.config.maxAgents), - REPOSITORIES: workspace.config.repositories.join(','), - PROVIDERS: workspace.config.providers.join(','), + SUPERVISOR_ENABLED: String(workspace.config.supervisorEnabled ?? false), + MAX_AGENTS: String(workspace.config.maxAgents ?? 10), + REPOSITORIES: (workspace.config.repositories ?? []).join(','), + PROVIDERS: (workspace.config.providers ?? []).join(','), }, services: [ { @@ -335,10 +335,10 @@ class RailwayProvisioner implements ComputeProvisioner { // Set environment variables const envVars: Record = { WORKSPACE_ID: workspace.id, - SUPERVISOR_ENABLED: String(workspace.config.supervisorEnabled), - MAX_AGENTS: String(workspace.config.maxAgents), - REPOSITORIES: workspace.config.repositories.join(','), - PROVIDERS: workspace.config.providers.join(','), + SUPERVISOR_ENABLED: String(workspace.config.supervisorEnabled ?? false), + MAX_AGENTS: String(workspace.config.maxAgents ?? 10), + REPOSITORIES: (workspace.config.repositories ?? []).join(','), + PROVIDERS: (workspace.config.providers ?? []).join(','), }; for (const [provider, token] of credentials) { @@ -512,10 +512,10 @@ class DockerProvisioner implements ComputeProvisioner { // Build environment variables const envArgs: string[] = [ `-e WORKSPACE_ID=${workspace.id}`, - `-e SUPERVISOR_ENABLED=${workspace.config.supervisorEnabled}`, - `-e MAX_AGENTS=${workspace.config.maxAgents}`, - `-e REPOSITORIES=${workspace.config.repositories.join(',')}`, - `-e PROVIDERS=${workspace.config.providers.join(',')}`, + `-e SUPERVISOR_ENABLED=${workspace.config.supervisorEnabled ?? false}`, + `-e MAX_AGENTS=${workspace.config.maxAgents ?? 10}`, + `-e REPOSITORIES=${(workspace.config.repositories ?? []).join(',')}`, + `-e PROVIDERS=${(workspace.config.providers ?? []).join(',')}`, ]; for (const [provider, token] of credentials) { diff --git a/src/cloud/vault/index.ts b/src/cloud/vault/index.ts index 0b1e82fa0..bcccfc713 100644 --- a/src/cloud/vault/index.ts +++ b/src/cloud/vault/index.ts @@ -119,10 +119,10 @@ export class CredentialVault { refreshToken: credential.refreshToken ? this.decrypt(credential.refreshToken) : undefined, - tokenExpiresAt: credential.tokenExpiresAt, - scopes: credential.scopes, - providerAccountId: credential.providerAccountId, - providerAccountEmail: credential.providerAccountEmail, + tokenExpiresAt: credential.tokenExpiresAt ?? undefined, + scopes: credential.scopes ?? undefined, + providerAccountId: credential.providerAccountId ?? undefined, + providerAccountEmail: credential.providerAccountEmail ?? undefined, }; } @@ -139,10 +139,10 @@ export class CredentialVault { refreshToken: cred.refreshToken ? this.decrypt(cred.refreshToken) : undefined, - tokenExpiresAt: cred.tokenExpiresAt, - scopes: cred.scopes, - providerAccountId: cred.providerAccountId, - providerAccountEmail: cred.providerAccountEmail, + tokenExpiresAt: cred.tokenExpiresAt ?? undefined, + scopes: cred.scopes ?? undefined, + providerAccountId: cred.providerAccountId ?? undefined, + providerAccountEmail: cred.providerAccountEmail ?? undefined, }); } diff --git a/src/dashboard/lib/cloudApi.ts b/src/dashboard/lib/cloudApi.ts new file mode 100644 index 000000000..c82b8171b --- /dev/null +++ b/src/dashboard/lib/cloudApi.ts @@ -0,0 +1,303 @@ +/** + * Cloud API Client + * + * Handles authenticated requests to the Agent Relay Cloud API. + * Includes automatic session expiration detection and handling. + */ + +// Session error codes from the backend +export type SessionErrorCode = 'SESSION_EXPIRED' | 'USER_NOT_FOUND' | 'SESSION_ERROR'; + +export interface SessionError { + error: string; + code: SessionErrorCode; + message: string; +} + +export interface SessionStatus { + authenticated: boolean; + code?: SessionErrorCode; + message?: string; + user?: { + id: string; + githubUsername: string; + email?: string; + avatarUrl?: string; + plan: string; + }; +} + +export interface CloudUser { + id: string; + githubUsername: string; + email?: string; + avatarUrl?: string; + plan: string; + connectedProviders: Array<{ + provider: string; + email?: string; + connectedAt: string; + }>; + pendingInvites: number; + onboardingCompleted: boolean; +} + +export type SessionExpiredCallback = (error: SessionError) => void; + +// Global session expiration listeners +const sessionExpiredListeners = new Set(); + +/** + * Register a callback for when session expires + */ +export function onSessionExpired(callback: SessionExpiredCallback): () => void { + sessionExpiredListeners.add(callback); + return () => sessionExpiredListeners.delete(callback); +} + +/** + * Notify all listeners that session has expired + */ +function notifySessionExpired(error: SessionError): void { + for (const listener of sessionExpiredListeners) { + try { + listener(error); + } catch (e) { + console.error('[cloudApi] Session expired listener error:', e); + } + } +} + +/** + * Check if response indicates session expiration + */ +function isSessionError(response: Response, data: unknown): data is SessionError { + if (response.status === 401) { + return true; + } + if (typeof data === 'object' && data !== null) { + const obj = data as Record; + return obj.code === 'SESSION_EXPIRED' || obj.code === 'USER_NOT_FOUND'; + } + return false; +} + +/** + * Make an authenticated request to the cloud API + */ +async function cloudFetch( + endpoint: string, + options: RequestInit = {} +): Promise<{ success: true; data: T } | { success: false; error: string; sessionExpired?: boolean }> { + try { + const response = await fetch(endpoint, { + ...options, + credentials: 'include', // Include cookies for session + headers: { + 'Content-Type': 'application/json', + ...options.headers, + }, + }); + + const data = await response.json(); + + if (isSessionError(response, data)) { + const error: SessionError = { + error: (data as SessionError).error || 'Session expired', + code: (data as SessionError).code || 'SESSION_EXPIRED', + message: (data as SessionError).message || 'Your session has expired. Please log in again.', + }; + notifySessionExpired(error); + return { success: false, error: error.message, sessionExpired: true }; + } + + if (!response.ok) { + return { + success: false, + error: (data as { error?: string }).error || `Request failed with status ${response.status}` + }; + } + + return { success: true, data: data as T }; + } catch (error) { + return { + success: false, + error: error instanceof Error ? error.message : 'Network error' + }; + } +} + +/** + * Cloud API methods + */ +export const cloudApi = { + /** + * Check current session status + */ + async checkSession(): Promise { + try { + const response = await fetch('/api/auth/session', { + credentials: 'include', + }); + const data = await response.json(); + return data as SessionStatus; + } catch { + return { + authenticated: false, + code: 'SESSION_ERROR', + message: 'Failed to check session status', + }; + } + }, + + /** + * Get current user profile + */ + async getMe() { + return cloudFetch('/api/auth/me'); + }, + + /** + * Logout current user + */ + async logout(): Promise<{ success: boolean; error?: string }> { + try { + const response = await fetch('/api/auth/logout', { + method: 'POST', + credentials: 'include', + }); + const data = await response.json(); + return data as { success: boolean; error?: string }; + } catch { + return { success: false, error: 'Network error' }; + } + }, + + // ===== Workspace API ===== + + /** + * Get user's workspaces + */ + async getWorkspaces() { + return cloudFetch<{ workspaces: Array<{ + id: string; + name: string; + slug: string; + repositories: number; + members: number; + plan: string; + }> }>('/api/workspaces'); + }, + + /** + * Get workspace by ID + */ + async getWorkspace(id: string) { + return cloudFetch<{ + id: string; + name: string; + slug: string; + config: Record; + createdAt: string; + }>(`/api/workspaces/${encodeURIComponent(id)}`); + }, + + /** + * Create workspace + */ + async createWorkspace(data: { name: string; slug?: string }) { + return cloudFetch<{ id: string; name: string; slug: string }>('/api/workspaces', { + method: 'POST', + body: JSON.stringify(data), + }); + }, + + // ===== Provider API ===== + + /** + * Get connected providers + */ + async getProviders() { + return cloudFetch<{ providers: Array<{ + provider: string; + connected: boolean; + email?: string; + scopes?: string[]; + }> }>('/api/providers'); + }, + + /** + * Disconnect a provider + */ + async disconnectProvider(provider: string) { + return cloudFetch<{ success: boolean }>(`/api/providers/${encodeURIComponent(provider)}`, { + method: 'DELETE', + }); + }, + + // ===== Team API ===== + + /** + * Get workspace members + */ + async getWorkspaceMembers(workspaceId: string) { + return cloudFetch<{ members: Array<{ + id: string; + userId: string; + role: string; + isPending: boolean; + user?: { + githubUsername: string; + email?: string; + avatarUrl?: string; + }; + }> }>(`/api/workspaces/${encodeURIComponent(workspaceId)}/members`); + }, + + /** + * Invite user to workspace + */ + async inviteMember(workspaceId: string, githubUsername: string, role = 'member') { + return cloudFetch<{ success: boolean; member: unknown }>( + `/api/workspaces/${encodeURIComponent(workspaceId)}/members`, + { + method: 'POST', + body: JSON.stringify({ githubUsername, role }), + } + ); + }, + + /** + * Get pending invites for current user + */ + async getPendingInvites() { + return cloudFetch<{ invites: Array<{ + id: string; + workspaceId: string; + workspaceName: string; + role: string; + invitedAt: string; + invitedBy: string; + }> }>('/api/invites'); + }, + + /** + * Accept workspace invite + */ + async acceptInvite(inviteId: string) { + return cloudFetch<{ success: boolean; workspaceId: string }>( + `/api/invites/${encodeURIComponent(inviteId)}/accept`, + { method: 'POST' } + ); + }, + + /** + * Decline workspace invite + */ + async declineInvite(inviteId: string) { + return cloudFetch<{ success: boolean }>( + `/api/invites/${encodeURIComponent(inviteId)}/decline`, + { method: 'POST' } + ); + }, +}; diff --git a/src/dashboard/react-components/CloudSessionProvider.tsx b/src/dashboard/react-components/CloudSessionProvider.tsx new file mode 100644 index 000000000..8a3f16f8f --- /dev/null +++ b/src/dashboard/react-components/CloudSessionProvider.tsx @@ -0,0 +1,130 @@ +/** + * Cloud Session Provider + * + * Wraps the dashboard app to provide cloud session management. + * Automatically detects session expiration and prompts re-login. + * + * Usage: + * ```tsx + * + * + * + * ``` + */ + +import React, { createContext, useContext, useCallback } from 'react'; +import { useSession, type UseSessionReturn, type SessionError } from './hooks/useSession'; +import { SessionExpiredModal } from './SessionExpiredModal'; + +// Context type +interface CloudSessionContextValue extends UseSessionReturn { + /** Whether this is a cloud-hosted dashboard */ + isCloudMode: boolean; +} + +// Create context with undefined default +const CloudSessionContext = createContext(undefined); + +export interface CloudSessionProviderProps { + /** Child components */ + children: React.ReactNode; + /** Whether this dashboard is running in cloud mode (default: auto-detect) */ + cloudMode?: boolean; + /** Session check interval in ms (default: 60000) */ + checkInterval?: number; + /** Callback when session expires */ + onSessionExpired?: (error: SessionError) => void; +} + +/** + * Auto-detect if running in cloud mode + * Cloud mode is detected by checking for cloud-specific environment markers + */ +function detectCloudMode(): boolean { + if (typeof window === 'undefined') return false; + + // Check for cloud URL patterns + const hostname = window.location.hostname; + if (hostname.includes('agent-relay.com')) return true; + if (hostname.includes('agentrelay.cloud')) return true; + + // Check for cloud mode flag in meta tags + const cloudMeta = document.querySelector('meta[name="agent-relay-cloud"]'); + if (cloudMeta?.getAttribute('content') === 'true') return true; + + // Check for cloud mode in local storage (for development) + if (localStorage.getItem('agent-relay-cloud-mode') === 'true') return true; + + return false; +} + +export function CloudSessionProvider({ + children, + cloudMode, + checkInterval = 60000, + onSessionExpired, +}: CloudSessionProviderProps) { + const isCloudMode = cloudMode ?? detectCloudMode(); + + // Use session hook only in cloud mode + const session = useSession({ + checkOnMount: isCloudMode, + checkInterval: isCloudMode ? checkInterval : 0, + onExpired: onSessionExpired, + }); + + // Handle login redirect + const handleLogin = useCallback(() => { + session.redirectToLogin(); + }, [session]); + + // Handle modal dismiss (optional - keeps modal closable for some use cases) + const handleDismiss = useCallback(() => { + session.clearExpired(); + }, [session]); + + // Context value + const contextValue: CloudSessionContextValue = { + ...session, + isCloudMode, + }; + + return ( + + {children} + + {/* Session Expired Modal - only shown in cloud mode */} + {isCloudMode && ( + + )} + + ); +} + +/** + * Hook to access cloud session context + * + * @throws Error if used outside of CloudSessionProvider + */ +export function useCloudSession(): CloudSessionContextValue { + const context = useContext(CloudSessionContext); + if (!context) { + throw new Error('useCloudSession must be used within a CloudSessionProvider'); + } + return context; +} + +/** + * Hook to optionally access cloud session context + * Returns undefined if not within a CloudSessionProvider + */ +export function useCloudSessionOptional(): CloudSessionContextValue | undefined { + return useContext(CloudSessionContext); +} + +export default CloudSessionProvider; diff --git a/src/dashboard/react-components/SessionExpiredModal.tsx b/src/dashboard/react-components/SessionExpiredModal.tsx new file mode 100644 index 000000000..fa35d09b0 --- /dev/null +++ b/src/dashboard/react-components/SessionExpiredModal.tsx @@ -0,0 +1,128 @@ +/** + * Session Expired Modal + * + * Displayed when the user's session has expired and they need to log in again. + * Provides a clear message and easy path to re-authenticate. + */ + +import React from 'react'; +import type { SessionError } from './hooks/useSession'; + +export interface SessionExpiredModalProps { + /** Whether the modal is visible */ + isOpen: boolean; + /** Session error details */ + error: SessionError | null; + /** Called when user clicks to log in */ + onLogin: () => void; + /** Called when modal is dismissed (optional) */ + onDismiss?: () => void; +} + +export function SessionExpiredModal({ + isOpen, + error, + onLogin, + onDismiss, +}: SessionExpiredModalProps) { + if (!isOpen) return null; + + const getMessage = () => { + if (!error) return 'Your session has expired. Please log in again to continue.'; + + switch (error.code) { + case 'SESSION_EXPIRED': + return 'Your session has expired. Please log in again to continue.'; + case 'USER_NOT_FOUND': + return 'Your account was not found. Please log in again.'; + case 'SESSION_ERROR': + return 'There was a problem with your session. Please log in again.'; + default: + return error.message || 'Your session has expired. Please log in again.'; + } + }; + + return ( + <> + {/* Backdrop */} +