Domain; version

Author: ZIJ

AGENTS.md

@@ -65,7 +65,7 @@ catty new --api http://127.0.0.1:4815
 ```
 ┌─────────────┐     ┌─────────────────────┐     ┌──────────────────────┐
 │   catty     │────▶│     catty-api       │────▶│  Fly Machines API    │
-│   (CLI)     │     │ (catty-api.fly.dev) │     │   (internal)         │
+│   (CLI)     │     │  (api.catty.dev)    │     │   (internal)         │
 └──────┬──────┘     └─────────────────────┘     └──────────────────────┘
        │
        │ HTTP (upload) + WebSocket (terminal)
@@ -159,7 +159,7 @@ catty/
 **catty CLI:**
 | Variable | Description | Default |
 |----------|-------------|---------|
-| `CATTY_API_ADDR` | Override API URL | `https://catty-api.fly.dev` |
+| `CATTY_API_ADDR` | Override API URL | `https://api.catty.dev` |
 | `ANTHROPIC_API_KEY` | Passed to remote sessions | Required for Claude |
 
 **catty-api (hosted on Fly):**
@@ -168,6 +168,7 @@ catty/
 | `FLY_API_TOKEN` | Fly.io API token | Required (set as secret) |
 | `FLY_MACHINES_API_BASE` | Machines API URL | `http://_api.internal:4280` |
 | `CATTY_EXEC_APP` | Fly app name for executor | `catty-exec` |
+| `CATTY_EXEC_HOST` | Hostname for executor WebSocket connections | `exec.catty.dev` |
 | `CATTY_API_ADDR` | API listen address | `0.0.0.0:8080` |
 | `ANTHROPIC_API_KEY` | Passed to machines for Claude | Required (set as secret) |
 | `WORKOS_CLIENT_ID` | WorkOS application client ID | Required (set as secret) |
@@ -517,7 +518,7 @@ Response:
 {
   "session_id": "uuid",
   "machine_id": "...",
-  "connect_url": "wss://catty-exec.fly.dev/connect",
+  "connect_url": "wss://exec.catty.dev/connect",
   "connect_token": "base64url",
   "headers": {
     "fly-force-instance-id": "..."
@@ -625,12 +626,12 @@ fly secrets list -a catty-api
 
 ## Roadmap
 
-### Custom Domain
-Move to own domain (e.g., `api.catty.sh`) so no Fly URLs are exposed to users:
-- Register domain
-- Configure Fly custom domains for both `catty-api` and `catty-exec`
-- Update CLI default API URL
-- Update WebSocket connect URLs returned by API
+### Custom Domain ✓
+Custom domains configured:
+- `api.catty.dev` - API server
+- `exec.catty.dev` - Executor WebSocket connections
+
+CLI default updated to use `api.catty.dev`. WebSocket URLs use `CATTY_EXEC_HOST` env var.
 
 ### Usage Metering & Billing
 Track per-user token usage and implement billing:

README.md

@@ -74,7 +74,7 @@ Maximum upload size: 100MB
 
 ## Roadmap
 
-- **Custom domain** - Move away from *.fly.dev URLs
+- ~~**Custom domain** - Move away from *.fly.dev URLs~~ ✓
 - **Usage metering & billing** - Track per-user token usage, free tier + subscription ($25/mo target)
 - **Multi-key support** - Pool of API keys for handling load spikes
 - **Database backend** - Persistent storage for users, sessions, and usage (Supabase)

catty

@@ -9,9 +9,12 @@ import (
 
 const (
 	// DefaultAPIAddr is the default API server address
-	DefaultAPIAddr = "https://catty-api.fly.dev"
+	DefaultAPIAddr = "https://api.catty.dev"
 )
 
+// Version is set at build time via -ldflags
+var Version = "dev"
+
 var apiAddr string
 
 func main() {
@@ -29,6 +32,7 @@ func main() {
 	rootCmd.AddCommand(stopAllCmd)
 	rootCmd.AddCommand(loginCmd)
 	rootCmd.AddCommand(logoutCmd)
+	rootCmd.AddCommand(versionCmd)
 
 	if err := rootCmd.Execute(); err != nil {
 		fmt.Fprintln(os.Stderr, err)

catty-api

@@ -0,0 +1,15 @@
+package main
+
+import (
+	"fmt"
+
+	"github.com/spf13/cobra"
+)
+
+var versionCmd = &cobra.Command{
+	Use:   "version",
+	Short: "Print the version number",
+	Run: func(cmd *cobra.Command, args []string) {
+		fmt.Println(Version)
+	},
+}

cmd/catty/main.go

@@ -18,6 +18,7 @@ primary_region = "iad"
   # Use Fly's internal Machines API when running on Fly
   FLY_MACHINES_API_BASE = "http://_api.internal:4280"
   CATTY_EXEC_APP = "catty-exec"
+  CATTY_EXEC_HOST = "exec.catty.dev"
   CATTY_API_ADDR = "0.0.0.0:8080"
 
 [http_service]

cmd/catty/version.go

@@ -170,7 +170,12 @@ func (h *Handlers) CreateSession(w http.ResponseWriter, r *http.Request) {
 	}
 
 	// Build connect URL
-	connectURL := fmt.Sprintf("wss://%s.fly.dev/connect", h.flyClient.AppName())
+	// Use custom domain if set, otherwise fall back to fly.dev
+	execHost := os.Getenv("CATTY_EXEC_HOST")
+	if execHost == "" {
+		execHost = fmt.Sprintf("%s.fly.dev", h.flyClient.AppName())
+	}
+	connectURL := fmt.Sprintf("wss://%s/connect", execHost)
 
 	// Save session
 	session := &Session{

fly.api.toml

@@ -1,6 +1,6 @@
 {
   "name": "@izalutski/catty",
-  "version": "0.2.4",
+  "version": "0.2.5",
   "description": "Run Claude Code sessions remotely",
   "keywords": [
     "ai",