@buildautomaton/cli 0.1.61 → 0.1.63

package/dist/cli.js

@@ -25631,7 +25631,7 @@ var {
 } = import_index.default;
 
 // src/cli-version.ts
-var CLI_VERSION = "0.1.61".length > 0 ? "0.1.61" : "0.0.0-dev";
+var CLI_VERSION = "0.1.63".length > 0 ? "0.1.63" : "0.0.0-dev";
 
 // src/cli/defaults.ts
 var DEFAULT_API_URL = process.env.BUILDAUTOMATON_API_URL ?? "https://api.buildautomaton.com";
@@ -26151,18 +26151,6 @@ var import_websocket = __toESM(require_websocket(), 1);
 var import_websocket_server = __toESM(require_websocket_server(), 1);
 var wrapper_default = import_websocket.default;
 
-// src/net/apply-cli-outbound-network-prefs.ts
-import dns from "node:dns";
-var applied = false;
-function applyCliOutboundNetworkPreferences() {
-  if (applied) return;
-  applied = true;
-  try {
-    dns.setDefaultResultOrder("ipv4first");
-  } catch {
-  }
-}
-
 // src/connection/cli-ws-client.ts
 import https from "node:https";
 var CLI_WEBSOCKET_CLIENT_PING_MS = 25e3;
@@ -26264,7 +26252,6 @@ function createWsBridge(options) {
     onCompactHeartbeatAck,
     isActiveSocket
   } = options;
