@buildautomaton/cli 0.1.59 → 0.1.60

package/dist/cli.js

@@ -25631,7 +25631,7 @@ var {
 } = import_index.default;
 
 // src/cli-version.ts
-var CLI_VERSION = "0.1.59".length > 0 ? "0.1.59" : "0.0.0-dev";
+var CLI_VERSION = "0.1.60".length > 0 ? "0.1.60" : "0.0.0-dev";
 
 // src/cli/defaults.ts
 var DEFAULT_API_URL = process.env.BUILDAUTOMATON_API_URL ?? "https://api.buildautomaton.com";
@@ -27439,8 +27439,8 @@ function runPendingAuth(options) {
   };
 }
 
-// src/dev-servers/manager/dev-server-constants.ts
-var BRIDGE_CLOSE_DEV_SERVER_GRACE_MS = 0;
+// src/preview-environments/manager/preview-environment-constants.ts
+var BRIDGE_CLOSE_PREVIEW_ENVIRONMENT_GRACE_MS = 0;
 var BRIDGE_SHUTDOWN_GRACE_MS = 8e3;
 
 // src/runtime/cli-process-interrupt.ts
@@ -28147,7 +28147,7 @@ async function ensureCodeNavCacheSqliteInitialized() {
 }
 
 // src/connection/close-bridge-connection.ts
-async function closeBridgeConnection(state, acpManager, devServerManager, log2) {
+async function closeBridgeConnection(state, acpManager, previewEnvironmentManager, log2) {
   requestCliImmediateShutdown();
   const say = log2 ?? logImmediate;
   say("Cleaning up connections\u2026");
@@ -28185,9 +28185,9 @@ async function closeBridgeConnection(state, acpManager, devServerManager, log2)
     }
     state.currentWs = null;
   }
