@buildautomaton/cli 0.1.21 → 0.1.23

package/dist/index.js

@@ -23088,7 +23088,7 @@ function installBridgeProcessResilience() {
 }
 
 // src/cli-version.ts
-var CLI_VERSION = "0.1.21".length > 0 ? "0.1.21" : "0.0.0-dev";
+var CLI_VERSION = "0.1.23".length > 0 ? "0.1.23" : "0.0.0-dev";
 
 // ../../node_modules/.pnpm/open@10.2.0/node_modules/open/index.js
 import process7 from "node:process";
@@ -24006,330 +24006,757 @@ function resolveSessionParentPathForAgentProcess(resolvedSessionParentPath) {
   return getBridgeRoot();
 }
 
-// src/git/session-git-queue.ts
-import { execFile as execFile7 } from "node:child_process";
-import { readFile, stat } from "node:fs/promises";
-import { promisify as promisify7 } from "node:util";
-import * as path8 from "node:path";
+// ../types/src/work-items.ts
+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()
+});
 
-// src/git/pre-turn-snapshot.ts
-import * as fs8 from "node:fs";
-import * as path7 from "node:path";
-import { execFile as execFile6 } from "node:child_process";
-import { promisify as promisify6 } from "node:util";
+// ../types/src/user-profiles.ts
+init_zod();
+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())
+});
 
-// src/git/discover-repos.ts
-import * as fs7 from "node:fs";
-import * as path6 from "node:path";
+// ../types/src/runtime.ts
+init_zod();
+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()
+});
 
-// ../../node_modules/.pnpm/simple-git@3.32.3/node_modules/simple-git/dist/esm/index.js
-var import_file_exists = __toESM(require_dist(), 1);
-var import_debug = __toESM(require_src(), 1);
-var import_promise_deferred = __toESM(require_dist2(), 1);
-var import_promise_deferred2 = __toESM(require_dist2(), 1);
-import { Buffer as Buffer22 } from "node:buffer";
-import { spawn as spawn3 } from "child_process";
-import { normalize as normalize2 } from "node:path";
-import { EventEmitter } from "node:events";
-var __defProp2 = Object.defineProperty;
-var __getOwnPropDesc2 = Object.getOwnPropertyDescriptor;
-var __getOwnPropNames2 = Object.getOwnPropertyNames;
-var __hasOwnProp2 = Object.prototype.hasOwnProperty;
-var __esm2 = (fn, res) => function __init() {
-  return fn && (res = (0, fn[__getOwnPropNames2(fn)[0]])(fn = 0)), res;
-};
-var __commonJS2 = (cb, mod) => function __require2() {
-  return mod || (0, cb[__getOwnPropNames2(cb)[0]])((mod = { exports: {} }).exports, mod), mod.exports;
-};
-var __export2 = (target, all) => {
-  for (var name in all)
-    __defProp2(target, name, { get: all[name], enumerable: true });
-};
-var __copyProps2 = (to, from, except, desc) => {
-  if (from && typeof from === "object" || typeof from === "function") {
-    for (let key of __getOwnPropNames2(from))
-      if (!__hasOwnProp2.call(to, key) && key !== except)
-        __defProp2(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc2(from, key)) || desc.enumerable });
-  }
-  return to;
-};
-var __toCommonJS = (mod) => __copyProps2(__defProp2({}, "__esModule", { value: true }), mod);
-function pathspec(...paths) {
-  const key = new String(paths);
-  cache.set(key, paths);
-  return key;
-}
-function isPathSpec(path34) {
-  return path34 instanceof String && cache.has(path34);
-}
-function toPaths(pathSpec) {
-  return cache.get(pathSpec) || [];
-}
-var cache;
-var init_pathspec = __esm2({
-  "src/lib/args/pathspec.ts"() {
-    "use strict";
-    cache = /* @__PURE__ */ new WeakMap();
-  }
+// ../types/src/agent.ts
+init_zod();
+var ProjectContextSchema = external_exports.object({
+  projectId: external_exports.string(),
+  context: external_exports.record(external_exports.unknown()).default({}),
+  updatedAt: external_exports.string()
 });
-var GitError;
-var init_git_error = __esm2({
-  "src/lib/errors/git-error.ts"() {
-    "use strict";
-    GitError = class extends Error {
-      constructor(task, message) {
-        super(message);
-        this.task = task;
-        Object.setPrototypeOf(this, new.target.prototype);
-      }
-    };
-  }
+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 GitResponseError;
-var init_git_response_error = __esm2({
-  "src/lib/errors/git-response-error.ts"() {
-    "use strict";
-    init_git_error();
-    GitResponseError = class extends GitError {
-      constructor(git, message) {
-        super(void 0, message || String(git));
-        this.git = git;
-      }
-    };
-  }
+
+// ../types/src/checkpoints.ts
+init_zod();
+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 TaskConfigurationError;
-var init_task_configuration_error = __esm2({
-  "src/lib/errors/task-configuration-error.ts"() {
-    "use strict";
-    init_git_error();
-    TaskConfigurationError = class extends GitError {
-      constructor(message) {
-        super(void 0, message);
-      }
-    };
-  }
+
+// ../types/src/threads.ts
+init_zod();
+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()
 });
-function asFunction(source) {
-  if (typeof source !== "function") {
-    return NOOP;
-  }
-  return source;
-}
-function isUserFunction(source) {
-  return typeof source === "function" && source !== NOOP;
-}
-function splitOn(input, char) {
-  const index = input.indexOf(char);
-  if (index <= 0) {
-    return [input, ""];
-  }
-  return [input.substr(0, index), input.substr(index + 1)];
-}
-function first(input, offset = 0) {
-  return isArrayLike(input) && input.length > offset ? input[offset] : void 0;
-}
-function last(input, offset = 0) {
-  if (isArrayLike(input) && input.length > offset) {
-    return input[input.length - 1 - offset];
-  }
-}
-function isArrayLike(input) {
-  return filterHasLength(input);
-}
-function toLinesWithContent(input = "", trimmed2 = true, separator = "\n") {
-  return input.split(separator).reduce((output, line) => {
-    const lineContent = trimmed2 ? line.trim() : line;
-    if (lineContent) {
-      output.push(lineContent);
-    }
-    return output;
-  }, []);
-}
-function forEachLineWithContent(input, callback) {
-  return toLinesWithContent(input, true).map((line) => callback(line));
-}
-function folderExists(path34) {
-  return (0, import_file_exists.exists)(path34, import_file_exists.FOLDER);
-}
-function append(target, item) {
-  if (Array.isArray(target)) {
-    if (!target.includes(item)) {
-      target.push(item);
-    }
-  } else {
-    target.add(item);
-  }
-  return item;
-}
-function including(target, item) {
-  if (Array.isArray(target) && !target.includes(item)) {
-    target.push(item);
-  }
-  return target;
-}
-function remove(target, item) {
-  if (Array.isArray(target)) {
-    const index = target.indexOf(item);
-    if (index >= 0) {
-      target.splice(index, 1);
-    }
-  } else {
-    target.delete(item);
-  }
-  return item;
-}
-function asArray(source) {
-  return Array.isArray(source) ? source : [source];
-}
-function asCamelCase(str) {
-  return str.replace(/[\s-]+(.)/g, (_all, chr) => {
-    return chr.toUpperCase();
-  });
-}
-function asStringArray(source) {
-  return asArray(source).map((item) => {
-    return item instanceof String ? item : String(item);
-  });
+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()
+});
+
+// ../types/src/content-items.ts
+init_zod();
+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()
+});
+
+// ../types/src/stories.ts
+init_zod();
+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()
+});
+
+// ../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(),
+  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()
+});
+var USER_ENDED_SESSION_TURN_ERROR_TEXT = "Stopped by user";
+var LEGACY_USER_ENDED_SESSION_TURN_ERRORS = ["Removed from queue", "Cancelled before start"];
+function isUserEndedSessionTurnErrorText(errorText) {
+  const raw = (errorText ?? "").trim();
+  if (!raw) return false;
+  const firstLine = raw.split(/\r?\n/)[0]?.trim() ?? "";
+  if (firstLine === USER_ENDED_SESSION_TURN_ERROR_TEXT) return true;
+  if (LEGACY_USER_ENDED_SESSION_TURN_ERRORS.includes(firstLine)) return true;
+  if (raw === USER_ENDED_SESSION_TURN_ERROR_TEXT) return true;
+  return LEGACY_USER_ENDED_SESSION_TURN_ERRORS.includes(raw);
 }