-  applyCliOutboundNetworkPreferences();
   const ws = new wrapper_default(url2, buildCliWebSocketClientOptions(url2));
   let clearClientPing = null;
   function disposeClientPing() {
@@ -27706,38 +27693,38 @@ function readCodeNavCacheMigrationSql(filename) {
 }
 
 // src/sqlite/run-sqlite-migrations.ts
-function checkpointSatisfiedByLegacyChain(applied2, replacesLegacyMigrations) {
-  return Array.isArray(replacesLegacyMigrations) && replacesLegacyMigrations.length > 0 && replacesLegacyMigrations.every((n) => applied2.has(n));
+function checkpointSatisfiedByLegacyChain(applied, replacesLegacyMigrations) {
+  return Array.isArray(replacesLegacyMigrations) && replacesLegacyMigrations.length > 0 && replacesLegacyMigrations.every((n) => applied.has(n));
 }
-function recordMigrationAndPruneCheckpointLegacy(db, migration, applied2) {
+function recordMigrationAndPruneCheckpointLegacy(db, migration, applied) {
   db.run("INSERT INTO __migrations (name) VALUES (?)", [migration.name]);
-  applied2.add(migration.name);
+  applied.add(migration.name);
   if (migration.checkpoint !== true) return;
   const legacy = migration.replacesLegacyMigrations;
   if (!legacy?.length) return;
   for (const legacyName of legacy) {
     if (legacyName === migration.name) continue;
     db.run("DELETE FROM __migrations WHERE name = ?", [legacyName]);
-    applied2.delete(legacyName);
+    applied.delete(legacyName);
   }
 }
 function runSqliteMigrations(db, migrations, bootstrapSql, label) {
   db.exec(bootstrapSql);
   const appliedRows = db.all("SELECT name FROM __migrations");
-  const applied2 = new Set(appliedRows.map((r) => r.name));
+  const applied = new Set(appliedRows.map((r) => r.name));
   for (const migration of migrations) {
-    if (applied2.has(migration.name)) continue;
-    if (migration.checkpoint === true && checkpointSatisfiedByLegacyChain(applied2, migration.replacesLegacyMigrations)) {
-      recordMigrationAndPruneCheckpointLegacy(db, migration, applied2);
+    if (applied.has(migration.name)) continue;
+    if (migration.checkpoint === true && checkpointSatisfiedByLegacyChain(applied, migration.replacesLegacyMigrations)) {
+      recordMigrationAndPruneCheckpointLegacy(db, migration, applied);
       continue;
     }
     if (migration.alreadyApplied?.(db)) {
-      recordMigrationAndPruneCheckpointLegacy(db, migration, applied2);
+      recordMigrationAndPruneCheckpointLegacy(db, migration, applied);
       continue;
     }
     try {
       migration.migrate(db);
-      recordMigrationAndPruneCheckpointLegacy(db, migration, applied2);
+      recordMigrationAndPruneCheckpointLegacy(db, migration, applied);
     } catch (e) {
       console.error(`[${label}] Migration failed: ${migration.name}`, e);
       throw e;
@@ -31968,7 +31955,6 @@ var StoryCheckpointSummarySchema = CheckpointSummarySchema.extend({
 
 // ../types/src/sessions.ts
 init_zod();
-var BUILTIN_SESSION_CHANGE_SUMMARY_FOLLOW_UP_CATALOG_PROMPT_ID = "__builtin_change_summary__";
 var SessionMetaSchema = external_exports.object({
   sessionId: external_exports.string(),
   workspaceId: external_exports.string(),
@@ -32101,146 +32087,6 @@ function buildPlanningSessionFollowUpAgentPrompt(userPrompt, existingTodos) {
   ].join("\n");
 }
 
-// ../types/src/change-summary-path.ts
-function normalizeRepoRelativePath(p) {
-  let t = p.trim().replace(/\\/g, "/");
-  while (t.startsWith("./")) t = t.slice(2);
-  return t.replace(/\/+/g, "/");
-}
-function resolveChangeSummaryPathAgainstAllowed(rawPath, allowed) {
-  const trimmed2 = rawPath.trim();
-  if (!trimmed2) return null;
-  if (allowed.has(trimmed2)) return trimmed2;
-  const n = normalizeRepoRelativePath(trimmed2);
-  if (allowed.has(n)) return n;
-  for (const a of allowed) {
-    if (normalizeRepoRelativePath(a) === n) return a;
-  }
-  return null;
-}
-
-// ../types/src/parse-change-summary-json.ts
-function clampSummaryToAtMostTwoLines(summary) {
-  const lines = summary.split(/\r?\n/).map((l) => l.trim()).filter((l) => l.length > 0);
-  return lines.slice(0, 2).join("\n");
-}
-function parseChangeSummaryJson(raw, allowedPaths, options) {
-  if (raw == null || raw.trim() === "") return [];
-  let text = raw.trim();
-  const fence = text.match(/```(?:json)?\s*([\s\S]*?)```/i);
-  if (fence?.[1]) text = fence[1].trim();
-  let parsed;
-  try {
-    parsed = JSON.parse(text);
-  } catch {
-    const start = text.indexOf("[");
-    const end = text.lastIndexOf("]");
-    if (start < 0 || end <= start) return [];
-    try {
-      parsed = JSON.parse(text.slice(start, end + 1));
-    } catch {
-      return [];
-    }
-  }
-  const rows = [];
-  let arr = [];
-  if (Array.isArray(parsed)) {
-    arr = parsed;
-  } else if (parsed && typeof parsed === "object" && Array.isArray(parsed.files)) {
-    arr = parsed.files;
-  }
-  const skip = options?.skipPathAllowlist === true;
-  for (const item of arr) {
-    if (!item || typeof item !== "object") continue;
-    const o = item;
-    const rawPath = typeof o.path === "string" ? o.path.trim() : "";
-    const summary = typeof o.summary === "string" ? o.summary.trim() : "";
-    if (!rawPath || !summary) continue;
-    const path81 = skip ? normalizeRepoRelativePath(rawPath) || rawPath : resolveChangeSummaryPathAgainstAllowed(rawPath, allowedPaths);
-    if (!path81) continue;
-    rows.push({ path: path81, summary: clampSummaryToAtMostTwoLines(summary) });
-  }
-  return rows;
-}
-
-// ../types/src/build-change-summary-prompt.ts
-var PATCH_PREVIEW_MAX = 12e3;
-function clip(s, max) {
-  if (s.length <= max) return s;
-  return `${s.slice(0, max)}
-
-\u2026(truncated, ${s.length - max} more characters)`;
-}
-function buildSessionChangeSummaryPrompt(files) {
-  const lines = [
-    "You are the same agent that produced the changes below. Summarize **your own** edits so a reader can scan them quickly.",
-    "",
-    "Write in second person (you / your): what you changed in each path and why it matters.",
-    "",
-    "Each summary must be **very concise**: **one line** of plain text, or **at most two short lines** (use a single line break between the two if needed). No bullets, no paragraphs.",
-    "",
-    "## How to format your reply (machine parsing)",
-    "",
-    "- Put the machine-readable part **only** inside a **markdown fenced code block** whose opening fence is exactly ```json on its own line. Close the block with ``` on its own line after the JSON.",
-    "- Inside that fence: **nothing except** one valid JSON value \u2014 the array described below. No trailing commentary inside the fence.",
-    "- **Do not** attach prose to the JSON on the same line (wrong: `Only one file\u2026page.tsx.[{\u2026}]`). Wrong: any sentence that ends with `.` immediately before `[`. Put a blank line before the ```json line.",
-    "- If you add optional plain English before the fence (e.g. one short sentence), keep it **separate**: end that sentence, blank line, then ```json.",
-    '- In each `"summary"` string, avoid raw double-quote characters, or escape them as `\\"` so the JSON parses.',
-    "",
-    "JSON shape **inside the fence** (array only):",
-    '[{"path":"<file path exactly as given>","summary":"<one line, or two short lines separated by \\n>"}]',
-    "",
-    "Rules:",
-    "- Include **exactly one** object per file path listed below (same path strings).",
-    "- If a path is a removed directory, state briefly what you removed.",
-    "- Do not invent paths; use only the paths provided.",
-    "",
-    "## Files you changed",
-    ""
-  ];
-  for (const f of files) {
-    lines.push(`### ${f.path}`);
-    if (f.directoryRemoved) {
-      lines.push("(directory removed)");
-      lines.push("");
-      continue;
-    }
-    if (f.patchContent && f.patchContent.trim() !== "") {
-      lines.push("```diff");
-      lines.push(clip(f.patchContent.trim(), PATCH_PREVIEW_MAX));
-      lines.push("```");
-    } else if (f.oldText != null || f.newText != null) {
-      const oldT = (f.oldText ?? "").trim();
-      const newT = (f.newText ?? "").trim();
-      lines.push("Previous snippet:", clip(oldT, 6e3));
-      lines.push("New snippet:", clip(newT, 6e3));
-    } else {
-      lines.push("(no diff body stored for this path)");
-    }
-    lines.push("");
-  }
-  return lines.join("\n");
-}
-
-// ../types/src/dedupe-session-file-changes-by-path.ts
-function defaultRichness(c) {
-  const patch = typeof c.patchContent === "string" ? c.patchContent.length : 0;
-  const nt = typeof c.newText === "string" ? c.newText.length : 0;
-  const ot = typeof c.oldText === "string" ? c.oldText.length : 0;
-  const dir = c.directoryRemoved === true ? 8 : 0;
-  return (patch > 0 ? 4 : 0) + (nt > 0 ? 2 : 0) + (ot > 0 ? 1 : 0) + dir;
-}
-function dedupeSessionFileChangesByPath(items, richness = (item) => defaultRichness(item)) {
-  const byPath = /* @__PURE__ */ new Map();
-  for (const item of items) {
-    const p = typeof item.path === "string" ? item.path.trim() : "";
-    if (!p) continue;
-    const prev = byPath.get(p);
-    if (!prev || richness(item) >= richness(prev)) byPath.set(p, item);
-  }
-  return Array.from(byPath.entries()).sort(([a], [b]) => a.localeCompare(b)).map(([, v]) => v);
-}
-
 // ../types/src/diff/line-diff.ts
 function normalizeDiffLineText(line) {
   return line.replace(/\r$/, "").replace(/\s*\\s*$/, "");
@@ -35849,102 +35695,6 @@ async function collectTurnGitDiffFromPreTurnSnapshot(options) {
   });
 }
 
-// src/agents/acp/put-summarize-change-summaries.ts
-async function putEncryptedChangeSummaryRows(params) {
-  const base = params.apiBaseUrl.replace(/\/+$/, "");
-  const entries = params.rows.map(({ path: path81, summary }) => {
-    const enc = params.e2ee.encryptFields({ summary }, ["summary"]);
-    return { path: path81, summary: JSON.stringify(enc) };
-  });
-  const res = await fetch(
-    `${base}/internal/sessions/${encodeURIComponent(params.sessionId)}/follow-ups/summarize-changes`,
-    {
-      method: "PUT",
-      headers: {
-        Authorization: `Bearer ${params.authToken}`,
-        "Content-Type": "application/json"
-      },
-      body: JSON.stringify({ entries })
-    }
-  );
-  if (!res.ok) {
-    const t = await res.text();
-    throw new Error(`PUT summarize-changes summaries failed ${res.status}: ${t.slice(0, 500)}`);
-  }
-}
-
-// src/agents/acp/maybe-upload-e2ee-session-change-summaries.ts
-async function maybeUploadE2eeSessionChangeSummariesAfterAgentSuccess(params) {
-  const {
-    sessionId,
-    runId,
-    resultSuccess,
-    output,
-    e2ee,
-    cloudApiBaseUrl,
-    getCloudAccessToken,
-    followUpCatalogPromptId,
-    sessionChangeSummaryFilePaths,
-    log: log2
-  } = params;
-  const outputStr = typeof output === "string" ? output : "";
-  if (!sessionId) {
-    return;
-  }
-  if (!runId) {
-    return;
-  }
-  if (!resultSuccess) {
-    return;
-  }
-  if (!e2ee) {
-    return;
-  }
-  if (!cloudApiBaseUrl) {
-    return;
-  }
-  if (!getCloudAccessToken) {
-    return;
-  }
-  if (followUpCatalogPromptId !== BUILTIN_SESSION_CHANGE_SUMMARY_FOLLOW_UP_CATALOG_PROMPT_ID) {
-    return;
-  }
-  if (!sessionChangeSummaryFilePaths || sessionChangeSummaryFilePaths.length === 0) {
-    return;
-  }
-  if (outputStr.trim() === "") {
-    return;
-  }
-  const allowed = /* @__PURE__ */ new Set();
-  for (const p of sessionChangeSummaryFilePaths) {
-    const t = p.trim();
-    if (!t) continue;
-    allowed.add(t);
-    allowed.add(normalizeRepoRelativePath(t));
-  }
-  const rows = parseChangeSummaryJson(outputStr, allowed);
-  if (rows.length === 0) {
-    return;
-  }
-  const token = getCloudAccessToken();
-  if (!token) {
-    return;
-  }
-  try {
-    await putEncryptedChangeSummaryRows({
-      apiBaseUrl: cloudApiBaseUrl,
-      authToken: token,
-      sessionId,
-      e2ee,
-      rows
-    });
-  } catch (uploadErr) {
-    log2(
-      `[Agent] Encrypted change summary upload failed: ${uploadErr instanceof Error ? uploadErr.message : String(uploadErr)}`
-    );
-  }
-}
-
 // src/agents/planning/submit-planning-todos-for-turn.ts
 async function submitPlanningTodosForTurn(params) {
   const token = params.getCloudAccessToken();
@@ -36013,10 +35763,8 @@ async function finalizeAndSendPromptResult(params) {
     agentCwd,
     isPlanningSession,
     followUpCatalogPromptId,
-    sessionChangeSummaryFilePaths,
     cloudApiBaseUrl,
     getCloudAccessToken,
-    e2ee,
     sendResult,
     sendSessionUpdate,
     log: log2
@@ -36030,18 +35778,6 @@ async function finalizeAndSendPromptResult(params) {
       log: log2
     });
   }
-  await maybeUploadE2eeSessionChangeSummariesAfterAgentSuccess({
-    sessionId,
-    runId,
-    resultSuccess: result.success === true,
-    output: result.output,
-    e2ee,
-    cloudApiBaseUrl,
-    getCloudAccessToken,
-    followUpCatalogPromptId,
-    sessionChangeSummaryFilePaths,
-    log: log2
-  });
   const planningTodosSubmit = await maybeSubmitPlanningTodosAfterAgentSuccess({
     sessionId,
     runId,
@@ -36485,7 +36221,6 @@ async function sendPromptToAgent(options) {
     sendSessionUpdate,
     log: log2,
     followUpCatalogPromptId,
-    sessionChangeSummaryFilePaths,
     cloudApiBaseUrl,
     getCloudAccessToken,
     e2ee,
@@ -36529,7 +36264,6 @@ async function sendPromptToAgent(options) {
       agentCwd,
       isPlanningSession,
       followUpCatalogPromptId,
-      sessionChangeSummaryFilePaths,
       cloudApiBaseUrl,
       getCloudAccessToken,
       e2ee,
@@ -36600,7 +36334,6 @@ async function runAcpPrompt(ctx, runCtx, opts) {
     sendResult,
     sendSessionUpdate,
     followUpCatalogPromptId,
-    sessionChangeSummaryFilePaths,
     cloudApiBaseUrl,
     getCloudAccessToken,
     e2ee,
@@ -36666,7 +36399,6 @@ async function runAcpPrompt(ctx, runCtx, opts) {
       sendSessionUpdate,
       log: ctx.log,
       followUpCatalogPromptId,
-      sessionChangeSummaryFilePaths,
       cloudApiBaseUrl,
       getCloudAccessToken,
       e2ee,
@@ -37713,6 +37445,9 @@ function envForSpawn(base, userEnv, ports) {
   });
   if (ports.length > 0) {
     out.PORTS = ports.join(",");
+    if (!userKeys.has("PORT")) {
+      out.PORT = String(ports[0]);
+    }
   }
   if (!userKeys.has("NO_COLOR")) {
     delete out.NO_COLOR;
@@ -38615,172 +38350,189 @@ function createBridgePreviewStack(options) {
   return { previewEnvironmentManager, scheduleInitialIndexBuildsOnce, identifyReportedPaths };
 }
 
-// src/net/transient-local-fetch-retry.ts
-var LOCAL_PREVIEW_FETCH_RETRY_DELAYS_MS = [30, 100, 200, 400];
-function sleepMs(ms) {
-  return new Promise((r) => setTimeout(r, ms));
-}
-function collectErrorText(err) {
-  const parts = [];
-  let e = err;
-  for (let depth = 0; depth < 6 && e != null; depth += 1) {
-    if (e instanceof Error) {
-      parts.push(e.message);
-      e = e.cause;
-    } else {
-      parts.push(String(e));
-      break;
-    }
-  }
-  return parts.join(" ").toLowerCase();
-}
-function isTransientLocalServiceError(err) {
-  const text = collectErrorText(err);
-  if (!text) return false;
-  return text.includes("fetch failed") || text.includes("econnrefused") || text.includes("econnreset") || text.includes("epipe") || text.includes("etimedout") || text.includes("socket hang up") || text.includes("network connection lost") || text.includes("ecanceled") || text.includes("aborted") || text.includes("und_err_socket") || text.includes("other side closed") || text.includes("eai_again");
+// src/firehose/build-cli-ws-url.ts
+function buildFirehoseCliWsUrl(baseUrl) {
+  const base = baseUrl.startsWith("https") ? baseUrl.replace(/^https/, "wss") : baseUrl.replace(/^http/, "ws");
+  return `${base.replace(/\/$/, "")}/ws`;
 }
-function isIdempotentHttpMethod(method) {
-  const m = method.toUpperCase();
-  return m === "GET" || m === "HEAD" || m === "OPTIONS";
+
+// src/firehose/proxy/prepare-local-proxy-request-headers.ts
+var HOP_BY_HOP_HEADERS = /* @__PURE__ */ new Set([
+  "connection",
+  "keep-alive",
+  "proxy-authenticate",
+  "proxy-authorization",
+  "te",
+  "trailers",
+  "transfer-encoding",
+  "upgrade"
+]);
+var BODY_HEADERS = /* @__PURE__ */ new Set(["content-length", "content-type", "content-encoding"]);
+function methodAllowsRequestBody(method) {
+  const normalized = method.toUpperCase();
+  return normalized !== "GET" && normalized !== "HEAD";
 }
-async function fetchWithLocalTransientRetries(url2, init, options) {
-  const method = (init?.method ?? "GET").toUpperCase();
-  const allowRetry = isIdempotentHttpMethod(method);
-  const delays = options?.delaysMs ?? LOCAL_PREVIEW_FETCH_RETRY_DELAYS_MS;
-  const maxAttempts = options?.maxAttempts ?? (allowRetry ? Math.max(1, delays.length + 1) : 1);
-  let lastErr;
-  for (let attempt = 0; attempt < maxAttempts; attempt += 1) {
-    try {
-      return await fetch(url2, init);
-    } catch (e) {
-      lastErr = e;
-      const canRetry = allowRetry && attempt < maxAttempts - 1 && isTransientLocalServiceError(e);
-      if (!canRetry) throw e;
-      const waitMs = delays[Math.min(attempt, delays.length - 1)] ?? 100;
-      await sleepMs(waitMs);
-    }
+function prepareLocalProxyRequestHeaders(method, headers, sendingBody) {
+  const out = {};
+  for (const [key, value] of Object.entries(headers ?? {})) {
+    const lower = key.toLowerCase();
+    if (lower === "host") continue;
+    if (HOP_BY_HOP_HEADERS.has(lower)) continue;
+    if (lower === "origin" || lower === "referer") continue;
+    if (!sendingBody && BODY_HEADERS.has(lower)) continue;
+    out[key] = value;
   }
-  throw lastErr instanceof Error ? lastErr : new Error(String(lastErr));
+  return out;
 }
 
-// src/firehose/proxy/local-proxy.ts
-var ALLOWED_HOSTS = ["localhost", "127.0.0.1", "::1"];
-function isAllowedHost(host) {
-  const h = host.replace(/^\[|\]$/g, "");
-  return ALLOWED_HOSTS.includes(host) || ALLOWED_HOSTS.includes(h);
-}
-function isIdempotentProxyMethod(method) {
-  const m = method.toUpperCase();
-  return m === "GET" || m === "HEAD" || m === "OPTIONS";
+// src/firehose/proxy/build-local-proxy-http-request.ts
+var ALLOWED_HOSTS = /* @__PURE__ */ new Set(["localhost", "127.0.0.1", "::1"]);
+function willSendLocalProxyBody(request) {
+  if (!methodAllowsRequestBody(request.method)) return false;
+  return request.body !== void 0 && request.body !== null;
 }
-function checkUrlAndHost(request) {
+function buildLocalProxyHttpRequest(request) {
   let url2;
   try {
     url2 = new URL(request.url);
   } catch {
     return { error: `Invalid URL: ${request.url}` };
   }
-  if (!isAllowedHost(url2.hostname)) {
+  const hostname2 = url2.hostname.replace(/^\[|\]$/g, "");
+  if (!ALLOWED_HOSTS.has(url2.hostname) && !ALLOWED_HOSTS.has(hostname2)) {
     return { error: "Only localhost requests are allowed" };
   }
-  return { url: url2 };
-}
-async function proxyToLocal(request) {
-  const checked = checkUrlAndHost(request);
-  if ("error" in checked) {
-    return { id: request.id, statusCode: 0, headers: {}, body: "", error: checked.error };
-  }
-  const { url: url2 } = checked;
+  const sendingBody = willSendLocalProxyBody(request);
+  const headers = prepareLocalProxyRequestHeaders(request.method, request.headers, sendingBody);
+  headers.host = url2.host;
   const isHttps = url2.protocol === "https:";
-  const mod = isHttps ? await import("https") : await import("http");
-  const opts = {
+  const port = url2.port ? Number(url2.port) : isHttps ? 443 : 80;
+  return {
     method: request.method,
     hostname: url2.hostname,
-    port: url2.port || (isHttps ? 443 : 80),
-    path: url2.pathname + url2.search,
-    headers: request.headers
+    port,
+    path: `${url2.pathname}${url2.search}`,
+    headers,
+    sendingBody,
+    body: sendingBody ? request.body : void 0
   };
-  const maxAttempts = isIdempotentProxyMethod(request.method) ? LOCAL_PREVIEW_FETCH_RETRY_DELAYS_MS.length + 1 : 1;
-  for (let attempt = 0; attempt < maxAttempts; attempt += 1) {
-    const once = await new Promise((resolve37) => {
-      const req = mod.request(opts, (res) => {
-        const chunks = [];
-        res.on("data", (c) => chunks.push(c));
-        res.on("end", () => {
-          const body = Buffer.concat(chunks).toString("utf8");
-          const headers = {};
-          for (const [k, v] of Object.entries(res.headers)) {
-            if (typeof v === "string") headers[k] = v;
-            else if (Array.isArray(v) && v[0]) headers[k] = v[0];
-          }
-          resolve37({
-            id: request.id,
-            statusCode: res.statusCode ?? 0,
-            headers,
-            body
-          });
+}
+
+// src/firehose/proxy/constants.ts
+var LOCAL_PROXY_REQUEST_TIMEOUT_MS = 3e4;
+
+// src/firehose/proxy/incoming-message-headers.ts
+function incomingMessageHeaders(res) {
+  const headers = {};
+  for (const [k, v] of Object.entries(res.headers)) {
+    if (typeof v === "string") headers[k] = v;
+    else if (Array.isArray(v) && v[0]) headers[k] = v[0];
+  }
+  return headers;
+}
+
+// src/firehose/proxy/run-local-http-request.ts
+async function loadHttpModule(isHttps) {
+  return isHttps ? import("https") : import("http");
+}
+function buildLocalHttpRequestOptions(built) {
+  return {
+    method: built.method,
+    hostname: built.hostname,
+    port: built.port,
+    path: built.path,
+    headers: built.headers
+  };
+}
+function runLocalHttpRequestOnce(mod, built) {
+  const opts = buildLocalHttpRequestOptions(built);
+  return new Promise((resolve37) => {
+    const req = mod.request(opts, (res) => {
+      const chunks = [];
+      res.on("data", (chunk) => chunks.push(chunk));
+      res.on("end", () => {
+        resolve37({
+          statusCode: res.statusCode ?? 0,
+          headers: incomingMessageHeaders(res),
+          body: Buffer.concat(chunks)
         });
       });
-      req.on("error", (err) => {
+      res.on("error", (err) => {
         resolve37({
-          id: request.id,
           statusCode: 0,
           headers: {},
-          body: "",
+          body: Buffer.alloc(0),
           error: err.message
         });
       });
-      const method = request.method.toUpperCase();
-      if (request.body && method !== "GET" && method !== "HEAD") req.write(request.body);
-      req.end();
     });
-    const errMsg = once.error ?? "";
-    const canRetry = attempt < maxAttempts - 1 && errMsg !== "" && isTransientLocalServiceError(new Error(errMsg));
-    if (!canRetry) return once;
-    const waitMs = LOCAL_PREVIEW_FETCH_RETRY_DELAYS_MS[Math.min(attempt, LOCAL_PREVIEW_FETCH_RETRY_DELAYS_MS.length - 1)] ?? 100;
-    await sleepMs(waitMs);
-  }
-  throw new Error("Local proxy retry loop exited unexpectedly");
+    req.setTimeout(LOCAL_PROXY_REQUEST_TIMEOUT_MS, () => {
+      req.destroy(new Error(`Local preview request timed out after ${LOCAL_PROXY_REQUEST_TIMEOUT_MS}ms`));
+    });
+    req.on("error", (err) => {
+      resolve37({
+        statusCode: 0,
+        headers: {},
+        body: Buffer.alloc(0),
+        error: err.message
+      });
+    });
+    if (built.sendingBody && built.body != null) {
+      req.write(built.body);
+    }
+    req.end();
+  });
 }
+
+// src/firehose/proxy/proxy-to-local-streaming.ts
 async function proxyToLocalStreaming(request, callbacks) {
-  const checked = checkUrlAndHost(request);
-  if ("error" in checked) {
-    callbacks.onError(checked.error);
+  const built = buildLocalProxyHttpRequest(request);
+  if ("error" in built) {
+    callbacks.onError(built.error);
     return;
   }
-  try {
-    const method = request.method.toUpperCase();
-    const init = {
-      method: request.method,
-      headers: request.headers
-    };
-    if (request.body !== void 0 && request.body !== null && method !== "GET" && method !== "HEAD") {
-      init.body = request.body;
-    }
-    const res = await fetchWithLocalTransientRetries(request.url, init);
-    const headers = {};
-    res.headers.forEach((value, key) => {
-      headers[key] = value;
-    });
-    callbacks.onStart(res.status, headers);
-    const reader = res.body?.getReader();
-    if (!reader) {
-      callbacks.onEnd();
-      return;
-    }
-    try {
-      for (; ; ) {
-        const { done, value } = await reader.read();
-        if (done) break;
-        callbacks.onChunk(value);
+  const isHttps = request.url.startsWith("https:");
+  const mod = await loadHttpModule(isHttps);
+  const opts = buildLocalHttpRequestOptions(built);
+  await new Promise((resolve37) => {
+    const req = mod.request(opts, (res) => {
+      try {
+        callbacks.onStart(res.statusCode ?? 0, incomingMessageHeaders(res));
+      } catch (err) {
+        req.destroy();
+        callbacks.onError(err instanceof Error ? err.message : String(err));
+        resolve37();
+        return;
       }
-    } finally {
-      reader.releaseLock();
+      res.on("data", (chunk) => {
+        try {
+          callbacks.onChunk(new Uint8Array(chunk));
+        } catch (err) {
+          req.destroy();
+          callbacks.onError(err instanceof Error ? err.message : String(err));
+        }
+      });
+      res.on("end", () => {
+        callbacks.onEnd();
+        resolve37();
+      });
+      res.on("error", (err) => {
+        callbacks.onError(err.message);
+        resolve37();
+      });
+    });
+    req.setTimeout(LOCAL_PROXY_REQUEST_TIMEOUT_MS, () => {
+      req.destroy(new Error(`Local preview request timed out after ${LOCAL_PROXY_REQUEST_TIMEOUT_MS}ms`));
+    });
+    req.on("error", (err) => {
+      callbacks.onError(err.message);
+      resolve37();
+    });
+    if (built.sendingBody && built.body != null) {
+      req.write(built.body);
     }
-    callbacks.onEnd();
-  } catch (err) {
-    callbacks.onError(err instanceof Error ? err.message : String(err));
-  }
+    req.end();
+  });
 }
 
 // src/firehose/proxy/start-streaming-proxy.ts
@@ -38790,15 +38542,7 @@ function startStreamingProxy(ws, log2, pr) {
       if (ws.readyState !== wrapper_default.OPEN) {
         throw new Error("Preview stream interrupted (firehose connection closed)");
       }
-      const forwardedHeaders = { ...headers };
-      const ce = "content-encoding";
-      const cl = "content-length";
-      const keys = Object.keys(forwardedHeaders).filter(
-        (k) => k.toLowerCase() !== ce && k.toLowerCase() !== cl
-      );
-      const filtered = {};
-      for (const k of keys) if (forwardedHeaders[k] != null) filtered[k] = forwardedHeaders[k];
-      sendWsMessage(ws, { type: "proxy_result_start", id: pr.id, statusCode, headers: filtered });
+      sendWsMessage(ws, { type: "proxy_result_start", id: pr.id, statusCode, headers });
     },
     onChunk: (chunk) => {
       const idBuf = Buffer.from(pr.id, "utf8");
@@ -38815,10 +38559,19 @@ function startStreamingProxy(ws, log2, pr) {
   });
 }
 
-// src/firehose/build-cli-ws-url.ts
-function buildFirehoseCliWsUrl(baseUrl) {
-  const base = baseUrl.startsWith("https") ? baseUrl.replace(/^https/, "wss") : baseUrl.replace(/^http/, "ws");
-  return `${base.replace(/\/$/, "")}/ws`;
+// src/firehose/create-firehose-message-deps.ts
+function createFirehoseMessageDeps(ws, log2, previewEnvironmentManager) {
+  const pendingProxyBody = /* @__PURE__ */ new Map();
+  const earlyProxyBinaryBody = /* @__PURE__ */ new Map();
+  const deps = {
+    ws,
+    log: log2,
+    previewEnvironmentManager,
+    pendingProxyBody,
+    earlyProxyBinaryBody,
+    startStreamingProxy: (pr) => startStreamingProxy(ws, log2, pr)
+  };
+  return deps;
 }
 
 // src/firehose/routing/firehose-message-router.ts
@@ -38853,36 +38606,95 @@ var handlePreviewEnvironmentLogsViewerClose = (msg, deps) => {
   deps.previewEnvironmentManager.handleFirehoseLogViewerClose(environmentId, viewerId);
 };
 
-// src/firehose/routing/handlers/proxy-message.ts
-var handleProxyMessage = (msg, deps) => {
-  const proxy = msg.proxy;
-  if (!proxy || typeof proxy !== "object") return;
-  const pr = proxy;
-  if (pr.streamResponse) {
-    const bodyLength = pr.bodyLength ?? 0;
-    if (bodyLength > 0) {
-      deps.pendingProxyBody.set(pr.id, {
-        pr: {
-          id: pr.id,
-          method: pr.method,
-          url: pr.url,
-          headers: pr.headers,
-          streamResponse: true
-        }
-      });
-    } else {
-      deps.startStreamingProxy({
-        id: pr.id,
-        method: pr.method,
-        url: pr.url,
-        headers: pr.headers,
-        streamResponse: true
-      });
-    }
-    return;
-  }
-  void proxyToLocal(pr).then((res) => {
-    if (res.error) deps.log(`[Proxy and log service] Preview proxy failed: ${res.error}`);
+// src/net/transient-local-fetch-retry.ts
+var LOCAL_PREVIEW_FETCH_RETRY_DELAYS_MS = [30, 100, 200, 400];
+function sleepMs(ms) {
+  return new Promise((r) => setTimeout(r, ms));
+}
+function collectErrorText(err) {
+  const parts = [];
+  let e = err;
+  for (let depth = 0; depth < 6 && e != null; depth += 1) {
+    if (e instanceof Error) {
+      parts.push(e.message);
+      e = e.cause;
+    } else {
+      parts.push(String(e));
+      break;
+    }
+  }
+  return parts.join(" ").toLowerCase();
+}
+function isTransientLocalServiceError(err) {
+  const text = collectErrorText(err);
+  if (!text) return false;
+  return text.includes("fetch failed") || text.includes("econnrefused") || text.includes("econnreset") || text.includes("epipe") || text.includes("etimedout") || text.includes("socket hang up") || text.includes("network connection lost") || text.includes("ecanceled") || text.includes("aborted") || text.includes("und_err_socket") || text.includes("other side closed") || text.includes("eai_again");
+}
+
+// src/firehose/proxy/proxy-to-local.ts
+function isIdempotentProxyMethod(method) {
+  const m = method.toUpperCase();
+  return m === "GET" || m === "HEAD" || m === "OPTIONS";
+}
+async function proxyToLocal(request) {
+  const built = buildLocalProxyHttpRequest(request);
+  if ("error" in built) {
+    return { id: request.id, statusCode: 0, headers: {}, body: "", error: built.error };
+  }
+  const isHttps = request.url.startsWith("https:");
+  const mod = await loadHttpModule(isHttps);
+  const maxAttempts = isIdempotentProxyMethod(request.method) ? LOCAL_PREVIEW_FETCH_RETRY_DELAYS_MS.length + 1 : 1;
+  for (let attempt = 0; attempt < maxAttempts; attempt += 1) {
+    const once = await runLocalHttpRequestOnce(mod, built);
+    const errMsg = once.error ?? "";
+    const canRetry = attempt < maxAttempts - 1 && errMsg !== "" && isTransientLocalServiceError(new Error(errMsg));
+    if (!canRetry) {
+      return {
+        id: request.id,
+        statusCode: once.statusCode,
+        headers: once.headers,
+        body: once.body.toString("utf8"),
+        error: once.error
+      };
+    }
+    const waitMs = LOCAL_PREVIEW_FETCH_RETRY_DELAYS_MS[Math.min(attempt, LOCAL_PREVIEW_FETCH_RETRY_DELAYS_MS.length - 1)] ?? 100;
+    await sleepMs(waitMs);
+  }
+  throw new Error("Local proxy retry loop exited unexpectedly");
+}
+
+// src/firehose/routing/handlers/proxy-message.ts
+var handleProxyMessage = (msg, deps) => {
+  const proxy = msg.proxy;
+  if (!proxy || typeof proxy !== "object") return;
+  const pr = proxy;
+  if (pr.streamResponse) {
+    const bodyLength = methodAllowsRequestBody(pr.method) ? pr.bodyLength ?? 0 : 0;
+    const streamingRequest = {
+      id: pr.id,
+      method: pr.method,
+      url: pr.url,
+      headers: pr.headers,
+      streamResponse: true
+    };
+    if (bodyLength > 0) {
+      const earlyBody = deps.earlyProxyBinaryBody.get(pr.id);
+      if (earlyBody !== void 0) {
+        deps.earlyProxyBinaryBody.delete(pr.id);
+        deps.startStreamingProxy({
+          ...streamingRequest,
+          body: earlyBody.length > 0 ? earlyBody : void 0
+        });
+      } else {
+        deps.pendingProxyBody.set(pr.id, { pr: streamingRequest });
+      }
+    } else {
+      deps.startStreamingProxy(streamingRequest);
+    }
+    return;
+  }
+  void proxyToLocal(pr).then((res) => {
+    if (res.error) deps.log(`[Proxy and log service] Preview proxy failed: ${res.error}`);
     sendWsMessage(deps.ws, { type: "proxy_result", ...res, id: pr.id });
   }).catch((err) => {
     deps.log(
@@ -38908,37 +38720,63 @@ function dispatchFirehoseJsonMessage(msg, deps) {
 
 // src/firehose/routing/try-consume-binary-proxy-body.ts
 var PROXY_ID_BYTES = 36;
+var PROXY_ID_RE = /^[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}$/i;
 function tryConsumeBinaryProxyBody(raw, deps) {
   if (raw.length < PROXY_ID_BYTES) return false;
   const id = raw.slice(0, PROXY_ID_BYTES).toString("utf8");
-  const pending2 = deps.pendingProxyBody.get(id);
-  if (!pending2) return false;
-  deps.pendingProxyBody.delete(id);
+  if (!PROXY_ID_RE.test(id)) return false;
   const body = raw.slice(PROXY_ID_BYTES);
-  deps.startStreamingProxy({
-    ...pending2.pr,
-    body: body.length > 0 ? new Uint8Array(body) : void 0
-  });
+  const bodyBytes = body.length > 0 ? new Uint8Array(body) : new Uint8Array(0);
+  const pending2 = deps.pendingProxyBody.get(id);
+  if (pending2) {
+    deps.pendingProxyBody.delete(id);
+    deps.startStreamingProxy({
+      ...pending2.pr,
+      body: bodyBytes.length > 0 ? bodyBytes : void 0
+    });
+    return true;
+  }
+  deps.earlyProxyBinaryBody.set(id, bodyBytes);
   return true;
 }
 
-// src/firehose/connect-firehose.ts
-function connectFirehose(options) {
+// src/firehose/handle-inbound-firehose-frame.ts
+function handleInboundFirehoseFrame(raw, deps) {
+  if (Buffer.isBuffer(raw) && tryConsumeBinaryProxyBody(raw, deps)) {
+    return;
+  }
+  let msg;
+  try {
+    const text = Buffer.isBuffer(raw) ? raw.toString("utf8") : String(raw);
+    msg = JSON.parse(text);
+  } catch {
+    return;
+  }
+  if (msg.type === "proxy") {
+    dispatchFirehoseJsonMessage(msg, deps);
+    return;
+  }
+  setImmediate(() => {
+    dispatchFirehoseJsonMessage(msg, deps);
+  });
+}
+
+// src/firehose/wire-firehose-websocket.ts
+function wireFirehoseWebSocket(options) {
   const {
-    firehoseServerUrl,
+    ws,
+    deps,
+    log: log2,
+    previewEnvironmentManager,
     workspaceId,
     bridgeName,
     proxyPorts,
-    log: log2,
-    previewEnvironmentManager,
     onOpen,
     onClose,
     suppressWebSocketErrors
   } = options;
-  const wsUrl = buildFirehoseCliWsUrl(firehoseServerUrl);
-  applyCliOutboundNetworkPreferences();
-  const ws = new wrapper_default(wsUrl, buildCliWebSocketClientOptions(wsUrl));
   let clearClientPing = null;
+  let identifyParams = { workspaceId, bridgeName, proxyPorts };
   function disposeClientPing() {
     clearClientPing?.();
     clearClientPing = null;
@@ -38946,36 +38784,32 @@ function connectFirehose(options) {
   const firehoseSend = (payload) => {
     sendWsMessage(ws, payload);
   };
-  const pendingProxyBody = /* @__PURE__ */ new Map();
-  const deps = {
-    ws,
-    log: log2,
-    previewEnvironmentManager,
-    pendingProxyBody,
-    startStreamingProxy: (pr) => startStreamingProxy(ws, log2, pr)
-  };
+  function sendIdentify(params) {
+    identifyParams = params;
+    if (ws.readyState !== wrapper_default.OPEN) return;
+    sendWsMessage(ws, {
+      type: "identify",
+      workspaceId: params.workspaceId,
+      bridgeName: params.bridgeName,
+      proxyPorts: params.proxyPorts
+    });
+  }
+  function detachPreviewEnvironmentManager() {
+    previewEnvironmentManager.detachFirehose();
+  }
   ws.on("open", () => {
     disposeClientPing();
     clearClientPing = attachWebSocketClientPing(ws, CLI_WEBSOCKET_CLIENT_PING_MS);
     onOpen?.();
     previewEnvironmentManager.attachFirehose(firehoseSend);
-    sendWsMessage(ws, { type: "identify", workspaceId, bridgeName, proxyPorts });
+    sendIdentify(identifyParams);
   });
   ws.on("message", (raw) => {
-    if (Buffer.isBuffer(raw) && tryConsumeBinaryProxyBody(raw, deps)) {
-      return;
-    }
-    setImmediate(() => {
-      try {
-        const text = Buffer.isBuffer(raw) ? raw.toString("utf8") : String(raw);
-        dispatchFirehoseJsonMessage(JSON.parse(text), deps);
-      } catch {
-      }
-    });
+    handleInboundFirehoseFrame(raw, deps);
   });
   ws.on("close", (code, reason) => {
     disposeClientPing();
-    previewEnvironmentManager.detachFirehose();
+    detachPreviewEnvironmentManager();
     const reasonStr = typeof reason === "string" ? reason : reason.toString();
     onClose?.(code, reasonStr);
   });
@@ -38988,25 +38822,64 @@ function connectFirehose(options) {
       safeCloseWebSocket(ws);
     }
   });
+  return { disposeClientPing, sendIdentify, detachPreviewEnvironmentManager };
+}
+
+// src/firehose/connect-firehose.ts
+function connectFirehose(options) {
+  const {
+    firehoseServerUrl,
+    workspaceId,
+    bridgeName,
+    proxyPorts,
+    log: log2,
+    previewEnvironmentManager,
+    onOpen,
+    onClose,
+    suppressWebSocketErrors
+  } = options;
+  const wsUrl = buildFirehoseCliWsUrl(firehoseServerUrl);
+  const ws = new wrapper_default(wsUrl, buildCliWebSocketClientOptions(wsUrl));
+  const deps = createFirehoseMessageDeps(ws, log2, previewEnvironmentManager);
+  const wired = wireFirehoseWebSocket({
+    ws,
+    deps,
+    log: log2,
+    previewEnvironmentManager,
+    workspaceId,
+    bridgeName,
+    proxyPorts,
+    onOpen,
+    onClose,
+    suppressWebSocketErrors
+  });
   return {
     close() {
-      disposeClientPing();
-      previewEnvironmentManager.detachFirehose();
+      wired.disposeClientPing();
+      wired.detachPreviewEnvironmentManager();
       safeCloseWebSocket(ws);
     },
-    isConnected: () => ws.readyState === wrapper_default.OPEN
+    isConnected: () => ws.readyState === wrapper_default.OPEN,
+    updateIdentify: wired.sendIdentify
   };
 }
 
-// src/connection/attach-firehose-after-identified.ts
-function attachFirehoseAfterIdentified(ctx, params) {
-  const { state, previewEnvironmentManager, logFn } = ctx;
-  function clearFirehoseReconnectTimer() {
-    if (state.firehoseReconnectTimeout != null) {
-      clearTimeout(state.firehoseReconnectTimeout);
-      state.firehoseReconnectTimeout = null;
-    }
-  }
+// src/connection/firehose/compare-firehose-params.ts
+function proxyPortsEqual(a, b) {
+  if (a.length !== b.length) return false;
+  const sa = [...a].sort((x, y) => x - y);
+  const sb = [...b].sort((x, y) => x - y);
+  return sa.every((v, i) => v === sb[i]);
+}
+function sameFirehoseBridge(a, b) {
+  return a.firehoseServerUrl === b.firehoseServerUrl && a.workspaceId === b.workspaceId && a.bridgeName === b.bridgeName;
+}
+function shouldReuseOpenFirehoseConnection(prev, next, isConnected) {
+  return Boolean(prev && sameFirehoseBridge(prev, next) && isConnected());
+}
+
+// src/connection/firehose/create-firehose-connect-callbacks.ts
+function createFirehoseConnectCallbacks(state, myGen, logFn, scheduleFirehoseRetryAfterDrop) {
   function firehoseCtx() {
     return {
       closedByUser: state.closedByUser,
@@ -39015,6 +38888,55 @@ function attachFirehoseAfterIdentified(ctx, params) {
       firehoseQuiet: state.firehoseQuiet
     };
   }
+  return {
+    onOpen: () => {
+      if (myGen !== state.firehoseGeneration) return;
+      try {
+        clearFirehoseReconnectQuietOnOpen(
+          {
+            firehoseQuiet: state.firehoseQuiet,
+            firehoseOutage: state.firehoseOutage,
+            lastFirehoseReconnectCloseMeta: state.lastFirehoseReconnectCloseMeta
+          },
+          logFn
+        );
+      } catch {
+      }
+      const logOpenAsFirehoseReconnect = state.firehoseReconnectAttempt > 0;
+      state.firehoseReconnectAttempt = 0;
+      if (!logOpenAsFirehoseReconnect) {
+        try {
+          logFn("Connected to preview tunnel (local HTTP proxy and dev logs).");
+        } catch {
+        }
+      }
+    },
+    onClose: (code, reason) => {
+      if (myGen !== state.firehoseGeneration) return;
+      state.firehoseHandle = null;
+      if (state.closedByUser) return;
+      state.lastFirehoseReconnectCloseMeta = { code, reason };
+      try {
+        beginFirehoseDeferredDisconnect(firehoseCtx(), code, reason, logFn);
+      } catch {
+      }
+      try {
+        scheduleFirehoseRetryAfterDrop({ code, reason });
+      } catch {
+      }
+    }
+  };
+}
+
+// src/connection/firehose/create-firehose-reconnect-scheduler.ts
+function createFirehoseReconnectScheduler(ctx, reconnect) {
+  const { state, logFn } = ctx;
+  function clearFirehoseReconnectTimer() {
+    if (state.firehoseReconnectTimeout != null) {
+      clearTimeout(state.firehoseReconnectTimeout);
+      state.firehoseReconnectTimeout = null;
+    }
+  }
   function scheduleFirehoseRetryAfterDrop(closeMeta) {
     if (state.closedByUser) return;
     const meta = closeMeta ?? state.lastFirehoseReconnectCloseMeta ?? void 0;
@@ -39036,30 +38958,60 @@ function attachFirehoseAfterIdentified(ctx, params) {
         state.firehoseReconnectTimeout = id;
       },
       shouldAbortBeforeRun: () => state.closedByUser,
-      run: () => {
-        const p = state.lastFirehoseParams;
-        if (!p) return;
-        attachFirehoseAfterIdentified(ctx, p);
-      },
+      run: reconnect,
       reschedule: () => {
         scheduleFirehoseRetryAfterDrop();
       }
     });
   }
-  state.lastFirehoseParams = params;
-  clearFirehoseReconnectTimer();
-  if (state.firehoseReconnectAttempt === 0) {
-    try {
-      logFn("Connecting to preview tunnel (local HTTP proxy and dev logs)\u2026");
-    } catch {
-    }
+  return { clearFirehoseReconnectTimer, scheduleFirehoseRetryAfterDrop };
+}
+function logInitialFirehoseConnect(state, logFn) {
+  if (state.firehoseReconnectAttempt !== 0) return;
+  try {
+    logFn("Connecting to preview tunnel (local HTTP proxy and dev logs)\u2026");
+  } catch {
   }
+}
+function replaceFirehoseHandle(state) {
   state.firehoseGeneration += 1;
   const myGen = state.firehoseGeneration;
   if (state.firehoseHandle) {
     state.firehoseHandle.close();
     state.firehoseHandle = null;
   }
+  return myGen;
+}
+
+// src/connection/firehose/attach-firehose-after-identified.ts
+function attachFirehoseAfterIdentified(ctx, params) {
+  const { state, previewEnvironmentManager, logFn } = ctx;
+  const prev = state.lastFirehoseParams;
+  if (shouldReuseOpenFirehoseConnection(prev, params, () => state.firehoseHandle?.isConnected() ?? false)) {
+    state.lastFirehoseParams = params;
+    if (prev && !proxyPortsEqual(prev.proxyPorts, params.proxyPorts)) {
+      state.firehoseHandle?.updateIdentify(params);
+    }
+    return;
+  }
+  const { clearFirehoseReconnectTimer, scheduleFirehoseRetryAfterDrop } = createFirehoseReconnectScheduler(
+    ctx,
+    () => {
+      const p = state.lastFirehoseParams;
+      if (!p) return;
+      attachFirehoseAfterIdentified(ctx, p);
+    }
+  );
+  state.lastFirehoseParams = params;
+  clearFirehoseReconnectTimer();
+  logInitialFirehoseConnect(state, logFn);
+  const myGen = replaceFirehoseHandle(state);
+  const { onOpen, onClose } = createFirehoseConnectCallbacks(
+    state,
+    myGen,
+    logFn,
+    scheduleFirehoseRetryAfterDrop
+  );
   state.firehoseHandle = connectFirehose({
     firehoseServerUrl: params.firehoseServerUrl,
     workspaceId: params.workspaceId,
@@ -39068,45 +39020,17 @@ function attachFirehoseAfterIdentified(ctx, params) {
     log: logFn,
     previewEnvironmentManager,
     suppressWebSocketErrors: () => !state.closedByUser && state.firehoseOutage.startedAt != null,
-    onOpen: () => {
-      if (myGen !== state.firehoseGeneration) return;
-      try {
-        clearFirehoseReconnectQuietOnOpen(
-          {
-            firehoseQuiet: state.firehoseQuiet,
-            firehoseOutage: state.firehoseOutage,
-            lastFirehoseReconnectCloseMeta: state.lastFirehoseReconnectCloseMeta
-          },
-          logFn
-        );
-      } catch {
-      }
-      const logOpenAsFirehoseReconnect = state.firehoseReconnectAttempt > 0;
-      state.firehoseReconnectAttempt = 0;
-      if (!logOpenAsFirehoseReconnect) {
-        try {
-          logFn("Connected to preview tunnel (local HTTP proxy and dev logs).");
-        } catch {
-        }
-      }
-    },
-    onClose: (code, reason) => {
-      if (myGen !== state.firehoseGeneration) return;
-      state.firehoseHandle = null;
-      if (state.closedByUser) return;
-      state.lastFirehoseReconnectCloseMeta = { code, reason };
-      try {
-        beginFirehoseDeferredDisconnect(firehoseCtx(), code, reason, logFn);
-      } catch {
-      }
-      try {
-        scheduleFirehoseRetryAfterDrop({ code, reason });
-      } catch {
-      }
-    }
+    onOpen,
+    onClose
   });
 }
 
+// src/connection/firehose/update-firehose-identify-on-open-connection.ts
+function updateFirehoseIdentifyOnOpenConnection(state, params) {
+  state.lastFirehoseParams = params;
+  state.firehoseHandle?.updateIdentify(params);
+}
+
 // src/connection/create-bridge-identified-handler.ts
 function createOnBridgeIdentified(opts) {
   const { previewEnvironmentManager, firehoseServerUrl, workspaceId, state, logFn } = opts;
@@ -39143,6 +39067,7 @@ function createBridgeMessageDeps(params) {
     reportAutoDetectedAgents,
     warmupAgentCapabilitiesOnConnect: warmupAgentCapabilitiesOnConnect2,
     previewEnvironmentManager,
+    updateFirehoseProxyPorts,
     e2ee,
     cloudApiBaseUrl,
     getCloudAccessToken
@@ -39161,6 +39086,7 @@ function createBridgeMessageDeps(params) {
     reportAutoDetectedAgents,
     warmupAgentCapabilitiesOnConnect: warmupAgentCapabilitiesOnConnect2,
     previewEnvironmentManager,
+    updateFirehoseProxyPorts,
     e2ee,
     cloudApiBaseUrl,
     getCloudAccessToken
@@ -39421,6 +39347,11 @@ function createBridgeRuntimeMessageSetup(options) {
       getWs
     }),
     previewEnvironmentManager,
+    updateFirehoseProxyPorts: (proxyPorts) => {
+      const p = state.lastFirehoseParams;
+      if (!p) return;
+      updateFirehoseIdentifyOnOpenConnection(state, { ...p, proxyPorts });
+    },
     e2ee,
     cloudApiBaseUrl: apiUrl,
     getCloudAccessToken: () => tokens.accessToken
@@ -46690,16 +46621,16 @@ async function applySessionWipToPreviewCheckouts(options) {
       return;
     }
     await gitResetWorktreeToBranch(previewCheckout, deployBranch);
-    const applied2 = await applyWorkingTreeWip(
+    const applied = await applyWorkingTreeWip(
       previewCheckout,
       state.sessionCheckout,
       state.wip,
       log2
     );
-    if (!applied2.ok) {
+    if (!applied.ok) {
       failure = {
         ok: false,
-        error: applied2.error ?? `Failed to apply session WIP to preview (${state.repoPathRelativeToWorkspaceRoot})`
+        error: applied.error ?? `Failed to apply session WIP to preview (${state.repoPathRelativeToWorkspaceRoot})`
       };
     }
   });
@@ -46798,7 +46729,7 @@ async function deploySessionToPreviewEnvironment(options) {
     return { ok: false, error: "Failed to create preview environment worktrees" };
   }
   await yieldToEventLoop2();
-  const applied2 = await applySessionWipToPreviewCheckouts({
+  const applied = await applySessionWipToPreviewCheckouts({
     previewWorktreeManager,
     environmentId: eid,
     deployBranch,
@@ -46806,8 +46737,8 @@ async function deploySessionToPreviewEnvironment(options) {
     repoStates,
     log: log2
   });
-  if (!applied2.ok) {
-    return { ok: false, error: applied2.error };
+  if (!applied.ok) {
+    return { ok: false, error: applied.error };
   }
   log2(
     `[worktrees] Deployed session ${sid.slice(0, 8)}\u2026 to preview ${eid.slice(0, 8)}\u2026 on branch ${deployBranch}.`
@@ -47129,8 +47060,6 @@ function dispatchLocalPrompt(next, deps) {
     ...sessionParentPath ? { sessionParentPath } : {},
     ...worktreeBaseBranches && Object.keys(worktreeBaseBranches).length > 0 ? { worktreeBaseBranches } : {},
     ...typeof pl.followUpCatalogPromptId === "string" ? { followUpCatalogPromptId: pl.followUpCatalogPromptId } : {},
-    ...Array.isArray(pl.sessionChangeSummaryFilePaths) ? { sessionChangeSummaryFilePaths: pl.sessionChangeSummaryFilePaths } : {},
-    ...Array.isArray(pl.sessionChangeSummaryFileSnapshots) ? { sessionChangeSummaryFileSnapshots: pl.sessionChangeSummaryFileSnapshots } : {},
     ...typeof pl.agentType === "string" && pl.agentType.trim() ? { agentType: pl.agentType.trim() } : {},
     ...pl.agentConfig != null && typeof pl.agentConfig === "object" && !Array.isArray(pl.agentConfig) && Object.keys(pl.agentConfig).length > 0 ? { agentConfig: pl.agentConfig } : {},
     ...Array.isArray(pl.attachments) && pl.attachments.length > 0 ? { attachments: pl.attachments } : {}
@@ -47393,8 +47322,7 @@ function createBridgePromptSenders(deps, getWs) {
     return true;
   };
   const sendResult = (result) => {
-    const skipEncryptForChangeSummaryFollowUp = result.type === "prompt_result" && result.followUpCatalogPromptId === BUILTIN_SESSION_CHANGE_SUMMARY_FOLLOW_UP_CATALOG_PROMPT_ID;
-    const encryptedFields = result.type === "prompt_result" && !skipEncryptForChangeSummaryFollowUp ? ["output", "error"] : [];
+    const encryptedFields = result.type === "prompt_result" ? ["output", "error"] : [];
     sendBridgeMessage(result, encryptedFields);
     if (result.type === "prompt_result") {
       const pr = result;
@@ -47458,61 +47386,6 @@ function parseWorktreeBaseBranches(msg) {
   return Object.keys(out).length > 0 ? out : void 0;
 }
 
-// src/agents/acp/change-summary/decrypt-change-summary-file-input.ts
-function decryptChangeSummaryFileInput(row, e2ee) {
-  if (!e2ee) return row;
-  for (const field of ["path", "patchContent", "oldText", "newText"]) {
-    const raw = row[field];
-    if (typeof raw !== "string" || raw.trim() === "") continue;
-    let o;
-    try {
-      o = JSON.parse(raw);
-    } catch {
-      continue;
-    }
-    if (!isE2eeEnvelope(o.ee)) continue;
-    try {
-      const d = e2ee.decryptMessage(o);
-      const out = {
-        path: typeof d.path === "string" ? d.path : row.path
-      };
-      if (d.directoryRemoved === true) out.directoryRemoved = true;
-      else if (row.directoryRemoved === true) out.directoryRemoved = true;
-      if (typeof d.patchContent === "string") out.patchContent = d.patchContent;
-      else if (typeof row.patchContent === "string" && row.patchContent !== raw) out.patchContent = row.patchContent;
-      if (typeof d.oldText === "string") out.oldText = d.oldText;
-      else if (typeof row.oldText === "string") out.oldText = row.oldText;
-      if (typeof d.newText === "string") out.newText = d.newText;
-      else if (typeof row.newText === "string") out.newText = row.newText;
-      return out;
-    } catch {
-      return row;
-    }
-  }
-  return row;
-}
-
-// src/agents/acp/change-summary/resolve-change-summary-prompt-for-agent.ts
-function hasSummarizePayload(f) {
-  return f.directoryRemoved === true || f.patchContent != null && f.patchContent.trim() !== "" || f.oldText != null && f.oldText.trim() !== "" || f.newText != null && f.newText.trim() !== "";
-}
-function resolveChangeSummaryPromptForAgent(params) {
-  const isBuiltin = params.followUpCatalogPromptId === BUILTIN_SESSION_CHANGE_SUMMARY_FOLLOW_UP_CATALOG_PROMPT_ID;
-  const snaps = params.sessionChangeSummaryFileSnapshots;
-  if (!isBuiltin || !snaps || snaps.length === 0) {
-    return { promptText: params.bridgePromptText, sessionChangeSummaryFilePaths: void 0 };
-  }
-  const decrypted = dedupeSessionFileChangesByPath(snaps.map((row) => decryptChangeSummaryFileInput(row, params.e2ee)));
-  const withPayload = decrypted.filter(hasSummarizePayload);
-  if (withPayload.length === 0) {
-    return { promptText: params.bridgePromptText, sessionChangeSummaryFilePaths: void 0 };
-  }
-  return {
-    promptText: buildSessionChangeSummaryPrompt(withPayload),
-    sessionChangeSummaryFilePaths: withPayload.map((f) => f.path)
-  };
-}
-
 // src/agents/acp/from-bridge/bridge-prompt-preamble.ts
 import { execFile as execFile8 } from "node:child_process";
 import { promisify as promisify9 } from "node:util";
@@ -47559,29 +47432,9 @@ async function runBridgePromptPreamble(params) {
     });
   }
 }
-function parseChangeSummarySnapshots(raw) {
-  if (!Array.isArray(raw) || raw.length === 0) return void 0;
-  const out = [];
-  for (const item of raw) {
-    if (!item || typeof item !== "object") continue;
-    const o = item;
-    const path81 = typeof o.path === "string" && o.path.trim() !== "" ? o.path.trim() : "";
-    if (!path81) continue;
-    const row = { path: path81 };
-    if (typeof o.patchContent === "string") row.patchContent = o.patchContent;
-    if (typeof o.oldText === "string") row.oldText = o.oldText;
-    if (typeof o.newText === "string") row.newText = o.newText;
-    if (o.directoryRemoved === true) row.directoryRemoved = true;
-    out.push(row);
-  }
-  return out.length > 0 ? out : void 0;
-}
 function parseFollowUpFieldsFromPromptMessage(msg) {
   const followUpCatalogPromptId = typeof msg.followUpCatalogPromptId === "string" && msg.followUpCatalogPromptId.trim() !== "" ? msg.followUpCatalogPromptId.trim() : null;
-  const rawPaths = msg.sessionChangeSummaryFilePaths;
-  const sessionChangeSummaryFilePaths = Array.isArray(rawPaths) ? rawPaths.filter((p) => typeof p === "string" && p.trim() !== "").map((p) => p.trim()) : void 0;
-  const sessionChangeSummaryFileSnapshots = parseChangeSummarySnapshots(msg.sessionChangeSummaryFileSnapshots);
-  return { followUpCatalogPromptId, sessionChangeSummaryFilePaths, sessionChangeSummaryFileSnapshots };
+  return { followUpCatalogPromptId };
 }
 
 // src/agents/acp/from-bridge/handle-bridge-prompt/run-preamble-and-prompt.ts
@@ -47612,25 +47465,9 @@ async function runPreambleAndPrompt(params) {
     runId,
     effectiveCwd
   });
-  const {
-    followUpCatalogPromptId,
-    sessionChangeSummaryFilePaths: pathsFromBridge,
-    sessionChangeSummaryFileSnapshots
-  } = parseFollowUpFieldsFromPromptMessage(msg);
-  const { promptText: resolvedPromptText, sessionChangeSummaryFilePaths } = resolveChangeSummaryPromptForAgent({
-    followUpCatalogPromptId,
-    sessionChangeSummaryFileSnapshots,
-    bridgePromptText: promptText,
-    e2ee: deps.e2ee
-  });
-  if (sessionChangeSummaryFileSnapshots && sessionChangeSummaryFileSnapshots.length > 0 && resolvedPromptText === promptText) {
-    deps.log(
-      "[Agent] Change-summary snapshots were present but the prompt was not rebuilt (decrypt failed or empty payloads); sending the bridge prompt as-is."
-    );
-  }
-  const pathsForUpload = sessionChangeSummaryFilePaths ?? pathsFromBridge;
+  const { followUpCatalogPromptId } = parseFollowUpFieldsFromPromptMessage(msg);
   deps.acpManager.handlePrompt({
-    promptText: resolvedPromptText,
+    promptText,
     promptId: msg.id,
     sessionId,
     runId,
@@ -47642,7 +47479,6 @@ async function runPreambleAndPrompt(params) {
     sendResult,
     sendSessionUpdate,
     followUpCatalogPromptId,
-    sessionChangeSummaryFilePaths: pathsForUpload,
     cloudApiBaseUrl: deps.cloudApiBaseUrl,
     getCloudAccessToken: deps.getCloudAccessToken,
     e2ee: deps.e2ee,
@@ -49402,12 +49238,17 @@ var handlePreviewEnvironmentControl = (msg, deps) => {
 };
 
 // src/routing/handlers/preview-environments-config.ts
+var VALID_PORT = (p) => typeof p === "number" && Number.isInteger(p) && p > 0 && p < 65536;
 var handlePreviewEnvironmentsConfig = (msg, deps) => {
   const previewEnvironments = msg.previewEnvironments;
+  const proxyPorts = Array.isArray(msg.proxyPorts) ? msg.proxyPorts.filter(VALID_PORT) : void 0;
   setImmediate(() => {
     deps.previewEnvironmentManager?.applyConfig(previewEnvironments ?? []);
     const environmentIds = parsePreviewEnvironmentDefs(previewEnvironments ?? []).map((d) => d.environmentId);
     void deps.previewWorktreeManager?.syncConfiguredEnvironments(environmentIds);
+    if (proxyPorts !== void 0) {
+      deps.updateFirehoseProxyPorts?.(proxyPorts);
+    }
   });
 };