@buildautomaton/cli 0.1.15 → 0.1.17

package/dist/index.js

@@ -2240,7 +2240,7 @@ var require_websocket = __commonJS({
     var http = __require("http");
     var net = __require("net");
     var tls = __require("tls");
-    var { randomBytes, createHash: createHash2 } = __require("crypto");
+    var { randomBytes: randomBytes2, createHash: createHash2 } = __require("crypto");
     var { Duplex, Readable: Readable2 } = __require("stream");
     var { URL: URL2 } = __require("url");
     var PerMessageDeflate = require_permessage_deflate();
@@ -2770,7 +2770,7 @@ var require_websocket = __commonJS({
         }
       }
       const defaultPort = isSecure ? 443 : 80;
-      const key = randomBytes(16).toString("base64");
+      const key = randomBytes2(16).toString("base64");
       const request = isSecure ? https2.request : http.request;
       const protocolSet = /* @__PURE__ */ new Set();
       let perMessageDeflate;
@@ -22787,8 +22787,8 @@ var PREVIEW_API_BASE_PATH = "/__preview";
 var PREVIEW_SECRET_HEADER = "X-Preview-Secret";
 var DEFAULT_PORT = 3e3;
 var DEFAULT_COMMAND = "npm run preview";
-var PREVIEW_COMMAND_ENV = "BUILDAMATON_PREVIEW_COMMAND";
-var PREVIEW_PORT_ENV = "BUILDAMATON_PREVIEW_PORT";
+var PREVIEW_COMMAND_ENV = "BUILDAUTOMATON_PREVIEW_COMMAND";
+var PREVIEW_PORT_ENV = "BUILDAUTOMATON_PREVIEW_PORT";
 var previewProcess = null;
 var previewPort = DEFAULT_PORT;
 var previewSecret = "";
@@ -22841,7 +22841,7 @@ var OPERATIONS = [
 var previewSkill = {
   id: "preview",
   name: "Preview",
-  description: "Start and manage a local preview server that implements the BuildAutomaton Preview Server API. Configure the command with BUILDAMATON_PREVIEW_COMMAND (default: npm run preview). The server receives PORT and PREVIEW_SECRET and must expose /__preview/status and /__preview/stop.",
+  description: "Start and manage a local preview server that implements the BuildAutomaton Preview Server API. Configure the command with BUILDAUTOMATON_PREVIEW_COMMAND (default: npm run preview). The server receives PORT and PREVIEW_SECRET and must expose /__preview/status and /__preview/stop.",
   operations: OPERATIONS,
   async execute(operationId, params) {
     const command = getPreviewCommand();
@@ -23564,8 +23564,11 @@ function isLocalApiUrl(apiUrl) {
     return false;
   }
 }
+function appUrlForApiUrl(apiUrl) {
+  return apiUrl && isLocalApiUrl(apiUrl) ? process.env.BUILDAUTOMATON_APP_URL ?? "http://localhost:3000" : process.env.BUILDAUTOMATON_APP_URL ?? "https://app.buildautomaton.com";
+}
 async function openBrowser(connectionId, initialWorkspaceId, preferredBridgeName, apiUrl, logFn = log) {
-  const appUrl = apiUrl && isLocalApiUrl(apiUrl) ? process.env.BUILDAUTOMATON_APP_URL ?? "http://localhost:3000" : process.env.BUILDAUTOMATON_APP_URL ?? "https://app.buildautomaton.com";
+  const appUrl = appUrlForApiUrl(apiUrl);
   let connectCliUrl = `${appUrl.replace(/\/$/, "")}/bridges/connect?connectionId=${connectionId}`;
   if (initialWorkspaceId) {
     try {
@@ -28773,6 +28776,498 @@ async function collectTurnGitDiffFromPreTurnSnapshot(options) {
   }
 }
 
+// ../types/dist/index.js
+init_zod();
+init_zod();
+init_zod();
+init_zod();
+init_zod();
+init_zod();
+init_zod();
+init_zod();
+init_zod();
+init_zod();
+init_zod();
+init_zod();
+var WorkItemStatusSchema = external_exports.enum(["backlog", "in-progress", "completed"]);
+var WorkItemProgressSchema = external_exports.object({
+  remainingCriteria: external_exports.array(external_exports.string()).default([]),
+  openQuestions: external_exports.array(external_exports.string()).default([]),
+  assignedTo: external_exports.enum(["agent", "human-product", "human-expert"]).optional()
+});
+var ChangeSchema = external_exports.object({
+  id: external_exports.string(),
+  description: external_exports.string(),
+  buildingBlockId: external_exports.string(),
+  buildingBlockType: external_exports.enum(["function", "workflow", "connector", "ui-component", "app-fragment", "application", "project"]),
+  action: external_exports.enum(["create", "update", "split", "combine"])
+});
+var CompletionCriterionSchema = external_exports.object({
+  id: external_exports.string(),
+  description: external_exports.string(),
+  type: external_exports.enum(["write-code", "write-tests", "verify-tests", "other"]),
+  verified: external_exports.boolean().default(false)
+});
+var WorkItemPrioritySchema = external_exports.enum(["low", "medium", "high", "critical"]);
+var IterationPhaseSchema = external_exports.enum(["analysis", "implementation", "verify", "reprioritize", "completed"]);
+var WorkItemDependencySchema = external_exports.object({
+  type: external_exports.enum(["work-item"]),
+  id: external_exports.string()
+});
+var WorkItemSchema = external_exports.object({
+  id: external_exports.string(),
+  sessionId: external_exports.string().optional(),
+  summary: external_exports.string().optional(),
+  description: external_exports.string(),
+  status: WorkItemStatusSchema,
+  buildingBlockId: external_exports.string().optional(),
+  buildingBlockType: external_exports.enum(["function", "workflow", "connector", "ui-component", "app-fragment", "application", "project"]),
+  changes: external_exports.array(ChangeSchema).default([]),
+  completionCriteria: external_exports.array(CompletionCriterionSchema).default([]),
+  priority: WorkItemPrioritySchema.default("medium"),
+  dependencies: external_exports.array(WorkItemDependencySchema).default([]),
+  assignedToUserId: external_exports.string().optional()
+});
+var UserWorkspaceProfileSchema = external_exports.object({
+  id: external_exports.string(),
+  workspaceId: external_exports.string(),
+  userId: external_exports.string(),
+  roleDescription: external_exports.string().optional(),
+  expertiseAreas: external_exports.array(external_exports.string()),
+  preferences: external_exports.record(external_exports.unknown()).optional(),
+  learnings: external_exports.array(external_exports.string())
+});
+var WorkspaceOwnerInfoSchema = external_exports.object({
+  ownerId: external_exports.string(),
+  ownerName: external_exports.string().optional(),
+  ownerEmail: external_exports.string().optional(),
+  ownerProfilePictureUrl: external_exports.string().optional()
+});
+var WorkspaceRuntimeEntrySchema = external_exports.object({
+  workspaceId: external_exports.string(),
+  path: external_exports.string(),
+  name: external_exports.string().optional(),
+  owner: WorkspaceOwnerInfoSchema.optional(),
+  isOwner: external_exports.boolean().optional()
+});
+var ProjectContextSchema = external_exports.object({
+  projectId: external_exports.string(),
+  context: external_exports.record(external_exports.unknown()).default({}),
+  updatedAt: external_exports.string()
+});
+var WebSocketMessageTypeSchema = external_exports.enum([
+  "plan-update",
+  "work-item-update",
+  "work-item-added",
+  "work-item-removed",
+  "project-processing-start",
+  "project-processing-update",
+  "project-processing-complete",
+  "project-processing-error",
+  "file-tool-request",
+  "file-tool-response",
+  "file-generated"
+]);
+var WebSocketMessageSchema = external_exports.object({
+  type: WebSocketMessageTypeSchema,
+  contextId: external_exports.string().optional(),
+  data: external_exports.any().optional(),
+  error: external_exports.string().optional()
+});
+var CheckpointKindSchema = external_exports.enum(["daily", "weekly", "overall"]);
+var CheckpointSummarySchema = external_exports.object({
+  id: external_exports.string(),
+  kind: CheckpointKindSchema,
+  /** ISO date for daily (YYYY-MM-DD), ISO week for weekly, null for overall */
+  periodKey: external_exports.string().nullable(),
+  summary: external_exports.string(),
+  createdAt: external_exports.string(),
+  updatedAt: external_exports.string()
+});
+var ThreadMetaSchema = external_exports.object({
+  threadId: external_exports.string(),
+  workspaceId: external_exports.string(),
+  /** External source (e.g. slack, discord); null if internal-only */
+  externalSource: external_exports.string().nullable(),
+  /** Id in the external system (e.g. channel_id + thread_ts) */
+  externalId: external_exports.string().nullable(),
+  title: external_exports.string().optional(),
+  createdAt: external_exports.string(),
+  updatedAt: external_exports.string()
+});
+var ThreadMessageSchema = external_exports.object({
+  messageId: external_exports.string(),
+  threadId: external_exports.string(),
+  /** Role: user, assistant, system */
+  role: external_exports.enum(["user", "assistant", "system"]),
+  content: external_exports.string(),
+  /** Optional reference to a ContentItem (e.g. doc, Notion page) */
+  contentItemId: external_exports.string().nullable(),
+  /** External message id if synced from external chat */
+  externalId: external_exports.string().nullable(),
+  createdAt: external_exports.string(),
+  updatedAt: external_exports.string()
+});
+var ThreadCheckpointSummarySchema = CheckpointSummarySchema.extend({
+  threadId: external_exports.string()
+});
+var ContentSourceSchema = external_exports.enum(["notion", "doc", "slack_thread", "other"]);
+var ContentItemMetaSchema = external_exports.object({
+  contentId: external_exports.string(),
+  workspaceId: external_exports.string(),
+  source: ContentSourceSchema,
+  /** Id in the external system (e.g. Notion page id, doc url) */
+  externalId: external_exports.string(),
+  /** If source is slack_thread, points to Thread DO id */
+  threadId: external_exports.string().nullable(),
+  title: external_exports.string().optional(),
+  createdAt: external_exports.string(),
+  updatedAt: external_exports.string()
+});
+var ContentStorageRefSchema = external_exports.object({
+  storageKey: external_exports.string(),
+  /** Optional: mime type or format hint */
+  contentType: external_exports.string().optional()
+});
+var ContentCheckpointSummarySchema = CheckpointSummarySchema.extend({
+  contentId: external_exports.string()
+});
+var StoryMetaSchema = external_exports.object({
+  storyId: external_exports.string(),
+  workspaceId: external_exports.string(),
+  title: external_exports.string(),
+  /** feature | bug | epic */
+  kind: external_exports.enum(["feature", "bug", "epic"]).default("feature"),
+  createdAt: external_exports.string(),
+  updatedAt: external_exports.string()
+});
+var StoryContentItemRefSchema = external_exports.object({
+  id: external_exports.string(),
+  storyId: external_exports.string(),
+  contentItemId: external_exports.string(),
+  /** Snapshot summary when added to story (or updated) */
+  summary: external_exports.string(),
+  orderIndex: external_exports.number().default(0),
+  createdAt: external_exports.string(),
+  updatedAt: external_exports.string()
+});
+var StoryCheckpointSummarySchema = CheckpointSummarySchema.extend({
+  storyId: external_exports.string()
+});
+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(),
+  title: external_exports.string().optional(),
+  createdAt: external_exports.string(),
+  updatedAt: external_exports.string()
+});
+var SessionPromptSchema = external_exports.object({
+  id: external_exports.string(),
+  sessionId: external_exports.string(),
+  /** text | resource */
+  type: external_exports.enum(["text", "resource"]).default("text"),
+  text: external_exports.string().optional(),
+  resourceUri: external_exports.string().optional(),
+  createdAt: external_exports.string()
+});
+var SessionResponseSchema = external_exports.object({
+  id: external_exports.string(),
+  sessionId: external_exports.string(),
+  promptId: external_exports.string(),
+  /** message | completion */
+  kind: external_exports.enum(["message", "completion"]),
+  content: external_exports.string().optional(),
+  /** For completion: stopReason etc. */
+  stopReason: external_exports.string().optional(),
+  createdAt: external_exports.string()
+});
+var SessionToolCallSchema = external_exports.object({
+  id: external_exports.string(),
+  sessionId: external_exports.string(),
+  promptId: external_exports.string(),
+  name: external_exports.string(),
+  params: external_exports.record(external_exports.unknown()).optional(),
+  result: external_exports.record(external_exports.unknown()).optional(),
+  createdAt: external_exports.string()
+});
+var SessionThreadRefSchema = external_exports.object({
+  sessionId: external_exports.string(),
+  threadId: external_exports.string(),
+  addedAt: external_exports.string()
+});
+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;
+}
+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 path32 = skip ? normalizeRepoRelativePath(rawPath) || rawPath : resolveChangeSummaryPathAgainstAllowed(rawPath, allowedPaths);
+    if (!path32) continue;
+    rows.push({ path: path32, summary: clampSummaryToAtMostTwoLines(summary) });
+  }
+  return rows;
+}
+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");
+}
+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);
+}
+var ArtifactMetaSchema = external_exports.object({
+  artifactId: external_exports.string(),
+  workspaceId: external_exports.string(),
+  /** Slug for permalink: /workspaces/:wid/artifacts/:slug */
+  permalinkSlug: external_exports.string(),
+  title: external_exports.string(),
+  /** e.g. summary_report, build_log */
+  type: external_exports.string().default("report"),
+  /** Optional session that produced this artifact */
+  sessionId: external_exports.string().nullable(),
+  createdAt: external_exports.string(),
+  updatedAt: external_exports.string()
+});
+var TemplateMetaSchema = external_exports.object({
+  templateId: external_exports.string(),
+  workspaceId: external_exports.string(),
+  name: external_exports.string(),
+  /** e.g. summary_report, build_log */
+  artifactType: external_exports.string().optional(),
+  createdAt: external_exports.string(),
+  updatedAt: external_exports.string()
+});
+var GitRepoMetaSchema = external_exports.object({
+  /** Stable id for the repo (e.g. hash of normalized canonical URL). Used for DO idFromName. */
+  repoId: external_exports.string(),
+  /** Canonical external URL (e.g. https://github.com/org/repo). Normalize before storing. */
+  canonicalUrl: external_exports.string().url(),
+  /** Optional workspace this repo was first linked in. */
+  workspaceId: external_exports.string().nullable(),
+  displayName: external_exports.string().optional(),
+  createdAt: external_exports.string(),
+  updatedAt: external_exports.string()
+});
+
+// src/agents/acp/put-summarize-change-summaries.ts
+async function putEncryptedChangeSummaryRows(params) {
+  const base = params.apiBaseUrl.replace(/\/+$/, "");
+  const entries = params.rows.map(({ path: path32, summary }) => {
+    const enc = params.e2ee.encryptFields({ summary }, ["summary"]);
+    return { path: path32, summary: JSON.stringify(enc) };
+  });
+  const res = await fetch(
+    `${base}/api/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/acp/send-prompt-result-augment.ts
+function augmentPromptResultAuthFields(agentType, errorText) {
+  const err = errorText ?? "";
+  const at = agentType ?? null;
+  const evaluated = Boolean(at && err.trim());
+  const suggestsAuth = evaluated && at ? localAgentErrorSuggestsAuth(at, err) : false;
+  if (!suggestsAuth || !agentType) return {};
+  return { agentAuthRequired: true, agentType };
+}
+
 // src/agents/acp/send-prompt-to-agent.ts
 async function sendPromptToAgent(options) {
   const {
@@ -28785,16 +29280,13 @@ async function sendPromptToAgent(options) {
     agentCwd,
     sendResult: sendResult2,
     sendSessionUpdate,
-    log: log2
+    log: log2,
+    followUpCatalogPromptId,
+    sessionChangeSummaryFilePaths,
+    cloudApiBaseUrl,
+    getCloudAccessToken,
+    e2ee
   } = options;
-  function augmentAuthFields(errorText) {
-    const err = errorText ?? "";
-    const at = agentType ?? null;
-    const evaluated = Boolean(at && err.trim());
-    const suggestsAuth = evaluated && at ? localAgentErrorSuggestsAuth(at, err) : false;
-    if (!suggestsAuth || !agentType) return {};
-    return { agentAuthRequired: true, agentType };
-  }
   try {
     const result = await handle.sendPrompt(promptText, {});
     if (sessionId && runId && sendSessionUpdate && agentCwd && result.success) {
@@ -28806,6 +29298,18 @@ async function sendPromptToAgent(options) {
         log: log2
       });
     }
+    await maybeUploadE2eeSessionChangeSummariesAfterAgentSuccess({
+      sessionId,
+      runId,
+      resultSuccess: result.success === true,
+      output: result.output,
+      e2ee,
+      cloudApiBaseUrl,
+      getCloudAccessToken,
+      followUpCatalogPromptId,
+      sessionChangeSummaryFilePaths,
+      log: log2
+    });
     const errStr = typeof result.error === "string" ? result.error : void 0;
     sendResult2({
       type: "prompt_result",
@@ -28813,7 +29317,8 @@ async function sendPromptToAgent(options) {
       ...sessionId ? { sessionId } : {},
       ...runId ? { runId } : {},
       ...result,
-      ...augmentAuthFields(errStr)
+      ...followUpCatalogPromptId != null && followUpCatalogPromptId !== "" ? { followUpCatalogPromptId } : {},
+      ...augmentPromptResultAuthFields(agentType, errStr)
     });
     if (!result.success) {
       log2(
@@ -28830,7 +29335,8 @@ async function sendPromptToAgent(options) {
       ...runId ? { runId } : {},
       success: false,
       error: errMsg,
-      ...augmentAuthFields(errMsg)
+      ...followUpCatalogPromptId != null && followUpCatalogPromptId !== "" ? { followUpCatalogPromptId } : {},
+      ...augmentPromptResultAuthFields(agentType, errMsg)
     });
   }
 }
@@ -28994,7 +29500,7 @@ async function createCursorAcpClient(options) {
     onRequest,
     onFileChange
   } = options;
-  const dbgFs = process.env.BUILDAMATON_DEBUG_ACP_FS === "1";
+  const dbgFs = process.env.BUILDAUTOMATON_DEBUG_ACP_FS === "1";
   const isWindows = process.platform === "win32";
   const child = spawn4(command[0], command.slice(1), {
     cwd,
@@ -30138,7 +30644,12 @@ async function createAcpManager(options) {
       agentType,
       cwd,
       sendResult: sendResult2,
-      sendSessionUpdate
+      sendSessionUpdate,
+      followUpCatalogPromptId,
+      sessionChangeSummaryFilePaths,
+      cloudApiBaseUrl,
+      getCloudAccessToken,
+      e2ee
     } = opts;
     const preferredForPrompt = agentType ?? backendFallbackAgentType ?? null;
     pendingCancelRunId = void 0;
@@ -30202,7 +30713,12 @@ async function createAcpManager(options) {
         agentCwd: cwd,
         sendResult: sendResult2,
         sendSessionUpdate,
-        log: log2
+        log: log2,
+        followUpCatalogPromptId,
+        sessionChangeSummaryFilePaths,
+        cloudApiBaseUrl,
+        getCloudAccessToken,
+        e2ee
       });
     }
     void run().finally(() => {
@@ -31541,7 +32057,7 @@ function startFileIndexWatcher(cwd = getBridgeWorkspaceDirectory()) {
 }
 
 // src/dev-servers/manager/dev-server-manager.ts
-import { rm } from "node:fs/promises";
+import { rm as rm2 } from "node:fs/promises";
 
 // src/dev-servers/process/send-server-status.ts
 function sendDevServerStatus(getWs, serverId, status, options) {
@@ -32050,8 +32566,90 @@ var StreamTail = class {
   }
 };
 
-// src/dev-servers/manager/dev-server-manager.ts
+// src/dev-servers/manager/dev-server-constants.ts
 var BRIDGE_SHUTDOWN_GRACE_MS = 8e3;
+
+// src/dev-servers/manager/dev-server-firehose-messages.ts
+function buildFirehoseSnapshotMessage(params) {
+  const payload = {
+    type: "log_snapshot",
+    serverId: params.serverId,
+    viewerId: params.viewerId,
+    stdoutTail: params.tails.stdout,
+    stderrTail: params.tails.stderr
+  };
+  return params.e2ee ? params.e2ee.encryptFields(payload, ["stdoutTail", "stderrTail"]) : payload;
+}
+function buildFirehoseLogChunkMessage(params) {
+  const payload = {
+    type: "log_chunk",
+    serverId: params.serverId,
+    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 {
+  constructor(options) {
+    this.options = options;
+  }
+  logViewerRefCountByServerId = /* @__PURE__ */ new Map();
+  firehoseSend = null;
+  attach(send) {
+    this.firehoseSend = send;
+  }
+  detach() {
+    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);
+  }
+  closeLogViewer(serverId) {
+    const n = (this.logViewerRefCountByServerId.get(serverId) ?? 0) - 1;
+    if (n <= 0) this.logViewerRefCountByServerId.delete(serverId);
+    else this.logViewerRefCountByServerId.set(serverId, n);
+  }
+  pushLogChunk(serverId, stream, chunk) {
+    if ((this.logViewerRefCountByServerId.get(serverId) ?? 0) <= 0) return;
+    if (!this.options.isPipedCaptureEnabled(serverId)) 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 }));
+    });
+  }
+  sendSnapshot(serverId, viewerId) {
+    const payload = buildFirehoseSnapshotMessage({
+      serverId,
+      viewerId,
+      tails: this.options.getTails(serverId),
+      e2ee: this.options.e2ee
+    });
+    setImmediate(() => {
+      const send = this.firehoseSend;
+      if (!send) return;
+      send(payload);
+    });
+  }
+};
+
+// src/dev-servers/manager/cleanup-merged-log-dir.ts
+import { rm } from "node:fs/promises";
+function cleanupMergedLogDirForServer(map2, serverId) {
+  const mergedDir = map2.get(serverId);
+  if (!mergedDir) return;
+  map2.delete(serverId);
+  void rm(mergedDir, { recursive: true, force: true }).catch(() => {
+  });
+}
+
+// src/dev-servers/manager/dev-server-manager.ts
 var emptyTails = () => ({ stdout: [], stderr: [] });
 var DevServerManager = class {
   defsById = /* @__PURE__ */ new Map();
@@ -32059,66 +32657,36 @@ var DevServerManager = class {
   streamTailsByServerId = /* @__PURE__ */ new Map();
   spawnGenerationByServerId = /* @__PURE__ */ new Map();
   pipedCaptureByServerId = /* @__PURE__ */ new Map();
-  logViewerRefCountByServerId = /* @__PURE__ */ new Map();
-  firehoseSend = null;
   mergedLogPollByServerId = /* @__PURE__ */ new Map();
   mergedLogCleanupDirByServerId = /* @__PURE__ */ new Map();
   abortControllersByServerId = /* @__PURE__ */ new Map();
   getWs;
   log;
   getBridgeCwd;
+  e2ee;
+  firehoseSink;
   constructor(options) {
     this.getWs = options.getWs;
     this.log = options.log;
     this.getBridgeCwd = options.getBridgeCwd ?? (() => process.cwd());
+    this.e2ee = options.e2ee;
+    this.firehoseSink = new DevServerFirehoseSink({
+      getTails: (serverId) => this.snapshotTails(serverId),
+      isPipedCaptureEnabled: (serverId) => this.pipedCaptureByServerId.get(serverId) === true,
+      e2ee: this.e2ee
+    });
   }
   attachFirehose(send) {
-    this.firehoseSend = send;
+    this.firehoseSink.attach(send);
   }
   detachFirehose() {
-    this.firehoseSend = null;
-    this.logViewerRefCountByServerId.clear();
+    this.firehoseSink.detach();
   }
   handleFirehoseLogViewerOpen(serverId, _viewerId) {
-    const next = (this.logViewerRefCountByServerId.get(serverId) ?? 0) + 1;
-    this.logViewerRefCountByServerId.set(serverId, next);
-    this.sendSnapshotToFirehose(serverId, _viewerId);
+    this.firehoseSink.openLogViewer(serverId, _viewerId);
   }
   handleFirehoseLogViewerClose(serverId, _viewerId) {
-    const n = (this.logViewerRefCountByServerId.get(serverId) ?? 0) - 1;
-    if (n <= 0) this.logViewerRefCountByServerId.delete(serverId);
-    else this.logViewerRefCountByServerId.set(serverId, n);
-  }
-  sendSnapshotToFirehose(serverId, viewerId) {
-    const tails = this.streamTailsByServerId.get(serverId);
-    const payload = {
-      type: "log_snapshot",
-      serverId,
-      viewerId,
-      stdoutTail: tails?.stdout.getTail() ?? [],
-      stderrTail: tails?.stderr.getTail() ?? []
-    };
-    setImmediate(() => {
-      const send = this.firehoseSend;
-      if (!send) return;
-      send(payload);
-    });
-  }
-  pushRemoteLogChunk(serverId, stream, chunk) {
-    if ((this.logViewerRefCountByServerId.get(serverId) ?? 0) <= 0) return;
-    if (!this.pipedCaptureByServerId.get(serverId)) return;
-    const send = this.firehoseSend;
-    if (!send) return;
-    const text = chunk.toString("utf8");
-    setImmediate(() => {
-      if (!this.firehoseSend) return;
-      this.firehoseSend({
-        type: "log_chunk",
-        serverId,
-        stream,
-        text
-      });
-    });
+    this.firehoseSink.closeLogViewer(serverId);
   }
   applyConfig(servers) {
     this.defsById.clear();
@@ -32171,12 +32739,7 @@ var DevServerManager = class {
     }
     this.clearTails(serverId);
     this.pipedCaptureByServerId.delete(serverId);
-    const mergedDir = this.mergedLogCleanupDirByServerId.get(serverId);
-    if (mergedDir) {
-      this.mergedLogCleanupDirByServerId.delete(serverId);
-      void rm(mergedDir, { recursive: true, force: true }).catch(() => {
-      });
-    }
+    cleanupMergedLogDirForServer(this.mergedLogCleanupDirByServerId, serverId);
     this.sendStatus(serverId, "stopped", void 0, tails);
   }
   start(serverId) {
@@ -32259,7 +32822,7 @@ var DevServerManager = class {
         log: this.log,
         stdoutTail,
         stderrTail,
-        pushRemoteLogChunk: (sid, stream, chunk) => this.pushRemoteLogChunk(sid, stream, chunk),
+        pushRemoteLogChunk: (sid, stream, chunk) => this.firehoseSink.pushLogChunk(sid, stream, chunk),
         sendStatus: (status, detail, tails) => this.sendStatus(serverId, status, detail, tails),
         setPollInterval: (iv) => {
           if (iv) this.mergedLogPollByServerId.set(serverId, iv);
@@ -32273,7 +32836,7 @@ var DevServerManager = class {
           this.mergedLogCleanupDirByServerId.delete(serverId);
         },
         rmMergedCleanupDir: (dir) => {
-          void rm(dir, { recursive: true, force: true }).catch(() => {
+          void rm2(dir, { recursive: true, force: true }).catch(() => {
           });
         },
         clearTailBuffers: () => this.clearTails(serverId)
@@ -32310,12 +32873,7 @@ var DevServerManager = class {
     this.processes.delete(serverId);
     this.clearPoll(serverId);
     this.pipedCaptureByServerId.delete(serverId);
-    const mergedDir = this.mergedLogCleanupDirByServerId.get(serverId);
-    if (mergedDir) {
-      this.mergedLogCleanupDirByServerId.delete(serverId);
-      void rm(mergedDir, { recursive: true, force: true }).catch(() => {
-      });
-    }
+    cleanupMergedLogDirForServer(this.mergedLogCleanupDirByServerId, serverId);
     const tails = this.snapshotTails(serverId);
     this.clearTails(serverId);
     this.sendStatus(serverId, "unknown", "Bridge closed before process exited", tails);
@@ -32775,7 +33333,7 @@ function reportGitRepos(getWs, log2) {
 var handleAuthToken = (msg, { log: log2 }) => {
   if (typeof msg.token !== "string") return;
   log2("Received auth token. Save it for future runs:");
-  log2(`  export BUILDAMATON_AUTH_TOKEN="${msg.token}"`);
+  log2(`  export BUILDAUTOMATON_AUTH_TOKEN="${msg.token}"`);
 };
 
 // src/bridge/routing/handlers/bridge-identified.ts
@@ -32819,6 +33377,42 @@ var handleAgentConfigMessage = (msg, deps) => {
 
 // src/agents/acp/from-bridge/handle-bridge-prompt.ts
 import * as path28 from "node:path";
+
+// src/agents/acp/from-bridge/bridge-prompt-wiring.ts
+function createBridgePromptSenders(deps, getWs) {
+  const sendBridgeMessage = (message, encryptedFields = []) => {
+    const s = getWs();
+    if (!s) return false;
+    const wire = deps.e2ee && encryptedFields.length > 0 ? deps.e2ee.encryptFields(message, encryptedFields) : message;
+    sendWsMessage(s, wire);
+    return true;
+  };
+  const sendResult2 = (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"] : [];
+    sendBridgeMessage(result, encryptedFields);
+  };
+  const sendSessionUpdate = (payload) => {
+    const s = getWs();
+    if (!s) {
+      deps.log("[Bridge service] Session update not sent: not connected to the bridge.");
+      return;
+    }
+    const p = payload;
+    const wire = p.type === "session_update" && deps.e2ee ? deps.e2ee.encryptFields(payload, ["payload"]) : p.type === "session_file_change" && deps.e2ee ? deps.e2ee.encryptFields(payload, [
+      "path",
+      "oldText",
+      "newText",
+      "patchContent",
+      "isDirectory",
+      "directoryRemoved"
+    ]) : payload;
+    sendWsMessage(s, wire);
+  };
+  return { sendBridgeMessage, sendResult: sendResult2, sendSessionUpdate };
+}
+
+// src/agents/acp/from-bridge/bridge-prompt-preamble.ts
 import { execFile as execFile10 } from "node:child_process";
 import { promisify as promisify10 } from "node:util";
 
@@ -32877,7 +33471,7 @@ async function resolveBridgeQueueBindFields(options) {
   return { canonicalQueueKey, repoId, cwdAbs };
 }
 
-// src/agents/acp/from-bridge/handle-bridge-prompt.ts
+// src/agents/acp/from-bridge/bridge-prompt-preamble.ts
 var execFileAsync9 = promisify10(execFile10);
 async function readGitBranch(cwd) {
   try {
@@ -32888,6 +33482,158 @@ async function readGitBranch(cwd) {
     return null;
   }
 }
+async function runBridgePromptPreamble(params) {
+  const { getWs, log: log2, sessionWorktreeManager, sessionId, runId, effectiveCwd } = params;
+  const s = getWs();
+  const worktreePaths = sessionWorktreeManager.getWorktreePathsForSession(sessionId) ?? [];
+  const repoRoots = await resolveSnapshotRepoRoots({
+    worktreePaths,
+    fallbackCwd: effectiveCwd,
+    log: log2
+  });
+  if (s && sessionId) {
+    const bind = await resolveBridgeQueueBindFields({
+      effectiveCwd,
+      worktreePaths,
+      primaryRepoRoots: repoRoots,
+      log: log2
+    });
+    if (bind) {
+      sendWsMessage(s, {
+        type: "bridge_queue_bind",
+        sessionId,
+        canonicalQueueKey: bind.canonicalQueueKey,
+        repoId: bind.repoId,
+        cwdAbs: bind.cwdAbs
+      });
+    }
+  }
+  if (s && sessionId) {
+    const cliGitBranch = await readGitBranch(effectiveCwd);
+    sendWsMessage(s, {
+      type: "session_git_context_report",
+      sessionId,
+      cliGitBranch,
+      agentUsesWorktree: sessionWorktreeManager.usesWorktreeSession(sessionId)
+    });
+  }
+  if (s && sessionId && runId) {
+    const cap = repoRoots.length > 0 ? await capturePreTurnSnapshot({ runId, repoRoots, agentCwd: effectiveCwd, log: log2 }) : { ok: false, error: "No git repos" };
+    sendWsMessage(s, {
+      type: "pre_turn_snapshot_report",
+      sessionId,
+      turnId: runId,
+      captured: cap.ok
+    });
+  }
+}
+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 path32 = typeof o.path === "string" && o.path.trim() !== "" ? o.path.trim() : "";
+    if (!path32) continue;
+    const row = { path: path32 };
+    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 };
+}
+
+// ../e2ee/src/constants.ts
+var E2EE_NONCE_BYTES = 12;
+
+// ../e2ee/src/types.ts
+function isE2eeEnvelope(value) {
+  if (value === null || typeof value !== "object" || Array.isArray(value)) return false;
+  const o = value;
+  return typeof o.k === "string" && typeof o.n === "string" && typeof o.c === "string";
+}
+
+// ../e2ee/src/encoding.ts
+function base64UrlEncode(bytes) {
+  let binary = "";
+  for (let i = 0; i < bytes.length; i += 1) binary += String.fromCharCode(bytes[i]);
+  const b64 = btoa(binary);
+  return b64.replace(/\+/g, "-").replace(/\//g, "_").replace(/=+$/g, "");
+}
+function base64UrlDecode(value) {
+  const b64 = value.replace(/-/g, "+").replace(/_/g, "/");
+  const padded = b64 + "=".repeat((4 - b64.length % 4) % 4);
+  const binary = atob(padded);
+  const out = new Uint8Array(binary.length);
+  for (let i = 0; i < binary.length; i += 1) out[i] = binary.charCodeAt(i);
+  return out;
+}
+
+// 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/handle-bridge-prompt.ts
 function handleBridgePrompt(msg, deps) {
   const { getWs, log: log2, acpManager, sessionWorktreeManager } = deps;
   const rawPrompt = msg.prompt;
@@ -32895,21 +33641,22 @@ function handleBridgePrompt(msg, deps) {
   const sessionId = msg.sessionId;
   const runId = typeof msg.runId === "string" ? msg.runId : void 0;
   const promptId = typeof msg.id === "string" ? msg.id : void 0;
+  const { sendBridgeMessage, sendResult: sendResult2, sendSessionUpdate } = createBridgePromptSenders(deps, getWs);
   if (!promptText.trim()) {
     log2(
       `[Bridge service] Prompt ignored: empty or missing prompt text (session ${typeof msg.sessionId === "string" ? msg.sessionId.slice(0, 8) : "\u2014"}\u2026, run ${typeof msg.runId === "string" ? msg.runId.slice(0, 8) : "\u2014"}\u2026).`
     );
-    const s = getWs();
-    if (s) {
-      sendWsMessage(s, {
+    sendBridgeMessage(
+      {
         type: "prompt_result",
         ...promptId ? { id: promptId } : {},
         ...sessionId ? { sessionId } : {},
         ...runId ? { runId } : {},
         success: false,
         error: "Empty or missing prompt text from the bridge; this turn was not sent to the agent."
-      });
-    }
+      },
+      ["error"]
+    );
     return;
   }
   const isNewSession = msg.isNewSession === true;
@@ -32917,65 +33664,35 @@ function handleBridgePrompt(msg, deps) {
   const agentType = typeof msg.agentType === "string" && msg.agentType.trim() ? msg.agentType.trim() : void 0;
   const mode = typeof msg.mode === "string" && msg.mode.trim() ? msg.mode.trim() : void 0;
   acpManager.logPromptReceivedFromBridge({ agentType, mode });
-  const sendResult2 = (result) => {
-    const s = getWs();
-    if (s) sendWsMessage(s, result);
-  };
-  const sendSessionUpdate = (payload) => {
-    const s = getWs();
-    if (!s) {
-      log2("[Bridge service] Session update not sent: not connected to the bridge.");
-      return;
-    }
-    const p = payload;
-    sendWsMessage(s, payload);
-  };
   async function preambleAndPrompt(resolvedCwd) {
-    const s = getWs();
     const effectiveCwd = path28.resolve(resolvedCwd ?? getBridgeWorkspaceDirectory());
-    const worktreePaths = sessionWorktreeManager.getWorktreePathsForSession(sessionId) ?? [];
-    const repoRoots = await resolveSnapshotRepoRoots({
-      worktreePaths,
-      fallbackCwd: effectiveCwd,
-      log: log2
+    await runBridgePromptPreamble({
+      getWs,
+      log: log2,
+      sessionWorktreeManager,
+      sessionId,
+      runId,
+      effectiveCwd
     });
-    if (s && sessionId) {
-      const bind = await resolveBridgeQueueBindFields({
-        effectiveCwd,
-        worktreePaths,
-        primaryRepoRoots: repoRoots,
-        log: log2
-      });
-      if (bind) {
-        sendWsMessage(s, {
-          type: "bridge_queue_bind",
-          sessionId,
-          canonicalQueueKey: bind.canonicalQueueKey,
-          repoId: bind.repoId,
-          cwdAbs: bind.cwdAbs
-        });
-      }
-    }
-    if (s && sessionId) {
-      const cliGitBranch = await readGitBranch(effectiveCwd);
-      sendWsMessage(s, {
-        type: "session_git_context_report",
-        sessionId,
-        cliGitBranch,
-        agentUsesWorktree: sessionWorktreeManager.usesWorktreeSession(sessionId)
-      });
-    }
-    if (s && sessionId && runId) {
-      const cap = repoRoots.length > 0 ? await capturePreTurnSnapshot({ runId, repoRoots, agentCwd: effectiveCwd, log: log2 }) : { ok: false, error: "No git repos" };
-      sendWsMessage(s, {
-        type: "pre_turn_snapshot_report",
-        sessionId,
-        turnId: runId,
-        captured: cap.ok
-      });
+    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;
     acpManager.handlePrompt({
-      promptText,
+      promptText: resolvedPromptText,
       promptId: msg.id,
       sessionId,
       runId,
@@ -32983,7 +33700,12 @@ function handleBridgePrompt(msg, deps) {
       agentType,
       cwd: effectiveCwd,
       sendResult: sendResult2,
-      sendSessionUpdate
+      sendSessionUpdate,
+      followUpCatalogPromptId,
+      sessionChangeSummaryFilePaths: pathsForUpload,
+      cloudApiBaseUrl: deps.cloudApiBaseUrl,
+      getCloudAccessToken: deps.getCloudAccessToken,
+      e2ee: deps.e2ee
     });
   }
   void sessionWorktreeManager.resolveCwdForPrompt(sessionId, { isNewSession, sessionWorktreesEnabled }).then((cwd) => preambleAndPrompt(cwd)).catch((err) => {
@@ -33309,28 +34031,30 @@ async function readFileAsync(relativePath, startLine, endLine, lineOffset, lineC
 
 // src/files/handle-file-browser-search.ts
 var SEARCH_LIMIT = 100;
-function handleFileBrowserSearch(msg, socket) {
+function handleFileBrowserSearch(msg, socket, e2ee) {
   void (async () => {
     await yieldToEventLoop();
     const q = typeof msg.q === "string" ? msg.q : "";
     const cwd = getBridgeWorkspaceDirectory();
     const index = loadFileIndex(cwd);
     if (index === null) {
-      sendWsMessage(socket, {
+      const payload2 = {
         type: "file_browser_search_response",
         id: msg.id,
         paths: [],
         indexReady: false
-      });
+      };
+      sendWsMessage(socket, e2ee ? e2ee.encryptFields(payload2, ["paths"]) : payload2);
       return;
     }
     const results = await searchFileIndexAsync(index, q, SEARCH_LIMIT);
-    sendWsMessage(socket, {
+    const payload = {
       type: "file_browser_search_response",
       id: msg.id,
       paths: results,
       indexReady: true
-    });
+    };
+    sendWsMessage(socket, e2ee ? e2ee.encryptFields(payload, ["paths"]) : payload);
   })();
 }
 function triggerFileIndexBuild() {
@@ -33342,7 +34066,10 @@ function triggerFileIndexBuild() {
 }
 
 // src/files/handle-file-browser-request.ts
-function handleFileBrowserRequest(msg, socket) {
+function sendFileBrowserMessage(socket, e2ee, payload) {
+  sendWsMessage(socket, e2ee ? e2ee.encryptFields(payload, ["entries", "content", "totalLines", "size", "lineOffset"]) : payload);
+}
+function handleFileBrowserRequest(msg, socket, e2ee) {
   void (async () => {
     const reqPath = msg.path.replace(/^\/+/, "") || ".";
     const op = msg.op === "read" ? "read" : "list";
@@ -33351,7 +34078,7 @@ function handleFileBrowserRequest(msg, socket) {
       if ("error" in result) {
         sendWsMessage(socket, { type: "file_browser_response", id: msg.id, error: result.error });
       } else {
-        sendWsMessage(socket, { type: "file_browser_response", id: msg.id, entries: result.entries });
+        sendFileBrowserMessage(socket, e2ee, { type: "file_browser_response", id: msg.id, entries: result.entries });
         if (reqPath === "." || reqPath === "") {
           triggerFileIndexBuild();
         }
@@ -33373,27 +34100,28 @@ function handleFileBrowserRequest(msg, socket) {
           size: result.size
         };
         if (result.lineOffset != null) payload.lineOffset = result.lineOffset;
-        sendWsMessage(socket, payload);
+        sendFileBrowserMessage(socket, e2ee, payload);
       }
     }
   })();
 }
 
 // src/bridge/routing/handlers/file-browser-messages.ts
-function handleFileBrowserRequestMessage(msg, { getWs }) {
+function handleFileBrowserRequestMessage(msg, { getWs, e2ee }) {
   if (typeof msg.id !== "string" || typeof msg.path !== "string") return;
   const socket = getWs();
   if (!socket) return;
   handleFileBrowserRequest(
     msg,
-    socket
+    socket,
+    e2ee
   );
 }
-function handleFileBrowserSearchMessage(msg, { getWs }) {
+function handleFileBrowserSearchMessage(msg, { getWs, e2ee }) {
   if (typeof msg.id !== "string") return;
   const socket = getWs();
   if (!socket) return;
-  handleFileBrowserSearch(msg, socket);
+  handleFileBrowserSearch(msg, socket, e2ee);
 }
 
 // src/bridge/routing/handlers/skill-layout-request.ts
@@ -33463,9 +34191,10 @@ var handleRefreshLocalSkills = (_msg, deps) => {
 };
 
 // src/bridge/routing/handlers/session-git-request.ts
-function sendResult(ws, id, payload) {
+function sendResult(ws, id, payload, e2ee, encryptedFields = []) {
   if (!ws) return;
-  sendWsMessage(ws, { type: "session_git_result", id, ...payload });
+  const message = { type: "session_git_result", id, ...payload };
+  sendWsMessage(ws, e2ee && encryptedFields.length > 0 ? e2ee.encryptFields(message, encryptedFields) : message);
 }
 var handleSessionGitRequestMessage = (msg, deps) => {
   if (typeof msg.id !== "string") return;
@@ -33475,7 +34204,7 @@ var handleSessionGitRequestMessage = (msg, deps) => {
     return;
   void (async () => {
     const ws = deps.getWs();
-    const reply = (payload) => sendResult(ws, msg.id, payload);
+    const reply = (payload, encryptedFields = []) => sendResult(ws, msg.id, payload, deps.e2ee, encryptedFields);
     try {
       if (action === "status") {
         const r = await deps.sessionWorktreeManager.getSessionWorkingTreeStatus(sessionId);
@@ -33501,7 +34230,7 @@ var handleSessionGitRequestMessage = (msg, deps) => {
         reply({
           ok: true,
           repos
-        });
+        }, ["repos"]);
         return;
       }
       if (action === "push") {
@@ -33603,8 +34332,15 @@ var handleRevertTurnSnapshotMessage = (msg, deps) => {
 
 // src/bridge/routing/handlers/dev-server-control.ts
 var handleDevServerControl = (msg, deps) => {
-  const serverId = typeof msg.serverId === "string" ? msg.serverId : "";
-  const action = msg.action === "start" || msg.action === "stop" ? msg.action : null;
+  let wire = msg;
+  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)}`);
+    return;
+  }
+  const serverId = typeof wire.serverId === "string" ? wire.serverId : "";
+  const action = wire.action === "start" || wire.action === "stop" ? wire.action : null;
   if (!serverId || !action) return;
   deps.devServerManager?.handleControl(serverId, action);
 };