-function asNumber(source, onNaN = 0) {
-  if (source == null) {
-    return onNaN;
-  }
-  const num = parseInt(source, 10);
-  return Number.isNaN(num) ? onNaN : num;
+
+// ../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 prefixedArray(input, prefix) {
-  const output = [];
-  for (let i = 0, max = input.length; i < max; i++) {
-    output.push(prefix, input[i]);
+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 output;
+  return null;
 }
-function bufferToString(input) {
-  return (Array.isArray(input) ? Buffer22.concat(input) : input).toString("utf-8");
+
+// ../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 pick2(source, properties) {
-  const out = {};
-  properties.forEach((key) => {
-    if (source[key] !== void 0) {
-      out[key] = source[key];
+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 [];
     }
-  });
-  return out;
-}
-function delay(duration3 = 0) {
-  return new Promise((done) => setTimeout(done, duration3));
-}
-function orVoid(input) {
-  if (input === false) {
-    return void 0;
   }
-  return input;
-}
-var NULL;
-var NOOP;
-var objectToString;
-var init_util3 = __esm2({
-  "src/lib/utils/util.ts"() {
-    "use strict";
-    init_argument_filters();
-    NULL = "\0";
-    NOOP = () => {
-    };
-    objectToString = Object.prototype.toString.call.bind(Object.prototype.toString);
+  const rows = [];
+  let arr = [];
+  if (Array.isArray(parsed)) {
+    arr = parsed;
+  } else if (parsed && typeof parsed === "object" && Array.isArray(parsed.files)) {
+    arr = parsed.files;
   }
-});
-function filterType(input, filter, def) {
-  if (filter(input)) {
-    return input;
+  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 path34 = skip ? normalizeRepoRelativePath(rawPath) || rawPath : resolveChangeSummaryPathAgainstAllowed(rawPath, allowedPaths);
+    if (!path34) continue;
+    rows.push({ path: path34, summary: clampSummaryToAtMostTwoLines(summary) });
   }
-  return arguments.length > 2 ? def : void 0;
-}
-function filterPrimitives(input, omit2) {
-  const type = isPathSpec(input) ? "string" : typeof input;
-  return /number|string|boolean/.test(type) && (!omit2 || !omit2.includes(type));
-}
-function filterPlainObject(input) {
-  return !!input && objectToString(input) === "[object Object]";
-}
-function filterFunction(input) {
-  return typeof input === "function";
+  return rows;
 }
-var filterArray;
-var filterNumber;
-var filterString;
-var filterStringOrStringArray;
-var filterHasLength;
-var init_argument_filters = __esm2({
-  "src/lib/utils/argument-filters.ts"() {
-    "use strict";
-    init_pathspec();
-    init_util3();
-    filterArray = (input) => {
-      return Array.isArray(input);
-    };
-    filterNumber = (input) => {
-      return typeof input === "number";
-    };
-    filterString = (input) => {
-      return typeof input === "string";
-    };
-    filterStringOrStringArray = (input) => {
-      return filterString(input) || Array.isArray(input) && input.every(filterString);
-    };
-    filterHasLength = (input) => {
-      if (input == null || "number|boolean|function".includes(typeof input)) {
-        return false;
-      }
-      return typeof input.length === "number";
-    };
+
+// ../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/artifacts.ts
+init_zod();
+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 ExitCodes;
-var init_exit_codes = __esm2({
-  "src/lib/utils/exit-codes.ts"() {
+
+// ../types/src/templates.ts
+init_zod();
+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()
+});
+
+// ../types/src/git-repos.ts
+init_zod();
+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/git/session-git-queue.ts
+import { execFile as execFile7 } from "node:child_process";
+import { readFile, stat } from "node:fs/promises";
+import { promisify as promisify7 } from "node:util";
+import * as path8 from "node:path";
+
+// src/git/pre-turn-snapshot.ts
+import * as fs8 from "node:fs";
+import * as path7 from "node:path";
+import { execFile as execFile6 } from "node:child_process";
+import { promisify as promisify6 } from "node:util";
+
+// src/git/discover-repos.ts
+import * as fs7 from "node:fs";
+import * as path6 from "node:path";
+
+// ../../node_modules/.pnpm/simple-git@3.32.3/node_modules/simple-git/dist/esm/index.js
+var import_file_exists = __toESM(require_dist(), 1);
+var import_debug = __toESM(require_src(), 1);
+var import_promise_deferred = __toESM(require_dist2(), 1);
+var import_promise_deferred2 = __toESM(require_dist2(), 1);
+import { Buffer as Buffer22 } from "node:buffer";
+import { spawn as spawn3 } from "child_process";
+import { normalize as normalize2 } from "node:path";
+import { EventEmitter } from "node:events";
+var __defProp2 = Object.defineProperty;
+var __getOwnPropDesc2 = Object.getOwnPropertyDescriptor;
+var __getOwnPropNames2 = Object.getOwnPropertyNames;
+var __hasOwnProp2 = Object.prototype.hasOwnProperty;
+var __esm2 = (fn, res) => function __init() {
+  return fn && (res = (0, fn[__getOwnPropNames2(fn)[0]])(fn = 0)), res;
+};
+var __commonJS2 = (cb, mod) => function __require2() {
+  return mod || (0, cb[__getOwnPropNames2(cb)[0]])((mod = { exports: {} }).exports, mod), mod.exports;
+};
+var __export2 = (target, all) => {
+  for (var name in all)
+    __defProp2(target, name, { get: all[name], enumerable: true });
+};
+var __copyProps2 = (to, from, except, desc) => {
+  if (from && typeof from === "object" || typeof from === "function") {
+    for (let key of __getOwnPropNames2(from))
+      if (!__hasOwnProp2.call(to, key) && key !== except)
+        __defProp2(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc2(from, key)) || desc.enumerable });
+  }
+  return to;
+};
+var __toCommonJS = (mod) => __copyProps2(__defProp2({}, "__esModule", { value: true }), mod);
+function pathspec(...paths) {
+  const key = new String(paths);
+  cache.set(key, paths);
+  return key;
+}
+function isPathSpec(path34) {
+  return path34 instanceof String && cache.has(path34);
+}
+function toPaths(pathSpec) {
+  return cache.get(pathSpec) || [];
+}
+var cache;
+var init_pathspec = __esm2({
+  "src/lib/args/pathspec.ts"() {
     "use strict";
-    ExitCodes = /* @__PURE__ */ ((ExitCodes2) => {
-      ExitCodes2[ExitCodes2["SUCCESS"] = 0] = "SUCCESS";
-      ExitCodes2[ExitCodes2["ERROR"] = 1] = "ERROR";
-      ExitCodes2[ExitCodes2["NOT_FOUND"] = -2] = "NOT_FOUND";
-      ExitCodes2[ExitCodes2["UNCLEAN"] = 128] = "UNCLEAN";
-      return ExitCodes2;
-    })(ExitCodes || {});
+    cache = /* @__PURE__ */ new WeakMap();
   }
 });
-var GitOutputStreams;
-var init_git_output_streams = __esm2({
-  "src/lib/utils/git-output-streams.ts"() {
+var GitError;
+var init_git_error = __esm2({
+  "src/lib/errors/git-error.ts"() {
     "use strict";
-    GitOutputStreams = class _GitOutputStreams {
-      constructor(stdOut, stdErr) {
-        this.stdOut = stdOut;
-        this.stdErr = stdErr;
-      }
-      asStrings() {
-        return new _GitOutputStreams(this.stdOut.toString("utf8"), this.stdErr.toString("utf8"));
+    GitError = class extends Error {
+      constructor(task, message) {
+        super(message);
+        this.task = task;
+        Object.setPrototypeOf(this, new.target.prototype);
       }
     };
   }
 });
-function useMatchesDefault() {
-  throw new Error(`LineParser:useMatches not implemented`);
-}
-var LineParser;
-var RemoteLineParser;
-var init_line_parser = __esm2({
-  "src/lib/utils/line-parser.ts"() {
+var GitResponseError;
+var init_git_response_error = __esm2({
+  "src/lib/errors/git-response-error.ts"() {
     "use strict";
-    LineParser = class {
-      constructor(regExp, useMatches) {
-        this.matches = [];
-        this.useMatches = useMatchesDefault;
-        this.parse = (line, target) => {
-          this.resetMatches();
-          if (!this._regExp.every((reg, index) => this.addMatch(reg, index, line(index)))) {
-            return false;
+    init_git_error();
+    GitResponseError = class extends GitError {
+      constructor(git, message) {
+        super(void 0, message || String(git));
+        this.git = git;
+      }
+    };
+  }
+});
+var TaskConfigurationError;
+var init_task_configuration_error = __esm2({
+  "src/lib/errors/task-configuration-error.ts"() {
+    "use strict";
+    init_git_error();
+    TaskConfigurationError = class extends GitError {
+      constructor(message) {
+        super(void 0, message);
+      }
+    };
+  }
+});
+function asFunction(source) {
+  if (typeof source !== "function") {
+    return NOOP;
+  }
+  return source;
+}
+function isUserFunction(source) {
+  return typeof source === "function" && source !== NOOP;
+}
+function splitOn(input, char) {
+  const index = input.indexOf(char);
+  if (index <= 0) {
+    return [input, ""];
+  }
+  return [input.substr(0, index), input.substr(index + 1)];
+}
+function first(input, offset = 0) {
+  return isArrayLike(input) && input.length > offset ? input[offset] : void 0;
+}
+function last(input, offset = 0) {
+  if (isArrayLike(input) && input.length > offset) {
+    return input[input.length - 1 - offset];
+  }
+}
+function isArrayLike(input) {
+  return filterHasLength(input);
+}
+function toLinesWithContent(input = "", trimmed2 = true, separator = "\n") {
+  return input.split(separator).reduce((output, line) => {
+    const lineContent = trimmed2 ? line.trim() : line;
+    if (lineContent) {
+      output.push(lineContent);
+    }
+    return output;
+  }, []);
+}
+function forEachLineWithContent(input, callback) {
+  return toLinesWithContent(input, true).map((line) => callback(line));
+}
+function folderExists(path34) {
+  return (0, import_file_exists.exists)(path34, import_file_exists.FOLDER);
+}
+function append(target, item) {
+  if (Array.isArray(target)) {
+    if (!target.includes(item)) {
+      target.push(item);
+    }
+  } else {
+    target.add(item);
+  }
+  return item;
+}
+function including(target, item) {
+  if (Array.isArray(target) && !target.includes(item)) {
+    target.push(item);
+  }
+  return target;
+}
+function remove(target, item) {
+  if (Array.isArray(target)) {
+    const index = target.indexOf(item);
+    if (index >= 0) {
+      target.splice(index, 1);
+    }
+  } else {
+    target.delete(item);
+  }
+  return item;
+}
+function asArray(source) {
+  return Array.isArray(source) ? source : [source];
+}
+function asCamelCase(str) {
+  return str.replace(/[\s-]+(.)/g, (_all, chr) => {
+    return chr.toUpperCase();
+  });
+}
+function asStringArray(source) {
+  return asArray(source).map((item) => {
+    return item instanceof String ? item : String(item);
+  });
+}
+function asNumber(source, onNaN = 0) {
+  if (source == null) {
+    return onNaN;
+  }
+  const num = parseInt(source, 10);
+  return Number.isNaN(num) ? onNaN : num;
+}
+function prefixedArray(input, prefix) {
+  const output = [];
+  for (let i = 0, max = input.length; i < max; i++) {
+    output.push(prefix, input[i]);
+  }
+  return output;
+}
+function bufferToString(input) {
+  return (Array.isArray(input) ? Buffer22.concat(input) : input).toString("utf-8");
+}
+function pick2(source, properties) {
+  const out = {};
+  properties.forEach((key) => {
+    if (source[key] !== void 0) {
+      out[key] = source[key];
+    }
+  });
+  return out;
+}
+function delay(duration3 = 0) {
+  return new Promise((done) => setTimeout(done, duration3));
+}
+function orVoid(input) {
+  if (input === false) {
+    return void 0;
+  }
+  return input;
+}
+var NULL;
+var NOOP;
+var objectToString;
+var init_util3 = __esm2({
+  "src/lib/utils/util.ts"() {
+    "use strict";
+    init_argument_filters();
+    NULL = "\0";
+    NOOP = () => {
+    };
+    objectToString = Object.prototype.toString.call.bind(Object.prototype.toString);
+  }
+});
+function filterType(input, filter, def) {
+  if (filter(input)) {
+    return input;
+  }
+  return arguments.length > 2 ? def : void 0;
+}
+function filterPrimitives(input, omit2) {
+  const type = isPathSpec(input) ? "string" : typeof input;
+  return /number|string|boolean/.test(type) && (!omit2 || !omit2.includes(type));
+}
+function filterPlainObject(input) {
+  return !!input && objectToString(input) === "[object Object]";
+}
+function filterFunction(input) {
+  return typeof input === "function";
+}
+var filterArray;
+var filterNumber;
+var filterString;
+var filterStringOrStringArray;
+var filterHasLength;
+var init_argument_filters = __esm2({
+  "src/lib/utils/argument-filters.ts"() {
+    "use strict";
+    init_pathspec();
+    init_util3();
+    filterArray = (input) => {
+      return Array.isArray(input);
+    };
+    filterNumber = (input) => {
+      return typeof input === "number";
+    };
+    filterString = (input) => {
+      return typeof input === "string";
+    };
+    filterStringOrStringArray = (input) => {
+      return filterString(input) || Array.isArray(input) && input.every(filterString);
+    };
+    filterHasLength = (input) => {
+      if (input == null || "number|boolean|function".includes(typeof input)) {
+        return false;
+      }
+      return typeof input.length === "number";
+    };
+  }
+});
+var ExitCodes;
+var init_exit_codes = __esm2({
+  "src/lib/utils/exit-codes.ts"() {
+    "use strict";
+    ExitCodes = /* @__PURE__ */ ((ExitCodes2) => {
+      ExitCodes2[ExitCodes2["SUCCESS"] = 0] = "SUCCESS";
+      ExitCodes2[ExitCodes2["ERROR"] = 1] = "ERROR";
+      ExitCodes2[ExitCodes2["NOT_FOUND"] = -2] = "NOT_FOUND";
+      ExitCodes2[ExitCodes2["UNCLEAN"] = 128] = "UNCLEAN";
+      return ExitCodes2;
+    })(ExitCodes || {});
+  }
+});
+var GitOutputStreams;
+var init_git_output_streams = __esm2({
+  "src/lib/utils/git-output-streams.ts"() {
+    "use strict";
+    GitOutputStreams = class _GitOutputStreams {
+      constructor(stdOut, stdErr) {
+        this.stdOut = stdOut;
+        this.stdErr = stdErr;
+      }
+      asStrings() {
+        return new _GitOutputStreams(this.stdOut.toString("utf8"), this.stdErr.toString("utf8"));
+      }
+    };
+  }
+});
+function useMatchesDefault() {
+  throw new Error(`LineParser:useMatches not implemented`);
+}
+var LineParser;
+var RemoteLineParser;
+var init_line_parser = __esm2({
+  "src/lib/utils/line-parser.ts"() {
+    "use strict";
+    LineParser = class {
+      constructor(regExp, useMatches) {
+        this.matches = [];
+        this.useMatches = useMatchesDefault;
+        this.parse = (line, target) => {
+          this.resetMatches();
+          if (!this._regExp.every((reg, index) => this.addMatch(reg, index, line(index)))) {
+            return false;
           }
           return this.useMatches(target, this.prepareMatches()) !== false;
         };
@@ -28521,748 +28948,332 @@ function timeoutPlugin({
     };
   }
 }
-init_pathspec();
-function suffixPathsPlugin() {
-  return {
-    type: "spawn.args",
-    action(data) {
-      const prefix = [];
-      let suffix;
-      function append2(args) {
-        (suffix = suffix || []).push(...args);
-      }
-      for (let i = 0; i < data.length; i++) {
-        const param = data[i];
-        if (isPathSpec(param)) {
-          append2(toPaths(param));
-          continue;
-        }
-        if (param === "--") {
-          append2(
-            data.slice(i + 1).flatMap((item) => isPathSpec(item) && toPaths(item) || item)
-          );
-          break;
-        }
-        prefix.push(param);
-      }
-      return !suffix ? prefix : [...prefix, "--", ...suffix.map(String)];
-    }
-  };
-}
-init_utils();
-var Git = require_git();
-function gitInstanceFactory(baseDir, options) {
-  const plugins = new PluginStore();
-  const config2 = createInstanceConfig(
-    baseDir && (typeof baseDir === "string" ? { baseDir } : baseDir) || {},
-    options
-  );
-  if (!folderExists(config2.baseDir)) {
-    throw new GitConstructError(
-      config2,
-      `Cannot use simple-git on a directory that does not exist`
-    );
-  }
-  if (Array.isArray(config2.config)) {
-    plugins.add(commandConfigPrefixingPlugin(config2.config));
-  }
-  plugins.add(blockUnsafeOperationsPlugin(config2.unsafe));
-  plugins.add(suffixPathsPlugin());
-  plugins.add(completionDetectionPlugin(config2.completion));
-  config2.abort && plugins.add(abortPlugin(config2.abort));
-  config2.progress && plugins.add(progressMonitorPlugin(config2.progress));
-  config2.timeout && plugins.add(timeoutPlugin(config2.timeout));
-  config2.spawnOptions && plugins.add(spawnOptionsPlugin(config2.spawnOptions));
-  plugins.add(errorDetectionPlugin(errorDetectionHandler(true)));
-  config2.errors && plugins.add(errorDetectionPlugin(config2.errors));
-  customBinaryPlugin(plugins, config2.binary, config2.unsafe?.allowUnsafeCustomBinary);
-  return new Git(config2, plugins);
-}
-init_git_response_error();
-var simpleGit = gitInstanceFactory;
-
-// src/git/remote-origin-url.ts
-async function getRemoteOriginUrl(gitDir) {
-  try {
-    const git = simpleGit(gitDir);
-    const remotes = await git.getRemotes(true);
-    const list = Array.isArray(remotes) ? remotes : [];
-    const origin = list.find((r) => r.name === "origin");
-    if (!origin?.refs?.fetch && !origin?.refs?.push) return "";
-    return (origin.refs.fetch ?? origin.refs.push ?? "").trim();
-  } catch {
-    return "";
-  }
-}
-
-// src/git/is-git-repo.ts
-async function isGitRepoDirectory(dirPath) {
-  try {
-    return await simpleGit(dirPath).checkIsRepo();
-  } catch {
-    return false;
-  }
-}
-
-// src/git/discover-repos.ts
-async function discoverGitRepos(cwd = getBridgeRoot()) {
-  const result = [];
-  const cwdResolved = path6.resolve(cwd);
-  if (await isGitRepoDirectory(cwdResolved)) {
-    const remoteUrl = await getRemoteOriginUrl(cwdResolved);
-    result.push({ absolutePath: cwdResolved, remoteUrl });
-  }
-  let entries;
-  try {
-    entries = fs7.readdirSync(cwdResolved, { withFileTypes: true });
-  } catch {
-    return result;
-  }
-  for (const ent of entries) {
-    if (!ent.isDirectory()) continue;
-    const childPath = path6.join(cwdResolved, ent.name);
-    if (await isGitRepoDirectory(childPath)) {
-      const remoteUrl = await getRemoteOriginUrl(childPath);
-      result.push({ absolutePath: childPath, remoteUrl });
-    }
-  }
-  return result;
-}
-async function discoverGitReposUnderRoot(rootPath) {
-  const root = path6.resolve(rootPath);
-  const roots = [];
-  async function walk(dir) {
-    if (await isGitRepoDirectory(dir)) {
-      roots.push(path6.resolve(dir));
-      return;
-    }
-    let entries;
-    try {
-      entries = fs7.readdirSync(dir, { withFileTypes: true });
-    } catch {
-      return;
-    }
-    for (const ent of entries) {
-      if (!ent.isDirectory() || ent.name === ".git") continue;
-      await walk(path6.join(dir, ent.name));
-    }
-  }
-  await walk(root);
-  const uniq = [...new Set(roots)];
-  const out = [];
-  for (const p of uniq) {
-    const remoteUrl = await getRemoteOriginUrl(p);
-    out.push({ absolutePath: p, remoteUrl });
-  }
-  return out;
-}
-
-// src/git/pre-turn-snapshot.ts
-var execFileAsync5 = promisify6(execFile6);
-function snapshotsDirForCwd(agentCwd) {
-  return path7.join(agentCwd, ".buildautomaton", "snapshots");
-}
-async function gitStashCreate(repoRoot, log2) {
-  try {
-    const { stdout } = await execFileAsync5("git", ["stash", "create"], {
-      cwd: repoRoot,
-      maxBuffer: 10 * 1024 * 1024
-    });
-    return stdout.trim();
-  } catch (e) {
-    log2(
-      `[snapshot] Git stash create failed in ${repoRoot}: ${e instanceof Error ? e.message : String(e)}`
-    );
-    return "";
-  }
-}
-async function gitRun(repoRoot, args, log2, label) {
-  try {
-    await execFileAsync5("git", args, { cwd: repoRoot, maxBuffer: 10 * 1024 * 1024 });
-    return { ok: true };
-  } catch (e) {
-    const msg = e instanceof Error ? e.message : String(e);
-    log2(`[snapshot] Git ${label} failed in ${repoRoot}: ${msg}`);
-    return { ok: false, error: msg };
-  }
-}
-async function resolveSnapshotRepoRoots(options) {
-  const { worktreePaths, fallbackCwd, sessionId, log: log2 } = options;
-  if (worktreePaths?.length) {
-    const uniq = [...new Set(worktreePaths.map((p) => path7.resolve(p)))];
-    return uniq;
-  }
-  try {
-    const repos = await discoverGitReposUnderRoot(fallbackCwd);
-    const mapped = repos.map((r) => r.absolutePath);
-    const sid = sessionId?.trim();
-    if (sid) {
-      const filtered = mapped.filter((root) => path7.basename(root) === sid);
-      if (filtered.length > 0) return filtered;
-    }
-    return mapped;
-  } catch (e) {
-    log2(`[snapshot] Discover repositories failed: ${e instanceof Error ? e.message : String(e)}`);
-    return [];
-  }
-}
-async function capturePreTurnSnapshot(options) {
-  const { runId, repoRoots, agentCwd, log: log2 } = options;
-  if (!runId || !repoRoots.length) {
-    return { ok: false, error: "No git repos to snapshot" };
-  }
-  const repos = [];
-  for (const root of repoRoots) {
-    const stashSha = await gitStashCreate(root, log2);
-    repos.push({ path: root, stashSha });
-  }
-  const dir = snapshotsDirForCwd(agentCwd);
-  try {
-    fs8.mkdirSync(dir, { recursive: true });
-  } catch (e) {
-    return { ok: false, error: e instanceof Error ? e.message : String(e) };
-  }
-  const payload = {
-    runId,
-    createdAt: (/* @__PURE__ */ new Date()).toISOString(),
-    repos
-  };
-  const filePath = path7.join(dir, `${runId}.json`);
-  try {
-    fs8.writeFileSync(filePath, JSON.stringify(payload, null, 2), "utf8");
-  } catch (e) {
-    return { ok: false, error: e instanceof Error ? e.message : String(e) };
-  }
-  const repoList = repos.map((r) => r.path).join(", ");
-  log2(
-    `[snapshot] Saved pre-turn snapshot ${runId.slice(0, 8)}\u2026 (${repos.length} repo(s)): ${repoList}`
-  );
-  return { ok: true, filePath, repos };
-}
-async function applyPreTurnSnapshot(filePath, log2) {
-  let data;
-  try {
-    const raw = fs8.readFileSync(filePath, "utf8");
-    data = JSON.parse(raw);
-  } catch (e) {
-    return { ok: false, error: e instanceof Error ? e.message : String(e) };
-  }
-  if (!Array.isArray(data.repos)) {
-    return { ok: false, error: "Invalid snapshot file" };
-  }
-  for (const r of data.repos) {
-    if (!r.path) continue;
-    const reset = await gitRun(r.path, ["reset", "--hard", "HEAD"], log2, "reset --hard");
-    if (!reset.ok) return reset;
-    const clean = await gitRun(r.path, ["clean", "-fd"], log2, "clean -fd");
-    if (!clean.ok) return clean;
-    if (r.stashSha) {
-      const ap = await gitRun(r.path, ["stash", "apply", r.stashSha], log2, "stash apply");
-      if (!ap.ok) return ap;
-    }
-  }
-  log2(`[snapshot] Restored pre-turn state for ${data.runId.slice(0, 8)}\u2026`);
-  return { ok: true };
-}
-function snapshotFilePath(agentCwd, runId) {
-  return path7.join(snapshotsDirForCwd(agentCwd), `${runId}.json`);
-}
-
-// src/git/session-git-queue.ts
-var execFileAsync6 = promisify7(execFile7);
-var MAX_FULL_FILE_TEXT_BYTES = 512 * 1024;
-async function readWorkspaceFileAsUtf8(absPath) {
-  try {
-    const st = await stat(absPath);
-    if (!st.isFile() || st.size > MAX_FULL_FILE_TEXT_BYTES) return void 0;
-    return await readFile(absPath, "utf8");
-  } catch {
-    return void 0;
-  }
-}
-async function collectTurnGitDiffFromPreTurnSnapshot(options) {
-  const { sessionId, runId, agentCwd, sendSessionUpdate, log: log2 } = options;
-  const filePath = snapshotFilePath(agentCwd, runId);
-  let data;
-  try {
-    const raw = await readFile(filePath, "utf8");
-    data = JSON.parse(raw);
-  } catch (e) {
-    log2(
-      `[session-git-queue] No pre-turn snapshot for run ${runId.slice(0, 8)}\u2026: ${e instanceof Error ? e.message : String(e)}`
-    );
-    return;
-  }
-  if (!Array.isArray(data.repos) || !data.repos.length) {
-    log2(`[session-git-queue] Empty repos in snapshot ${runId.slice(0, 8)}\u2026; skipping aggregate diff.`);
-    return;
-  }
-  const multiRepo = data.repos.length > 1;
-  for (const repo of data.repos) {
-    if (!repo.stashSha) continue;
-    let namesRaw;
-    try {
-      const { stdout } = await execFileAsync6("git", ["diff", "--name-only", repo.stashSha], {
-        cwd: repo.path,
-        maxBuffer: 10 * 1024 * 1024
-      });
-      namesRaw = stdout;
-    } catch (e) {
-      log2(
-        `[session-git-queue] Git diff --name-only failed in ${repo.path}: ${e instanceof Error ? e.message : String(e)}`
-      );
-      continue;
-    }
-    const lines = namesRaw.split("\n").map((l) => l.trim()).filter(Boolean);
-    const slug = path8.basename(repo.path).replace(/[^\w.-]+/g, "_") || "repo";
-    for (const rel of lines) {
-      if (rel.includes("..")) continue;
-      try {
-        const { stdout: patchContent } = await execFileAsync6(
-          "git",
-          ["diff", "--no-color", repo.stashSha, "--", rel],
-          {
-            cwd: repo.path,
-            maxBuffer: 50 * 1024 * 1024
-          }
-        );
-        if (!patchContent.trim()) continue;
-        const displayPath = multiRepo ? `${slug}/${rel}` : rel;
-        const workspaceFilePath = path8.join(repo.path, rel);
-        const newText = await readWorkspaceFileAsUtf8(workspaceFilePath);
-        sendSessionUpdate({
-          type: "session_file_change",
-          sessionId,
-          runId,
-          path: displayPath,
-          patchContent,
-          ...newText !== void 0 ? { newText } : {}
-        });
-      } catch (e) {
-        log2(
-          `[session-git-queue] Git diff failed for ${rel}: ${e instanceof Error ? e.message : String(e)}`
-        );
-      }
-    }
-  }
-}
-
-// ../types/src/work-items.ts
-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()
-});
-
-// ../types/src/user-profiles.ts
-init_zod();
-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())
-});
-
-// ../types/src/runtime.ts
-init_zod();
-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()
-});
-
-// ../types/src/agent.ts
-init_zod();
-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()
-});
-
-// ../types/src/checkpoints.ts
-init_zod();
-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()
-});
-
-// ../types/src/threads.ts
-init_zod();
-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()
-});
-
-// ../types/src/content-items.ts
-init_zod();
-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()
-});
-
-// ../types/src/stories.ts
-init_zod();
-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()
-});
-
-// ../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(),
-  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()
-});
-
-// ../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, "/");
+init_pathspec();
+function suffixPathsPlugin() {
+  return {
+    type: "spawn.args",
+    action(data) {
+      const prefix = [];
+      let suffix;
+      function append2(args) {
+        (suffix = suffix || []).push(...args);
+      }
+      for (let i = 0; i < data.length; i++) {
+        const param = data[i];
+        if (isPathSpec(param)) {
+          append2(toPaths(param));
+          continue;
+        }
+        if (param === "--") {
+          append2(
+            data.slice(i + 1).flatMap((item) => isPathSpec(item) && toPaths(item) || item)
+          );
+          break;
+        }
+        prefix.push(param);
+      }
+      return !suffix ? prefix : [...prefix, "--", ...suffix.map(String)];
+    }
+  };
 }
-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;
+init_utils();
+var Git = require_git();
+function gitInstanceFactory(baseDir, options) {
+  const plugins = new PluginStore();
+  const config2 = createInstanceConfig(
+    baseDir && (typeof baseDir === "string" ? { baseDir } : baseDir) || {},
+    options
+  );
+  if (!folderExists(config2.baseDir)) {
+    throw new GitConstructError(
+      config2,
+      `Cannot use simple-git on a directory that does not exist`
+    );
+  }
+  if (Array.isArray(config2.config)) {
+    plugins.add(commandConfigPrefixingPlugin(config2.config));
+  }
+  plugins.add(blockUnsafeOperationsPlugin(config2.unsafe));
+  plugins.add(suffixPathsPlugin());
+  plugins.add(completionDetectionPlugin(config2.completion));
+  config2.abort && plugins.add(abortPlugin(config2.abort));
+  config2.progress && plugins.add(progressMonitorPlugin(config2.progress));
+  config2.timeout && plugins.add(timeoutPlugin(config2.timeout));
+  config2.spawnOptions && plugins.add(spawnOptionsPlugin(config2.spawnOptions));
+  plugins.add(errorDetectionPlugin(errorDetectionHandler(true)));
+  config2.errors && plugins.add(errorDetectionPlugin(config2.errors));
+  customBinaryPlugin(plugins, config2.binary, config2.unsafe?.allowUnsafeCustomBinary);
+  return new Git(config2, plugins);
+}
+init_git_response_error();
+var simpleGit = gitInstanceFactory;
+
+// src/git/remote-origin-url.ts
+async function getRemoteOriginUrl(gitDir) {
+  try {
+    const git = simpleGit(gitDir);
+    const remotes = await git.getRemotes(true);
+    const list = Array.isArray(remotes) ? remotes : [];
+    const origin = list.find((r) => r.name === "origin");
+    if (!origin?.refs?.fetch && !origin?.refs?.push) return "";
+    return (origin.refs.fetch ?? origin.refs.push ?? "").trim();
+  } catch {
+    return "";
   }
-  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");
+// src/git/is-git-repo.ts
+async function isGitRepoDirectory(dirPath) {
+  try {
+    return await simpleGit(dirPath).checkIsRepo();
+  } catch {
+    return false;
+  }
 }
-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;
+
+// src/git/discover-repos.ts
+async function discoverGitRepos(cwd = getBridgeRoot()) {
+  const result = [];
+  const cwdResolved = path6.resolve(cwd);
+  if (await isGitRepoDirectory(cwdResolved)) {
+    const remoteUrl = await getRemoteOriginUrl(cwdResolved);
+    result.push({ absolutePath: cwdResolved, remoteUrl });
+  }
+  let entries;
   try {
-    parsed = JSON.parse(text);
+    entries = fs7.readdirSync(cwdResolved, { withFileTypes: true });
   } catch {
-    const start = text.indexOf("[");
-    const end = text.lastIndexOf("]");
-    if (start < 0 || end <= start) return [];
+    return result;
+  }
+  for (const ent of entries) {
+    if (!ent.isDirectory()) continue;
+    const childPath = path6.join(cwdResolved, ent.name);
+    if (await isGitRepoDirectory(childPath)) {
+      const remoteUrl = await getRemoteOriginUrl(childPath);
+      result.push({ absolutePath: childPath, remoteUrl });
+    }
+  }
+  return result;
+}
+async function discoverGitReposUnderRoot(rootPath) {
+  const root = path6.resolve(rootPath);
+  const roots = [];
+  async function walk(dir) {
+    if (await isGitRepoDirectory(dir)) {
+      roots.push(path6.resolve(dir));
+      return;
+    }
+    let entries;
     try {
-      parsed = JSON.parse(text.slice(start, end + 1));
+      entries = fs7.readdirSync(dir, { withFileTypes: true });
     } catch {
-      return [];
+      return;
+    }
+    for (const ent of entries) {
+      if (!ent.isDirectory() || ent.name === ".git") continue;
+      await walk(path6.join(dir, ent.name));
     }
   }
-  const rows = [];
-  let arr = [];
-  if (Array.isArray(parsed)) {
-    arr = parsed;
-  } else if (parsed && typeof parsed === "object" && Array.isArray(parsed.files)) {
-    arr = parsed.files;
+  await walk(root);
+  const uniq = [...new Set(roots)];
+  const out = [];
+  for (const p of uniq) {
+    const remoteUrl = await getRemoteOriginUrl(p);
+    out.push({ absolutePath: p, remoteUrl });
   }
-  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 path34 = skip ? normalizeRepoRelativePath(rawPath) || rawPath : resolveChangeSummaryPathAgainstAllowed(rawPath, allowedPaths);
-    if (!path34) continue;
-    rows.push({ path: path34, summary: clampSummaryToAtMostTwoLines(summary) });
+  return out;
+}
+
+// src/git/pre-turn-snapshot.ts
+var execFileAsync5 = promisify6(execFile6);
+function snapshotsDirForCwd(agentCwd) {
+  return path7.join(agentCwd, ".buildautomaton", "snapshots");
+}
+async function gitStashCreate(repoRoot, log2) {
+  try {
+    const { stdout } = await execFileAsync5("git", ["stash", "create"], {
+      cwd: repoRoot,
+      maxBuffer: 10 * 1024 * 1024
+    });
+    return stdout.trim();
+  } catch (e) {
+    log2(
+      `[snapshot] Git stash create failed in ${repoRoot}: ${e instanceof Error ? e.message : String(e)}`
+    );
+    return "";
+  }
+}
+async function gitRun(repoRoot, args, log2, label) {
+  try {
+    await execFileAsync5("git", args, { cwd: repoRoot, maxBuffer: 10 * 1024 * 1024 });
+    return { ok: true };
+  } catch (e) {
+    const msg = e instanceof Error ? e.message : String(e);
+    log2(`[snapshot] Git ${label} failed in ${repoRoot}: ${msg}`);
+    return { ok: false, error: msg };
+  }
+}
+async function resolveSnapshotRepoRoots(options) {
+  const { worktreePaths, fallbackCwd, sessionId, log: log2 } = options;
+  if (worktreePaths?.length) {
+    const uniq = [...new Set(worktreePaths.map((p) => path7.resolve(p)))];
+    return uniq;
+  }
+  try {
+    const repos = await discoverGitReposUnderRoot(fallbackCwd);
+    const mapped = repos.map((r) => r.absolutePath);
+    const sid = sessionId?.trim();
+    if (sid) {
+      const filtered = mapped.filter((root) => path7.basename(root) === sid);
+      if (filtered.length > 0) return filtered;
+    }
+    return mapped;
+  } catch (e) {
+    log2(`[snapshot] Discover repositories failed: ${e instanceof Error ? e.message : String(e)}`);
+    return [];
+  }
+}
+async function capturePreTurnSnapshot(options) {
+  const { runId, repoRoots, agentCwd, log: log2 } = options;
+  if (!runId || !repoRoots.length) {
+    return { ok: false, error: "No git repos to snapshot" };
+  }
+  const repos = [];
+  for (const root of repoRoots) {
+    const stashSha = await gitStashCreate(root, log2);
+    repos.push({ path: root, stashSha });
+  }
+  const dir = snapshotsDirForCwd(agentCwd);
+  try {
+    fs8.mkdirSync(dir, { recursive: true });
+  } catch (e) {
+    return { ok: false, error: e instanceof Error ? e.message : String(e) };
+  }
+  const payload = {
+    runId,
+    createdAt: (/* @__PURE__ */ new Date()).toISOString(),
+    repos
+  };
+  const filePath = path7.join(dir, `${runId}.json`);
+  try {
+    fs8.writeFileSync(filePath, JSON.stringify(payload, null, 2), "utf8");
+  } catch (e) {
+    return { ok: false, error: e instanceof Error ? e.message : String(e) };
+  }
+  const repoList = repos.map((r) => r.path).join(", ");
+  log2(
+    `[snapshot] Saved pre-turn snapshot ${runId.slice(0, 8)}\u2026 (${repos.length} repo(s)): ${repoList}`
+  );
+  return { ok: true, filePath, repos };
+}
+async function applyPreTurnSnapshot(filePath, log2) {
+  let data;
+  try {
+    const raw = fs8.readFileSync(filePath, "utf8");
+    data = JSON.parse(raw);
+  } catch (e) {
+    return { ok: false, error: e instanceof Error ? e.message : String(e) };
+  }
+  if (!Array.isArray(data.repos)) {
+    return { ok: false, error: "Invalid snapshot file" };
   }
-  return rows;
+  for (const r of data.repos) {
+    if (!r.path) continue;
+    const reset = await gitRun(r.path, ["reset", "--hard", "HEAD"], log2, "reset --hard");
+    if (!reset.ok) return reset;
+    const clean = await gitRun(r.path, ["clean", "-fd"], log2, "clean -fd");
+    if (!clean.ok) return clean;
+    if (r.stashSha) {
+      const ap = await gitRun(r.path, ["stash", "apply", r.stashSha], log2, "stash apply");
+      if (!ap.ok) return ap;
+    }
+  }
+  log2(`[snapshot] Restored pre-turn state for ${data.runId.slice(0, 8)}\u2026`);
+  return { ok: true };
+}
+function snapshotFilePath(agentCwd, runId) {
+  return path7.join(snapshotsDirForCwd(agentCwd), `${runId}.json`);
 }
 
-// ../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)`;
+// src/git/session-git-queue.ts
+var execFileAsync6 = promisify7(execFile7);
+var MAX_FULL_FILE_TEXT_BYTES = 512 * 1024;
+async function readWorkspaceFileAsUtf8(absPath) {
+  try {
+    const st = await stat(absPath);
+    if (!st.isFile() || st.size > MAX_FULL_FILE_TEXT_BYTES) return void 0;
+    return await readFile(absPath, "utf8");
+  } catch {
+    return void 0;
+  }
 }
-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("");
+async function collectTurnGitDiffFromPreTurnSnapshot(options) {
+  const { sessionId, runId, agentCwd, sendSessionUpdate, log: log2 } = options;
+  const filePath = snapshotFilePath(agentCwd, runId);
+  let data;
+  try {
+    const raw = await readFile(filePath, "utf8");
+    data = JSON.parse(raw);
+  } catch (e) {
+    log2(
+      `[session-git-queue] No pre-turn snapshot for run ${runId.slice(0, 8)}\u2026: ${e instanceof Error ? e.message : String(e)}`
+    );
+    return;
+  }
+  if (!Array.isArray(data.repos) || !data.repos.length) {
+    log2(`[session-git-queue] Empty repos in snapshot ${runId.slice(0, 8)}\u2026; skipping aggregate diff.`);
+    return;
+  }
+  const multiRepo = data.repos.length > 1;
+  for (const repo of data.repos) {
+    if (!repo.stashSha) continue;
+    let namesRaw;
+    try {
+      const { stdout } = await execFileAsync6("git", ["diff", "--name-only", repo.stashSha], {
+        cwd: repo.path,
+        maxBuffer: 10 * 1024 * 1024
+      });
+      namesRaw = stdout;
+    } catch (e) {
+      log2(
+        `[session-git-queue] Git diff --name-only failed in ${repo.path}: ${e instanceof Error ? e.message : String(e)}`
+      );
       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)");
+    const lines = namesRaw.split("\n").map((l) => l.trim()).filter(Boolean);
+    const slug = path8.basename(repo.path).replace(/[^\w.-]+/g, "_") || "repo";
+    for (const rel of lines) {
+      if (rel.includes("..")) continue;
+      try {
+        const { stdout: patchContent } = await execFileAsync6(
+          "git",
+          ["diff", "--no-color", repo.stashSha, "--", rel],
+          {
+            cwd: repo.path,
+            maxBuffer: 50 * 1024 * 1024
+          }
+        );
+        if (!patchContent.trim()) continue;
+        const displayPath = multiRepo ? `${slug}/${rel}` : rel;
+        const workspaceFilePath = path8.join(repo.path, rel);
+        const newText = await readWorkspaceFileAsUtf8(workspaceFilePath);
+        sendSessionUpdate({
+          type: "session_file_change",
+          sessionId,
+          runId,
+          path: displayPath,
+          patchContent,
+          ...newText !== void 0 ? { newText } : {}
+        });
+      } catch (e) {
+        log2(
+          `[session-git-queue] Git diff failed for ${rel}: ${e instanceof Error ? e.message : String(e)}`
+        );
+      }
     }
-    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/artifacts.ts
-init_zod();
-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()
-});
-
-// ../types/src/templates.ts
-init_zod();
-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()
-});
-
-// ../types/src/git-repos.ts
-init_zod();
-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(/\/+$/, "");
@@ -29412,6 +29423,8 @@ async function sendPromptToAgent(options) {
       log: log2
     });
     const errStr = typeof result.error === "string" ? result.error : void 0;
