portless 0.2.2 → 0.4.0

package/dist/cli.js

@@ -1,21 +1,494 @@
 #!/usr/bin/env node
 import {
+  FILE_MODE,
+  PORTLESS_HEADER,
   RouteStore,
   createProxyServer,
+  formatUrl,
   isErrnoException,
   parseHostname
-} from "./chunk-SE7KL62V.js";
+} from "./chunk-VRBD6YAY.js";
 
 // src/cli.ts
 import chalk from "chalk";
+import * as fs3 from "fs";
+import * as path3 from "path";
+import { spawn as spawn2, spawnSync } from "child_process";
+
+// src/certs.ts
 import * as fs from "fs";
 import * as path from "path";
-import * as readline from "readline";
-import { execSync, spawn, spawnSync } from "child_process";
+import * as crypto from "crypto";
+import * as tls from "tls";
+import { execFile as execFileCb, execFileSync } from "child_process";
+import { promisify } from "util";
+var CA_VALIDITY_DAYS = 3650;
+function fixOwnership(...paths) {
+  const uid = process.env.SUDO_UID;
+  const gid = process.env.SUDO_GID;
+  if (!uid || process.getuid?.() !== 0) return;
+  for (const p of paths) {
+    try {
+      fs.chownSync(p, parseInt(uid, 10), parseInt(gid || uid, 10));
+    } catch {
+    }
+  }
+}
+var SERVER_VALIDITY_DAYS = 365;
+var EXPIRY_BUFFER_MS = 7 * 24 * 60 * 60 * 1e3;
+var CA_COMMON_NAME = "portless Local CA";
+var OPENSSL_TIMEOUT_MS = 15e3;
+var CA_KEY_FILE = "ca-key.pem";
+var CA_CERT_FILE = "ca.pem";
+var SERVER_KEY_FILE = "server-key.pem";
+var SERVER_CERT_FILE = "server.pem";
+function fileExists(filePath) {
+  try {
+    fs.accessSync(filePath, fs.constants.R_OK);
+    return true;
+  } catch {
+    return false;
+  }
+}
+function isCertValid(certPath) {
+  try {
+    const pem = fs.readFileSync(certPath, "utf-8");
+    const cert = new crypto.X509Certificate(pem);
+    const expiry = new Date(cert.validTo).getTime();
+    return Date.now() + EXPIRY_BUFFER_MS < expiry;
+  } catch {
+    return false;
+  }
+}
+function openssl(args, options) {
+  try {
+    return execFileSync("openssl", args, {
+      encoding: "utf-8",
+      timeout: OPENSSL_TIMEOUT_MS,
+      input: options?.input,
+      stdio: ["pipe", "pipe", "pipe"]
+    });
+  } catch (err) {
+    const message = err instanceof Error ? err.message : String(err);
+    throw new Error(
+      `openssl failed: ${message}
+
+Make sure openssl is installed (ships with macOS and most Linux distributions).`
+    );
+  }
+}
+var execFileAsync = promisify(execFileCb);
+async function opensslAsync(args) {
+  try {
+    const { stdout } = await execFileAsync("openssl", args, {
+      encoding: "utf-8",
+      timeout: OPENSSL_TIMEOUT_MS
+    });
+    return stdout;
+  } catch (err) {
+    const message = err instanceof Error ? err.message : String(err);
+    throw new Error(
+      `openssl failed: ${message}
+
+Make sure openssl is installed (ships with macOS and most Linux distributions).`
+    );
+  }
+}
+function generateCA(stateDir) {
+  const keyPath = path.join(stateDir, CA_KEY_FILE);
+  const certPath = path.join(stateDir, CA_CERT_FILE);
+  openssl(["ecparam", "-genkey", "-name", "prime256v1", "-noout", "-out", keyPath]);
+  openssl([
+    "req",
+    "-new",
+    "-x509",
+    "-key",
+    keyPath,
+    "-out",
+    certPath,
+    "-days",
+    CA_VALIDITY_DAYS.toString(),
+    "-subj",
+    `/CN=${CA_COMMON_NAME}`,
+    "-addext",
+    "basicConstraints=critical,CA:TRUE",
+    "-addext",
+    "keyUsage=critical,keyCertSign,cRLSign"
+  ]);
+  fs.chmodSync(keyPath, 384);
+  fs.chmodSync(certPath, 420);
+  fixOwnership(keyPath, certPath);
+  return { certPath, keyPath };
+}
+function generateServerCert(stateDir) {
+  const caKeyPath = path.join(stateDir, CA_KEY_FILE);
+  const caCertPath = path.join(stateDir, CA_CERT_FILE);
+  const serverKeyPath = path.join(stateDir, SERVER_KEY_FILE);
+  const serverCertPath = path.join(stateDir, SERVER_CERT_FILE);
+  const csrPath = path.join(stateDir, "server.csr");
+  const extPath = path.join(stateDir, "server-ext.cnf");
+  openssl(["ecparam", "-genkey", "-name", "prime256v1", "-noout", "-out", serverKeyPath]);
+  openssl(["req", "-new", "-key", serverKeyPath, "-out", csrPath, "-subj", "/CN=localhost"]);
+  fs.writeFileSync(
+    extPath,
+    [
+      "authorityKeyIdentifier=keyid,issuer",
+      "basicConstraints=CA:FALSE",
+      "keyUsage=digitalSignature,keyEncipherment",
+      "extendedKeyUsage=serverAuth",
+      "subjectAltName=DNS:localhost,DNS:*.localhost"
+    ].join("\n") + "\n"
+  );
+  openssl([
+    "x509",
+    "-req",
+    "-in",
+    csrPath,
+    "-CA",
+    caCertPath,
+    "-CAkey",
+    caKeyPath,
+    "-CAcreateserial",
+    "-out",
+    serverCertPath,
+    "-days",
+    SERVER_VALIDITY_DAYS.toString(),
+    "-extfile",
+    extPath
+  ]);
+  for (const tmp of [csrPath, extPath]) {
+    try {
+      fs.unlinkSync(tmp);
+    } catch {
+    }
+  }
+  fs.chmodSync(serverKeyPath, 384);
+  fs.chmodSync(serverCertPath, 420);
+  fixOwnership(serverKeyPath, serverCertPath);
+  return { certPath: serverCertPath, keyPath: serverKeyPath };
+}
+function ensureCerts(stateDir) {
+  const caCertPath = path.join(stateDir, CA_CERT_FILE);
+  const caKeyPath = path.join(stateDir, CA_KEY_FILE);
+  const serverCertPath = path.join(stateDir, SERVER_CERT_FILE);
+  let caGenerated = false;
+  if (!fileExists(caCertPath) || !fileExists(caKeyPath) || !isCertValid(caCertPath)) {
+    generateCA(stateDir);
+    caGenerated = true;
+  }
+  if (caGenerated || !fileExists(serverCertPath) || !isCertValid(serverCertPath)) {
+    generateServerCert(stateDir);
+  }
+  return {
+    certPath: serverCertPath,
+    keyPath: path.join(stateDir, SERVER_KEY_FILE),
+    caPath: caCertPath,
+    caGenerated
+  };
+}
+function isCATrusted(stateDir) {
+  const caCertPath = path.join(stateDir, CA_CERT_FILE);
+  if (!fileExists(caCertPath)) return false;
+  if (process.platform === "darwin") {
+    return isCATrustedMacOS(caCertPath);
+  } else if (process.platform === "linux") {
+    return isCATrustedLinux(stateDir);
+  }
+  return false;
+}
+function isCATrustedMacOS(caCertPath) {
+  try {
+    const fingerprint = openssl(["x509", "-in", caCertPath, "-noout", "-fingerprint", "-sha1"]).trim().replace(/^.*=/, "").replace(/:/g, "").toLowerCase();
+    for (const keychain of [loginKeychainPath(), "/Library/Keychains/System.keychain"]) {
+      try {
+        const result = execFileSync("security", ["find-certificate", "-a", "-Z", keychain], {
+          encoding: "utf-8",
+          timeout: 5e3,
+          stdio: ["pipe", "pipe", "pipe"]
+        });
+        if (result.toLowerCase().includes(fingerprint)) return true;
+      } catch {
+      }
+    }
+    return false;
+  } catch {
+    return false;
+  }
+}
+function loginKeychainPath() {
+  try {
+    const result = execFileSync("security", ["default-keychain"], {
+      encoding: "utf-8",
+      timeout: 5e3
+    }).trim();
+    const match = result.match(/"(.+)"/);
+    if (match) return match[1];
+  } catch {
+  }
+  const home = process.env.HOME || `/Users/${process.env.USER || "unknown"}`;
+  return path.join(home, "Library", "Keychains", "login.keychain-db");
+}
+function isCATrustedLinux(stateDir) {
+  const systemCertPath = `/usr/local/share/ca-certificates/portless-ca.crt`;
+  if (!fileExists(systemCertPath)) return false;
+  try {
+    const ours = fs.readFileSync(path.join(stateDir, CA_CERT_FILE), "utf-8").trim();
+    const installed = fs.readFileSync(systemCertPath, "utf-8").trim();
+    return ours === installed;
+  } catch {
+    return false;
+  }
+}
+var HOST_CERTS_DIR = "host-certs";
+function sanitizeHostForFilename(hostname) {
+  return hostname.replace(/\./g, "_").replace(/[^a-z0-9_-]/gi, "");
+}
+async function generateHostCertAsync(stateDir, hostname) {
+  const caKeyPath = path.join(stateDir, CA_KEY_FILE);
+  const caCertPath = path.join(stateDir, CA_CERT_FILE);
+  const hostDir = path.join(stateDir, HOST_CERTS_DIR);
+  if (!fs.existsSync(hostDir)) {
+    await fs.promises.mkdir(hostDir, { recursive: true, mode: 493 });
+    fixOwnership(hostDir);
+  }
+  const safeName = sanitizeHostForFilename(hostname);
+  const keyPath = path.join(hostDir, `${safeName}-key.pem`);
+  const certPath = path.join(hostDir, `${safeName}.pem`);
+  const csrPath = path.join(hostDir, `${safeName}.csr`);
+  const extPath = path.join(hostDir, `${safeName}-ext.cnf`);
+  await opensslAsync(["ecparam", "-genkey", "-name", "prime256v1", "-noout", "-out", keyPath]);
+  await opensslAsync(["req", "-new", "-key", keyPath, "-out", csrPath, "-subj", `/CN=${hostname}`]);
+  const sans = [`DNS:${hostname}`];
+  const parts = hostname.split(".");
+  if (parts.length >= 2) {
+    sans.push(`DNS:*.${parts.slice(1).join(".")}`);
+  }
+  await fs.promises.writeFile(
+    extPath,
+    [
+      "authorityKeyIdentifier=keyid,issuer",
+      "basicConstraints=CA:FALSE",
+      "keyUsage=digitalSignature,keyEncipherment",
+      "extendedKeyUsage=serverAuth",
+      `subjectAltName=${sans.join(",")}`
+    ].join("\n") + "\n"
+  );
+  await opensslAsync([
+    "x509",
+    "-req",
+    "-in",
+    csrPath,
+    "-CA",
+    caCertPath,
+    "-CAkey",
+    caKeyPath,
+    "-CAcreateserial",
+    "-out",
+    certPath,
+    "-days",
+    SERVER_VALIDITY_DAYS.toString(),
+    "-extfile",
+    extPath
+  ]);
+  for (const tmp of [csrPath, extPath]) {
+    try {
+      await fs.promises.unlink(tmp);
+    } catch {
+    }
+  }
+  await fs.promises.chmod(keyPath, 384);
+  await fs.promises.chmod(certPath, 420);
+  fixOwnership(keyPath, certPath);
+  return { certPath, keyPath };
+}
+function isSimpleLocalhostSubdomain(hostname) {
+  const parts = hostname.split(".");
+  return parts.length === 2 && parts[1] === "localhost";
+}
+function createSNICallback(stateDir, defaultCert, defaultKey) {
+  const cache = /* @__PURE__ */ new Map();
+  const pending = /* @__PURE__ */ new Map();
+  const defaultCtx = tls.createSecureContext({ cert: defaultCert, key: defaultKey });
+  return (servername, cb) => {
+    if (servername === "localhost" || isSimpleLocalhostSubdomain(servername)) {
+      cb(null, defaultCtx);
+      return;
+    }
+    if (cache.has(servername)) {
+      cb(null, cache.get(servername));
+      return;
+    }
+    const safeName = sanitizeHostForFilename(servername);
+    const hostDir = path.join(stateDir, HOST_CERTS_DIR);
+    const certPath = path.join(hostDir, `${safeName}.pem`);
+    const keyPath = path.join(hostDir, `${safeName}-key.pem`);
+    if (fileExists(certPath) && fileExists(keyPath) && isCertValid(certPath)) {
+      try {
+        const ctx = tls.createSecureContext({
+          cert: fs.readFileSync(certPath),
+          key: fs.readFileSync(keyPath)
+        });
+        cache.set(servername, ctx);
+        cb(null, ctx);
+        return;
+      } catch {
+      }
+    }
+    if (pending.has(servername)) {
+      pending.get(servername).then((ctx) => cb(null, ctx)).catch((err) => cb(err instanceof Error ? err : new Error(String(err))));
+      return;
+    }
+    const promise = generateHostCertAsync(stateDir, servername).then(async (generated) => {
+      const [cert, key] = await Promise.all([
+        fs.promises.readFile(generated.certPath),
+        fs.promises.readFile(generated.keyPath)
+      ]);
+      return tls.createSecureContext({ cert, key });
+    });
+    pending.set(servername, promise);
+    promise.then((ctx) => {
+      cache.set(servername, ctx);
+      pending.delete(servername);
+      cb(null, ctx);
+    }).catch((err) => {
+      pending.delete(servername);
+      cb(err instanceof Error ? err : new Error(String(err)));
+    });
+  };
+}
+function trustCA(stateDir) {
+  const caCertPath = path.join(stateDir, CA_CERT_FILE);
+  if (!fileExists(caCertPath)) {
+    return { trusted: false, error: "CA certificate not found. Run with --https first." };
+  }
+  try {
+    if (process.platform === "darwin") {
+      const keychain = loginKeychainPath();
+      execFileSync(
+        "security",
+        ["add-trusted-cert", "-r", "trustRoot", "-k", keychain, caCertPath],
+        { stdio: "pipe", timeout: 3e4 }
+      );
+      return { trusted: true };
+    } else if (process.platform === "linux") {
+      const dest = "/usr/local/share/ca-certificates/portless-ca.crt";
+      fs.copyFileSync(caCertPath, dest);
+      execFileSync("update-ca-certificates", [], { stdio: "pipe", timeout: 3e4 });
+      return { trusted: true };
+    }
+    return { trusted: false, error: `Unsupported platform: ${process.platform}` };
+  } catch (err) {
+    const message = err instanceof Error ? err.message : String(err);
+    if (message.includes("authorization") || message.includes("permission") || message.includes("EACCES")) {
+      return {
+        trusted: false,
+        error: "Permission denied. Try: sudo portless trust"
+      };
+    }
+    return { trusted: false, error: message };
+  }
+}
 
 // src/cli-utils.ts