-  if (devServerManager) {
-    say("Stopping local dev server processes\u2026");
-    await devServerManager.shutdownAllGraceful({ graceMs: BRIDGE_CLOSE_DEV_SERVER_GRACE_MS });
+  if (previewEnvironmentManager) {
+    say("Stopping local preview environment processes\u2026");
+    await previewEnvironmentManager.shutdownAllGraceful({ graceMs: BRIDGE_CLOSE_PREVIEW_ENVIRONMENT_GRACE_MS });
   }
   try {
     closeAllCliSqliteConnections();
@@ -43613,12 +43613,12 @@ function startFileIndexWatcher(cwd = getBridgeRoot()) {
 // src/connection/create-bridge-connection.ts
 import * as path74 from "node:path";
 
-// src/dev-servers/manager/dev-server-manager.ts
+// src/preview-environments/manager/preview-environment-manager.ts
 import { rm as rm2 } from "node:fs/promises";
 
-// src/dev-servers/process/send-server-status.ts
-function sendDevServerStatus(getWs, serverId, status, options) {
-  const payload = { type: "server_status", serverId, status };
+// src/preview-environments/process/send-preview-environment-status.ts
+function sendPreviewEnvironmentStatus(getWs, environmentId, status, options) {
+  const payload = { type: "preview_environment_status", environmentId, status };
   if (options?.detail) payload.detail = options.detail;
   if (options?.tails) {
     payload.stdoutTail = options.tails.stdout;
@@ -43631,12 +43631,12 @@ function sendDevServerStatus(getWs, serverId, status, options) {
   });
 }
 
-// src/dev-servers/process/terminate-child-process.ts
+// src/preview-environments/process/terminate-child-process.ts
 async function sigtermAndWaitForExit(proc, graceMs, log2, shortId) {
   const exited = new Promise((resolve34) => {
     proc.once("exit", () => resolve34());
   });
-  log2(`[dev-server] Sending SIGTERM to ${shortId} (pid=${proc.pid ?? "?"}).`);
+  log2(`[preview-environment] Sending SIGTERM to ${shortId} (pid=${proc.pid ?? "?"}).`);
   try {
     proc.kill("SIGTERM");
   } catch {
@@ -43645,7 +43645,7 @@ async function sigtermAndWaitForExit(proc, graceMs, log2, shortId) {
 }
 function forceKillChild(proc, log2, shortId, graceMs) {
   log2(
-    `[dev-server] ${shortId} did not exit within ${graceMs}ms; sending SIGKILL (pid=${proc.pid ?? "?"}).`
+    `[preview-environment] ${shortId} did not exit within ${graceMs}ms; sending SIGKILL (pid=${proc.pid ?? "?"}).`
   );
   proc.removeAllListeners();
   try {
@@ -43654,10 +43654,10 @@ function forceKillChild(proc, log2, shortId, graceMs) {
   }
 }
 
-// src/dev-servers/process/wire-dev-server-child-process.ts
+// src/preview-environments/process/wire-preview-environment-child-process.ts
 import fs37 from "node:fs";
 
-// src/dev-servers/manager/forward-pipe.ts
+// src/preview-environments/manager/forward-pipe.ts
 function forwardChildPipe(childReadable, terminal, onData) {
   if (!childReadable) return;
   childReadable.on("data", (chunk) => {
@@ -43673,16 +43673,16 @@ function forwardChildPipe(childReadable, terminal, onData) {
   });
 }
 
-// src/dev-servers/process/wire-dev-server-child-process.ts
-function wireDevServerChildProcess(d) {
-  const { proc, serverId, title } = d;
+// src/preview-environments/process/wire-preview-environment-child-process.ts
+function wirePreviewEnvironmentChildProcess(d) {
+  const { proc, environmentId, title } = d;
   forwardChildPipe(proc.stdout, null, (chunk) => {
     d.stdoutTail.push(chunk);
-    d.pushRemoteLogChunk(serverId, "stdout", chunk);
+    d.pushRemoteLogChunk(environmentId, "stdout", chunk);
   });
   forwardChildPipe(proc.stderr, null, (chunk) => {
     d.stderrTail.push(chunk);
-    d.pushRemoteLogChunk(serverId, "stderr", chunk);
+    d.pushRemoteLogChunk(environmentId, "stderr", chunk);
   });
   if (d.mergedLogPath && d.mergedCleanupDir) {
     const pollIv = setInterval(() => {
@@ -43698,7 +43698,7 @@ function wireDevServerChildProcess(d) {
         d.mergedReadPos.value = buf.length;
         if (chunk.length === 0) return;
         d.stdoutTail.push(chunk);
-        d.pushRemoteLogChunk(serverId, "stdout", chunk);
+        d.pushRemoteLogChunk(environmentId, "stdout", chunk);
       });
     }, 100);
     d.setPollInterval(pollIv);
@@ -43716,10 +43716,10 @@ function wireDevServerChildProcess(d) {
         d.rmMergedCleanupDir(cleanupDir);
       }
       if (signal) {
-        d.log(`[dev-server] ${title} stopped (signal: ${String(signal)}).`);
+        d.log(`[preview-environment] ${title} stopped (signal: ${String(signal)}).`);
       } else if (code !== null && code !== 0) {
         const errTail = d.stderrTail.getTail().slice(-3).join("\n");
-        d.log(`[dev-server] ${title} exited with code ${code}${errTail ? `
+        d.log(`[preview-environment] ${title} exited with code ${code}${errTail ? `
 ${errTail}` : ""}`);
       }
       d.detachProcessFromManager();
@@ -43734,7 +43734,7 @@ ${errTail}` : ""}`);
           const chunk = Buffer.from(buf.subarray(d.mergedReadPos.value));
           if (chunk.length > 0) {
             d.stdoutTail.push(chunk);
-            d.pushRemoteLogChunk(serverId, "stdout", chunk);
+            d.pushRemoteLogChunk(environmentId, "stdout", chunk);
           }
         }
         finishExit();
@@ -43758,12 +43758,12 @@ ${errTail}` : ""}`);
     d.clearTailBuffers();
     const msg = err instanceof Error ? err.message : String(err);
     const errno = typeof err === "object" && err && "code" in err ? String(err.code) : "";
-    d.log(`[dev-server] ${title} process error: ${msg}${errno ? ` (${errno})` : ""}`);
+    d.log(`[preview-environment] ${title} process error: ${msg}${errno ? ` (${errno})` : ""}`);
     d.sendStatus("error", msg, tails);
   });
 }
 
-// src/dev-servers/manager/dev-server-env.ts
+// src/preview-environments/manager/preview-environment-env.ts
 function substituteCommand(cmd, env) {
   return cmd.replace(/\$\{([^}]+)\}/g, (_, key) => env[key] != null ? String(env[key]) : "");
 }
@@ -43799,15 +43799,15 @@ function envForSpawn(base, userEnv, ports) {
   return out;
 }
 
-// src/dev-servers/manager/parse-config.ts
-function parseDevServerDefs(servers) {
+// src/preview-environments/manager/parse-config.ts
+function parsePreviewEnvironmentDefs(servers) {
   const out = [];
   if (!Array.isArray(servers)) return out;
   for (const s of servers) {
     if (!s || typeof s !== "object") continue;
     const o = s;
-    const serverId = typeof o.serverId === "string" ? o.serverId : "";
-    if (!serverId) continue;
+    const environmentId = typeof o.environmentId === "string" ? o.environmentId : "";
+    if (!environmentId) continue;
     const envRaw = o.env;
     const env = Array.isArray(envRaw) ? envRaw.map((e) => {
       if (!e || typeof e !== "object") return null;
@@ -43820,7 +43820,7 @@ function parseDevServerDefs(servers) {
     const portsRaw = o.ports;
     const ports = Array.isArray(portsRaw) ? portsRaw.filter((p) => typeof p === "number" && Number.isInteger(p) && p > 0 && p < 65536) : [];
     out.push({
-      serverId,
+      environmentId,
       name: typeof o.name === "string" ? o.name : "",
       command: typeof o.command === "string" ? o.command : "",
       env,
@@ -43830,7 +43830,7 @@ function parseDevServerDefs(servers) {
   return out;
 }
 
-// src/dev-servers/manager/shell-spawn/utils.ts
+// src/preview-environments/manager/shell-spawn/utils.ts
 import fs38 from "node:fs";
 function isSpawnEbadf(e) {
   return typeof e === "object" && e !== null && "code" in e && e.code === "EBADF";
@@ -43853,7 +43853,7 @@ function pipedStdoutStderrFor(attemptStdio) {
   return attemptStdio !== "inherit" && Array.isArray(attemptStdio) && attemptStdio[1] === "pipe" && attemptStdio[2] === "pipe";
 }
 
-// src/dev-servers/manager/shell-spawn/try-spawn-piped-via-sh.ts
+// src/preview-environments/manager/shell-spawn/try-spawn-piped-via-sh.ts
 import { spawn as spawn5 } from "node:child_process";
 function trySpawnPipedViaSh(command, env, cwd, signal) {
   const attempts = [
@@ -43896,7 +43896,7 @@ function trySpawnPipedViaSh(command, env, cwd, signal) {
   return { ok: false, lastErr };
 }
 
-// src/dev-servers/manager/shell-spawn/try-spawn-shell-true-piped.ts
+// src/preview-environments/manager/shell-spawn/try-spawn-shell-true-piped.ts
 import { spawn as spawn6 } from "node:child_process";
 function trySpawnShellTruePiped(command, env, cwd, devNullFd, signal) {
   try {
@@ -43917,7 +43917,7 @@ function trySpawnShellTruePiped(command, env, cwd, devNullFd, signal) {
   }
 }
 
-// src/dev-servers/manager/shell-spawn/try-spawn-merged-log-file.ts
+// src/preview-environments/manager/shell-spawn/try-spawn-merged-log-file.ts
 import { spawn as spawn7 } from "node:child_process";
 import fs39 from "node:fs";
 import { tmpdir } from "node:os";
@@ -43964,7 +43964,7 @@ function trySpawnMergedLogFile(command, env, cwd, signal) {
   }
 }
 
-// src/dev-servers/manager/shell-spawn/try-spawn-shell-script-log-redirect.ts
+// src/preview-environments/manager/shell-spawn/try-spawn-shell-script-log-redirect.ts
 import { spawn as spawn8 } from "node:child_process";
 import fs40 from "node:fs";
 import { tmpdir as tmpdir2 } from "node:os";
@@ -44040,7 +44040,7 @@ ${command} >> ${q(logPath)} 2>&1\r
   }
 }
 
-// src/dev-servers/manager/shell-spawn/try-spawn-inherit.ts
+// src/preview-environments/manager/shell-spawn/try-spawn-inherit.ts
 import { spawn as spawn9 } from "node:child_process";
 function trySpawnInheritStdio(command, env, cwd, signal) {
   const opts = {
@@ -44060,7 +44060,7 @@ function trySpawnInheritStdio(command, env, cwd, signal) {
   return { proc, pipedStdoutStderr: false };
 }
 
-// src/dev-servers/manager/shell-spawn/shell-spawn.ts
+// src/preview-environments/manager/shell-spawn/shell-spawn.ts
 function shellSpawn(command, env, cwd, options) {
   const signal = options?.signal;
   const piped = trySpawnPipedViaSh(command, env, cwd, signal);
@@ -44087,7 +44087,7 @@ function shellSpawn(command, env, cwd, options) {
   }
 }
 
-// src/dev-servers/manager/stream-tail.ts
+// src/preview-environments/manager/stream-tail.ts
 var MAX_TAIL_LINES = 80;
 var MAX_LINE_CHARS = 8192;
 var MAX_PENDING_CHARS = 65536;
@@ -44123,11 +44123,11 @@ var StreamTail = class {
   }
 };
 
-// src/dev-servers/manager/dev-server-firehose-messages.ts
+// src/preview-environments/manager/preview-environment-firehose-messages.ts
 function buildFirehoseSnapshotMessage(params) {
   const payload = {
     type: "log_snapshot",
-    serverId: params.serverId,
+    environmentId: params.environmentId,
     viewerId: params.viewerId,
     stdoutTail: params.tails.stdout,
     stderrTail: params.tails.stderr
@@ -44137,15 +44137,15 @@ function buildFirehoseSnapshotMessage(params) {
 function buildFirehoseLogChunkMessage(params) {
   const payload = {
     type: "log_chunk",
-    serverId: params.serverId,
+    environmentId: params.environmentId,
     stream: params.stream,
     text: params.text
   };
   return params.e2ee ? params.e2ee.encryptFields(payload, ["text"]) : payload;
 }
 
-// src/dev-servers/manager/dev-server-firehose-sink.ts
-var DevServerFirehoseSink = class {
+// src/preview-environments/manager/preview-environment-firehose-sink.ts
+var PreviewEnvironmentFirehoseSink = class {
   constructor(options) {
     this.options = options;
   }
@@ -44158,31 +44158,31 @@ var DevServerFirehoseSink = class {
     this.firehoseSend = null;
     this.logViewerRefCountByServerId.clear();
   }
-  openLogViewer(serverId, viewerId) {
-    const next = (this.logViewerRefCountByServerId.get(serverId) ?? 0) + 1;
-    this.logViewerRefCountByServerId.set(serverId, next);
-    this.sendSnapshot(serverId, viewerId);
+  openLogViewer(environmentId, viewerId) {
+    const next = (this.logViewerRefCountByServerId.get(environmentId) ?? 0) + 1;
+    this.logViewerRefCountByServerId.set(environmentId, next);
+    this.sendSnapshot(environmentId, viewerId);
   }
-  closeLogViewer(serverId) {
-    const n = (this.logViewerRefCountByServerId.get(serverId) ?? 0) - 1;
-    if (n <= 0) this.logViewerRefCountByServerId.delete(serverId);
-    else this.logViewerRefCountByServerId.set(serverId, n);
+  closeLogViewer(environmentId) {
+    const n = (this.logViewerRefCountByServerId.get(environmentId) ?? 0) - 1;
+    if (n <= 0) this.logViewerRefCountByServerId.delete(environmentId);
+    else this.logViewerRefCountByServerId.set(environmentId, n);
   }
-  pushLogChunk(serverId, stream, chunk) {
-    if ((this.logViewerRefCountByServerId.get(serverId) ?? 0) <= 0) return;
-    if (!this.options.isPipedCaptureEnabled(serverId)) return;
+  pushLogChunk(environmentId, stream, chunk) {
+    if ((this.logViewerRefCountByServerId.get(environmentId) ?? 0) <= 0) return;
+    if (!this.options.isPipedCaptureEnabled(environmentId)) return;
     if (!this.firehoseSend) return;
     const text = chunk.toString("utf8");
     setImmediate(() => {
       if (!this.firehoseSend) return;
-      this.firehoseSend(buildFirehoseLogChunkMessage({ serverId, stream, text, e2ee: this.options.e2ee }));
+      this.firehoseSend(buildFirehoseLogChunkMessage({ environmentId, stream, text, e2ee: this.options.e2ee }));
     });
   }
-  sendSnapshot(serverId, viewerId) {
+  sendSnapshot(environmentId, viewerId) {
     const payload = buildFirehoseSnapshotMessage({
-      serverId,
+      environmentId,
       viewerId,
-      tails: this.options.getTails(serverId),
+      tails: this.options.getTails(environmentId),
       e2ee: this.options.e2ee
     });
     setImmediate(() => {
@@ -44193,19 +44193,19 @@ var DevServerFirehoseSink = class {
   }
 };
 
-// src/dev-servers/manager/cleanup-merged-log-dir.ts
+// src/preview-environments/manager/cleanup-merged-log-dir.ts
 import { rm } from "node:fs/promises";
-function cleanupMergedLogDirForServer(map2, serverId) {
-  const mergedDir = map2.get(serverId);
+function cleanupMergedLogDirForServer(map2, environmentId) {
+  const mergedDir = map2.get(environmentId);
   if (!mergedDir) return;
-  map2.delete(serverId);
+  map2.delete(environmentId);
   void rm(mergedDir, { recursive: true, force: true }).catch(() => {
   });
 }
 
-// src/dev-servers/manager/dev-server-manager.ts
+// src/preview-environments/manager/preview-environment-manager.ts
 var emptyTails = () => ({ stdout: [], stderr: [] });
-var DevServerManager = class {
+var PreviewEnvironmentManager = class {
   defsById = /* @__PURE__ */ new Map();
   processes = /* @__PURE__ */ new Map();
   streamTailsByServerId = /* @__PURE__ */ new Map();
@@ -44224,9 +44224,9 @@ var DevServerManager = class {
     this.log = options.log;
     this.getBridgeRoot = options.getBridgeRoot ?? (() => process.cwd());
     this.e2ee = options.e2ee;
-    this.firehoseSink = new DevServerFirehoseSink({
-      getTails: (serverId) => this.snapshotTails(serverId),
-      isPipedCaptureEnabled: (serverId) => this.pipedCaptureByServerId.get(serverId) === true,
+    this.firehoseSink = new PreviewEnvironmentFirehoseSink({
+      getTails: (environmentId) => this.snapshotTails(environmentId),
+      isPipedCaptureEnabled: (environmentId) => this.pipedCaptureByServerId.get(environmentId) === true,
       e2ee: this.e2ee
     });
   }
@@ -44236,89 +44236,89 @@ var DevServerManager = class {
   detachFirehose() {
     this.firehoseSink.detach();
   }
-  handleFirehoseLogViewerOpen(serverId, _viewerId) {
-    this.firehoseSink.openLogViewer(serverId, _viewerId);
+  handleFirehoseLogViewerOpen(environmentId, _viewerId) {
+    this.firehoseSink.openLogViewer(environmentId, _viewerId);
   }
-  handleFirehoseLogViewerClose(serverId, _viewerId) {
-    this.firehoseSink.closeLogViewer(serverId);
+  handleFirehoseLogViewerClose(environmentId, _viewerId) {
+    this.firehoseSink.closeLogViewer(environmentId);
   }
   applyConfig(servers) {
     this.defsById.clear();
-    for (const d of parseDevServerDefs(servers)) {
-      this.defsById.set(d.serverId, d);
+    for (const d of parsePreviewEnvironmentDefs(servers)) {
+      this.defsById.set(d.environmentId, d);
     }
   }
-  snapshotTails(serverId) {
-    const t = this.streamTailsByServerId.get(serverId);
+  snapshotTails(environmentId) {
+    const t = this.streamTailsByServerId.get(environmentId);
     if (!t) return { stdout: [], stderr: [] };
     return { stdout: t.stdout.getTail(), stderr: t.stderr.getTail() };
   }
-  clearTails(serverId) {
-    this.streamTailsByServerId.delete(serverId);
+  clearTails(environmentId) {
+    this.streamTailsByServerId.delete(environmentId);
   }
-  sendStatus(serverId, status, detail, tails) {
-    sendDevServerStatus(this.getWs, serverId, status, { detail, tails });
+  sendStatus(environmentId, status, detail, tails) {
+    sendPreviewEnvironmentStatus(this.getWs, environmentId, status, { detail, tails });
   }
-  bumpGeneration(serverId) {
-    const nextGen = (this.spawnGenerationByServerId.get(serverId) ?? 0) + 1;
-    this.spawnGenerationByServerId.set(serverId, nextGen);
+  bumpGeneration(environmentId) {
+    const nextGen = (this.spawnGenerationByServerId.get(environmentId) ?? 0) + 1;
+    this.spawnGenerationByServerId.set(environmentId, nextGen);
   }
-  clearPoll(serverId) {
-    const poll = this.mergedLogPollByServerId.get(serverId);
+  clearPoll(environmentId) {
+    const poll = this.mergedLogPollByServerId.get(environmentId);
     if (poll) {
       clearInterval(poll);
-      this.mergedLogPollByServerId.delete(serverId);
+      this.mergedLogPollByServerId.delete(environmentId);
     }
   }
-  abortSpawn(serverId) {
-    this.abortControllersByServerId.get(serverId)?.abort();
-    this.abortControllersByServerId.delete(serverId);
+  abortSpawn(environmentId) {
+    this.abortControllersByServerId.get(environmentId)?.abort();
+    this.abortControllersByServerId.delete(environmentId);
   }
-  stop(serverId) {
-    const tails = this.snapshotTails(serverId);
-    if (this.processes.has(serverId)) {
-      this.sendStatus(serverId, "stopping", void 0, tails);
+  stop(environmentId) {
+    const tails = this.snapshotTails(environmentId);
+    if (this.processes.has(environmentId)) {
+      this.sendStatus(environmentId, "stopping", void 0, tails);
     }
-    this.bumpGeneration(serverId);
-    this.abortSpawn(serverId);
-    this.clearPoll(serverId);
-    const proc = this.processes.get(serverId);
+    this.bumpGeneration(environmentId);
+    this.abortSpawn(environmentId);
+    this.clearPoll(environmentId);
+    const proc = this.processes.get(environmentId);
     if (proc) {
       proc.removeAllListeners();
       try {
         proc.kill("SIGTERM");
       } catch {
       }
-      this.processes.delete(serverId);
+      this.processes.delete(environmentId);
     }
-    this.clearTails(serverId);
-    this.pipedCaptureByServerId.delete(serverId);
-    cleanupMergedLogDirForServer(this.mergedLogCleanupDirByServerId, serverId);
-    this.sendStatus(serverId, "stopped", void 0, tails);
+    this.clearTails(environmentId);
+    this.pipedCaptureByServerId.delete(environmentId);
+    cleanupMergedLogDirForServer(this.mergedLogCleanupDirByServerId, environmentId);
+    this.sendStatus(environmentId, "stopped", void 0, tails);
   }
-  start(serverId) {
-    const def = this.defsById.get(serverId);
+  start(environmentId) {
+    const def = this.defsById.get(environmentId);
     if (!def) {
-      this.log(`[dev-server] Unknown server id ${serverId.slice(0, 8)}\u2026`);
-      this.sendStatus(serverId, "error", "Unknown server", emptyTails());
+      this.log(`[preview-environment] Unknown server id ${environmentId.slice(0, 8)}\u2026`);
+      this.sendStatus(environmentId, "error", "Unknown server", emptyTails());
       return;
     }
     if (!def.command.trim()) {
-      this.sendStatus(serverId, "idle", "No command configured", emptyTails());
+      this.sendStatus(environmentId, "idle", "No command configured", emptyTails());
       return;
     }
-    this.stop(serverId);
-    this.sendStatus(serverId, "starting", void 0, emptyTails());
+    this.stop(environmentId);
+    this.sendStatus(environmentId, "starting", void 0, emptyTails());
     const ac = new AbortController();
-    this.abortControllersByServerId.set(serverId, ac);
+    this.abortControllersByServerId.set(environmentId, ac);
     const cwd = this.getBridgeRoot();
     const childEnv = envForSpawn(process.env, def.env, def.ports);
     const cmd = substituteCommand(def.command.trim(), childEnv);
-    const title = def.name.trim() || serverId.slice(0, 8);
-    this.log(`[dev-server] Starting ${title}: ${cmd.slice(0, 120)}${cmd.length > 120 ? "\u2026" : ""}`);
-    const scheduledGen = this.spawnGenerationByServerId.get(serverId) ?? 0;
+    const title = def.name.trim() || environmentId.slice(0, 8);
+    this.log(`[preview-environment] Starting ${title}: ${cmd.slice(0, 120)}${cmd.length > 120 ? "\u2026" : ""}`);
+    const scheduledGen = this.spawnGenerationByServerId.get(environmentId) ?? 0;
     setImmediate(() => {
-      if ((this.spawnGenerationByServerId.get(serverId) ?? 0) !== scheduledGen) {
+      if ((this.spawnGenerationByServerId.get(environmentId) ?? 0) !== scheduledGen) {
         return;
       }
       let proc;
@@ -44335,12 +44335,12 @@ var DevServerManager = class {
         mergedCleanupDir = spawned.mergedLogCleanupDir;
       } catch (e) {
         const msg = e instanceof Error ? e.message : String(e);
-        this.log(`[dev-server] Failed to start ${title}: ${msg}`);
-        this.abortControllersByServerId.delete(serverId);
-        this.sendStatus(serverId, "error", msg, emptyTails());
+        this.log(`[preview-environment] Failed to start ${title}: ${msg}`);
+        this.abortControllersByServerId.delete(environmentId);
+        this.sendStatus(environmentId, "error", msg, emptyTails());
         return;
       }
-      if ((this.spawnGenerationByServerId.get(serverId) ?? 0) !== scheduledGen) {
+      if ((this.spawnGenerationByServerId.get(environmentId) ?? 0) !== scheduledGen) {
         try {
           proc.removeAllListeners();
           proc.kill("SIGTERM");
@@ -44349,89 +44349,89 @@ var DevServerManager = class {
         return;
       }
       if (!pipedStdoutStderr) {
-        this.log(`[dev-server] ${title} running (inherited stdio; bridge log preview disabled)`);
+        this.log(`[preview-environment] ${title} running (inherited stdio; bridge log preview disabled)`);
       } else if (mergedLogPath && mergedCleanupDir) {
         this.log(
-          `[dev-server] ${title} running (logs captured via temp file; open the browser log viewer for live output)`
+          `[preview-environment] ${title} running (logs captured via temp file; open the browser log viewer for live output)`
         );
       }
-      this.pipedCaptureByServerId.set(serverId, pipedStdoutStderr);
+      this.pipedCaptureByServerId.set(environmentId, pipedStdoutStderr);
       const stdoutTail = new StreamTail();
       const stderrTail = new StreamTail();
-      this.streamTailsByServerId.set(serverId, { stdout: stdoutTail, stderr: stderrTail });
+      this.streamTailsByServerId.set(environmentId, { stdout: stdoutTail, stderr: stderrTail });
       if (mergedLogPath && mergedCleanupDir) {
-        this.mergedLogCleanupDirByServerId.set(serverId, mergedCleanupDir);
+        this.mergedLogCleanupDirByServerId.set(environmentId, mergedCleanupDir);
       }
       const mergedReadPos = { value: 0 };
-      this.processes.set(serverId, proc);
-      wireDevServerChildProcess({
-        serverId,
+      this.processes.set(environmentId, proc);
+      wirePreviewEnvironmentChildProcess({
+        environmentId,
         title,
         proc,
         mergedLogPath,
         mergedCleanupDir,
         mergedReadPos,
         scheduledGen,
-        getSpawnGeneration: () => this.spawnGenerationByServerId.get(serverId) ?? 0,
+        getSpawnGeneration: () => this.spawnGenerationByServerId.get(environmentId) ?? 0,
         log: this.log,
         stdoutTail,
         stderrTail,
         pushRemoteLogChunk: (sid, stream, chunk) => this.firehoseSink.pushLogChunk(sid, stream, chunk),
-        sendStatus: (status, detail, tails) => this.sendStatus(serverId, status, detail, tails),
+        sendStatus: (status, detail, tails) => this.sendStatus(environmentId, status, detail, tails),
         setPollInterval: (iv) => {
-          if (iv) this.mergedLogPollByServerId.set(serverId, iv);
-          else this.mergedLogPollByServerId.delete(serverId);
+          if (iv) this.mergedLogPollByServerId.set(environmentId, iv);
+          else this.mergedLogPollByServerId.delete(environmentId);
         },
-        getPollInterval: () => this.mergedLogPollByServerId.get(serverId),
+        getPollInterval: () => this.mergedLogPollByServerId.get(environmentId),
         detachProcessFromManager: () => {
-          this.processes.delete(serverId);
-          this.pipedCaptureByServerId.delete(serverId);
-          this.abortControllersByServerId.delete(serverId);
-          this.mergedLogCleanupDirByServerId.delete(serverId);
+          this.processes.delete(environmentId);
+          this.pipedCaptureByServerId.delete(environmentId);
+          this.abortControllersByServerId.delete(environmentId);
+          this.mergedLogCleanupDirByServerId.delete(environmentId);
         },
         rmMergedCleanupDir: (dir) => {
           void rm2(dir, { recursive: true, force: true }).catch(() => {
           });
         },
-        clearTailBuffers: () => this.clearTails(serverId)
+        clearTailBuffers: () => this.clearTails(environmentId)
       });
-      this.sendStatus(serverId, "running", `pid=${proc.pid ?? "?"}`, {
+      this.sendStatus(environmentId, "running", `pid=${proc.pid ?? "?"}`, {
         stdout: stdoutTail.getTail(),
         stderr: stderrTail.getTail()
       });
     });
   }
-  handleControl(serverId, action) {
+  handleControl(environmentId, action) {
     if (action === "stop") {
-      this.stop(serverId);
+      this.stop(environmentId);
       return;
     }
-    this.start(serverId);
+    this.start(environmentId);
   }
   async shutdownAllGraceful(opts) {
     const graceMs = opts?.graceMs ?? BRIDGE_SHUTDOWN_GRACE_MS;
     const pairs = [...this.processes.entries()];
     if (pairs.length === 0) return;
     this.log(
-      `[dev-server] Stopping ${pairs.length} local dev server process${pairs.length === 1 ? "" : "es"}\u2026`
+      `[preview-environment] Stopping ${pairs.length} local preview environment process${pairs.length === 1 ? "" : "es"}\u2026`
     );
-    await Promise.all(pairs.map(([serverId, proc]) => this.gracefulTerminateOrUnknown(serverId, proc, graceMs)));
+    await Promise.all(pairs.map(([environmentId, proc]) => this.gracefulTerminateOrUnknown(environmentId, proc, graceMs)));
   }
-  async gracefulTerminateOrUnknown(serverId, proc, graceMs) {
-    const shortId = `${serverId.slice(0, 8)}\u2026`;
+  async gracefulTerminateOrUnknown(environmentId, proc, graceMs) {
+    const shortId = `${environmentId.slice(0, 8)}\u2026`;
     await sigtermAndWaitForExit(proc, graceMs, this.log, shortId);
-    if (!this.processes.has(serverId) || this.processes.get(serverId) !== proc) {
+    if (!this.processes.has(environmentId) || this.processes.get(environmentId) !== proc) {
       return;
     }
-    this.bumpGeneration(serverId);
+    this.bumpGeneration(environmentId);
     forceKillChild(proc, this.log, shortId, graceMs);
-    this.processes.delete(serverId);
-    this.clearPoll(serverId);
-    this.pipedCaptureByServerId.delete(serverId);
-    cleanupMergedLogDirForServer(this.mergedLogCleanupDirByServerId, serverId);
-    const tails = this.snapshotTails(serverId);
-    this.clearTails(serverId);
-    this.sendStatus(serverId, "unknown", "Bridge closed before process exited", tails);
+    this.processes.delete(environmentId);
+    this.clearPoll(environmentId);
+    this.pipedCaptureByServerId.delete(environmentId);
+    cleanupMergedLogDirForServer(this.mergedLogCleanupDirByServerId, environmentId);
+    const tails = this.snapshotTails(environmentId);
+    this.clearTails(environmentId);
+    this.sendStatus(environmentId, "unknown", "Bridge closed before process exited", tails);
   }
 };
 
@@ -44657,20 +44657,20 @@ function createFirehoseMessageRouter() {
   };
 }
 
-// src/firehose/routing/handlers/dev-server-logs-viewer-open.ts
-var handleDevServerLogsViewerOpen = (msg, deps) => {
-  const serverId = typeof msg.serverId === "string" ? msg.serverId : "";
+// src/firehose/routing/handlers/preview-environment-logs-viewer-open.ts
+var handlePreviewEnvironmentLogsViewerOpen = (msg, deps) => {
+  const environmentId = typeof msg.environmentId === "string" ? msg.environmentId : "";
   const viewerId = typeof msg.viewerId === "string" ? msg.viewerId : "";
-  if (!serverId || !viewerId) return;
-  deps.devServerManager.handleFirehoseLogViewerOpen(serverId, viewerId);
+  if (!environmentId || !viewerId) return;
+  deps.previewEnvironmentManager.handleFirehoseLogViewerOpen(environmentId, viewerId);
 };
 
-// src/firehose/routing/handlers/dev-server-logs-viewer-close.ts
-var handleDevServerLogsViewerClose = (msg, deps) => {
-  const serverId = typeof msg.serverId === "string" ? msg.serverId : "";
+// src/firehose/routing/handlers/preview-environment-logs-viewer-close.ts
+var handlePreviewEnvironmentLogsViewerClose = (msg, deps) => {
+  const environmentId = typeof msg.environmentId === "string" ? msg.environmentId : "";
   const viewerId = typeof msg.viewerId === "string" ? msg.viewerId : "";
-  if (!serverId || !viewerId) return;
-  deps.devServerManager.handleFirehoseLogViewerClose(serverId, viewerId);
+  if (!environmentId || !viewerId) return;
+  deps.previewEnvironmentManager.handleFirehoseLogViewerClose(environmentId, viewerId);
 };
 
 // src/firehose/routing/handlers/proxy-message.ts
@@ -44719,8 +44719,8 @@ var handleFirehoseIdentified = (_msg, _deps) => {
 // src/firehose/routing/dispatch-firehose-message.ts
 var router = createFirehoseMessageRouter();
 router.register("identified", handleFirehoseIdentified);
-router.register("log_viewer_open", handleDevServerLogsViewerOpen);
-router.register("log_viewer_close", handleDevServerLogsViewerClose);
+router.register("log_viewer_open", handlePreviewEnvironmentLogsViewerOpen);
+router.register("log_viewer_close", handlePreviewEnvironmentLogsViewerClose);
 router.register("proxy", handleProxyMessage);
 function dispatchFirehoseJsonMessage(msg, deps) {
   router.dispatch(msg, deps);
@@ -44750,7 +44750,7 @@ function connectFirehose(options) {
     bridgeName,
     proxyPorts,
     log: log2,
-    devServerManager,
+    previewEnvironmentManager,
     onOpen,
     onClose,
     suppressWebSocketErrors
@@ -44770,7 +44770,7 @@ function connectFirehose(options) {
   const deps = {
     ws,
     log: log2,
-    devServerManager,
+    previewEnvironmentManager,
     pendingProxyBody,
     startStreamingProxy: (pr) => startStreamingProxy(ws, log2, pr)
   };
@@ -44778,7 +44778,7 @@ function connectFirehose(options) {
     disposeClientPing();
     clearClientPing = attachWebSocketClientPing(ws, CLI_WEBSOCKET_CLIENT_PING_MS);
     onOpen?.();
-    devServerManager.attachFirehose(firehoseSend);
+    previewEnvironmentManager.attachFirehose(firehoseSend);
     sendWsMessage(ws, { type: "identify", workspaceId, bridgeName, proxyPorts });
   });
   ws.on("message", (raw) => {
@@ -44795,7 +44795,7 @@ function connectFirehose(options) {
   });
   ws.on("close", (code, reason) => {
     disposeClientPing();
-    devServerManager.detachFirehose();
+    previewEnvironmentManager.detachFirehose();
     const reasonStr = typeof reason === "string" ? reason : reason.toString();
     onClose?.(code, reasonStr);
   });
@@ -44811,7 +44811,7 @@ function connectFirehose(options) {
   return {
     close() {
       disposeClientPing();
-      devServerManager.detachFirehose();
+      previewEnvironmentManager.detachFirehose();
       safeCloseWebSocket(ws);
     },
     isConnected: () => ws.readyState === wrapper_default.OPEN
@@ -44820,7 +44820,7 @@ function connectFirehose(options) {
 
 // src/connection/attach-firehose-after-identified.ts
 function attachFirehoseAfterIdentified(ctx, params) {
-  const { state, devServerManager, logFn } = ctx;
+  const { state, previewEnvironmentManager, logFn } = ctx;
   function clearFirehoseReconnectTimer() {
     if (state.firehoseReconnectTimeout != null) {
       clearTimeout(state.firehoseReconnectTimeout);
@@ -44886,7 +44886,7 @@ function attachFirehoseAfterIdentified(ctx, params) {
     bridgeName: params.bridgeName,
     proxyPorts: params.proxyPorts,
     log: logFn,
-    devServerManager,
+    previewEnvironmentManager,
     suppressWebSocketErrors: () => !state.closedByUser && state.firehoseOutage.startedAt != null,
     onOpen: () => {
       if (myGen !== state.firehoseGeneration) return;
@@ -44929,14 +44929,14 @@ function attachFirehoseAfterIdentified(ctx, params) {
 
 // src/connection/create-bridge-identified-handler.ts
 function createOnBridgeIdentified(opts) {
-  const { devServerManager, firehoseServerUrl, workspaceId, state, logFn } = opts;
-  const firehoseCtx = { state, devServerManager, logFn };
+  const { previewEnvironmentManager, firehoseServerUrl, workspaceId, state, logFn } = opts;
+  const firehoseCtx = { state, previewEnvironmentManager, logFn };
   return (msg) => {
     const bridgeName = msg.bridgeName;
     const proxyPorts = Array.isArray(msg.proxyPorts) ? msg.proxyPorts : [];
-    const devServers = msg.devServers ?? [];
+    const previewEnvironments = msg.previewEnvironments ?? [];
     setImmediate(() => {
-      devServerManager.applyConfig(devServers);
+      previewEnvironmentManager.applyConfig(previewEnvironments);
       if (!firehoseServerUrl || typeof bridgeName !== "string" || !bridgeName) return;
       state.firehoseReconnectAttempt = 0;
       attachFirehoseAfterIdentified(firehoseCtx, {
@@ -45112,8 +45112,8 @@ var API_TO_BRIDGE_MESSAGE_TYPES = [
   "auth_token",
   "bridge_identified",
   "ha",
-  "dev_servers_config",
-  "server_control",
+  "preview_environments_config",
+  "preview_environment_control",
   "agent_config",
   "prompt_queue_state",
   "prompt",
@@ -45173,7 +45173,7 @@ var handleBridgeIdentified = (msg, deps) => {
   deps.onBridgeIdentified({
     bridgeName: msg.bridgeName,
     proxyPorts: msg.proxyPorts,
-    devServers: msg.devServers
+    previewEnvironments: msg.previewEnvironments
   });
   setImmediate(() => {
     void (async () => {
@@ -47610,26 +47610,26 @@ var handleRevertTurnSnapshotMessage = (msg, deps) => {
   })();
 };
 
-// src/routing/handlers/dev-server-control.ts
-var handleDevServerControl = (msg, deps) => {
+// src/routing/handlers/preview-environment-control.ts
+var handlePreviewEnvironmentControl = (msg, deps) => {
   let wire;
   try {
     wire = deps.e2ee ? deps.e2ee.decryptMessage(msg) : msg;
   } catch (e) {
-    deps.log(`[E2EE] Could not decrypt dev server command: ${e instanceof Error ? e.message : String(e)}`);
+    deps.log(`[E2EE] Could not decrypt preview environment command: ${e instanceof Error ? e.message : String(e)}`);
     return;
   }
-  const serverId = typeof wire.serverId === "string" ? wire.serverId : "";
+  const environmentId = typeof wire.environmentId === "string" ? wire.environmentId : "";
   const action = wire.action === "start" || wire.action === "stop" ? wire.action : null;
-  if (!serverId || !action) return;
-  deps.devServerManager?.handleControl(serverId, action);
+  if (!environmentId || !action) return;
+  deps.previewEnvironmentManager?.handleControl(environmentId, action);
 };
 
-// src/routing/handlers/dev-servers-config.ts
-var handleDevServersConfig = (msg, deps) => {
-  const devServers = msg.devServers;
+// src/routing/handlers/preview-environments-config.ts
+var handlePreviewEnvironmentsConfig = (msg, deps) => {
+  const previewEnvironments = msg.previewEnvironments;
   setImmediate(() => {
-    deps.devServerManager?.applyConfig(devServers ?? []);
+    deps.previewEnvironmentManager?.applyConfig(previewEnvironments ?? []);
   });
 };
 
@@ -47789,11 +47789,11 @@ function dispatchBridgeMessage(msg, deps) {
     case "ha":
       handleBridgeHeartbeatAck(msg, deps);
       break;
-    case "dev_servers_config":
-      handleDevServersConfig(msg, deps);
+    case "preview_environments_config":
+      handlePreviewEnvironmentsConfig(msg, deps);
       break;
-    case "server_control":
-      handleDevServerControl(msg, deps);
+    case "preview_environment_control":
+      handlePreviewEnvironmentControl(msg, deps);
       break;
     case "agent_config":
       handleAgentConfigMessage(msg, deps);
@@ -48901,7 +48901,7 @@ function createBridgeMessageDeps(params) {
     sendLocalSkillsReport,
     reportAutoDetectedAgents,
     warmupAgentCapabilitiesOnConnect: warmupAgentCapabilitiesOnConnect2,
-    devServerManager,
+    previewEnvironmentManager,
     e2ee,
     cloudApiBaseUrl,
     getCloudAccessToken
@@ -48918,7 +48918,7 @@ function createBridgeMessageDeps(params) {
     sendLocalSkillsReport,
     reportAutoDetectedAgents,
     warmupAgentCapabilitiesOnConnect: warmupAgentCapabilitiesOnConnect2,
-    devServerManager,
+    previewEnvironmentManager,
     e2ee,
     cloudApiBaseUrl,
     getCloudAccessToken
@@ -48988,10 +48988,10 @@ async function createBridgeConnection(options) {
     initialIndexBuildsScheduled = true;
     scheduleInitialIndexBuilds(getBridgeRoot());
   };
-  const devServerManager = new DevServerManager({ getWs, log: logFn, getBridgeRoot, e2ee });
+  const previewEnvironmentManager = new PreviewEnvironmentManager({ getWs, log: logFn, getBridgeRoot, e2ee });
   const bridgeHeartbeat = createBridgeHeartbeatController({ getWs, log: logFn });
   const baseOnBridgeIdentified = createOnBridgeIdentified({
-    devServerManager,
+    previewEnvironmentManager,
     firehoseServerUrl,
     workspaceId,
     state,
@@ -49017,7 +49017,7 @@ async function createBridgeConnection(options) {
       log: logFn,
       getWs
     }),
-    devServerManager,
+    previewEnvironmentManager,
     e2ee,
     cloudApiBaseUrl: apiUrl,
     getCloudAccessToken: () => tokens.accessToken
@@ -49050,7 +49050,7 @@ async function createBridgeConnection(options) {
       requestCliImmediateShutdown();
       stopFileIndexWatcher();
       bridgeHeartbeat.stop();
-      await closeBridgeConnection(state, acpManager, devServerManager, logFn);
+      await closeBridgeConnection(state, acpManager, previewEnvironmentManager, logFn);
       await bridgeAccess.close();
     }
   };