+    const resultStop = typeof result.stopReason === "string" ? result.stopReason.trim() : "";
+    const cancelledByAgent = resultStop.toLowerCase() === "cancelled" || errStr != null && isUserEndedSessionTurnErrorText(errStr);
     sendResult2({
       type: "prompt_result",
       id: promptId,
@@ -29419,12 +29432,17 @@ async function sendPromptToAgent(options) {
       ...runId ? { runId } : {},
       ...result,
       ...followUpCatalogPromptId != null && followUpCatalogPromptId !== "" ? { followUpCatalogPromptId } : {},
-      ...augmentPromptResultAuthFields(agentType, errStr)
+      ...augmentPromptResultAuthFields(agentType, errStr),
+      ...!result.success && cancelledByAgent ? { stopReason: "cancelled" } : {}
     });
     if (!result.success) {
-      log2(
-        `[Agent] Prompt did not run successfully on the agent (no successful start/completion): ${result.error ?? "Unknown error"}`
-      );
+      if (cancelledByAgent) {
+        log2("[Agent] Run ended after stop request (stopped by user).");
+      } else {
+        log2(
+          `[Agent] Prompt did not run successfully on the agent (no successful start/completion): ${result.error ?? "Unknown error"}`
+        );
+      }
     }
   } catch (err) {
     const errMsg = err instanceof Error ? err.message : String(err);
@@ -29504,7 +29522,8 @@ async function createClaudeCodeAcpClient(options) {
     ...options,
     command,
     /** Claude-based agents sometimes ignore `session/cancel`; unblocks stop / stuck prompt. */
-    killSubprocessAfterCancelMs: options.killSubprocessAfterCancelMs ?? 1e3
+    /** Claude Code can be slow to honor ACP `session/cancel`; give the subprocess a moment before SIGKILL (see ACP prompt-turn cancellation). */
+    killSubprocessAfterCancelMs: options.killSubprocessAfterCancelMs ?? 2500
   });
 }
 