@@ -33730,7 +34466,8 @@ function createMainBridgeWebSocketLifecycle(params) {
     messageDeps,
     tokens,
     persistTokens,
-    onAuthInvalid
+    onAuthInvalid,
+    e2ee
   } = params;
   let authRefreshInFlight = false;
   function handleOpen() {
@@ -33743,15 +34480,15 @@ function createMainBridgeWebSocketLifecycle(params) {
     }
     const socket = getWs();
     if (socket) {
-      sendWsMessage(socket, { type: "identify", role: "cli" });
+      sendWsMessage(socket, { type: "identify", role: "cli", ...e2ee ? { e: e2ee.handshake } : {} });
       reportGitRepos(getWs, logFn);
     }
     if (justAuthenticated && socket) {
       logFn(
         "Save these for future runs (access token may rotate; refresh token is stored in ~/.buildautomaton/config.json when you use browser auth):"
       );
-      logFn(`  export BUILDAMATON_AUTH_TOKEN="${tokens.accessToken}"`);
-      logFn(`  export BUILDAMATON_WORKSPACE_ID="${workspaceId}"`);
+      logFn(`  export BUILDAUTOMATON_AUTH_TOKEN="${tokens.accessToken}"`);
+      logFn(`  export BUILDAUTOMATON_WORKSPACE_ID="${workspaceId}"`);
     }
   }
   function handleClose(code, reason) {
@@ -33833,6 +34570,74 @@ function createMainBridgeWebSocketLifecycle(params) {
   return { connect };
 }
 
+// src/lib/e2ee/cli-e2ee-runtime.ts
+import { createCipheriv, createDecipheriv, randomBytes } from "node:crypto";
+function nonceFromCounter(prefix, counter) {
+  const nonce = Buffer.alloc(E2EE_NONCE_BYTES);
+  prefix.copy(nonce, 0);
+  nonce.writeBigUInt64BE(counter, 4);
+  return nonce;
+}
+function createCliE2eeRuntime(key) {
+  const rawKey = Buffer.from(base64UrlDecode(key.k));
+  const prefix = randomBytes(4);
+  let counter = 0n;
+  function nextNonce() {
+    counter += 1n;
+    return nonceFromCounter(prefix, counter);
+  }
+  function encryptObject(messageWithoutSensitiveFields, plaintext) {
+    const nonce = nextNonce();
+    const cipher = createCipheriv("aes-256-gcm", rawKey, nonce);
+    const ciphertext = Buffer.concat([cipher.update(JSON.stringify(plaintext), "utf8"), cipher.final()]);
+    const tag = cipher.getAuthTag();
+    return {
+      k: key.id,
+      n: base64UrlEncode(nonce),
+      c: base64UrlEncode(Buffer.concat([ciphertext, tag]))
+    };
+  }
+  return {
+    keyId: key.id,
+    handshake: { k: key.id, a: key.a },
+    encryptFields(message, fields) {
+      const plaintext = {};
+      const stripped = { ...message };
+      let hasPlaintext = false;
+      for (const field of fields) {
+        if (Object.prototype.hasOwnProperty.call(stripped, field) && stripped[field] !== void 0) {
+          plaintext[field] = stripped[field];
+          delete stripped[field];
+          hasPlaintext = true;
+        }
+      }
+      if (!hasPlaintext) return message;
+      stripped.ee = encryptObject(stripped, plaintext);
+      return stripped;
+    },
+    decryptMessage(message) {
+      const envelope = message.ee;
+      if (!isE2eeEnvelope(envelope)) return message;
+      if (envelope.k !== key.id) throw new Error(`E2EE key mismatch: ${envelope.k}`);
+      const sealed = Buffer.from(base64UrlDecode(envelope.c));
+      if (sealed.length < 16) throw new Error("Invalid E2EE payload.");
+      const ciphertext = sealed.subarray(0, sealed.length - 16);
+      const tag = sealed.subarray(sealed.length - 16);
+      const nonce = Buffer.from(base64UrlDecode(envelope.n));
+      const decipher = createDecipheriv("aes-256-gcm", rawKey, nonce);
+      decipher.setAuthTag(tag);
+      const decrypted = Buffer.concat([decipher.update(ciphertext), decipher.final()]).toString("utf8");
+      const parsed = JSON.parse(decrypted);
+      if (parsed === null || typeof parsed !== "object" || Array.isArray(parsed)) {
+        throw new Error("E2EE payload did not decode to an object.");
+      }
+      const merged = { ...message, ...parsed };
+      delete merged.ee;
+      return merged;
+    }
+  };
+}
+
 // src/bridge/connection/create-bridge-connection.ts
 async function createBridgeConnection(options) {
   const { apiUrl, workspaceId, justAuthenticated, onAuthInvalid, persistTokens } = options;
@@ -33866,7 +34671,8 @@ async function createBridgeConnection(options) {
   function getWs() {
     return state.currentWs;
   }
-  const devServerManager = new DevServerManager({ getWs, log: logFn, getBridgeCwd: getBridgeWorkspaceDirectory });
+  const e2ee = options.e2eCertificate ? createCliE2eeRuntime(options.e2eCertificate) : void 0;
+  const devServerManager = new DevServerManager({ getWs, log: logFn, getBridgeCwd: getBridgeWorkspaceDirectory, e2ee });
   const onBridgeIdentified = createOnBridgeIdentified({
     sessionWorktreeManager,
     devServerManager,
@@ -33885,7 +34691,10 @@ async function createBridgeConnection(options) {
     onBridgeIdentified,
     sendLocalSkillsReport,
     reportAutoDetectedAgents,
-    devServerManager
+    devServerManager,
+    e2ee,
+    cloudApiBaseUrl: apiUrl,
+    getCloudAccessToken: () => tokens.accessToken
   };
   const { connect } = createMainBridgeWebSocketLifecycle({
     state,
@@ -33897,7 +34706,8 @@ async function createBridgeConnection(options) {
     messageDeps,
     tokens,
     persistTokens,
-    onAuthInvalid
+    onAuthInvalid,
+    e2ee
   });
   connect();
   const stopFileIndexWatcher = startFileIndexWatcher(getBridgeWorkspaceDirectory());
@@ -33909,56 +34719,72 @@ async function createBridgeConnection(options) {
   };
 }
 
-// src/run-bridge.ts
-async function runBridge(options) {
-  installBridgeProcessResilience();
-  const { apiUrl, workspaceId, authToken, refreshToken, bridgeName, justAuthenticated, worktreesRootAbs } = options;
-  const firehoseServerUrl = options.firehoseServerUrl ?? options.proxyServerUrl;
-  const hasAuth = workspaceId && authToken;
-  if (!hasAuth) {
-    const handle2 = runPendingAuth({
-      apiUrl,
-      initialWorkspaceId: workspaceId,
-      preferredBridgeName: bridgeName,
-      log,
-      onAuth: (_auth) => {
-      }
-    });
-    const onSignal2 = (kind) => {
-      logImmediate(
-        kind === "interrupt" ? "Keyboard interrupt (Ctrl+C) \u2014 stopping\u2026" : "Stop requested \u2014 shutting down\u2026"
-      );
-      setImmediate(() => {
-        handle2.close();
-        process.exit(0);
-      });
+// src/e2e-certificates/key-command.ts
+import * as readline3 from "node:readline";
+function installE2eCertificateKeyCommand({
+  log: log2,
+  onOpenCertificate,
+  onInterrupt
+}) {
+  if (!process.stdin.isTTY || typeof process.stdin.setRawMode !== "function") {
+    log2("[E2EE] Press c to import the E2EE key in a browser when running in an interactive terminal.");
+    return () => {
     };
-    const onSigInt2 = () => onSignal2("interrupt");
-    const onSigTerm2 = () => onSignal2("stop");
-    process.on("SIGINT", onSigInt2);
-    process.on("SIGTERM", onSigTerm2);
-    const auth = await handle2.authPromise;
-    process.off("SIGINT", onSigInt2);
-    process.off("SIGTERM", onSigTerm2);
-    handle2.close();
-    if (!auth) return;
-    writeConfigForApi(apiUrl, {
-      workspaceId: auth.workspaceId,
-      token: auth.token,
-      refreshToken: auth.refreshToken
-    });
-    await runBridge({
-      apiUrl,
-      workspaceId: auth.workspaceId,
-      authToken: auth.token,
-      refreshToken: auth.refreshToken,
-      firehoseServerUrl,
-      bridgeName,
-      justAuthenticated: true,
-      worktreesRootAbs
-    });
-    return;
   }
+  readline3.emitKeypressEvents(process.stdin);
+  process.stdin.setRawMode(true);
+  process.stdin.resume();
+  const onKeypress = (str, key) => {
+    if (key?.ctrl && key.name === "c") {
+      onInterrupt();
+      return;
+    }
+    if (!key?.ctrl && !key?.meta && (key?.name === "c" || str === "c")) {
+      onOpenCertificate();
+    }
+  };
+  process.stdin.on("keypress", onKeypress);
+  log2("[E2EE] Press c to import the active E2EE key into the browser.");
+  return () => {
+    process.stdin.off("keypress", onKeypress);
+    if (process.stdin.isTTY && typeof process.stdin.setRawMode === "function") {
+      process.stdin.setRawMode(false);
+    }
+  };
+}
+
+// src/e2e-certificates/open-import-url.ts
+async function openE2eCertificateImportUrl({
+  apiUrl,
+  workspaceId,
+  certificate,
+  log: log2
+}) {
+  const appUrl = appUrlForApiUrl(apiUrl);
+  const payload = encodeURIComponent(certificate.pemBundle);
+  const url2 = `${appUrl.replace(/\/$/, "")}/w/${encodeURIComponent(workspaceId)}/settings/e2e-encryption?certificate=${payload}`;
+  log2(`[E2EE] Opening browser to import key "${certificate.name}" (${certificate.id})...`);
+  try {
+    await open_default(url2, { wait: false });
+  } catch {
+    log2("[E2EE] Could not open browser. Open this URL manually:");
+    log2(url2);
+  }
+}
+
+// src/run-bridge-connected.ts
+async function runConnectedBridge(options, restartWithoutAuth) {
+  const {
+    apiUrl,
+    workspaceId,
+    authToken,
+    refreshToken,
+    justAuthenticated,
+    worktreesRootAbs,
+    e2eCertificate
+  } = options;
+  const firehoseServerUrl = options.firehoseServerUrl ?? options.proxyServerUrl;
+  let cleanupKeyCommand;
   const handle = await createBridgeConnection({
     apiUrl,
     workspaceId,
@@ -33967,6 +34793,7 @@ async function runBridge(options) {
     firehoseServerUrl,
     justAuthenticated,
     worktreesRootAbs,
+    e2eCertificate,
     log,
     persistTokens: (t) => {
       writeConfigForApi(apiUrl, {
@@ -33976,14 +34803,16 @@ async function runBridge(options) {
       });
     },
     onAuthInvalid: () => {
+      cleanupKeyCommand?.();
       log("[Bridge service] Access token invalid or revoked; re-authenticating\u2026");
       clearConfigForApi(apiUrl);
       void handle.close().then(() => {
-        void runBridge({ apiUrl, firehoseServerUrl, worktreesRootAbs });
+        void restartWithoutAuth({ apiUrl, firehoseServerUrl, worktreesRootAbs, e2eCertificate });
       });
     }
   });
   const onSignal = (kind) => {
+    cleanupKeyCommand?.();
     logImmediate(
       kind === "interrupt" ? "Keyboard interrupt (Ctrl+C) \u2014 stopping\u2026" : "Stop requested \u2014 shutting down\u2026"
     );
@@ -33997,6 +34826,86 @@ async function runBridge(options) {
   const onSigTerm = () => onSignal("stop");
   process.on("SIGINT", onSigInt);
   process.on("SIGTERM", onSigTerm);
+  if (e2eCertificate) {
+    let openingCertificate = false;
+    cleanupKeyCommand = installE2eCertificateKeyCommand({
+      log,
+      onInterrupt: onSigInt,
+      onOpenCertificate: () => {
+        if (openingCertificate) return;
+        openingCertificate = true;
+        void openE2eCertificateImportUrl({
+          apiUrl,
+          workspaceId,
+          certificate: e2eCertificate,
+          log
+        }).finally(() => {
+          openingCertificate = false;
+        });
+      }
+    });
+  }
+}
+
+// src/run-bridge.ts
+async function runBridge(options) {
+  installBridgeProcessResilience();
+  const {
+    apiUrl,
+    workspaceId,
+    authToken,
+    bridgeName,
+    worktreesRootAbs,
+    e2eCertificate
+  } = options;
+  const firehoseServerUrl = options.firehoseServerUrl ?? options.proxyServerUrl;
+  const hasAuth = workspaceId && authToken;
+  if (!hasAuth) {
+    const handle = runPendingAuth({
+      apiUrl,
+      initialWorkspaceId: workspaceId,
+      preferredBridgeName: bridgeName,
+      log,
+      onAuth: (_auth) => {
+      }
+    });
+    const onSignal = (kind) => {
+      logImmediate(
+        kind === "interrupt" ? "Keyboard interrupt (Ctrl+C) \u2014 stopping\u2026" : "Stop requested \u2014 shutting down\u2026"
+      );
+      setImmediate(() => {
+        handle.close();
+        process.exit(0);
+      });
+    };
+    const onSigInt = () => onSignal("interrupt");
+    const onSigTerm = () => onSignal("stop");
+    process.on("SIGINT", onSigInt);
+    process.on("SIGTERM", onSigTerm);
+    const auth = await handle.authPromise;
+    process.off("SIGINT", onSigInt);
+    process.off("SIGTERM", onSigTerm);
+    handle.close();
+    if (!auth) return;
+    writeConfigForApi(apiUrl, {
+      workspaceId: auth.workspaceId,
+      token: auth.token,
+      refreshToken: auth.refreshToken
+    });
+    await runBridge({
+      apiUrl,
+      workspaceId: auth.workspaceId,
+      authToken: auth.token,
+      refreshToken: auth.refreshToken,
+      firehoseServerUrl,
+      bridgeName,
+      justAuthenticated: true,
+      worktreesRootAbs,
+      e2eCertificate
+    });
+    return;
+  }
+  await runConnectedBridge(options, runBridge);
 }
 export {
   callSkill,