+import * as fs2 from "fs";
+import * as http from "http";
+import * as https from "https";
 import * as net from "net";
-async function findFreePort(minPort = 4e3, maxPort = 4999) {
+import * as os from "os";
+import * as path2 from "path";
+import * as readline from "readline";
+import { execSync, spawn } from "child_process";
+var DEFAULT_PROXY_PORT = 1355;
+var PRIVILEGED_PORT_THRESHOLD = 1024;
+var SYSTEM_STATE_DIR = "/tmp/portless";
+var USER_STATE_DIR = path2.join(os.homedir(), ".portless");
+var MIN_APP_PORT = 4e3;
+var MAX_APP_PORT = 4999;
+var RANDOM_PORT_ATTEMPTS = 50;
+var SOCKET_TIMEOUT_MS = 500;
+var LSOF_TIMEOUT_MS = 5e3;
+var WAIT_FOR_PROXY_MAX_ATTEMPTS = 20;
+var WAIT_FOR_PROXY_INTERVAL_MS = 250;
+var SIGNAL_CODES = {
+  SIGHUP: 1,
+  SIGINT: 2,
+  SIGQUIT: 3,
+  SIGABRT: 6,
+  SIGKILL: 9,
+  SIGTERM: 15
+};
+function getDefaultPort() {
+  const envPort = process.env.PORTLESS_PORT;
+  if (envPort) {
+    const port = parseInt(envPort, 10);
+    if (!isNaN(port) && port >= 1 && port <= 65535) return port;
+  }
+  return DEFAULT_PROXY_PORT;
+}
+function resolveStateDir(port) {
+  if (process.env.PORTLESS_STATE_DIR) return process.env.PORTLESS_STATE_DIR;
+  return port < PRIVILEGED_PORT_THRESHOLD ? SYSTEM_STATE_DIR : USER_STATE_DIR;
+}
+function readPortFromDir(dir) {
+  try {
+    const raw = fs2.readFileSync(path2.join(dir, "proxy.port"), "utf-8").trim();
+    const port = parseInt(raw, 10);
+    return isNaN(port) ? null : port;
+  } catch {
+    return null;
+  }
+}
+var TLS_MARKER_FILE = "proxy.tls";
+function readTlsMarker(dir) {
+  try {
+    return fs2.existsSync(path2.join(dir, TLS_MARKER_FILE));
+  } catch {
+    return false;
+  }
+}
+function writeTlsMarker(dir, enabled) {
+  const markerPath = path2.join(dir, TLS_MARKER_FILE);
+  if (enabled) {
+    fs2.writeFileSync(markerPath, "1", { mode: 420 });
+  } else {
+    try {
+      fs2.unlinkSync(markerPath);
+    } catch {
+    }
+  }
+}
+function isHttpsEnvEnabled() {
+  const val = process.env.PORTLESS_HTTPS;
+  return val === "1" || val === "true";
+}
+async function discoverState() {
+  if (process.env.PORTLESS_STATE_DIR) {
+    const dir = process.env.PORTLESS_STATE_DIR;
+    const port = readPortFromDir(dir) ?? getDefaultPort();
+    const tls2 = readTlsMarker(dir);
+    return { dir, port, tls: tls2 };
+  }
+  const userPort = readPortFromDir(USER_STATE_DIR);
+  if (userPort !== null) {
+    const tls2 = readTlsMarker(USER_STATE_DIR);
+    if (await isProxyRunning(userPort, tls2)) {
+      return { dir: USER_STATE_DIR, port: userPort, tls: tls2 };
+    }
+  }
+  const systemPort = readPortFromDir(SYSTEM_STATE_DIR);
+  if (systemPort !== null) {
+    const tls2 = readTlsMarker(SYSTEM_STATE_DIR);
+    if (await isProxyRunning(systemPort, tls2)) {
+      return { dir: SYSTEM_STATE_DIR, port: systemPort, tls: tls2 };
+    }
+  }
+  const defaultPort = getDefaultPort();
+  return { dir: resolveStateDir(defaultPort), port: defaultPort, tls: false };
+}
+async function findFreePort(minPort = MIN_APP_PORT, maxPort = MAX_APP_PORT) {
+  if (minPort > maxPort) {
+    throw new Error(`minPort (${minPort}) must be <= maxPort (${maxPort})`);
+  }
   const tryPort = (port) => {
     return new Promise((resolve) => {
       const server = net.createServer();
@@ -25,7 +498,7 @@ async function findFreePort(minPort = 4e3, maxPort = 4999) {
       server.on("error", () => resolve(false));
     });
   };
-  for (let i = 0; i < 50; i++) {
+  for (let i = 0; i < RANDOM_PORT_ATTEMPTS; i++) {
     const port = minPort + Math.floor(Math.random() * (maxPort - minPort + 1));
     if (await tryPort(port)) {
       return port;
@@ -38,58 +511,36 @@ async function findFreePort(minPort = 4e3, maxPort = 4999) {
   }
   throw new Error(`No free port found in range ${minPort}-${maxPort}`);
 }
-function isProxyRunning(port = 80) {
+function isProxyRunning(port, tls2 = false) {
   return new Promise((resolve) => {
-    const socket = new net.Socket();
-    socket.setTimeout(500);
-    socket.on("connect", () => {
-      socket.destroy();
-      resolve(true);
-    });
-    socket.on("error", () => resolve(false));
-    socket.on("timeout", () => {
-      socket.destroy();
+    const requestFn = tls2 ? https.request : http.request;
+    const req = requestFn(
+      {
+        hostname: "127.0.0.1",
+        port,
+        path: "/",
+        method: "HEAD",
+        timeout: SOCKET_TIMEOUT_MS,
+        ...tls2 ? { rejectUnauthorized: false } : {}
+      },
+      (res) => {
+        res.resume();
+        resolve(res.headers[PORTLESS_HEADER.toLowerCase()] === "1");
+      }
+    );
+    req.on("error", () => resolve(false));
+    req.on("timeout", () => {
+      req.destroy();
       resolve(false);
     });
-    socket.connect(port, "127.0.0.1");
+    req.end();
   });
 }
-
-// src/cli.ts
-var SIGNAL_CODES = { SIGINT: 2, SIGTERM: 15 };
-function prompt(question) {
-  const rl = readline.createInterface({
-    input: process.stdin,
-    output: process.stdout
-  });
-  return new Promise((resolve) => {
-    rl.on("close", () => resolve(""));
-    rl.question(question, (answer) => {
-      rl.close();
-      resolve(answer.trim().toLowerCase());
-    });
-  });
-}
-var PORTLESS_DIR = "/tmp/portless";
-var PROXY_PORT_PATH = path.join(PORTLESS_DIR, "proxy.port");
-var DEFAULT_PROXY_PORT = 80;
-var store = new RouteStore(PORTLESS_DIR, {
-  onWarning: (msg) => console.warn(chalk.yellow(msg))
-});
-function readProxyPort() {
-  try {
-    const raw = fs.readFileSync(PROXY_PORT_PATH, "utf-8").trim();
-    const port = parseInt(raw, 10);
-    return isNaN(port) ? DEFAULT_PROXY_PORT : port;
-  } catch {
-    return DEFAULT_PROXY_PORT;
-  }
-}
 function findPidOnPort(port) {
   try {
     const output = execSync(`lsof -ti tcp:${port} -sTCP:LISTEN`, {
       encoding: "utf-8",
-      timeout: 5e3
+      timeout: LSOF_TIMEOUT_MS
     });
     const pid = parseInt(output.trim().split("\n")[0], 10);
     return isNaN(pid) ? null : pid;
@@ -97,11 +548,10 @@ function findPidOnPort(port) {
     return null;
   }
 }
-async function waitForProxy(proxyPort, maxAttempts = 20, intervalMs = 250) {
-  const port = proxyPort ?? readProxyPort();
+async function waitForProxy(port, maxAttempts = WAIT_FOR_PROXY_MAX_ATTEMPTS, intervalMs = WAIT_FOR_PROXY_INTERVAL_MS, tls2 = false) {
   for (let i = 0; i < maxAttempts; i++) {
     await new Promise((resolve) => setTimeout(resolve, intervalMs));
-    if (await isProxyRunning(port)) {
+    if (await isProxyRunning(port, tls2)) {
       return true;
     }
   }
@@ -113,45 +563,76 @@ function spawnCommand(commandArgs, options) {
     env: options?.env
   });
   let exiting = false;
+  const cleanup = () => {
+    process.removeListener("SIGINT", onSigInt);
+    process.removeListener("SIGTERM", onSigTerm);
+    options?.onCleanup?.();
+  };
   const handleSignal = (signal) => {
     if (exiting) return;
     exiting = true;
     child.kill(signal);
-    options?.onCleanup?.();
+    cleanup();
     process.exit(128 + (SIGNAL_CODES[signal] || 15));
   };
-  process.on("SIGINT", () => handleSignal("SIGINT"));
-  process.on("SIGTERM", () => handleSignal("SIGTERM"));
+  const onSigInt = () => handleSignal("SIGINT");
+  const onSigTerm = () => handleSignal("SIGTERM");
+  process.on("SIGINT", onSigInt);
+  process.on("SIGTERM", onSigTerm);
   child.on("error", (err) => {
     if (exiting) return;
     exiting = true;
-    console.error(chalk.red(`Failed to run command: ${err.message}`));
-    options?.onCleanup?.();
+    console.error(`Failed to run command: ${err.message}`);
+    if (err.code === "ENOENT") {
+      console.error(`Is "${commandArgs[0]}" installed and in your PATH?`);
+    }
+    cleanup();
     process.exit(1);
   });
   child.on("exit", (code, signal) => {
     if (exiting) return;
     exiting = true;
-    options?.onCleanup?.();
+    cleanup();
     if (signal) {
-      process.exit(128 + (SIGNAL_CODES[signal] || 1));
+      process.exit(128 + (SIGNAL_CODES[signal] || 15));
     }
     process.exit(code ?? 1);
   });
 }
-function startProxyServer(proxyPort) {
+function prompt(question) {
+  const rl = readline.createInterface({
+    input: process.stdin,
+    output: process.stdout
+  });
+  return new Promise((resolve) => {
+    rl.on("close", () => resolve(""));
+    rl.question(question, (answer) => {
+      rl.close();
+      resolve(answer.trim().toLowerCase());
+    });
+  });
+}
+
+// src/cli.ts
+var DEBOUNCE_MS = 100;
+var POLL_INTERVAL_MS = 3e3;
+var EXIT_TIMEOUT_MS = 2e3;
+var SUDO_SPAWN_TIMEOUT_MS = 3e4;
+function startProxyServer(store, proxyPort, tlsOptions) {
   store.ensureDir();
+  const isTls = !!tlsOptions;
   const routesPath = store.getRoutesPath();
-  if (!fs.existsSync(routesPath)) {
-    fs.writeFileSync(routesPath, "[]", { mode: 420 });
+  if (!fs3.existsSync(routesPath)) {
+    fs3.writeFileSync(routesPath, "[]", { mode: FILE_MODE });
   }
   try {
-    fs.chmodSync(routesPath, 420);
+    fs3.chmodSync(routesPath, FILE_MODE);
   } catch {
   }
   let cachedRoutes = store.loadRoutes();
   let debounceTimer = null;
   let watcher = null;
+  let pollingInterval = null;
   const reloadRoutes = () => {
     try {
       cachedRoutes = store.loadRoutes();
@@ -159,86 +640,107 @@ function startProxyServer(proxyPort) {
     }
   };
   try {
-    watcher = fs.watch(routesPath, () => {
+    watcher = fs3.watch(routesPath, () => {
       if (debounceTimer) clearTimeout(debounceTimer);
-      debounceTimer = setTimeout(reloadRoutes, 100);
+      debounceTimer = setTimeout(reloadRoutes, DEBOUNCE_MS);
     });
   } catch {
     console.warn(chalk.yellow("fs.watch unavailable; falling back to polling for route changes"));
-    setInterval(reloadRoutes, 3e3);
+    pollingInterval = setInterval(reloadRoutes, POLL_INTERVAL_MS);
   }
   const server = createProxyServer({
     getRoutes: () => cachedRoutes,
-    onError: (msg) => console.error(chalk.red(msg))
+    proxyPort,
+    onError: (msg) => console.error(chalk.red(msg)),
+    tls: tlsOptions
   });
   server.on("error", (err) => {
     if (err.code === "EADDRINUSE") {
-      console.error(chalk.red(`Port ${proxyPort} is already in use`));
+      console.error(chalk.red(`Port ${proxyPort} is already in use.`));
+      console.error(chalk.blue("Stop the existing proxy first:"));
+      console.error(chalk.cyan("  portless proxy stop"));
+      console.error(chalk.blue("Or check what is using the port:"));
+      console.error(chalk.cyan(`  lsof -ti tcp:${proxyPort}`));
     } else if (err.code === "EACCES") {
-      console.error(chalk.red("Permission denied. Use: sudo portless proxy"));
+      console.error(chalk.red(`Permission denied for port ${proxyPort}.`));
+      console.error(chalk.blue("Either run with sudo:"));
+      console.error(chalk.cyan("  sudo portless proxy start -p 80"));
+      console.error(chalk.blue("Or use a non-privileged port (no sudo needed):"));
+      console.error(chalk.cyan("  portless proxy start"));
     } else {
       console.error(chalk.red(`Proxy error: ${err.message}`));
     }
     process.exit(1);
   });
   server.listen(proxyPort, () => {
-    fs.writeFileSync(store.pidPath, process.pid.toString(), { mode: 420 });
-    fs.writeFileSync(PROXY_PORT_PATH, proxyPort.toString(), { mode: 420 });
-    console.log(chalk.green(`HTTP proxy listening on port ${proxyPort}`));
+    fs3.writeFileSync(store.pidPath, process.pid.toString(), { mode: FILE_MODE });
+    fs3.writeFileSync(store.portFilePath, proxyPort.toString(), { mode: FILE_MODE });
+    writeTlsMarker(store.dir, isTls);
+    const proto = isTls ? "HTTPS/2" : "HTTP";
+    console.log(chalk.green(`${proto} proxy listening on port ${proxyPort}`));
   });
   let exiting = false;
   const cleanup = () => {
     if (exiting) return;
     exiting = true;
+    if (debounceTimer) clearTimeout(debounceTimer);
+    if (pollingInterval) clearInterval(pollingInterval);
     if (watcher) {
       watcher.close();
     }
     try {
-      fs.unlinkSync(store.pidPath);
+      fs3.unlinkSync(store.pidPath);
     } catch {
     }
     try {
-      fs.unlinkSync(PROXY_PORT_PATH);
+      fs3.unlinkSync(store.portFilePath);
     } catch {
     }
+    writeTlsMarker(store.dir, false);
     server.close(() => process.exit(0));
-    setTimeout(() => process.exit(0), 2e3).unref();
+    setTimeout(() => process.exit(0), EXIT_TIMEOUT_MS).unref();
   };
   process.on("SIGINT", cleanup);
   process.on("SIGTERM", cleanup);
   console.log(chalk.cyan("\nProxy is running. Press Ctrl+C to stop.\n"));
   console.log(chalk.gray(`Routes file: ${store.getRoutesPath()}`));
 }
-async function stopProxy() {
+async function stopProxy(store, proxyPort, tls2) {
   const pidPath = store.pidPath;
-  const proxyPort = readProxyPort();
-  if (!fs.existsSync(pidPath)) {
-    if (await isProxyRunning(proxyPort)) {
+  const needsSudo = proxyPort < PRIVILEGED_PORT_THRESHOLD;
+  const sudoHint = needsSudo ? "sudo " : "";
+  if (!fs3.existsSync(pidPath)) {
+    if (await isProxyRunning(proxyPort, tls2)) {
       console.log(chalk.yellow(`PID file is missing but port ${proxyPort} is still in use.`));
       const pid = findPidOnPort(proxyPort);
       if (pid !== null) {
         try {
           process.kill(pid, "SIGTERM");
           try {
-            fs.unlinkSync(PROXY_PORT_PATH);
+            fs3.unlinkSync(store.portFilePath);
           } catch {
           }
           console.log(chalk.green(`Killed process ${pid}. Proxy stopped.`));
         } catch (err) {
           if (isErrnoException(err) && err.code === "EPERM") {
-            console.error(chalk.red("Permission denied. The proxy runs as root."));
-            console.log(chalk.blue("Use: sudo portless proxy stop"));
+            console.error(chalk.red("Permission denied. The proxy was started with sudo."));
+            console.error(chalk.blue("Stop it with:"));
+            console.error(chalk.cyan("  sudo portless proxy stop"));
           } else {
             const message = err instanceof Error ? err.message : String(err);
-            console.error(chalk.red("Failed to stop proxy:"), message);
+            console.error(chalk.red(`Failed to stop proxy: ${message}`));
+            console.error(chalk.blue("Check if the process is still running:"));
+            console.error(chalk.cyan(`  lsof -ti tcp:${proxyPort}`));
           }
         }
       } else if (process.getuid?.() !== 0) {
-        console.error(chalk.red("Permission denied. The proxy likely runs as root."));
-        console.log(chalk.blue("Use: sudo portless proxy stop"));
+        console.error(chalk.red("Cannot identify the process. It may be running as root."));
+        console.error(chalk.blue("Try stopping with sudo:"));
+        console.error(chalk.cyan("  sudo portless proxy stop"));
       } else {
         console.error(chalk.red(`Could not identify the process on port ${proxyPort}.`));
-        console.log(chalk.blue(`Try: sudo kill "$(lsof -ti tcp:${proxyPort})"`));
+        console.error(chalk.blue("Try manually:"));
+        console.error(chalk.cyan(`  sudo kill "$(lsof -ti tcp:${proxyPort})"`));
       }
     } else {
       console.log(chalk.yellow("Proxy is not running."));
@@ -246,47 +748,54 @@ async function stopProxy() {
     return;
   }
   try {
-    const pid = parseInt(fs.readFileSync(pidPath, "utf-8"), 10);
+    const pid = parseInt(fs3.readFileSync(pidPath, "utf-8"), 10);
     if (isNaN(pid)) {
       console.error(chalk.red("Corrupted PID file. Removing it."));
-      fs.unlinkSync(pidPath);
+      fs3.unlinkSync(pidPath);
       return;
     }
     try {
       process.kill(pid, 0);
     } catch {
-      console.log(chalk.yellow("Proxy process is no longer running. Cleaning up."));
-      fs.unlinkSync(pidPath);
+      console.log(chalk.yellow("Proxy process is no longer running. Cleaning up stale files."));
+      fs3.unlinkSync(pidPath);
+      try {
+        fs3.unlinkSync(store.portFilePath);
+      } catch {
+      }
       return;
     }
-    if (!await isProxyRunning(proxyPort)) {
+    if (!await isProxyRunning(proxyPort, tls2)) {
       console.log(
         chalk.yellow(
           `PID file exists but port ${proxyPort} is not listening. The PID may have been recycled.`
         )
       );
       console.log(chalk.yellow("Removing stale PID file."));
-      fs.unlinkSync(pidPath);
+      fs3.unlinkSync(pidPath);
       return;
     }
     process.kill(pid, "SIGTERM");
-    fs.unlinkSync(pidPath);
+    fs3.unlinkSync(pidPath);
     try {
-      fs.unlinkSync(PROXY_PORT_PATH);
+      fs3.unlinkSync(store.portFilePath);
     } catch {
     }
     console.log(chalk.green("Proxy stopped."));
   } catch (err) {
     if (isErrnoException(err) && err.code === "EPERM") {
-      console.error(chalk.red("Permission denied. The proxy runs as root."));
-      console.log(chalk.blue("Use: sudo portless proxy stop"));
+      console.error(chalk.red("Permission denied. The proxy was started with sudo."));
+      console.error(chalk.blue("Stop it with:"));
+      console.error(chalk.cyan(`  ${sudoHint}portless proxy stop`));
     } else {
       const message = err instanceof Error ? err.message : String(err);
-      console.error(chalk.red("Failed to stop proxy:"), message);
+      console.error(chalk.red(`Failed to stop proxy: ${message}`));
+      console.error(chalk.blue("Check if the process is still running:"));
+      console.error(chalk.cyan(`  lsof -ti tcp:${proxyPort}`));
     }
   }
 }
-function listRoutes() {
+function listRoutes(store, proxyPort, tls2) {
   const routes = store.loadRoutes();
   if (routes.length === 0) {
     console.log(chalk.yellow("No active routes."));
@@ -295,21 +804,32 @@ function listRoutes() {
   }
   console.log(chalk.blue.bold("\nActive routes:\n"));
   for (const route of routes) {
+    const url = formatUrl(route.hostname, proxyPort, tls2);
     console.log(
-      `  ${chalk.cyan(`http://${route.hostname}`)}  ${chalk.gray("->")}  ${chalk.white(`localhost:${route.port}`)}  ${chalk.gray(`(pid ${route.pid})`)}`
+      `  ${chalk.cyan(url)}  ${chalk.gray("->")}  ${chalk.white(`localhost:${route.port}`)}  ${chalk.gray(`(pid ${route.pid})`)}`
     );
   }
   console.log();
 }
-async function runApp(name, commandArgs) {
+async function runApp(store, proxyPort, stateDir, name, commandArgs, tls2) {
   const hostname = parseHostname(name);
-  const proxyPort = readProxyPort();
   console.log(chalk.blue.bold(`
 portless
 `));
   console.log(chalk.gray(`-- ${hostname} (auto-resolves to 127.0.0.1)`));
-  if (!await isProxyRunning(proxyPort)) {
-    if (process.stdin.isTTY) {
+  if (!await isProxyRunning(proxyPort, tls2)) {
+    const defaultPort = getDefaultPort();
+    const needsSudo = defaultPort < PRIVILEGED_PORT_THRESHOLD;
+    const wantHttps = isHttpsEnvEnabled();
+    if (needsSudo) {
+      if (!process.stdin.isTTY) {
+        console.error(chalk.red("Proxy is not running."));
+        console.error(chalk.blue("Start the proxy first (requires sudo for this port):"));
+        console.error(chalk.cyan("  sudo portless proxy start -p 80"));
+        console.error(chalk.blue("Or use the default port (no sudo needed):"));
+        console.error(chalk.cyan("  portless proxy start"));
+        process.exit(1);
+      }
       const answer = await prompt(chalk.yellow("Proxy not running. Start it? [Y/n/skip] "));
       if (answer === "n" || answer === "no") {
         console.log(chalk.gray("Cancelled."));
@@ -321,37 +841,55 @@ portless
         return;
       }
       console.log(chalk.yellow("Starting proxy (requires sudo)..."));
-      const result = spawnSync("sudo", [process.execPath, process.argv[1], "proxy", "--daemon"], {
+      const startArgs = [process.execPath, process.argv[1], "proxy", "start"];
+      if (wantHttps) startArgs.push("--https");
+      const result = spawnSync("sudo", startArgs, {
         stdio: "inherit",
-        timeout: 3e4
+        timeout: SUDO_SPAWN_TIMEOUT_MS
       });
       if (result.status !== 0) {
-        console.log(chalk.red("\nFailed to start proxy"));
+        console.error(chalk.red("Failed to start proxy."));
+        console.error(chalk.blue("Try starting it manually:"));
+        console.error(chalk.cyan("  sudo portless proxy start"));
         process.exit(1);
       }
-      if (!await waitForProxy()) {
-        console.log(chalk.red("\nProxy failed to start"));
-        const logPath = path.join(PORTLESS_DIR, "proxy.log");
-        if (fs.existsSync(logPath)) {
-          console.log(chalk.gray(`Check logs: ${logPath}`));
-        }
+    } else {
+      console.log(chalk.yellow("Starting proxy..."));
+      const startArgs = [process.argv[1], "proxy", "start"];
+      if (wantHttps) startArgs.push("--https");
+      const result = spawnSync(process.execPath, startArgs, {
+        stdio: "inherit",
+        timeout: SUDO_SPAWN_TIMEOUT_MS
+      });
+      if (result.status !== 0) {
+        console.error(chalk.red("Failed to start proxy."));
+        console.error(chalk.blue("Try starting it manually:"));
+        console.error(chalk.cyan("  portless proxy start"));
         process.exit(1);
       }
-      console.log(chalk.green("Proxy started in background"));
-    } else {
-      console.log(chalk.red("\nProxy is not running!"));
-      console.log(chalk.blue("\nStart the proxy first (one time):"));
-      console.log(chalk.cyan("  sudo portless proxy\n"));
+    }
+    const autoTls = readTlsMarker(stateDir);
+    if (!await waitForProxy(defaultPort, void 0, void 0, autoTls)) {
+      console.error(chalk.red("Proxy failed to start (timed out waiting for it to listen)."));
+      const logPath = path3.join(stateDir, "proxy.log");
+      console.error(chalk.blue("Try starting the proxy manually to see the error:"));
+      console.error(chalk.cyan(`  ${needsSudo ? "sudo " : ""}portless proxy start`));
+      if (fs3.existsSync(logPath)) {
+        console.error(chalk.gray(`Logs: ${logPath}`));
+      }
       process.exit(1);
     }
+    tls2 = autoTls;
+    console.log(chalk.green("Proxy started in background"));
   } else {
     console.log(chalk.gray("-- Proxy is running"));
   }
   const port = await findFreePort();
   console.log(chalk.green(`-- Using port ${port}`));
   store.addRoute(hostname, port, process.pid);
+  const finalUrl = formatUrl(hostname, proxyPort, tls2);
   console.log(chalk.cyan.bold(`
-  -> http://${hostname}
+  -> ${finalUrl}
 `));
   console.log(chalk.gray(`Running: PORT=${port} ${commandArgs.join(" ")}
 `));
@@ -371,7 +909,8 @@ async function main() {
   const isPnpmDlx = !!process.env.PNPM_SCRIPT_SRC_DIR && !process.env.npm_lifecycle_event;
   if (isNpx || isPnpmDlx) {
     console.error(chalk.red("Error: portless should not be run via npx or pnpm dlx."));
-    console.log(chalk.blue("Install globally: npm install -g portless"));
+    console.error(chalk.blue("Install globally instead:"));
+    console.error(chalk.cyan("  npm install -g portless"));
     process.exit(1);
   }
   const skipPortless = process.env.PORTLESS === "0" || process.env.PORTLESS === "skip";
@@ -391,16 +930,19 @@ ${chalk.bold("Install:")}
   Do NOT add portless as a project dependency.
 
 ${chalk.bold("Usage:")}
-  ${chalk.cyan("sudo portless proxy")}              Start the proxy (run once, keep open)
-  ${chalk.cyan("sudo portless proxy --port 8080")}  Start the proxy on a custom port
-  ${chalk.cyan("sudo portless proxy stop")}         Stop the proxy
+  ${chalk.cyan("portless proxy start")}             Start the proxy (background daemon)
+  ${chalk.cyan("portless proxy start --https")}     Start with HTTP/2 + TLS (auto-generates certs)
+  ${chalk.cyan("portless proxy start -p 80")}       Start on port 80 (requires sudo)
+  ${chalk.cyan("portless proxy stop")}              Stop the proxy
   ${chalk.cyan("portless <name> <cmd>")}            Run your app through the proxy
   ${chalk.cyan("portless list")}                    Show active routes
+  ${chalk.cyan("portless trust")}                   Add local CA to system trust store
 
 ${chalk.bold("Examples:")}
-  sudo portless proxy               # Start proxy in terminal 1
-  portless myapp next dev           # Terminal 2 -> http://myapp.localhost
-  portless api.myapp pnpm start     # Terminal 3 -> http://api.myapp.localhost
+  portless proxy start                # Start proxy on port 1355
+  portless proxy start --https        # Start with HTTPS/2 (faster page loads)
+  portless myapp next dev             # -> http://myapp.localhost:1355
+  portless api.myapp pnpm start       # -> http://api.myapp.localhost:1355
 
 ${chalk.bold("In package.json:")}
   {
@@ -410,14 +952,30 @@ ${chalk.bold("In package.json:")}
   }
 
 ${chalk.bold("How it works:")}
-  1. Start the proxy once with sudo (listens on port 80 by default)
-  2. Run your apps - they register automatically  
-  3. Access via http://<name>.localhost
+  1. Start the proxy once (listens on port 1355 by default, no sudo needed)
+  2. Run your apps - they auto-start the proxy and register automatically
+  3. Access via http://<name>.localhost:1355
   4. .localhost domains auto-resolve to 127.0.0.1
 
+${chalk.bold("HTTP/2 + HTTPS:")}
+  Use --https for HTTP/2 multiplexing (faster dev server page loads).
+  On first use, portless generates a local CA and adds it to your
+  system trust store. No browser warnings. No sudo required on macOS.
+
 ${chalk.bold("Options:")}
-  --port <number>               Port for the proxy to listen on (default: 80)
-                                Ports >= 1024 do not require sudo
+  -p, --port <number>           Port for the proxy to listen on (default: 1355)
+                                Ports < 1024 require sudo
+  --https                       Enable HTTP/2 + TLS with auto-generated certs
+  --cert <path>                 Use a custom TLS certificate (implies --https)
+  --key <path>                  Use a custom TLS private key (implies --https)
+  --no-tls                      Disable HTTPS (overrides PORTLESS_HTTPS)
+  --foreground                  Run proxy in foreground (for debugging)
+
+${chalk.bold("Environment variables:")}
+  PORTLESS_PORT=<number>        Override the default proxy port (e.g. in .bashrc)
+  PORTLESS_HTTPS=1              Always enable HTTPS (set in .bashrc / .zshrc)
+  PORTLESS_STATE_DIR=<path>     Override the state directory
+  PORTLESS=0 | PORTLESS=skip    Run command directly without proxy
 
 ${chalk.bold("Skip portless:")}
   PORTLESS=0 pnpm dev           # Runs command directly without proxy
@@ -426,88 +984,245 @@ ${chalk.bold("Skip portless:")}
     process.exit(0);
   }
   if (args[0] === "--version" || args[0] === "-v") {
-    console.log("0.2.2");
+    console.log("0.4.0");
     process.exit(0);
   }
+  if (args[0] === "trust") {
+    const { dir: dir2 } = await discoverState();
+    const result = trustCA(dir2);
+    if (result.trusted) {
+      console.log(chalk.green("Local CA added to system trust store."));
+      console.log(chalk.gray("Browsers will now trust portless HTTPS certificates."));
+    } else {
+      console.error(chalk.red(`Failed to trust CA: ${result.error}`));
+      if (result.error?.includes("sudo")) {
+        console.error(chalk.blue("Run with sudo:"));
+        console.error(chalk.cyan("  sudo portless trust"));
+      }
+      process.exit(1);
+    }
+    return;
+  }
   if (args[0] === "list") {
-    listRoutes();
+    const { dir: dir2, port: port2, tls: tls3 } = await discoverState();
+    const store2 = new RouteStore(dir2, {
+      onWarning: (msg) => console.warn(chalk.yellow(msg))
+    });
+    listRoutes(store2, port2, tls3);
     return;
   }
   if (args[0] === "proxy") {
     if (args[1] === "stop") {
-      await stopProxy();
+      const { dir: dir2, port: port2, tls: tls3 } = await discoverState();
+      const store3 = new RouteStore(dir2, {
+        onWarning: (msg) => console.warn(chalk.yellow(msg))
+      });
+      await stopProxy(store3, port2, tls3);
       return;
     }
-    const isDaemon = args.includes("--daemon");
-    let proxyPort = DEFAULT_PROXY_PORT;
-    const portFlagIndex = args.indexOf("--port");
+    if (args[1] !== "start") {
+      console.log(`
+${chalk.bold("Usage: portless proxy <command>")}
+
+  ${chalk.cyan("portless proxy start")}                Start the proxy (daemon)
+  ${chalk.cyan("portless proxy start --https")}        Start with HTTP/2 + TLS
+  ${chalk.cyan("portless proxy start --foreground")}   Start in foreground (for debugging)
+  ${chalk.cyan("portless proxy start -p 80")}          Start on port 80 (requires sudo)
+  ${chalk.cyan("portless proxy stop")}                 Stop the proxy
+`);
+      process.exit(args[1] ? 1 : 0);
+    }
+    const isForeground = args.includes("--foreground");
+    let proxyPort = getDefaultPort();
+    let portFlagIndex = args.indexOf("--port");
+    if (portFlagIndex === -1) portFlagIndex = args.indexOf("-p");
     if (portFlagIndex !== -1) {
       const portValue = args[portFlagIndex + 1];
       if (!portValue || portValue.startsWith("-")) {
-        console.error(chalk.red("Error: --port requires a port number"));
-        console.log(chalk.blue("Usage: portless proxy --port 8080"));
+        console.error(chalk.red("Error: --port / -p requires a port number."));
+        console.error(chalk.blue("Usage:"));
+        console.error(chalk.cyan("  portless proxy start -p 8080"));
         process.exit(1);
       }
       proxyPort = parseInt(portValue, 10);
       if (isNaN(proxyPort) || proxyPort < 1 || proxyPort > 65535) {
         console.error(chalk.red(`Error: Invalid port number: ${portValue}`));
-        console.log(chalk.blue("Port must be between 1 and 65535"));
+        console.error(chalk.blue("Port must be between 1 and 65535."));
         process.exit(1);
       }
     }
+    const hasNoTls = args.includes("--no-tls");
+    const hasHttpsFlag = args.includes("--https");
+    const wantHttps = !hasNoTls && (hasHttpsFlag || isHttpsEnvEnabled());
+    let customCertPath = null;
+    let customKeyPath = null;
+    const certIdx = args.indexOf("--cert");
+    if (certIdx !== -1) {
+      customCertPath = args[certIdx + 1] || null;
+      if (!customCertPath || customCertPath.startsWith("-")) {
+        console.error(chalk.red("Error: --cert requires a file path."));
+        process.exit(1);
+      }
+    }
+    const keyIdx = args.indexOf("--key");
+    if (keyIdx !== -1) {
+      customKeyPath = args[keyIdx + 1] || null;
+      if (!customKeyPath || customKeyPath.startsWith("-")) {
+        console.error(chalk.red("Error: --key requires a file path."));
+        process.exit(1);
+      }
+    }
+    if (customCertPath && !customKeyPath || !customCertPath && customKeyPath) {
+      console.error(chalk.red("Error: --cert and --key must be used together."));
+      process.exit(1);
+    }
+    const useHttps = wantHttps || !!(customCertPath && customKeyPath);
+    const stateDir = resolveStateDir(proxyPort);
+    const store2 = new RouteStore(stateDir, {
+      onWarning: (msg) => console.warn(chalk.yellow(msg))
+    });
     if (await isProxyRunning(proxyPort)) {
-      if (!isDaemon) {
-        console.log(chalk.yellow("Proxy is already running."));
-        console.log(chalk.blue("To restart: portless proxy stop && sudo portless proxy"));
+      if (isForeground) {
+        return;
       }
+      const needsSudo = proxyPort < PRIVILEGED_PORT_THRESHOLD;
+      const sudoPrefix = needsSudo ? "sudo " : "";
+      console.log(chalk.yellow(`Proxy is already running on port ${proxyPort}.`));
+      console.log(
+        chalk.blue(`To restart: portless proxy stop && ${sudoPrefix}portless proxy start`)
+      );
       return;
     }
-    if (proxyPort < 1024 && process.getuid() !== 0) {
-      console.error(chalk.red(`Error: Proxy requires sudo for port ${proxyPort}`));
-      console.log(chalk.blue("Usage: sudo portless proxy"));
+    if (proxyPort < PRIVILEGED_PORT_THRESHOLD && (process.getuid?.() ?? -1) !== 0) {
+      console.error(chalk.red(`Error: Port ${proxyPort} requires sudo.`));
+      console.error(chalk.blue("Either run with sudo:"));
+      console.error(chalk.cyan("  sudo portless proxy start -p 80"));
+      console.error(chalk.blue("Or use the default port (no sudo needed):"));
+      console.error(chalk.cyan("  portless proxy start"));
       process.exit(1);
     }
-    if (isDaemon) {
-      store.ensureDir();
-      const logPath = path.join(PORTLESS_DIR, "proxy.log");
-      const logFd = fs.openSync(logPath, "a");
+    let tlsOptions;
+    if (useHttps) {
+      store2.ensureDir();
+      if (customCertPath && customKeyPath) {
+        try {
+          const cert = fs3.readFileSync(customCertPath);
+          const key = fs3.readFileSync(customKeyPath);
+          const certStr = cert.toString("utf-8");
+          const keyStr = key.toString("utf-8");
+          if (!certStr.includes("-----BEGIN CERTIFICATE-----")) {
+            console.error(chalk.red(`Error: ${customCertPath} is not a valid PEM certificate.`));
+            console.error(chalk.gray("Expected a file starting with -----BEGIN CERTIFICATE-----"));
+            process.exit(1);
+          }
+          if (!keyStr.match(/-----BEGIN [\w\s]*PRIVATE KEY-----/)) {
+            console.error(chalk.red(`Error: ${customKeyPath} is not a valid PEM private key.`));
+            console.error(
+              chalk.gray("Expected a file starting with -----BEGIN ...PRIVATE KEY-----")
+            );
+            process.exit(1);
+          }
+          tlsOptions = { cert, key };
+        } catch (err) {
+          const message = err instanceof Error ? err.message : String(err);
+          console.error(chalk.red(`Error reading certificate files: ${message}`));
+          process.exit(1);
+        }
+      } else {
+        console.log(chalk.gray("Ensuring TLS certificates..."));
+        const certs = ensureCerts(stateDir);
+        if (certs.caGenerated) {
+          console.log(chalk.green("Generated local CA certificate."));
+        }
+        if (!isCATrusted(stateDir)) {
+          console.log(chalk.yellow("Adding CA to system trust store..."));
+          const trustResult = trustCA(stateDir);
+          if (trustResult.trusted) {
+            console.log(
+              chalk.green("CA added to system trust store. Browsers will trust portless certs.")
+            );
+          } else {
+            console.warn(chalk.yellow("Could not add CA to system trust store."));
+            if (trustResult.error) {
+              console.warn(chalk.gray(trustResult.error));
+            }
+            console.warn(
+              chalk.yellow("Browsers will show certificate warnings. To fix this later, run:")
+            );
+            console.warn(chalk.cyan("  portless trust"));
+          }
+        }
+        const cert = fs3.readFileSync(certs.certPath);
+        const key = fs3.readFileSync(certs.keyPath);
+        tlsOptions = {
+          cert,
+          key,
+          SNICallback: createSNICallback(stateDir, cert, key)
+        };
+      }
+    }
+    if (isForeground) {
+      console.log(chalk.blue.bold("\nportless proxy\n"));
+      startProxyServer(store2, proxyPort, tlsOptions);
+      return;
+    }
+    store2.ensureDir();
+    const logPath = path3.join(stateDir, "proxy.log");
+    const logFd = fs3.openSync(logPath, "a");
+    try {
       try {
-        fs.chmodSync(logPath, 420);
+        fs3.chmodSync(logPath, FILE_MODE);
       } catch {
       }
-      const daemonArgs = [process.argv[1], "proxy"];
+      const daemonArgs = [process.argv[1], "proxy", "start", "--foreground"];
       if (portFlagIndex !== -1) {
         daemonArgs.push("--port", proxyPort.toString());
       }
-      const child = spawn(process.execPath, daemonArgs, {
+      if (useHttps) {
+        if (customCertPath && customKeyPath) {
+          daemonArgs.push("--cert", customCertPath, "--key", customKeyPath);
+        } else {
+          daemonArgs.push("--https");
+        }
+      }
+      const child = spawn2(process.execPath, daemonArgs, {
         detached: true,
         stdio: ["ignore", logFd, logFd],
         env: process.env
       });
       child.unref();
-      fs.closeSync(logFd);
-      if (!await waitForProxy(proxyPort)) {
-        console.error(chalk.red("Proxy failed to start"));
-        if (fs.existsSync(logPath)) {
-          console.log(chalk.gray(`Check logs: ${logPath}`));
-        }
-        process.exit(1);
+    } finally {
+      fs3.closeSync(logFd);
+    }
+    if (!await waitForProxy(proxyPort, void 0, void 0, useHttps)) {
+      console.error(chalk.red("Proxy failed to start (timed out waiting for it to listen)."));
+      console.error(chalk.blue("Try starting the proxy in the foreground to see the error:"));
+      const needsSudo = proxyPort < PRIVILEGED_PORT_THRESHOLD;
+      console.error(chalk.cyan(`  ${needsSudo ? "sudo " : ""}portless proxy start --foreground`));
+      if (fs3.existsSync(logPath)) {
+        console.error(chalk.gray(`Logs: ${logPath}`));
       }
-      return;
+      process.exit(1);
     }
-    console.log(chalk.blue.bold("\nportless proxy\n"));
-    startProxyServer(proxyPort);
+    const proto = useHttps ? "HTTPS/2" : "HTTP";
+    console.log(chalk.green(`${proto} proxy started on port ${proxyPort}`));
     return;
   }
   const name = args[0];
   const commandArgs = args.slice(1);
   if (commandArgs.length === 0) {
-    console.error(chalk.red("Error: No command provided"));
-    console.log(chalk.blue("Usage: portless <name> <command...>"));
-    console.log(chalk.blue("Example: portless myapp next dev"));
+    console.error(chalk.red("Error: No command provided."));
+    console.error(chalk.blue("Usage:"));
+    console.error(chalk.cyan("  portless <name> <command...>"));
+    console.error(chalk.blue("Example:"));
+    console.error(chalk.cyan("  portless myapp next dev"));
     process.exit(1);
   }
-  await runApp(name, commandArgs);
+  const { dir, port, tls: tls2 } = await discoverState();
+  const store = new RouteStore(dir, {
+    onWarning: (msg) => console.warn(chalk.yellow(msg))
+  });
+  await runApp(store, port, dir, name, commandArgs, tls2);
 }
 main().catch((err) => {
   const message = err instanceof Error ? err.message : String(err);