@@ -33768,7 +33787,6 @@ var API_TO_BRIDGE_MESSAGE_TYPES = [
   "session_archived",
   "session_discarded",
   "revert_turn_snapshot",
-  "cancel_run",
   "cursor_request_response",
   "skill_call",
   "file_browser_request",
@@ -33838,6 +33856,9 @@ var handleAgentConfigMessage = (msg, deps) => {
   handleBridgeAgentConfig(msg, deps);
 };
 
+// src/prompt-turn-queue/runner.ts
+import fs28 from "node:fs";
+
 // src/prompt-turn-queue/client-report.ts
 function sendPromptQueueClientReport(ws, queues) {
   if (!ws) return false;
@@ -33872,6 +33893,14 @@ function queueStateFilePath(queueKey) {
 }
 
 // src/prompt-turn-queue/disk-store.ts
+var MERGEABLE_SERVER_STATES = /* @__PURE__ */ new Set([
+  "queued",
+  "requeued",
+  "requeued_with_revert",
+  "cancel_requested",
+  "stopping",
+  "discarded"
+]);
 function parsePersistedQueueFile(raw) {
   try {
     const o = JSON.parse(raw);
@@ -33908,7 +33937,7 @@ function mergeServerQueueSnapshot(queueKey, serverTurns) {
     const lastClientState = o.lastClientState ?? null;
     const payload = o.payload && typeof o.payload === "object" ? o.payload : {};
     if (!turnId || !sessionId) continue;
-    if (serverState !== "queued" && serverState !== "stopping" && serverState !== "discarded") continue;
+    if (!MERGEABLE_SERVER_STATES.has(String(serverState))) continue;
     const old = prev?.turns.find((t) => t.turnId === turnId);
     const mergedClient = old?.lastClientState === "running" && lastClientState == null ? "running" : lastClientState;
     turns.push({
@@ -33926,11 +33955,17 @@ function mergeServerQueueSnapshot(queueKey, serverTurns) {
 
 // src/prompt-turn-queue/runner.ts
 var runIdToQueueKey = /* @__PURE__ */ new Map();
+function isRunnableServerState(s) {
+  return s === "queued" || s === "requeued" || s === "requeued_with_revert";
+}
 function pickNextRunnableTurn(turns) {
   for (const t of turns) {
     if (t.serverState === "discarded" || t.serverState === "stopping") continue;
-    if (t.serverState !== "queued") continue;
-    if (t.lastClientState === "running" || t.lastClientState === "stopped" || t.lastClientState === "failed") continue;
+    if (t.serverState === "cancel_requested") continue;
+    if (!isRunnableServerState(t.serverState)) continue;
+    if (t.lastClientState === "running" || t.lastClientState === "stopped" || t.lastClientState === "failed" || t.lastClientState === "cancelled") {
+      continue;
+    }
     return t;
   }
   return null;
@@ -33938,6 +33973,25 @@ function pickNextRunnableTurn(turns) {
 function hasRunningTurn(turns) {
   return turns.some((t) => t.lastClientState === "running");
 }
+async function runLocalRevertBeforeQueuedPrompt(next, deps) {
+  if (next.serverState !== "requeued_with_revert") return true;
+  const sid = next.sessionId;
+  const pl = next.payload;
+  const tid = typeof pl.snapshotRevertTurnId === "string" && pl.snapshotRevertTurnId.trim() !== "" ? pl.snapshotRevertTurnId.trim() : next.turnId;
+  const agentBase = deps.sessionWorktreeManager.getSessionWorktreeRootForSession(sid) ?? getBridgeRoot();
+  const file2 = snapshotFilePath(agentBase, tid);
+  if (!fs28.existsSync(file2)) {
+    deps.log(
+      `[Queue] requeued_with_revert: no pre-turn snapshot for ${tid.slice(0, 8)}\u2026; continuing without revert.`
+    );
+    return true;
+  }
+  const res = await applyPreTurnSnapshot(file2, deps.log);
+  if (!res.ok) {
+    deps.log(`[Queue] requeued_with_revert: snapshot apply failed: ${res.error ?? "unknown"}`);
+  }
+  return res.ok;
+}
 function dispatchLocalPrompt(next, deps) {
   const pl = next.payload;
   const rawParent = pl["sessionParent"];
@@ -33960,7 +34014,7 @@ function dispatchLocalPrompt(next, deps) {
   };
   handleBridgePrompt(msg, deps);
 }
-function applyPromptQueueStateFromServer(msg, deps) {
+async function applyPromptQueueStateFromServer(msg, deps) {
   const raw = msg.queues;
   if (!raw || typeof raw !== "object") return;
   const getWs = deps.getWs;
@@ -33969,6 +34023,40 @@ function applyPromptQueueStateFromServer(msg, deps) {
     const file2 = mergeServerQueueSnapshot(queueKey, serverTurns);
     writePersistedQueue(file2);
   }
+  for (const [queueKey, serverTurns] of Object.entries(raw)) {
+    if (!Array.isArray(serverTurns)) continue;
+    const file2 = readPersistedQueue(queueKey);
+    if (!file2) continue;
+    for (const running of file2.turns.filter((t) => t.lastClientState === "running")) {
+      runIdToQueueKey.set(running.turnId, queueKey);
+    }
+  }
+  for (const [queueKey, serverTurns] of Object.entries(raw)) {
+    if (!Array.isArray(serverTurns)) continue;
+    const file2 = readPersistedQueue(queueKey);
+    if (!file2) continue;
+    const cancelRow = file2.turns.find((t) => t.serverState === "cancel_requested" && t.lastClientState === "running");
+    if (cancelRow) {
+      const localCancelHandled = await deps.acpManager.cancelRun(cancelRow.turnId);
+      if (!localCancelHandled) {
+        deps.log(
+          `[Queue] server cancel_requested for ${cancelRow.turnId.slice(0, 8)}\u2026 but no local agent run is active (e.g. after CLI restart); marking cancelled and notifying bridge.`
+        );
+        finalizePromptTurnOnBridge(deps.getWs, cancelRow.turnId, false, { terminalClientState: "cancelled" });
+        const ws = deps.getWs();
+        if (ws && cancelRow.sessionId) {
+          sendWsMessage(ws, {
+            type: "prompt_result",
+            sessionId: cancelRow.sessionId,
+            runId: cancelRow.turnId,
+            success: false,
+            error: "Stopped by user",
+            stopReason: "cancelled"
+          });
+        }
+      }
+    }
+  }
   const report = {};
   const startedThisTick = /* @__PURE__ */ new Set();
   for (const [queueKey, serverTurns] of Object.entries(raw)) {
@@ -33978,6 +34066,12 @@ function applyPromptQueueStateFromServer(msg, deps) {
     if (hasRunningTurn(file2.turns)) continue;
     const next = pickNextRunnableTurn(file2.turns);
     if (!next) continue;
+    if (!await runLocalRevertBeforeQueuedPrompt(next, deps)) {
+      next.lastClientState = "failed";
+      writePersistedQueue(file2);
+      sendPromptQueueClientReport(getWs(), { [queueKey]: [{ turnId: next.turnId, clientState: "failed" }] });
+      continue;
+    }
     next.lastClientState = "running";
     writePersistedQueue(file2);
     runIdToQueueKey.set(next.turnId, queueKey);
@@ -33997,18 +34091,19 @@ function applyPromptQueueStateFromServer(msg, deps) {
     dispatchLocalPrompt(running, deps);
   }
 }
-function finalizePromptTurnOnBridge(getWs, runId, success2) {
-  if (!runId) return;
+function finalizePromptTurnOnBridge(getWs, runId, success2, opts) {
+  if (!runId) return false;
   const queueKey = runIdToQueueKey.get(runId);
   runIdToQueueKey.delete(runId);
-  if (!queueKey) return;
+  if (!queueKey) return false;
   const f = readPersistedQueue(queueKey);
-  if (!f) return;
+  if (!f) return false;
   const t = f.turns.find((x) => x.turnId === runId);
-  if (!t) return;
-  t.lastClientState = success2 ? "stopped" : "failed";
+  if (!t) return false;
+  t.lastClientState = opts?.terminalClientState ?? (success2 ? "stopped" : "failed");
   writePersistedQueue(f);
   sendPromptQueueClientReport(getWs(), { [queueKey]: [{ turnId: runId, clientState: t.lastClientState }] });
+  return true;
 }
 
 // src/agents/acp/from-bridge/bridge-prompt-wiring.ts
@@ -34025,7 +34120,14 @@ function createBridgePromptSenders(deps, getWs) {
     const encryptedFields = result.type === "prompt_result" && !skipEncryptForChangeSummaryFollowUp ? ["output", "error"] : [];
     sendBridgeMessage(result, encryptedFields);
     if (result.type === "prompt_result") {
-      finalizePromptTurnOnBridge(getWs, typeof result.runId === "string" ? result.runId : void 0, result.success === true);
+      const pr = result;
+      const cancelled = pr.stopReason === "cancelled";
+      finalizePromptTurnOnBridge(
+        getWs,
+        typeof pr.runId === "string" ? pr.runId : void 0,
+        pr.success === true,
+        cancelled ? { terminalClientState: "cancelled" } : void 0
+      );
     }
   };
   const sendSessionUpdate = (payload) => {
@@ -34290,34 +34392,9 @@ var handlePromptMessage = (msg, deps) => {
 
 // src/bridge/routing/handlers/prompt-queue-state.ts
 var handlePromptQueueStateMessage = (msg, deps) => {
-  applyPromptQueueStateFromServer(msg, deps);
-};
-
-// src/agents/acp/from-bridge/handle-bridge-cancel-run.ts
-async function handleBridgeCancelRun(msg, { log: log2, acpManager, getWs }) {
-  const runId = msg.runId;
-  if (!runId) return;
-  const sessionId = typeof msg.sessionId === "string" ? msg.sessionId.trim() : "";
-  const sent = await acpManager.cancelRun(runId);
-  if (sent) return;
-  log2(`[Agent] Cancel: no local run for ${runId.slice(0, 8)}\u2026 \u2014 reporting stopped to cloud.`);
-  const ws = getWs();
-  if (!ws || ws.readyState !== 1) return;
-  sendWsMessage(ws, {
-    type: "prompt_result",
-    id: `cancel-nack-${runId}`,
-    runId,
-    ...sessionId ? { sessionId } : {},
-    success: false,
-    error: "Stopped by user",
-    stopReason: "no_local_run"
+  void applyPromptQueueStateFromServer(msg, deps).catch((err) => {
+    deps.log(`[Queue] applyPromptQueueStateFromServer failed: ${err instanceof Error ? err.message : String(err)}`);
   });
-  finalizePromptTurnOnBridge(getWs, runId, false);
-}
-
-// src/bridge/routing/handlers/cancel-run.ts
-var handleCancelRunMessage = (msg, deps) => {
-  void handleBridgeCancelRun(msg, deps);
 };
 
 // src/agents/acp/from-bridge/handle-bridge-cursor-request-response.ts
@@ -34356,7 +34433,7 @@ var handleSkillCallMessage = (msg, { getWs, log: log2 }) => {
 };
 
 // src/files/list-dir.ts
-import fs28 from "node:fs";
+import fs29 from "node:fs";
 import path31 from "node:path";
 
 // src/files/ensure-under-cwd.ts
@@ -34378,7 +34455,7 @@ async function listDirAsync(relativePath) {
     return { error: "Path is outside working directory" };
   }
   try {
-    const names = await fs28.promises.readdir(resolved, { withFileTypes: true });
+    const names = await fs29.promises.readdir(resolved, { withFileTypes: true });
     const visible = names.filter((d) => !d.name.startsWith("."));
     const entries = [];
     for (let i = 0; i < visible.length; i++) {
@@ -34391,7 +34468,7 @@ async function listDirAsync(relativePath) {
       let isDir = d.isDirectory();
       if (d.isSymbolicLink()) {
         try {
-          const targetStat = await fs28.promises.stat(fullPath);
+          const targetStat = await fs29.promises.stat(fullPath);
           isDir = targetStat.isDirectory();
         } catch {
           isDir = false;
@@ -34416,25 +34493,25 @@ async function listDirAsync(relativePath) {
 }
 
 // src/files/read-file.ts
-import fs29 from "node:fs";
+import fs30 from "node:fs";
 import { StringDecoder } from "node:string_decoder";
 function resolveFilePath(relativePath) {
   const resolved = ensureUnderCwd(relativePath, getBridgeRoot());
   if (!resolved) return { error: "Path is outside working directory" };
   let real;
   try {
-    real = fs29.realpathSync(resolved);
+    real = fs30.realpathSync(resolved);
   } catch {
     real = resolved;
   }
-  const stat2 = fs29.statSync(real);
+  const stat2 = fs30.statSync(real);
   if (!stat2.isFile()) return { error: "Not a file" };
   return real;
 }
 var LINE_CHUNK_SIZE = 64 * 1024;
 function readFileRange(filePath, startLine, endLine, lineOffsetIn, lineChunkSize = LINE_CHUNK_SIZE) {
-  const fileSize = fs29.statSync(filePath).size;
-  const fd = fs29.openSync(filePath, "r");
+  const fileSize = fs30.statSync(filePath).size;
+  const fd = fs30.openSync(filePath, "r");
   const bufSize = 64 * 1024;
   const buf = Buffer.alloc(bufSize);
   const decoder = new StringDecoder("utf8");
@@ -34447,7 +34524,7 @@ function readFileRange(filePath, startLine, endLine, lineOffsetIn, lineChunkSize
   let line0Accum = "";
   try {
     let bytesRead;
-    while (!done && (bytesRead = fs29.readSync(fd, buf, 0, bufSize, null)) > 0) {
+    while (!done && (bytesRead = fs30.readSync(fd, buf, 0, bufSize, null)) > 0) {
       const text = partial2 + decoder.write(buf.subarray(0, bytesRead));
       partial2 = "";
       let lineStart = 0;
@@ -34582,7 +34659,7 @@ function readFileRange(filePath, startLine, endLine, lineOffsetIn, lineChunkSize
     }
     return { content: resultLines.join("\n"), size: fileSize };
   } finally {
-    fs29.closeSync(fd);
+    fs30.closeSync(fd);
   }
 }
 function readFile2(relativePath, startLine, endLine, lineOffset, lineChunkSize = LINE_CHUNK_SIZE) {
@@ -34593,8 +34670,8 @@ function readFile2(relativePath, startLine, endLine, lineOffset, lineChunkSize =
     if (hasRange) {
       return readFileRange(result, startLine, endLine, lineOffset, lineChunkSize);
     }
-    const stat2 = fs29.statSync(result);
-    const raw = fs29.readFileSync(result, "utf8");
+    const stat2 = fs30.statSync(result);
+    const raw = fs30.readFileSync(result, "utf8");
     const lines = raw.split(/\r?\n/);
     return { content: raw, totalLines: lines.length, size: stat2.size };
   } catch (err) {
@@ -34712,7 +34789,7 @@ function handleSkillLayoutRequest(msg, deps) {
 }
 
 // src/skills/install-remote-skills.ts
-import fs30 from "node:fs";
+import fs31 from "node:fs";
 import path32 from "node:path";
 function installRemoteSkills(cwd, targetDir, items) {
   const installed2 = [];
@@ -34728,11 +34805,11 @@ function installRemoteSkills(cwd, targetDir, items) {
       for (const f of item.files) {
         if (typeof f.path !== "string" || !f.text && !f.base64) continue;
         const dest = path32.join(skillDir, f.path);
-        fs30.mkdirSync(path32.dirname(dest), { recursive: true });
+        fs31.mkdirSync(path32.dirname(dest), { recursive: true });
         if (f.text !== void 0) {
-          fs30.writeFileSync(dest, f.text, "utf8");
+          fs31.writeFileSync(dest, f.text, "utf8");
         } else if (f.base64) {
-          fs30.writeFileSync(dest, Buffer.from(f.base64, "base64"));
+          fs31.writeFileSync(dest, Buffer.from(f.base64, "base64"));
         }
       }
       installed2.push({
@@ -34882,7 +34959,7 @@ var handleSessionDiscardedMessage = (msg, deps) => {
 };
 
 // src/bridge/routing/handlers/revert-turn-snapshot.ts
-import * as fs31 from "node:fs";
+import * as fs32 from "node:fs";
 var handleRevertTurnSnapshotMessage = (msg, deps) => {
   const id = typeof msg.id === "string" ? msg.id : "";
   const sessionId = typeof msg.sessionId === "string" ? msg.sessionId : "";
@@ -34894,7 +34971,7 @@ var handleRevertTurnSnapshotMessage = (msg, deps) => {
     if (!s) return;
     const agentBase = sessionWorktreeManager.getSessionWorktreeRootForSession(sessionId) ?? getBridgeRoot();
     const file2 = snapshotFilePath(agentBase, turnId);
-    if (!fs31.existsSync(file2)) {
+    if (!fs32.existsSync(file2)) {
       sendWsMessage(s, {
         type: "revert_turn_snapshot_result",
         id,
@@ -34973,9 +35050,6 @@ function dispatchBridgeMessage(msg, deps) {
     case "revert_turn_snapshot":
       handleRevertTurnSnapshotMessage(msg, deps);
       break;
-    case "cancel_run":
-      handleCancelRunMessage(msg, deps);
-      break;
     case "cursor_request_response":
       handleCursorRequestResponseMessage(msg, deps);
       break;