lody 0.83.0 → 0.85.0

package/dist/index.js

@@ -1,7 +1,7 @@
 #!/usr/bin/env node
 import * as path$1 from "path";
 import path__default$1, { posix, dirname, sep, isAbsolute as isAbsolute$1, relative, parse as parse$4, resolve as resolve$2 } from "path";
-import * as fs$2 from "node:fs";
+import * as fs$1 from "node:fs";
 import fs__default$1, { createReadStream, createWriteStream, existsSync, rmSync, readdirSync, readFileSync, mkdirSync as mkdirSync$2, chmodSync, watch, promises as promises$1, realpathSync, unlinkSync as unlinkSync$1, accessSync as accessSync$1, constants as constants$9, writeSync } from "node:fs";
 import * as readline$1 from "node:readline";
 import readline__default, { createInterface } from "node:readline";
@@ -16,36 +16,36 @@ import * as path from "node:path";
 import path__default, { posix as posix$1, basename, win32, join as join$2, resolve as resolve$1, dirname as dirname$1, relative as relative$1, isAbsolute as isAbsolute$2, sep as sep$1, delimiter, normalize } from "node:path";
 import { _ as _coercedNumber, Z as ZodNumber$1, o as object$1, s as string$1, l as literal$1, n as number$4, b as boolean, a as _enum$1, c as array$2, d as discriminatedUnion, e as _instanceof, r as record$1, u as unknown, f as union$7, p as preprocess, g as ZodError$1, h as _null, i as normalizeParams, $ as $constructor, j as $ZodObject, k as defineLazy, m as $ZodType, q as parse$5, t as safeParse$1, v as parseAsync, w as safeParseAsync$1, x as clone$2, y as looseObject, z as intersection, A as optional$1, B as datetime, C as custom$1, D as toJSONSchema, E as ZodOptional$1, F as never$1, G as xor } from "./chunks/schemas-Du3qLZPS.js";
 import require$$0$4, { once as once$1, EventEmitter as EventEmitter$1 } from "node:events";
-import require$$1$2, { execFile, spawn as spawn$1, execFileSync } from "node:child_process";
+import LE__default, { execFile, spawn as spawn$1, execFileSync } from "node:child_process";
 import process$2 from "node:process";
 import tty from "node:tty";
 import * as os from "os";
 import os__default$1 from "os";
-import crypto$2, { randomFillSync, randomUUID, createHash, randomBytes, timingSafeEqual } from "node:crypto";
+import crypto__default$1, { randomFillSync, randomUUID, createHash, randomBytes, timingSafeEqual } from "node:crypto";
 import require$$0$5, { promisify as promisify$1 } from "util";
-import un, { Transform as Transform$1, Readable as Readable$1 } from "stream";
+import Zr, { Transform as Transform$1, Readable as Readable$1 } from "stream";
 import require$$0$6, { Buffer as Buffer$1 } from "buffer";
 import require$$0$7, { EventEmitter as EventEmitter$2 } from "events";
-import * as Ko from "zlib";
-import Ko__default from "zlib";
-import require$$1$3 from "tty";
-import require$$1$4 from "string_decoder";
+import * as $s from "zlib";
+import $s__default from "zlib";
+import require$$1$2 from "tty";
+import require$$1$3 from "string_decoder";
 import http from "http";
 import require$$1__default from "https";
 import require$$0$8, { promisify, inspect as inspect$1, stripVTControlCharacters, isDeepStrictEqual } from "node:util";
-import * as fs$1 from "node:fs/promises";
-import fs__default$2, { mkdir as mkdir$1, realpath, symlink, mkdtemp, chmod, writeFile, rm, rename, stat, lstat, readdir, readFile, unlink, open, opendir } from "node:fs/promises";
+import * as jt from "node:fs/promises";
+import jt__default, { mkdir as mkdir$1, realpath, symlink, mkdtemp, chmod, writeFile, rm, rename, stat, lstat, readdir, readFile, unlink, open, opendir } from "node:fs/promises";
 import zlib__default, { gzip, gunzip as gunzip$1, gunzipSync, brotliDecompressSync } from "node:zlib";
-import require$$1$9, { exec, execFile as execFile$1, spawn as spawn$2 } from "child_process";
+import require$$1$8, { exec, execFile as execFile$1, spawn as spawn$2 } from "child_process";
+import { i as imports, _ as __wbg_set_wasm$1, r as rawWasm, L as LoroDoc, E as EphemeralStoreWasm, U as UndoManager, c as callPendingEvents$3, a as LoroTree, b as LoroText, d as LoroMovableList, e as LoroList, f as LoroMap, V as VersionVector, g as __vite__initWasm, h as decodeImportBlobMeta, __tla as __tla_0 } from "./chunks/loro_wasm_bg-BPNKba8n.js";
 import { performance as performance$1 } from "perf_hooks";
 import require$$0$9 from "net";
 import require$$4$2 from "tls";
 import require$$7$2, { fileURLToPath as fileURLToPath$1, pathToFileURL as pathToFileURL$1 } from "url";
-import { i as imports, _ as __wbg_set_wasm$1, r as rawWasm, L as LoroDoc, E as EphemeralStoreWasm, U as UndoManager, c as callPendingEvents$3, a as LoroTree, b as LoroText, d as LoroMovableList, e as LoroList, f as LoroMap, V as VersionVector, g as __vite__initWasm, h as decodeImportBlobMeta, __tla as __tla_0 } from "./chunks/loro_wasm_bg-BPNKba8n.js";
-import { D as DEEPSEEK_HARNESS_PERMISSION_MODES, a as DEEPSEEK_HARNESS_AGENT_PRESETS, b as DEEPSEEK_HARNESS_MODELS, c as DEEPSEEK_HARNESS_REASONING_OPTIONS, A as ACP_EXTENSION_DSH_CAPABILITY_SOURCE_VERSION, d as createDeepSeekHarnessCordisConfig, e as ACP_EXTENSION_DSH_VERSION, f as ACP_EXTENSION_DSH_PROFILE_REVISION, g as ACP_EXTENSION_DSH_QUERY_PATH_ENV, h as ACP_EXTENSION_DSH_SESSION_ROOT_ENV, i as DEEPSEEK_HARNESS_NPX_PACKAGES, j as DEEPSEEK_HARNESS_VERSION, k as DEEPSEEK_HARNESS_DEFAULT_SESSION_COMPRESSION } from "./chunks/profile-RfMzWliN.js";
+import { D as DEEPSEEK_HARNESS_PERMISSION_MODES, a as DEEPSEEK_HARNESS_AGENT_PRESETS, b as DEEPSEEK_HARNESS_MODELS, c as DEEPSEEK_HARNESS_REASONING_OPTIONS, A as ACP_EXTENSION_DSH_CAPABILITY_SOURCE_VERSION, d as createDeepSeekHarnessCordisConfig, e as ACP_EXTENSION_DSH_VERSION, f as ACP_EXTENSION_DSH_PROFILE_REVISION, g as ACP_EXTENSION_DSH_QUERY_PATH_ENV, h as ACP_EXTENSION_DSH_SESSION_ROOT_ENV, i as DEEPSEEK_HARNESS_NPX_PACKAGES, j as DEEPSEEK_HARNESS_VERSION, k as DEEPSEEK_HARNESS_DEFAULT_SESSION_COMPRESSION } from "./chunks/profile-Cxxl5hCq.js";
 import assert from "assert";
-import * as fs$3 from "fs/promises";
-import fs__default$3 from "fs/promises";
+import * as fs$2 from "fs/promises";
+import fs__default$2 from "fs/promises";
 import Database from "better-sqlite3";
 import require$$0$d, { channel } from "node:diagnostics_channel";
 import require$$0$b from "node:assert";
@@ -57,15 +57,15 @@ import require$$7$3 from "node:querystring";
 import require$$5$2 from "node:tls";
 import require$$5$3, { performance as performance$2 } from "node:perf_hooks";
 import require$$8 from "node:util/types";
-import require$$1$5, { Worker as Worker$1 } from "node:worker_threads";
-import require$$1$6, { fileURLToPath, pathToFileURL } from "node:url";
-import require$$1$7 from "node:console";
-import require$$1$8 from "node:dns";
+import require$$1$4, { Worker as Worker$1 } from "node:worker_threads";
+import require$$1$5, { fileURLToPath, pathToFileURL } from "node:url";
+import require$$1$6 from "node:console";
+import require$$1$7 from "node:dns";
 import { C as CodeCollabV2OpenTextRequestSchema, a as CodeCollabV2RefreshTextRequestSchema, b as CodeCollabV2SaveTextRequestSchema, c as CodeCollabV2OpenCurrentDiffRequestSchema, d as CodeCollabV2OpenAllChangesDiffRequestSchema, e as CodeCollabV2OpenTurnDiffRequestSchema, f as CodeCollabV2InitDirectoryRequestSchema, g as CodeCollabV2OpenTextOkSchema, h as CodeCollabV2RefreshTextResponseSchema, i as CodeCollabV2SaveTextResponseSchema, j as CodeCollabV2OpenCurrentDiffResponseSchema, k as CodeCollabV2OpenAllChangesDiffResponseSchema, l as CodeCollabV2OpenTurnDiffResponseSchema, m as CodeCollabV2InitDirectoryOkSchema, n as CodeCollabV2LspUnsupportedSchema, o as CodeCollabV2ErrorSchema, p as CodeCollabV2RpcContentEnvelopeSchema, q as deriveCodeCollabV2ContentKeyId, r as CodeCollabV2ErrorCodeSchema, s as CodeCollabV2RpcResponseSchema, t as deriveCodeCollabV2ContentKeyBytes, u as readCodeCollabFileIndexSignalFromFlock, w as writeCodeCollabFileIndexSignalToFlock, v as writeCodeCollabFileIndexToFlock, x as buildCodeCollabFileIndexState, y as CODE_COLLAB_V2_TEXT_LIMITS, z as CODE_COLLAB_V2_ALL_CHANGES_DIFF_LIMITS, A as computeAllChanges, B as codeCollabFileIndexStatesEqual, D as scanGitDirectoryEntries, E as closeDirectoryQuietly } from "./chunks/directory-handle-OPjjCl3O.js";
 import { C as ClientSideConnection, P as PROTOCOL_VERSION, n as ndJsonStream } from "./chunks/acp-CrvzLY5A.js";
 import { StringDecoder } from "node:string_decoder";
 import { pipeline, finished } from "node:stream/promises";
-import { p as packageJson } from "./chunks/package-Ce-NgzCA.js";
+import { p as packageJson } from "./chunks/package-CNW89xCh.js";
 import { r as runtimeManifest } from "./chunks/runtime-manifest-Fr5DEH54.js";
 import { AsyncLocalStorage as AsyncLocalStorage$1 } from "async_hooks";
 import { createRequire } from "module";
@@ -2296,7 +2296,7 @@ Upgrade Node, then re-run: npx lody@latest`;
       return frames;
     };
   }
-  const version$8 = "5.38.8";
+  const version$a = "5.38.8";
   const FeatureFlagError = {
     ERRORS_WHILE_COMPUTING: "errors_while_computing_flags",
     FLAG_MISSING: "flag_missing",
@@ -3474,7 +3474,7 @@ Upgrade Node, then re-run: npx lody@latest`;
       return this.options.fetch ? this.options.fetch(url, options) : fetch(url, options);
     }
     getLibraryVersion() {
-      return version$8;
+      return version$a;
     }
     getCustomUserAgent() {
       return `${this.getLibraryId()}/${this.getLibraryVersion()}`;
@@ -4324,7 +4324,7 @@ Upgrade Node, then re-run: npx lody@latest`;
   }
   const name$2 = "lody";
   const name$1 = "@lody/cli-cloud";
-  const version$7 = "0.83.0";
+  const version$9 = "0.85.0";
   const type$2 = "module";
   const scripts = {
     "dev": "node dev.mjs",
@@ -4341,7 +4341,7 @@ Upgrade Node, then re-run: npx lody@latest`;
   };
   const pkg = {
     name: name$1,
-    version: version$7,
+    version: version$9,
     "private": true,
     type: type$2,
     scripts,
@@ -14362,6 +14362,43 @@ Requirements:
         }
       }
     },
+    {
+      id: "antigravity-acp",
+      name: "Google Antigravity",
+      version: "1.0.0",
+      description: "Google\u2019s AI coding agent",
+      icon: "https://cdn.agentclientprotocol.com/registry/v1/latest/antigravity-acp.svg",
+      distribution: {
+        binary: {
+          "darwin-aarch64": {
+            archive: "https://dl.google.com/agy-extensions/releases/macos/agy-acp-server-agy_acp_server_20260818_01_RC01-darwin-arm64.zip",
+            cmd: "./agy_acp_server.par"
+          },
+          "linux-x86_64": {
+            archive: "https://dl.google.com/agy-extensions/releases/linux/agy-acp-server-agy_acp_server_20260818_01_RC01-linux-x86_64.zip",
+            cmd: "./agy_acp_server.par",
+            args: [
+              "--uid="
+            ]
+          },
+          "linux-aarch64": {
+            archive: "https://dl.google.com/agy-extensions/releases/linux/agy-acp-server-agy_acp_server_20260818_01_RC01-linux-arm64.zip",
+            cmd: "./agy_acp_server.par",
+            args: [
+              "--uid="
+            ]
+          },
+          "windows-x86_64": {
+            archive: "https://dl.google.com/agy-extensions/releases/windows/agy-acp-server-agy_acp_server_20260818_01_RC01-windows-x86_64.zip",
+            cmd: "./agy_acp_server.exe"
+          },
+          "windows-aarch64": {
+            archive: "https://dl.google.com/agy-extensions/releases/windows/agy-acp-server-agy_acp_server_20260818_01_RC01-windows-arm64.zip",
+            cmd: "./agy_acp_server.exe"
+          }
+        }
+      }
+    },
     {
       id: "auggie",
       name: "Auggie CLI",
@@ -14410,12 +14447,12 @@ Requirements:
     {
       id: "codebuddy-code",
       name: "Codebuddy Code",
-      version: "2.106.7",
+      version: "2.137.1",
       description: "Tencent Cloud's official intelligent coding tool",
       icon: "https://cdn.agentclientprotocol.com/registry/v1/latest/codebuddy-code.svg",
       distribution: {
         npx: {
-          package: "@tencent-ai/codebuddy-code@2.106.7",
+          package: "@tencent-ai/codebuddy-code@2.137.1",
           args: [
             "--acp"
           ]
@@ -14640,12 +14677,12 @@ Requirements:
     {
       id: "dimcode",
       name: "DimCode",
-      version: "0.3.15",
+      version: "0.3.17",
       description: "A coding agent that puts leading models at your command.",
       icon: "https://cdn.agentclientprotocol.com/registry/v1/latest/dimcode.svg",
       distribution: {
         npx: {
-          package: "dimcode@0.3.15",
+          package: "dimcode@0.3.17",
           args: [
             "acp"
           ]
@@ -14670,12 +14707,12 @@ Requirements:
     {
       id: "factory-droid",
       name: "Factory Droid",
-      version: "0.198.0",
+      version: "0.200.0",
       description: "Factory Droid - AI coding agent powered by Factory AI",
       icon: "https://cdn.agentclientprotocol.com/registry/v1/latest/factory-droid.svg",
       distribution: {
         npx: {
-          package: "droid@0.198.0",
+          package: "droid@0.200.0",
           args: [
             "exec",
             "--output-format",
@@ -14709,12 +14746,12 @@ Requirements:
     {
       id: "gemini",
       name: "Gemini CLI",
-      version: "0.55.1",
+      version: "0.56.0",
       description: "Google's official CLI for Gemini",
       icon: "https://cdn.agentclientprotocol.com/registry/v1/latest/gemini.svg",
       distribution: {
         npx: {
-          package: "@google/gemini-cli@0.55.1",
+          package: "@google/gemini-cli@0.56.0",
           args: [
             "--acp"
           ]
@@ -14739,12 +14776,12 @@ Requirements:
     {
       id: "glm-acp-agent",
       name: "GLM Agent",
-      version: "1.5.0",
+      version: "1.6.0",
       description: "ACP agent powered by Zhipu AI's GLM Coding Plan models (glm-5.1, glm-5-turbo, glm-4.7, glm-4.5-air). Supports streaming, tool calls, mid-session model switching, image input via Z.AI Coding Plan Vision MCP, and session load/fork/resume with on-disk persistence.",
       icon: "https://cdn.agentclientprotocol.com/registry/v1/latest/glm-acp-agent.svg",
       distribution: {
         npx: {
-          package: "glm-acp-agent@1.5.0"
+          package: "glm-acp-agent@1.6.0"
         }
       }
     },
@@ -14769,13 +14806,13 @@ Requirements:
     {
       id: "harn",
       name: "Harn",
-      version: "0.10.103",
+      version: "0.10.108",
       description: "Harn runs .harn agent pipelines as a native ACP coding agent over stdio.",
       icon: "https://cdn.agentclientprotocol.com/registry/v1/latest/harn.svg",
       distribution: {
         binary: {
           "darwin-aarch64": {
-            archive: "https://github.com/burin-labs/harn/releases/download/v0.10.103/harn-aarch64-apple-darwin.tar.gz",
+            archive: "https://github.com/burin-labs/harn/releases/download/v0.10.108/harn-aarch64-apple-darwin.tar.gz",
             cmd: "./harn",
             args: [
               "serve",
@@ -14783,7 +14820,7 @@ Requirements:
             ]
           },
           "darwin-x86_64": {
-            archive: "https://github.com/burin-labs/harn/releases/download/v0.10.103/harn-x86_64-apple-darwin.tar.gz",
+            archive: "https://github.com/burin-labs/harn/releases/download/v0.10.108/harn-x86_64-apple-darwin.tar.gz",
             cmd: "./harn",
             args: [
               "serve",
@@ -14791,7 +14828,7 @@ Requirements:
             ]
           },
           "linux-aarch64": {
-            archive: "https://github.com/burin-labs/harn/releases/download/v0.10.103/harn-aarch64-unknown-linux-gnu.tar.gz",
+            archive: "https://github.com/burin-labs/harn/releases/download/v0.10.108/harn-aarch64-unknown-linux-gnu.tar.gz",
             cmd: "./harn",
             args: [
               "serve",
@@ -14799,7 +14836,7 @@ Requirements:
             ]
           },
           "linux-x86_64": {
-            archive: "https://github.com/burin-labs/harn/releases/download/v0.10.103/harn-x86_64-unknown-linux-gnu.tar.gz",
+            archive: "https://github.com/burin-labs/harn/releases/download/v0.10.108/harn-x86_64-unknown-linux-gnu.tar.gz",
             cmd: "./harn",
             args: [
               "serve",
@@ -14807,7 +14844,7 @@ Requirements:
             ]
           },
           "windows-x86_64": {
-            archive: "https://github.com/burin-labs/harn/releases/download/v0.10.103/harn-x86_64-pc-windows-msvc.zip",
+            archive: "https://github.com/burin-labs/harn/releases/download/v0.10.108/harn-x86_64-pc-windows-msvc.zip",
             cmd: "harn.exe",
             args: [
               "serve",
@@ -14820,7 +14857,7 @@ Requirements:
     {
       id: "junie",
       name: "Junie",
-      version: "2783.5.0",
+      version: "2913.6.0",
       description: "AI Coding Agent by JetBrains",
       icon: "https://cdn.agentclientprotocol.com/registry/v1/latest/junie.svg",
       distribution: {
@@ -14838,47 +14875,47 @@ Requirements:
     {
       id: "kilo",
       name: "Kilo",
-      version: "7.4.22",
+      version: "7.4.23",
       description: "The open source coding agent",
       icon: "https://cdn.agentclientprotocol.com/registry/v1/latest/kilo.svg",
       distribution: {
         npx: {
-          package: "@kilocode/cli@7.4.22",
+          package: "@kilocode/cli@7.4.23",
           args: [
             "acp"
           ]
         },
         binary: {
           "darwin-aarch64": {
-            archive: "https://github.com/Kilo-Org/kilocode/releases/download/v7.4.22/kilo-darwin-arm64.zip",
+            archive: "https://github.com/Kilo-Org/kilocode/releases/download/v7.4.23/kilo-darwin-arm64.zip",
             cmd: "./kilo",
             args: [
               "acp"
             ]
           },
           "darwin-x86_64": {
-            archive: "https://github.com/Kilo-Org/kilocode/releases/download/v7.4.22/kilo-darwin-x64.zip",
+            archive: "https://github.com/Kilo-Org/kilocode/releases/download/v7.4.23/kilo-darwin-x64.zip",
             cmd: "./kilo",
             args: [
               "acp"
             ]
           },
           "linux-aarch64": {
-            archive: "https://github.com/Kilo-Org/kilocode/releases/download/v7.4.22/kilo-linux-arm64.tar.gz",
+            archive: "https://github.com/Kilo-Org/kilocode/releases/download/v7.4.23/kilo-linux-arm64.tar.gz",
             cmd: "./kilo",
             args: [
               "acp"
             ]
           },
           "linux-x86_64": {
-            archive: "https://github.com/Kilo-Org/kilocode/releases/download/v7.4.22/kilo-linux-x64.tar.gz",
+            archive: "https://github.com/Kilo-Org/kilocode/releases/download/v7.4.23/kilo-linux-x64.tar.gz",
             cmd: "./kilo",
             args: [
               "acp"
             ]
           },
           "windows-x86_64": {
-            archive: "https://github.com/Kilo-Org/kilocode/releases/download/v7.4.22/kilo-windows-x64.zip",
+            archive: "https://github.com/Kilo-Org/kilocode/releases/download/v7.4.23/kilo-windows-x64.zip",
             cmd: "./kilo.exe",
             args: [
               "acp"
@@ -14975,7 +15012,7 @@ Requirements:
     {
       id: "opencode",
       name: "OpenCode",
-      version: "1.18.18",
+      version: "1.18.19",
       description: "The open source coding agent",
       icon: "https://cdn.agentclientprotocol.com/registry/v1/latest/opencode.svg",
       distribution: {
@@ -15073,12 +15110,12 @@ Requirements:
     {
       id: "qwen-code",
       name: "Qwen Code",
-      version: "0.21.13",
+      version: "0.21.15",
       description: "Alibaba's Qwen coding assistant",
       icon: "https://cdn.agentclientprotocol.com/registry/v1/latest/qwen-code.svg",
       distribution: {
         npx: {
-          package: "@qwen-code/qwen-code@0.21.13",
+          package: "@qwen-code/qwen-code@0.21.15",
           args: [
             "--acp",
             "--experimental-skills"
@@ -24068,907 +24105,6 @@ ${context2.authorReply.trim()}
     }
     return bytes;
   }
-  const scheduleDataWorkNextTurn = (work) => {
-    const handle = setTimeout(work, 0);
-    return () => clearTimeout(handle);
-  };
-  const createLocalLoroDataPlaneScheduler = (scheduleTurn = scheduleDataWorkNextTurn) => {
-    const queue2 = [];
-    let running2 = false;
-    let cancelScheduledTurn = null;
-    const takeNext = () => {
-      for (; ; ) {
-        const work = queue2.shift();
-        if (!work) return null;
-        if (!work.cancelled) return work;
-      }
-    };
-    const requestRun = () => {
-      if (running2 || cancelScheduledTurn || queue2.length === 0) return;
-      cancelScheduledTurn = scheduleTurn(() => {
-        cancelScheduledTurn = null;
-        const work = takeNext();
-        if (!work) {
-          return;
-        }
-        running2 = true;
-        void Promise.resolve().then(work.run).finally(() => {
-          running2 = false;
-          requestRun();
-        });
-      });
-    };
-    return {
-      scheduleDataWork: (run2) => {
-        const work = {
-          run: run2,
-          cancelled: false
-        };
-        queue2.push(work);
-        requestRun();
-        return () => {
-          work.cancelled = true;
-        };
-      }
-    };
-  };
-  function syncTaskKey(key2, peerId) {
-    return `${key2}
-${peerId}`;
-  }
-  class LocalLoroDataPlaneServer {
-    constructor(options) {
-      this.options = options;
-      this.scheduler = options.scheduler ?? createLocalLoroDataPlaneScheduler();
-      this.docRoomJoinHandler = options.onDocRoomJoin ?? null;
-      this.docRoomLeaveHandler = options.onDocRoomLeave ?? null;
-      this.flockRoomJoinHandler = options.onFlockRoomJoin ?? null;
-      this.flockRoomLeaveHandler = options.onFlockRoomLeave ?? null;
-      if (options.presenceSource) {
-        this.presenceUnsubscribe = options.presenceSource.subscribeLocalOrigin(() => this.broadcastPresence());
-      }
-      if (options.machineMonitorSource) {
-        this.machineMonitorUnsubscribe = options.machineMonitorSource.subscribe(() => this.broadcastMachineMonitor());
-      }
-    }
-    rooms = /* @__PURE__ */ new Map();
-    resolveInFlight = /* @__PURE__ */ new Map();
-    roomGenerations = /* @__PURE__ */ new Map();
-    presenceReceivers = /* @__PURE__ */ new Map();
-    machineMonitorReceivers = /* @__PURE__ */ new Map();
-    writers = /* @__PURE__ */ new Map();
-    presenceUnsubscribe = null;
-    machineMonitorUnsubscribe = null;
-    docRoomJoinHandler = null;
-    docRoomLeaveHandler = null;
-    flockRoomJoinHandler = null;
-    flockRoomLeaveHandler = null;
-    scheduler;
-    disposed = false;
-    setDocRoomJoinHandler(handler) {
-      this.docRoomJoinHandler = handler;
-    }
-    setDocRoomLeaveHandler(handler) {
-      this.docRoomLeaveHandler = handler;
-    }
-    setFlockRoomJoinHandler(handler) {
-      this.flockRoomJoinHandler = handler;
-    }
-    setFlockRoomLeaveHandler(handler) {
-      this.flockRoomLeaveHandler = handler;
-    }
-    publishRoomStatus(room, status) {
-      const entry = this.rooms.get(roomKey(room));
-      if (!entry) {
-        return;
-      }
-      for (const subscriber of entry.subscribers.values()) {
-        this.enqueueMessage(subscriber.connection, {
-          type: "room-status",
-          protocolVersion: LOCAL_LORO_DATA_PLANE_PROTOCOL_VERSION,
-          workspaceId: this.options.workspaceId,
-          peerId: subscriber.peerId,
-          room,
-          status
-        });
-      }
-    }
-    invalidateDocRoom(docId) {
-      const room = {
-        scope: "doc",
-        docId
-      };
-      const key2 = roomKey(room);
-      this.roomGenerations.set(key2, (this.roomGenerations.get(key2) ?? 0) + 1);
-      const entry = this.rooms.get(key2);
-      if (!entry || entry.scope !== "doc") {
-        return;
-      }
-      this.dropQueuedRoomWork(key2);
-      this.publishRoomStatus(room, "disconnected");
-      entry.unsubscribe();
-      entry.subscribers.clear();
-      entry.uploadAssemblers.clear();
-      this.rooms.delete(key2);
-    }
-    dropQueuedRoomWork(key2) {
-      for (const writer of this.writers.values()) {
-        writer.queue = writer.queue.filter((task) => !((task.kind === "sync" || task.kind === "join-reply") && task.roomKey === key2));
-        for (const taskKey of [
-          ...writer.queuedSyncKeys
-        ]) {
-          if (taskKey.startsWith(`${key2}
-`)) {
-            writer.queuedSyncKeys.delete(taskKey);
-          }
-        }
-      }
-    }
-    get maxPayloadBytes() {
-      return this.options.maxPayloadBytes ?? LOCAL_LORO_DATA_PLANE_MAX_PAYLOAD_BYTES;
-    }
-    async handleMessage(connection2, message) {
-      if (this.disposed) {
-        this.sendError(connection2, {
-          code: "workspace_runtime_unavailable",
-          peerId: message.peerId,
-          requestId: message.type === "join" ? message.requestId : void 0
-        });
-        return;
-      }
-      if (message.workspaceId !== this.options.workspaceId) {
-        this.sendError(connection2, {
-          code: "workspace_mismatch",
-          peerId: message.peerId,
-          requestId: message.type === "join" ? message.requestId : void 0
-        });
-        return;
-      }
-      try {
-        this.registerPresenceReceiver(connection2);
-        switch (message.type) {
-          case "join":
-            await this.handleJoin(connection2, message);
-            return;
-          case "update":
-            await this.handleUpdate(connection2, message);
-            return;
-          case "leave":
-            this.unsubscribePeer(message.peerId, roomKey(message.room));
-            return;
-          case "detach":
-            this.detachPeer(message.peerId);
-            return;
-          case "machine-monitor":
-            this.registerMachineMonitorReceiver(connection2);
-            this.options.machineMonitorSource?.apply(base64ToBytes(message.dataBase64));
-            return;
-        }
-      } catch (error2) {
-        this.options.onError?.(error2, `handleMessage:${message.type}`);
-        this.sendError(connection2, {
-          code: "data_plane_error",
-          message: errorMessage(error2),
-          peerId: message.peerId,
-          requestId: message.type === "join" ? message.requestId : void 0,
-          room: "room" in message ? message.room : void 0
-        });
-      }
-    }
-    registerPresenceReceiver(connection2) {
-      if (!this.options.presenceSource || this.presenceReceivers.has(connection2.id)) {
-        return;
-      }
-      this.presenceReceivers.set(connection2.id, connection2);
-      this.enqueuePresence(connection2);
-    }
-    broadcastPresence() {
-      if (this.disposed) {
-        return;
-      }
-      for (const connection2 of this.presenceReceivers.values()) {
-        this.enqueuePresence(connection2);
-      }
-    }
-    registerMachineMonitorReceiver(connection2) {
-      if (!this.options.machineMonitorSource || this.machineMonitorReceivers.has(connection2.id)) {
-        return;
-      }
-      this.machineMonitorReceivers.set(connection2.id, connection2);
-      this.enqueueMachineMonitor(connection2);
-    }
-    broadcastMachineMonitor() {
-      if (this.disposed) return;
-      for (const connection2 of this.machineMonitorReceivers.values()) {
-        this.enqueueMachineMonitor(connection2);
-      }
-    }
-    dispose() {
-      this.disposed = true;
-      this.presenceUnsubscribe?.();
-      this.presenceUnsubscribe = null;
-      this.machineMonitorUnsubscribe?.();
-      this.machineMonitorUnsubscribe = null;
-      this.presenceReceivers.clear();
-      this.machineMonitorReceivers.clear();
-      for (const entry of this.rooms.values()) {
-        entry.unsubscribe();
-        this.notifyDocRoomLeave(entry.room);
-        this.notifyFlockRoomLeave(entry.room);
-        entry.subscribers.clear();
-      }
-      this.rooms.clear();
-      this.roomGenerations.clear();
-      for (const writer of this.writers.values()) {
-        this.cancelScheduledDataPump(writer);
-        writer.unsubscribeDrain?.();
-        writer.queue.length = 0;
-        writer.pendingFrames.length = 0;
-      }
-      this.writers.clear();
-    }
-    handleDisconnect(connectionId) {
-      this.presenceReceivers.delete(connectionId);
-      this.machineMonitorReceivers.delete(connectionId);
-      const writer = this.writers.get(connectionId);
-      if (writer) {
-        this.cancelScheduledDataPump(writer);
-        writer.unsubscribeDrain?.();
-        writer.queue.length = 0;
-        writer.pendingFrames.length = 0;
-        this.writers.delete(connectionId);
-      }
-      for (const key2 of [
-        ...this.rooms.keys()
-      ]) {
-        const entry = this.rooms.get(key2);
-        if (!entry) {
-          continue;
-        }
-        for (const [peerId, subscriber] of [
-          ...entry.subscribers
-        ]) {
-          if (subscriber.connection.id === connectionId) {
-            entry.subscribers.delete(peerId);
-            if (entry.scope === "doc") {
-              entry.uploadAssemblers.delete(peerId);
-            }
-          }
-        }
-        this.releaseRoomIfEmpty(key2, entry);
-      }
-    }
-    detachPeer(peerId) {
-      for (const key2 of [
-        ...this.rooms.keys()
-      ]) {
-        this.unsubscribePeer(peerId, key2);
-      }
-    }
-    async handleJoin(connection2, message) {
-      const key2 = roomKey(message.room);
-      for (; ; ) {
-        const entry = await this.ensureRoom(message.room);
-        if (this.rooms.get(key2) !== entry) {
-          continue;
-        }
-        if (entry.scope === "doc") {
-          entry.subscribers.set(message.peerId, {
-            peerId: message.peerId,
-            connection: connection2,
-            latestJoinRequestId: message.requestId,
-            lastSentVV: decodeVersion(message.haveVersion)
-          });
-        } else {
-          entry.subscribers.set(message.peerId, {
-            peerId: message.peerId,
-            connection: connection2,
-            latestJoinRequestId: message.requestId,
-            lastSentVersion: decodeFlockVersion(message.haveVersion)
-          });
-        }
-        this.enqueueJoinReply(connection2, key2, message.peerId, message.requestId);
-        if (message.room.scope === "doc") {
-          this.notifyDocRoomJoin(message.room.docId);
-        } else if (message.room.scope === "flock-doc") {
-          this.notifyFlockRoomJoin(message.room.flockDocId);
-        }
-        return;
-      }
-    }
-    notifyDocRoomJoin(docId) {
-      if (!this.docRoomJoinHandler) {
-        return;
-      }
-      void Promise.resolve(this.docRoomJoinHandler(docId)).catch((error2) => {
-        this.options.onError?.(error2, "onDocRoomJoin");
-      });
-    }
-    notifyFlockRoomJoin(flockDocId) {
-      if (!this.flockRoomJoinHandler) {
-        return;
-      }
-      void Promise.resolve(this.flockRoomJoinHandler(flockDocId)).catch((error2) => {
-        this.options.onError?.(error2, "onFlockRoomJoin");
-      });
-    }
-    notifyDocRoomLeave(room) {
-      if (room.scope !== "doc" || !this.docRoomLeaveHandler) {
-        return;
-      }
-      void Promise.resolve(this.docRoomLeaveHandler(room.docId)).catch((error2) => {
-        this.options.onError?.(error2, "onDocRoomLeave");
-      });
-    }
-    notifyFlockRoomLeave(room) {
-      if (room.scope !== "flock-doc" || !this.flockRoomLeaveHandler) {
-        return;
-      }
-      void Promise.resolve(this.flockRoomLeaveHandler(room.flockDocId)).catch((error2) => {
-        this.options.onError?.(error2, "onFlockRoomLeave");
-      });
-    }
-    async handleUpdate(connection2, message) {
-      const key2 = roomKey(message.room);
-      let entry = await this.ensureRoom(message.room);
-      while (this.rooms.get(key2) !== entry) {
-        entry = await this.ensureRoom(message.room);
-      }
-      if (entry.scope === "doc") {
-        if (message.payload.kind === "flock-json") {
-          this.sendError(connection2, {
-            code: "payload_kind_mismatch",
-            message: "expected doc-update",
-            peerId: message.peerId,
-            room: message.room
-          });
-          return;
-        }
-        let dataBase64;
-        if (message.payload.kind === "doc-update") {
-          entry.uploadAssemblers.delete(message.peerId);
-          dataBase64 = message.payload.dataBase64;
-        } else {
-          let assembler = entry.uploadAssemblers.get(message.peerId);
-          if (!assembler) {
-            assembler = new DocUpdateChunkAssembler();
-            entry.uploadAssemblers.set(message.peerId, assembler);
-          }
-          dataBase64 = assembler.push(message.payload);
-          if (dataBase64 === null) {
-            return;
-          }
-          entry.uploadAssemblers.delete(message.peerId);
-        }
-        const subscriber2 = entry.subscribers.get(message.peerId);
-        if (subscriber2) {
-          subscriber2.lastSentVV = decodeVersion(message.haveVersion);
-        }
-        entry.doc.import(base64ToBytes(dataBase64));
-        return;
-      }
-      if (message.payload.kind !== "flock-json") {
-        this.sendError(connection2, {
-          code: "payload_kind_mismatch",
-          message: "expected flock-json",
-          peerId: message.peerId,
-          room: message.room
-        });
-        return;
-      }
-      const subscriber = entry.subscribers.get(message.peerId);
-      if (subscriber) {
-        subscriber.lastSentVersion = mergeFlockVersions(subscriber.lastSentVersion, decodeFlockVersion(message.haveVersion));
-      }
-      await entry.flock.importJson(message.payload.bundle);
-      entry.flock.commit?.();
-    }
-    async ensureRoom(room) {
-      const key2 = roomKey(room);
-      for (; ; ) {
-        const existing = this.rooms.get(key2);
-        if (existing) {
-          return existing;
-        }
-        const inFlight = this.resolveInFlight.get(key2);
-        if (inFlight) {
-          const shared = await inFlight;
-          if (shared) {
-            return shared;
-          }
-          continue;
-        }
-        const generation = this.roomGenerations.get(key2) ?? 0;
-        const build = (async () => {
-          const entry = room.scope === "doc" ? await this.buildDocRoom(room, room.docId) : await this.buildFlockRoom(room, await this.resolveFlockForRoom(room));
-          if (this.disposed) {
-            entry.unsubscribe();
-            throw new Error("data_plane_engine_disposed");
-          }
-          if ((this.roomGenerations.get(key2) ?? 0) !== generation) {
-            entry.unsubscribe();
-            return null;
-          }
-          this.rooms.set(key2, entry);
-          return entry;
-        })().finally(() => this.resolveInFlight.delete(key2));
-        this.resolveInFlight.set(key2, build);
-        const resolved = await build;
-        if (resolved) {
-          return resolved;
-        }
-      }
-    }
-    async buildDocRoom(room, docId) {
-      const doc = await this.options.resolveDoc(docId);
-      const entry = {
-        scope: "doc",
-        room,
-        doc,
-        unsubscribe: () => {
-        },
-        subscribers: /* @__PURE__ */ new Map(),
-        uploadAssemblers: /* @__PURE__ */ new Map()
-      };
-      entry.unsubscribe = doc.subscribe(() => this.markRoomDirty(entry));
-      return entry;
-    }
-    resolveFlockForRoom(room) {
-      if (room.scope === "flock-doc") {
-        return this.options.resolveFlockDoc(room.flockDocId);
-      }
-      return this.options.resolveMetaFlock ? this.options.resolveMetaFlock() : this.options.resolveFlockDoc("meta");
-    }
-    async buildFlockRoom(room, flock) {
-      const entry = {
-        scope: "flock",
-        room,
-        flock,
-        unsubscribe: () => {
-        },
-        subscribers: /* @__PURE__ */ new Map()
-      };
-      entry.unsubscribe = flock.subscribe(() => this.markRoomDirty(entry));
-      return entry;
-    }
-    markRoomDirty(entry) {
-      if (this.disposed) {
-        return;
-      }
-      const key2 = roomKey(entry.room);
-      for (const subscriber of entry.subscribers.values()) {
-        this.enqueueSync(subscriber.connection, key2, subscriber.peerId);
-      }
-      this.releaseRoomIfEmpty(key2, entry);
-    }
-    writerFor(connection2) {
-      const existing = this.writers.get(connection2.id);
-      if (existing) {
-        return existing;
-      }
-      const writer = {
-        connection: connection2,
-        queue: [],
-        queuedSyncKeys: /* @__PURE__ */ new Set(),
-        presenceQueued: false,
-        machineMonitorQueued: false,
-        pendingFrames: [],
-        pumping: false,
-        pumpScheduled: false,
-        cancelScheduledPump: null,
-        blocked: false,
-        unsubscribeDrain: null
-      };
-      writer.unsubscribeDrain = connection2.onDrain?.(() => {
-        writer.blocked = false;
-        this.scheduleDataPump(writer);
-      }) ?? null;
-      this.writers.set(connection2.id, writer);
-      return writer;
-    }
-    enqueueMessage(connection2, message) {
-      const writer = this.writerFor(connection2);
-      writer.queue.push({
-        kind: "message",
-        message
-      });
-      this.scheduleDataPump(writer);
-    }
-    enqueueJoinReply(connection2, key2, peerId, requestId) {
-      const writer = this.writerFor(connection2);
-      writer.queue.push({
-        kind: "join-reply",
-        roomKey: key2,
-        peerId,
-        requestId
-      });
-      this.scheduleDataPump(writer);
-    }
-    enqueueSync(connection2, key2, peerId) {
-      const writer = this.writerFor(connection2);
-      const taskKey = syncTaskKey(key2, peerId);
-      if (writer.queuedSyncKeys.has(taskKey)) {
-        return;
-      }
-      writer.queuedSyncKeys.add(taskKey);
-      writer.queue.push({
-        kind: "sync",
-        roomKey: key2,
-        peerId
-      });
-      this.scheduleDataPump(writer);
-    }
-    enqueuePresence(connection2) {
-      const writer = this.writerFor(connection2);
-      if (writer.presenceQueued) {
-        return;
-      }
-      writer.presenceQueued = true;
-      writer.queue.push({
-        kind: "presence"
-      });
-      this.scheduleDataPump(writer);
-    }
-    enqueueMachineMonitor(connection2) {
-      const writer = this.writerFor(connection2);
-      if (writer.machineMonitorQueued) return;
-      writer.machineMonitorQueued = true;
-      writer.queue.push({
-        kind: "machine-monitor"
-      });
-      this.scheduleDataPump(writer);
-    }
-    isWriterActive(writer) {
-      return !this.disposed && this.writers.get(writer.connection.id) === writer;
-    }
-    cancelScheduledDataPump(writer) {
-      writer.cancelScheduledPump?.();
-      writer.cancelScheduledPump = null;
-      writer.pumpScheduled = false;
-    }
-    hasPendingDataWork(writer) {
-      return writer.pendingFrames.length > 0 || writer.queue.length > 0;
-    }
-    scheduleDataPump(writer) {
-      if (!this.isWriterActive(writer) || writer.blocked || writer.pumping || writer.pumpScheduled || !this.hasPendingDataWork(writer)) {
-        return;
-      }
-      writer.pumpScheduled = true;
-      writer.cancelScheduledPump = this.scheduler.scheduleDataWork(() => {
-        writer.pumpScheduled = false;
-        writer.cancelScheduledPump = null;
-        return this.pumpWriter(writer).catch((error2) => {
-          this.options.onError?.(error2, "pumpWriter");
-        });
-      });
-    }
-    async pumpWriter(writer) {
-      if (!this.isWriterActive(writer) || writer.pumping || writer.blocked) {
-        return;
-      }
-      writer.pumping = true;
-      try {
-        const pendingFrame = writer.pendingFrames.shift();
-        if (pendingFrame) {
-          this.writeFrame(writer, pendingFrame);
-          return;
-        }
-        const task = writer.queue.shift();
-        if (!task) {
-          return;
-        }
-        if (task.kind === "sync") {
-          writer.queuedSyncKeys.delete(syncTaskKey(task.roomKey, task.peerId));
-        } else if (task.kind === "presence") {
-          writer.presenceQueued = false;
-        } else if (task.kind === "machine-monitor") {
-          writer.machineMonitorQueued = false;
-        }
-        try {
-          const frames = await this.buildFrames(writer, task);
-          if (!this.isWriterActive(writer)) return;
-          writer.pendingFrames.push(...frames);
-        } catch (error2) {
-          this.options.onError?.(error2, `buildFrames:${task.kind}`);
-        }
-        if (!this.isWriterActive(writer) || writer.blocked) {
-          return;
-        }
-        const firstFrame = writer.pendingFrames.shift();
-        if (firstFrame) {
-          this.writeFrame(writer, firstFrame);
-        }
-      } finally {
-        writer.pumping = false;
-        if (this.isWriterActive(writer)) {
-          this.scheduleDataPump(writer);
-        }
-      }
-    }
-    writeFrame(writer, frame2) {
-      const accepted = writer.connection.send(frame2);
-      if (accepted === false && writer.unsubscribeDrain) {
-        writer.blocked = true;
-      }
-    }
-    async buildFrames(writer, task) {
-      switch (task.kind) {
-        case "message":
-          return [
-            task.message
-          ];
-        case "presence": {
-          const source = this.options.presenceSource;
-          if (!source) {
-            return [];
-          }
-          const encoded = source.encodeLocalOrigin();
-          if (encoded.length === 0) {
-            return [];
-          }
-          return [
-            {
-              type: "presence",
-              protocolVersion: LOCAL_LORO_DATA_PLANE_PROTOCOL_VERSION,
-              workspaceId: this.options.workspaceId,
-              dataBase64: bytesToBase64(encoded)
-            }
-          ];
-        }
-        case "machine-monitor": {
-          const source = this.options.machineMonitorSource;
-          if (!source) return [];
-          const encoded = source.encodeAll();
-          if (encoded.length === 0) return [];
-          return [
-            {
-              type: "machine-monitor",
-              protocolVersion: LOCAL_LORO_DATA_PLANE_PROTOCOL_VERSION,
-              workspaceId: this.options.workspaceId,
-              dataBase64: bytesToBase64(encoded)
-            }
-          ];
-        }
-        case "join-reply":
-          return await this.buildJoinReplyFrames(writer, task);
-        case "sync":
-          return await this.buildSyncFrames(writer, task.roomKey, task.peerId, null);
-      }
-      const exhaustive = task;
-      throw new Error(`Unsupported local data-plane writer task: ${String(exhaustive)}`);
-    }
-    async buildJoinReplyFrames(writer, task) {
-      const entry = this.rooms.get(task.roomKey);
-      if (!entry) {
-        return [];
-      }
-      const subscriber = entry.subscribers.get(task.peerId);
-      if (!subscriber || subscriber.connection.id !== writer.connection.id) {
-        return [];
-      }
-      if (subscriber.latestJoinRequestId !== task.requestId) {
-        return [];
-      }
-      return await this.buildSyncFrames(writer, task.roomKey, task.peerId, task.requestId);
-    }
-    async buildSyncFrames(writer, key2, peerId, joinRequestId) {
-      const entry = this.rooms.get(key2);
-      if (!entry) {
-        return [];
-      }
-      const subscriber = entry.subscribers.get(peerId);
-      if (!subscriber || subscriber.connection.id !== writer.connection.id) {
-        return [];
-      }
-      if (entry.scope === "doc") {
-        const docSubscriber = subscriber;
-        const serverVV = entry.doc.oplogVersion();
-        const delta = entry.doc.export({
-          mode: "update",
-          from: docSubscriber.lastSentVV
-        });
-        const serverVersion2 = bytesToBase64(serverVV.encode());
-        const dataBase64 = delta.length > 0 ? bytesToBase64(delta) : null;
-        docSubscriber.lastSentVV = serverVV;
-        if (dataBase64 && dataBase64.length > this.maxPayloadBytes) {
-          const chunkPayloads = buildDocUpdateChunkPayloads(dataBase64, this.maxPayloadBytes, createDocUpdateTransferId());
-          const frames2 = [];
-          if (joinRequestId !== null) {
-            frames2.push({
-              type: "joined",
-              protocolVersion: LOCAL_LORO_DATA_PLANE_PROTOCOL_VERSION,
-              workspaceId: this.options.workspaceId,
-              peerId,
-              requestId: joinRequestId,
-              room: entry.room,
-              serverVersion: serverVersion2
-            });
-          }
-          for (const payload of chunkPayloads) {
-            frames2.push({
-              type: "update",
-              protocolVersion: LOCAL_LORO_DATA_PLANE_PROTOCOL_VERSION,
-              workspaceId: this.options.workspaceId,
-              peerId,
-              room: entry.room,
-              serverVersion: serverVersion2,
-              payload
-            });
-          }
-          return frames2;
-        }
-        if (joinRequestId !== null) {
-          return [
-            {
-              type: "joined",
-              protocolVersion: LOCAL_LORO_DATA_PLANE_PROTOCOL_VERSION,
-              workspaceId: this.options.workspaceId,
-              peerId,
-              requestId: joinRequestId,
-              room: entry.room,
-              serverVersion: serverVersion2,
-              ...dataBase64 ? {
-                payload: {
-                  kind: "doc-update",
-                  dataBase64
-                }
-              } : {}
-            }
-          ];
-        }
-        if (!dataBase64) {
-          return [];
-        }
-        return [
-          {
-            type: "update",
-            protocolVersion: LOCAL_LORO_DATA_PLANE_PROTOCOL_VERSION,
-            workspaceId: this.options.workspaceId,
-            peerId,
-            room: entry.room,
-            serverVersion: serverVersion2,
-            payload: {
-              kind: "doc-update",
-              dataBase64
-            }
-          }
-        ];
-      }
-      const flockSubscriber = subscriber;
-      const have = entry.flock.version();
-      const bundle = await entry.flock.exportJson(flockSubscriber.lastSentVersion);
-      const currentEntry = this.rooms.get(key2);
-      const currentSubscriber = currentEntry?.scope === "flock" ? currentEntry.subscribers.get(peerId) : void 0;
-      if (currentEntry !== entry || currentSubscriber !== flockSubscriber || currentSubscriber.connection.id !== writer.connection.id || joinRequestId !== null && currentSubscriber.latestJoinRequestId !== joinRequestId) {
-        return [];
-      }
-      flockSubscriber.lastSentVersion = mergeFlockVersions(flockSubscriber.lastSentVersion, have);
-      const serverVersion = encodeFlockVersion(have);
-      if (isEmptyFlockBundle(bundle)) {
-        if (joinRequestId !== null) {
-          return [
-            {
-              type: "joined",
-              protocolVersion: LOCAL_LORO_DATA_PLANE_PROTOCOL_VERSION,
-              workspaceId: this.options.workspaceId,
-              peerId,
-              requestId: joinRequestId,
-              room: entry.room,
-              serverVersion
-            }
-          ];
-        }
-        return [];
-      }
-      const chunks = chunkFlockBundle(bundle, this.maxPayloadBytes);
-      if (!chunks) {
-        entry.subscribers.delete(peerId);
-        this.releaseRoomIfEmpty(key2, entry);
-        return [
-          this.payloadTooLargeError(peerId, entry.room, joinRequestId ?? void 0)
-        ];
-      }
-      const frames = [];
-      for (const [index, chunk] of chunks.entries()) {
-        if (joinRequestId !== null && index === 0) {
-          frames.push({
-            type: "joined",
-            protocolVersion: LOCAL_LORO_DATA_PLANE_PROTOCOL_VERSION,
-            workspaceId: this.options.workspaceId,
-            peerId,
-            requestId: joinRequestId,
-            room: entry.room,
-            serverVersion,
-            payload: {
-              kind: "flock-json",
-              bundle: chunk
-            }
-          });
-          continue;
-        }
-        frames.push({
-          type: "update",
-          protocolVersion: LOCAL_LORO_DATA_PLANE_PROTOCOL_VERSION,
-          workspaceId: this.options.workspaceId,
-          peerId,
-          room: entry.room,
-          serverVersion,
-          payload: {
-            kind: "flock-json",
-            bundle: chunk
-          }
-        });
-      }
-      return frames;
-    }
-    payloadTooLargeError(peerId, room, requestId) {
-      return {
-        type: "error",
-        protocolVersion: LOCAL_LORO_DATA_PLANE_PROTOCOL_VERSION,
-        workspaceId: this.options.workspaceId,
-        code: LOCAL_LORO_DATA_PLANE_PAYLOAD_TOO_LARGE,
-        message: "sync payload exceeds the local data-plane frame budget",
-        peerId,
-        room,
-        ...requestId ? {
-          requestId
-        } : {},
-        terminal: true
-      };
-    }
-    unsubscribePeer(peerId, key2) {
-      const entry = this.rooms.get(key2);
-      if (!entry) {
-        return;
-      }
-      entry.subscribers.delete(peerId);
-      if (entry.scope === "doc") {
-        entry.uploadAssemblers.delete(peerId);
-      }
-      this.releaseRoomIfEmpty(key2, entry);
-    }
-    releaseRoomIfEmpty(key2, entry) {
-      if (entry.subscribers.size > 0 || this.rooms.get(key2) !== entry) {
-        return;
-      }
-      entry.unsubscribe();
-      this.rooms.delete(key2);
-      this.notifyDocRoomLeave(entry.room);
-      this.notifyFlockRoomLeave(entry.room);
-    }
-    sendError(connection2, error2) {
-      this.enqueueMessage(connection2, {
-        type: "error",
-        protocolVersion: LOCAL_LORO_DATA_PLANE_PROTOCOL_VERSION,
-        workspaceId: this.options.workspaceId,
-        code: error2.code,
-        ...error2.message ? {
-          message: error2.message
-        } : {},
-        ...error2.peerId ? {
-          peerId: error2.peerId
-        } : {},
-        ...error2.requestId ? {
-          requestId: error2.requestId
-        } : {},
-        ...error2.room ? {
-          room: error2.room
-        } : {},
-        ...error2.terminal ? {
-          terminal: true
-        } : {}
-      });
-    }
-  }
-  function decodeVersion(encoded) {
-    if (!encoded) {
-      return new VersionVector(null);
-    }
-    return VersionVector.decode(base64ToBytes(encoded));
-  }
-  function errorMessage(error2) {
-    return error2 instanceof Error ? error2.message : String(error2);
-  }
   const DEFAULT_SAMPLE_RATES = {
     A: 1,
     B: 1,
@@ -25608,7 +24744,7 @@ ${peerId}`;
   }
   const runtimeEnv = getRuntimeEnv();
   const apiKey = resolveApiKey();
-  const release = `${name$2}@${version$7}`;
+  const release = `${name$2}@${version$9}`;
   const distinctId = resolveDistinctId();
   const errorReportingEnabled = runtimeEnv !== "dev" && !!apiKey;
   let client$1 = null;
@@ -25620,9 +24756,9 @@ ${peerId}`;
   }
   const baseExceptionProps = {
     $lib: "lody-cli",
-    $lib_version: version$7,
+    $lib_version: version$9,
     platform: "cli",
-    app_version: version$7,
+    app_version: version$9,
     env: runtimeEnv,
     release,
     machine_id: distinctId
@@ -26314,7 +25450,7 @@ ${peerId}`;
     if (hasRequiredCommand$1) return command$1;
     hasRequiredCommand$1 = 1;
     const EventEmitter2 = require$$0$4.EventEmitter;
-    const childProcess = require$$1$2;
+    const childProcess = LE__default;
     const path2 = path__default;
     const fs2 = fs__default$1;
     const process2 = process$2;
@@ -31232,9 +30368,9 @@ ${originalIndentation}`;
     })(common$2);
     return common$2;
   }
-  const version$6 = "3.19.0";
+  const version$8 = "3.19.0";
   const require$$2$3 = {
-    version: version$6
+    version: version$8
   };
   var transports = {};
   var winstonTransport = {
@@ -31256,7 +30392,7 @@ ${originalIndentation}`;
   function requireStream$3() {
     if (hasRequiredStream$3) return stream$3;
     hasRequiredStream$3 = 1;
-    stream$3 = un;
+    stream$3 = Zr;
     return stream$3;
   }
   var destroy_1;
@@ -34847,7 +33983,7 @@ ${originalIndentation}`;
     if (hasRequiredReadable$1) return readable$1.exports;
     hasRequiredReadable$1 = 1;
     (function(module2, exports$1) {
-      var Stream = un;
+      var Stream = Zr;
       if (process.env.READABLE_STREAM === "disable" && Stream) {
         module2.exports = Stream.Readable;
         Object.assign(module2.exports, Stream);
@@ -37621,7 +36757,7 @@ ${originalIndentation}`;
     if (hasRequiredDevelopment) return development;
     hasRequiredDevelopment = 1;
     var create = requireDiagnostics$1();
-    var tty2 = require$$1$3.isatty(1);
+    var tty2 = require$$1$2.isatty(1);
     var diagnostics2 = create(function dev(namespace, options) {
       options = options || {};
       options.colors = "colors" in options ? options.colors : tty2;
@@ -37656,7 +36792,7 @@ ${originalIndentation}`;
     if (hasRequiredTailFile) return tailFile;
     hasRequiredTailFile = 1;
     const fs2 = fs__default;
-    const { StringDecoder: StringDecoder2 } = require$$1$4;
+    const { StringDecoder: StringDecoder2 } = require$$1$3;
     const { Stream } = requireReadable$1();
     function noop2() {
     }
@@ -37753,7 +36889,7 @@ ${originalIndentation}`;
     const fs2 = fs__default;
     const path2 = path__default$1;
     const asyncSeries = requireSeries();
-    const zlib = Ko__default;
+    const zlib = $s__default;
     const { MESSAGE } = requireTripleBeam();
     const { Stream, PassThrough: PassThrough2 } = requireReadable$1();
     const TransportStream = requireWinstonTransport();
@@ -44690,10 +43826,10 @@ ${originalIndentation}`;
     const os2 = os__default$1;
     const path2 = path__default$1;
     const util2 = require$$0$5;
-    const zlib = Ko__default;
+    const zlib = $s__default;
     const hash2 = requireObjectHash();
     const MESSAGE = requireTripleBeam().MESSAGE;
-    const PassThrough2 = un.PassThrough;
+    const PassThrough2 = Zr.PassThrough;
     const Transport = requireWinstonTransport();
     const loggerDefaults = {
       json: false,
@@ -45145,7 +44281,7 @@ ${value.slice(value.length - safeTailChars)}`;
     return files;
   }
   async function readDailyLogFile(file2) {
-    const raw2 = await fs__default$2.readFile(file2.path);
+    const raw2 = await jt__default.readFile(file2.path);
     if (!file2.compressed) return raw2.toString("utf8");
     return (await gunzip(raw2)).toString("utf8");
   }
@@ -63849,6 +62985,907 @@ ${this.stack.split("\n").slice(1).join("\n")}` : this.toString();
   function getDisableValidationMakeOption(options) {
     return isBoolean(options) ? options : options?.disableValidation ?? false;
   }
+  const scheduleDataWorkNextTurn = (work) => {
+    const handle = setTimeout(work, 0);
+    return () => clearTimeout(handle);
+  };
+  const createLocalLoroDataPlaneScheduler = (scheduleTurn = scheduleDataWorkNextTurn) => {
+    const queue2 = [];
+    let running2 = false;
+    let cancelScheduledTurn = null;
+    const takeNext = () => {
+      for (; ; ) {
+        const work = queue2.shift();
+        if (!work) return null;
+        if (!work.cancelled) return work;
+      }
+    };
+    const requestRun = () => {
+      if (running2 || cancelScheduledTurn || queue2.length === 0) return;
+      cancelScheduledTurn = scheduleTurn(() => {
+        cancelScheduledTurn = null;
+        const work = takeNext();
+        if (!work) {
+          return;
+        }
+        running2 = true;
+        void Promise.resolve().then(work.run).finally(() => {
+          running2 = false;
+          requestRun();
+        });
+      });
+    };
+    return {
+      scheduleDataWork: (run2) => {
+        const work = {
+          run: run2,
+          cancelled: false
+        };
+        queue2.push(work);
+        requestRun();
+        return () => {
+          work.cancelled = true;
+        };
+      }
+    };
+  };
+  function syncTaskKey(key2, peerId) {
+    return `${key2}
+${peerId}`;
+  }
+  class LocalLoroDataPlaneServer {
+    constructor(options) {
+      this.options = options;
+      this.scheduler = options.scheduler ?? createLocalLoroDataPlaneScheduler();
+      this.docRoomJoinHandler = options.onDocRoomJoin ?? null;
+      this.docRoomLeaveHandler = options.onDocRoomLeave ?? null;
+      this.flockRoomJoinHandler = options.onFlockRoomJoin ?? null;
+      this.flockRoomLeaveHandler = options.onFlockRoomLeave ?? null;
+      if (options.presenceSource) {
+        this.presenceUnsubscribe = options.presenceSource.subscribeLocalOrigin(() => this.broadcastPresence());
+      }
+      if (options.machineMonitorSource) {
+        this.machineMonitorUnsubscribe = options.machineMonitorSource.subscribe(() => this.broadcastMachineMonitor());
+      }
+    }
+    rooms = /* @__PURE__ */ new Map();
+    resolveInFlight = /* @__PURE__ */ new Map();
+    roomGenerations = /* @__PURE__ */ new Map();
+    presenceReceivers = /* @__PURE__ */ new Map();
+    machineMonitorReceivers = /* @__PURE__ */ new Map();
+    writers = /* @__PURE__ */ new Map();
+    presenceUnsubscribe = null;
+    machineMonitorUnsubscribe = null;
+    docRoomJoinHandler = null;
+    docRoomLeaveHandler = null;
+    flockRoomJoinHandler = null;
+    flockRoomLeaveHandler = null;
+    scheduler;
+    disposed = false;
+    setDocRoomJoinHandler(handler) {
+      this.docRoomJoinHandler = handler;
+    }
+    setDocRoomLeaveHandler(handler) {
+      this.docRoomLeaveHandler = handler;
+    }
+    setFlockRoomJoinHandler(handler) {
+      this.flockRoomJoinHandler = handler;
+    }
+    setFlockRoomLeaveHandler(handler) {
+      this.flockRoomLeaveHandler = handler;
+    }
+    publishRoomStatus(room, status) {
+      const entry = this.rooms.get(roomKey(room));
+      if (!entry) {
+        return;
+      }
+      for (const subscriber of entry.subscribers.values()) {
+        this.enqueueMessage(subscriber.connection, {
+          type: "room-status",
+          protocolVersion: LOCAL_LORO_DATA_PLANE_PROTOCOL_VERSION,
+          workspaceId: this.options.workspaceId,
+          peerId: subscriber.peerId,
+          room,
+          status
+        });
+      }
+    }
+    invalidateDocRoom(docId) {
+      const room = {
+        scope: "doc",
+        docId
+      };
+      const key2 = roomKey(room);
+      this.roomGenerations.set(key2, (this.roomGenerations.get(key2) ?? 0) + 1);
+      const entry = this.rooms.get(key2);
+      if (!entry || entry.scope !== "doc") {
+        return;
+      }
+      this.dropQueuedRoomWork(key2);
+      this.publishRoomStatus(room, "disconnected");
+      entry.unsubscribe();
+      entry.subscribers.clear();
+      entry.uploadAssemblers.clear();
+      this.rooms.delete(key2);
+    }
+    dropQueuedRoomWork(key2) {
+      for (const writer of this.writers.values()) {
+        writer.queue = writer.queue.filter((task) => !((task.kind === "sync" || task.kind === "join-reply") && task.roomKey === key2));
+        for (const taskKey of [
+          ...writer.queuedSyncKeys
+        ]) {
+          if (taskKey.startsWith(`${key2}
+`)) {
+            writer.queuedSyncKeys.delete(taskKey);
+          }
+        }
+      }
+    }
+    get maxPayloadBytes() {
+      return this.options.maxPayloadBytes ?? LOCAL_LORO_DATA_PLANE_MAX_PAYLOAD_BYTES;
+    }
+    async handleMessage(connection2, message) {
+      if (this.disposed) {
+        this.sendError(connection2, {
+          code: "workspace_runtime_unavailable",
+          peerId: message.peerId,
+          requestId: message.type === "join" ? message.requestId : void 0
+        });
+        return;
+      }
+      if (message.workspaceId !== this.options.workspaceId) {
+        this.sendError(connection2, {
+          code: "workspace_mismatch",
+          peerId: message.peerId,
+          requestId: message.type === "join" ? message.requestId : void 0
+        });
+        return;
+      }
+      try {
+        this.registerPresenceReceiver(connection2);
+        switch (message.type) {
+          case "join":
+            await this.handleJoin(connection2, message);
+            return;
+          case "update":
+            await this.handleUpdate(connection2, message);
+            return;
+          case "leave":
+            this.unsubscribePeer(message.peerId, roomKey(message.room));
+            return;
+          case "detach":
+            this.detachPeer(message.peerId);
+            return;
+          case "machine-monitor":
+            this.registerMachineMonitorReceiver(connection2);
+            this.options.machineMonitorSource?.apply(base64ToBytes(message.dataBase64));
+            return;
+        }
+      } catch (error2) {
+        this.options.onError?.(error2, `handleMessage:${message.type}`);
+        this.sendError(connection2, {
+          code: "data_plane_error",
+          message: errorMessage(error2),
+          peerId: message.peerId,
+          requestId: message.type === "join" ? message.requestId : void 0,
+          room: "room" in message ? message.room : void 0
+        });
+      }
+    }
+    registerPresenceReceiver(connection2) {
+      if (!this.options.presenceSource || this.presenceReceivers.has(connection2.id)) {
+        return;
+      }
+      this.presenceReceivers.set(connection2.id, connection2);
+      this.enqueuePresence(connection2);
+    }
+    broadcastPresence() {
+      if (this.disposed) {
+        return;
+      }
+      for (const connection2 of this.presenceReceivers.values()) {
+        this.enqueuePresence(connection2);
+      }
+    }
+    registerMachineMonitorReceiver(connection2) {
+      if (!this.options.machineMonitorSource || this.machineMonitorReceivers.has(connection2.id)) {
+        return;
+      }
+      this.machineMonitorReceivers.set(connection2.id, connection2);
+      this.enqueueMachineMonitor(connection2);
+    }
+    broadcastMachineMonitor() {
+      if (this.disposed) return;
+      for (const connection2 of this.machineMonitorReceivers.values()) {
+        this.enqueueMachineMonitor(connection2);
+      }
+    }
+    dispose() {
+      this.disposed = true;
+      this.presenceUnsubscribe?.();
+      this.presenceUnsubscribe = null;
+      this.machineMonitorUnsubscribe?.();
+      this.machineMonitorUnsubscribe = null;
+      this.presenceReceivers.clear();
+      this.machineMonitorReceivers.clear();
+      for (const entry of this.rooms.values()) {
+        entry.unsubscribe();
+        this.notifyDocRoomLeave(entry.room);
+        this.notifyFlockRoomLeave(entry.room);
+        entry.subscribers.clear();
+      }
+      this.rooms.clear();
+      this.roomGenerations.clear();
+      for (const writer of this.writers.values()) {
+        this.cancelScheduledDataPump(writer);
+        writer.unsubscribeDrain?.();
+        writer.queue.length = 0;
+        writer.pendingFrames.length = 0;
+      }
+      this.writers.clear();
+    }
+    handleDisconnect(connectionId) {
+      this.presenceReceivers.delete(connectionId);
+      this.machineMonitorReceivers.delete(connectionId);
+      const writer = this.writers.get(connectionId);
+      if (writer) {
+        this.cancelScheduledDataPump(writer);
+        writer.unsubscribeDrain?.();
+        writer.queue.length = 0;
+        writer.pendingFrames.length = 0;
+        this.writers.delete(connectionId);
+      }
+      for (const key2 of [
+        ...this.rooms.keys()
+      ]) {
+        const entry = this.rooms.get(key2);
+        if (!entry) {
+          continue;
+        }
+        for (const [peerId, subscriber] of [
+          ...entry.subscribers
+        ]) {
+          if (subscriber.connection.id === connectionId) {
+            entry.subscribers.delete(peerId);
+            if (entry.scope === "doc") {
+              entry.uploadAssemblers.delete(peerId);
+            }
+          }
+        }
+        this.releaseRoomIfEmpty(key2, entry);
+      }
+    }
+    detachPeer(peerId) {
+      for (const key2 of [
+        ...this.rooms.keys()
+      ]) {
+        this.unsubscribePeer(peerId, key2);
+      }
+    }
+    async handleJoin(connection2, message) {
+      const key2 = roomKey(message.room);
+      for (; ; ) {
+        const entry = await this.ensureRoom(message.room);
+        if (this.rooms.get(key2) !== entry) {
+          continue;
+        }
+        if (entry.scope === "doc") {
+          entry.subscribers.set(message.peerId, {
+            peerId: message.peerId,
+            connection: connection2,
+            latestJoinRequestId: message.requestId,
+            lastSentVV: decodeVersion(message.haveVersion)
+          });
+        } else {
+          entry.subscribers.set(message.peerId, {
+            peerId: message.peerId,
+            connection: connection2,
+            latestJoinRequestId: message.requestId,
+            lastSentVersion: decodeFlockVersion(message.haveVersion)
+          });
+        }
+        this.enqueueJoinReply(connection2, key2, message.peerId, message.requestId);
+        if (message.room.scope === "doc") {
+          this.notifyDocRoomJoin(message.room.docId);
+        } else if (message.room.scope === "flock-doc") {
+          this.notifyFlockRoomJoin(message.room.flockDocId);
+        }
+        return;
+      }
+    }
+    notifyDocRoomJoin(docId) {
+      if (!this.docRoomJoinHandler) {
+        return;
+      }
+      void Promise.resolve(this.docRoomJoinHandler(docId)).catch((error2) => {
+        this.options.onError?.(error2, "onDocRoomJoin");
+      });
+    }
+    notifyFlockRoomJoin(flockDocId) {
+      if (!this.flockRoomJoinHandler) {
+        return;
+      }
+      void Promise.resolve(this.flockRoomJoinHandler(flockDocId)).catch((error2) => {
+        this.options.onError?.(error2, "onFlockRoomJoin");
+      });
+    }
+    notifyDocRoomLeave(room) {
+      if (room.scope !== "doc" || !this.docRoomLeaveHandler) {
+        return;
+      }
+      void Promise.resolve(this.docRoomLeaveHandler(room.docId)).catch((error2) => {
+        this.options.onError?.(error2, "onDocRoomLeave");
+      });
+    }
+    notifyFlockRoomLeave(room) {
+      if (room.scope !== "flock-doc" || !this.flockRoomLeaveHandler) {
+        return;
+      }
+      void Promise.resolve(this.flockRoomLeaveHandler(room.flockDocId)).catch((error2) => {
+        this.options.onError?.(error2, "onFlockRoomLeave");
+      });
+    }
+    async handleUpdate(connection2, message) {
+      const key2 = roomKey(message.room);
+      let entry = await this.ensureRoom(message.room);
+      while (this.rooms.get(key2) !== entry) {
+        entry = await this.ensureRoom(message.room);
+      }
+      if (entry.scope === "doc") {
+        if (message.payload.kind === "flock-json") {
+          this.sendError(connection2, {
+            code: "payload_kind_mismatch",
+            message: "expected doc-update",
+            peerId: message.peerId,
+            room: message.room
+          });
+          return;
+        }
+        let dataBase64;
+        if (message.payload.kind === "doc-update") {
+          entry.uploadAssemblers.delete(message.peerId);
+          dataBase64 = message.payload.dataBase64;
+        } else {
+          let assembler = entry.uploadAssemblers.get(message.peerId);
+          if (!assembler) {
+            assembler = new DocUpdateChunkAssembler();
+            entry.uploadAssemblers.set(message.peerId, assembler);
+          }
+          dataBase64 = assembler.push(message.payload);
+          if (dataBase64 === null) {
+            return;
+          }
+          entry.uploadAssemblers.delete(message.peerId);
+        }
+        const subscriber2 = entry.subscribers.get(message.peerId);
+        if (subscriber2) {
+          subscriber2.lastSentVV = decodeVersion(message.haveVersion);
+        }
+        entry.doc.import(base64ToBytes(dataBase64));
+        return;
+      }
+      if (message.payload.kind !== "flock-json") {
+        this.sendError(connection2, {
+          code: "payload_kind_mismatch",
+          message: "expected flock-json",
+          peerId: message.peerId,
+          room: message.room
+        });
+        return;
+      }
+      const subscriber = entry.subscribers.get(message.peerId);
+      if (subscriber) {
+        subscriber.lastSentVersion = mergeFlockVersions(subscriber.lastSentVersion, decodeFlockVersion(message.haveVersion));
+      }
+      await entry.flock.importJson(message.payload.bundle);
+      entry.flock.commit?.();
+    }
+    async ensureRoom(room) {
+      const key2 = roomKey(room);
+      for (; ; ) {
+        const existing = this.rooms.get(key2);
+        if (existing) {
+          return existing;
+        }
+        const inFlight = this.resolveInFlight.get(key2);
+        if (inFlight) {
+          const shared = await inFlight;
+          if (shared) {
+            return shared;
+          }
+          continue;
+        }
+        const generation = this.roomGenerations.get(key2) ?? 0;
+        const build = (async () => {
+          const entry = room.scope === "doc" ? await this.buildDocRoom(room, room.docId) : await this.buildFlockRoom(room, await this.resolveFlockForRoom(room));
+          if (this.disposed) {
+            entry.unsubscribe();
+            throw new Error("data_plane_engine_disposed");
+          }
+          if ((this.roomGenerations.get(key2) ?? 0) !== generation) {
+            entry.unsubscribe();
+            return null;
+          }
+          this.rooms.set(key2, entry);
+          return entry;
+        })().finally(() => this.resolveInFlight.delete(key2));
+        this.resolveInFlight.set(key2, build);
+        const resolved = await build;
+        if (resolved) {
+          return resolved;
+        }
+      }
+    }
+    async buildDocRoom(room, docId) {
+      const doc = await this.options.resolveDoc(docId);
+      const entry = {
+        scope: "doc",
+        room,
+        doc,
+        unsubscribe: () => {
+        },
+        subscribers: /* @__PURE__ */ new Map(),
+        uploadAssemblers: /* @__PURE__ */ new Map()
+      };
+      entry.unsubscribe = doc.subscribe(() => this.markRoomDirty(entry));
+      return entry;
+    }
+    resolveFlockForRoom(room) {
+      if (room.scope === "flock-doc") {
+        return this.options.resolveFlockDoc(room.flockDocId);
+      }
+      return this.options.resolveMetaFlock ? this.options.resolveMetaFlock() : this.options.resolveFlockDoc("meta");
+    }
+    async buildFlockRoom(room, flock) {
+      const entry = {
+        scope: "flock",
+        room,
+        flock,
+        unsubscribe: () => {
+        },
+        subscribers: /* @__PURE__ */ new Map()
+      };
+      entry.unsubscribe = flock.subscribe(() => this.markRoomDirty(entry));
+      return entry;
+    }
+    markRoomDirty(entry) {
+      if (this.disposed) {
+        return;
+      }
+      const key2 = roomKey(entry.room);
+      for (const subscriber of entry.subscribers.values()) {
+        this.enqueueSync(subscriber.connection, key2, subscriber.peerId);
+      }
+      this.releaseRoomIfEmpty(key2, entry);
+    }
+    writerFor(connection2) {
+      const existing = this.writers.get(connection2.id);
+      if (existing) {
+        return existing;
+      }
+      const writer = {
+        connection: connection2,
+        queue: [],
+        queuedSyncKeys: /* @__PURE__ */ new Set(),
+        presenceQueued: false,
+        machineMonitorQueued: false,
+        pendingFrames: [],
+        pumping: false,
+        pumpScheduled: false,
+        cancelScheduledPump: null,
+        blocked: false,
+        unsubscribeDrain: null
+      };
+      writer.unsubscribeDrain = connection2.onDrain?.(() => {
+        writer.blocked = false;
+        this.scheduleDataPump(writer);
+      }) ?? null;
+      this.writers.set(connection2.id, writer);
+      return writer;
+    }
+    enqueueMessage(connection2, message) {
+      const writer = this.writerFor(connection2);
+      writer.queue.push({
+        kind: "message",
+        message
+      });
+      this.scheduleDataPump(writer);
+    }
+    enqueueJoinReply(connection2, key2, peerId, requestId) {
+      const writer = this.writerFor(connection2);
+      writer.queue.push({
+        kind: "join-reply",
+        roomKey: key2,
+        peerId,
+        requestId
+      });
+      this.scheduleDataPump(writer);
+    }
+    enqueueSync(connection2, key2, peerId) {
+      const writer = this.writerFor(connection2);
+      const taskKey = syncTaskKey(key2, peerId);
+      if (writer.queuedSyncKeys.has(taskKey)) {
+        return;
+      }
+      writer.queuedSyncKeys.add(taskKey);
+      writer.queue.push({
+        kind: "sync",
+        roomKey: key2,
+        peerId
+      });
+      this.scheduleDataPump(writer);
+    }
+    enqueuePresence(connection2) {
+      const writer = this.writerFor(connection2);
+      if (writer.presenceQueued) {
+        return;
+      }
+      writer.presenceQueued = true;
+      writer.queue.push({
+        kind: "presence"
+      });
+      this.scheduleDataPump(writer);
+    }
+    enqueueMachineMonitor(connection2) {
+      const writer = this.writerFor(connection2);
+      if (writer.machineMonitorQueued) return;
+      writer.machineMonitorQueued = true;
+      writer.queue.push({
+        kind: "machine-monitor"
+      });
+      this.scheduleDataPump(writer);
+    }
+    isWriterActive(writer) {
+      return !this.disposed && this.writers.get(writer.connection.id) === writer;
+    }
+    cancelScheduledDataPump(writer) {
+      writer.cancelScheduledPump?.();
+      writer.cancelScheduledPump = null;
+      writer.pumpScheduled = false;
+    }
+    hasPendingDataWork(writer) {
+      return writer.pendingFrames.length > 0 || writer.queue.length > 0;
+    }
+    scheduleDataPump(writer) {
+      if (!this.isWriterActive(writer) || writer.blocked || writer.pumping || writer.pumpScheduled || !this.hasPendingDataWork(writer)) {
+        return;
+      }
+      writer.pumpScheduled = true;
+      writer.cancelScheduledPump = this.scheduler.scheduleDataWork(() => {
+        writer.pumpScheduled = false;
+        writer.cancelScheduledPump = null;
+        return this.pumpWriter(writer).catch((error2) => {
+          this.options.onError?.(error2, "pumpWriter");
+        });
+      });
+    }
+    async pumpWriter(writer) {
+      if (!this.isWriterActive(writer) || writer.pumping || writer.blocked) {
+        return;
+      }
+      writer.pumping = true;
+      try {
+        const pendingFrame = writer.pendingFrames.shift();
+        if (pendingFrame) {
+          this.writeFrame(writer, pendingFrame);
+          return;
+        }
+        const task = writer.queue.shift();
+        if (!task) {
+          return;
+        }
+        if (task.kind === "sync") {
+          writer.queuedSyncKeys.delete(syncTaskKey(task.roomKey, task.peerId));
+        } else if (task.kind === "presence") {
+          writer.presenceQueued = false;
+        } else if (task.kind === "machine-monitor") {
+          writer.machineMonitorQueued = false;
+        }
+        try {
+          const frames = await this.buildFrames(writer, task);
+          if (!this.isWriterActive(writer)) return;
+          writer.pendingFrames.push(...frames);
+        } catch (error2) {
+          this.options.onError?.(error2, `buildFrames:${task.kind}`);
+        }
+        if (!this.isWriterActive(writer) || writer.blocked) {
+          return;
+        }
+        const firstFrame = writer.pendingFrames.shift();
+        if (firstFrame) {
+          this.writeFrame(writer, firstFrame);
+        }
+      } finally {
+        writer.pumping = false;
+        if (this.isWriterActive(writer)) {
+          this.scheduleDataPump(writer);
+        }
+      }
+    }
+    writeFrame(writer, frame2) {
+      const accepted = writer.connection.send(frame2);
+      if (accepted === false && writer.unsubscribeDrain) {
+        writer.blocked = true;
+      }
+    }
+    async buildFrames(writer, task) {
+      switch (task.kind) {
+        case "message":
+          return [
+            task.message
+          ];
+        case "presence": {
+          const source = this.options.presenceSource;
+          if (!source) {
+            return [];
+          }
+          const encoded = source.encodeLocalOrigin();
+          if (encoded.length === 0) {
+            return [];
+          }
+          return [
+            {
+              type: "presence",
+              protocolVersion: LOCAL_LORO_DATA_PLANE_PROTOCOL_VERSION,
+              workspaceId: this.options.workspaceId,
+              dataBase64: bytesToBase64(encoded)
+            }
+          ];
+        }
+        case "machine-monitor": {
+          const source = this.options.machineMonitorSource;
+          if (!source) return [];
+          const encoded = source.encodeAll();
+          if (encoded.length === 0) return [];
+          return [
+            {
+              type: "machine-monitor",
+              protocolVersion: LOCAL_LORO_DATA_PLANE_PROTOCOL_VERSION,
+              workspaceId: this.options.workspaceId,
+              dataBase64: bytesToBase64(encoded)
+            }
+          ];
+        }
+        case "join-reply":
+          return await this.buildJoinReplyFrames(writer, task);
+        case "sync":
+          return await this.buildSyncFrames(writer, task.roomKey, task.peerId, null);
+      }
+      const exhaustive = task;
+      throw new Error(`Unsupported local data-plane writer task: ${String(exhaustive)}`);
+    }
+    async buildJoinReplyFrames(writer, task) {
+      const entry = this.rooms.get(task.roomKey);
+      if (!entry) {
+        return [];
+      }
+      const subscriber = entry.subscribers.get(task.peerId);
+      if (!subscriber || subscriber.connection.id !== writer.connection.id) {
+        return [];
+      }
+      if (subscriber.latestJoinRequestId !== task.requestId) {
+        return [];
+      }
+      return await this.buildSyncFrames(writer, task.roomKey, task.peerId, task.requestId);
+    }
+    async buildSyncFrames(writer, key2, peerId, joinRequestId) {
+      const entry = this.rooms.get(key2);
+      if (!entry) {
+        return [];
+      }
+      const subscriber = entry.subscribers.get(peerId);
+      if (!subscriber || subscriber.connection.id !== writer.connection.id) {
+        return [];
+      }
+      if (entry.scope === "doc") {
+        const docSubscriber = subscriber;
+        const serverVV = entry.doc.oplogVersion();
+        const delta = entry.doc.export({
+          mode: "update",
+          from: docSubscriber.lastSentVV
+        });
+        const serverVersion2 = bytesToBase64(serverVV.encode());
+        const dataBase64 = delta.length > 0 ? bytesToBase64(delta) : null;
+        docSubscriber.lastSentVV = serverVV;
+        if (dataBase64 && dataBase64.length > this.maxPayloadBytes) {
+          const chunkPayloads = buildDocUpdateChunkPayloads(dataBase64, this.maxPayloadBytes, createDocUpdateTransferId());
+          const frames2 = [];
+          if (joinRequestId !== null) {
+            frames2.push({
+              type: "joined",
+              protocolVersion: LOCAL_LORO_DATA_PLANE_PROTOCOL_VERSION,
+              workspaceId: this.options.workspaceId,
+              peerId,
+              requestId: joinRequestId,
+              room: entry.room,
+              serverVersion: serverVersion2
+            });
+          }
+          for (const payload of chunkPayloads) {
+            frames2.push({
+              type: "update",
+              protocolVersion: LOCAL_LORO_DATA_PLANE_PROTOCOL_VERSION,
+              workspaceId: this.options.workspaceId,
+              peerId,
+              room: entry.room,
+              serverVersion: serverVersion2,
+              payload
+            });
+          }
+          return frames2;
+        }
+        if (joinRequestId !== null) {
+          return [
+            {
+              type: "joined",
+              protocolVersion: LOCAL_LORO_DATA_PLANE_PROTOCOL_VERSION,
+              workspaceId: this.options.workspaceId,
+              peerId,
+              requestId: joinRequestId,
+              room: entry.room,
+              serverVersion: serverVersion2,
+              ...dataBase64 ? {
+                payload: {
+                  kind: "doc-update",
+                  dataBase64
+                }
+              } : {}
+            }
+          ];
+        }
+        if (!dataBase64) {
+          return [];
+        }
+        return [
+          {
+            type: "update",
+            protocolVersion: LOCAL_LORO_DATA_PLANE_PROTOCOL_VERSION,
+            workspaceId: this.options.workspaceId,
+            peerId,
+            room: entry.room,
+            serverVersion: serverVersion2,
+            payload: {
+              kind: "doc-update",
+              dataBase64
+            }
+          }
+        ];
+      }
+      const flockSubscriber = subscriber;
+      const have = entry.flock.version();
+      const bundle = await entry.flock.exportJson(flockSubscriber.lastSentVersion);
+      const currentEntry = this.rooms.get(key2);
+      const currentSubscriber = currentEntry?.scope === "flock" ? currentEntry.subscribers.get(peerId) : void 0;
+      if (currentEntry !== entry || currentSubscriber !== flockSubscriber || currentSubscriber.connection.id !== writer.connection.id || joinRequestId !== null && currentSubscriber.latestJoinRequestId !== joinRequestId) {
+        return [];
+      }
+      flockSubscriber.lastSentVersion = mergeFlockVersions(flockSubscriber.lastSentVersion, have);
+      const serverVersion = encodeFlockVersion(have);
+      if (isEmptyFlockBundle(bundle)) {
+        if (joinRequestId !== null) {
+          return [
+            {
+              type: "joined",
+              protocolVersion: LOCAL_LORO_DATA_PLANE_PROTOCOL_VERSION,
+              workspaceId: this.options.workspaceId,
+              peerId,
+              requestId: joinRequestId,
+              room: entry.room,
+              serverVersion
+            }
+          ];
+        }
+        return [];
+      }
+      const chunks = chunkFlockBundle(bundle, this.maxPayloadBytes);
+      if (!chunks) {
+        entry.subscribers.delete(peerId);
+        this.releaseRoomIfEmpty(key2, entry);
+        return [
+          this.payloadTooLargeError(peerId, entry.room, joinRequestId ?? void 0)
+        ];
+      }
+      const frames = [];
+      for (const [index, chunk] of chunks.entries()) {
+        if (joinRequestId !== null && index === 0) {
+          frames.push({
+            type: "joined",
+            protocolVersion: LOCAL_LORO_DATA_PLANE_PROTOCOL_VERSION,
+            workspaceId: this.options.workspaceId,
+            peerId,
+            requestId: joinRequestId,
+            room: entry.room,
+            serverVersion,
+            payload: {
+              kind: "flock-json",
+              bundle: chunk
+            }
+          });
+          continue;
+        }
+        frames.push({
+          type: "update",
+          protocolVersion: LOCAL_LORO_DATA_PLANE_PROTOCOL_VERSION,
+          workspaceId: this.options.workspaceId,
+          peerId,
+          room: entry.room,
+          serverVersion,
+          payload: {
+            kind: "flock-json",
+            bundle: chunk
+          }
+        });
+      }
+      return frames;
+    }
+    payloadTooLargeError(peerId, room, requestId) {
+      return {
+        type: "error",
+        protocolVersion: LOCAL_LORO_DATA_PLANE_PROTOCOL_VERSION,
+        workspaceId: this.options.workspaceId,
+        code: LOCAL_LORO_DATA_PLANE_PAYLOAD_TOO_LARGE,
+        message: "sync payload exceeds the local data-plane frame budget",
+        peerId,
+        room,
+        ...requestId ? {
+          requestId
+        } : {},
+        terminal: true
+      };
+    }
+    unsubscribePeer(peerId, key2) {
+      const entry = this.rooms.get(key2);
+      if (!entry) {
+        return;
+      }
+      entry.subscribers.delete(peerId);
+      if (entry.scope === "doc") {
+        entry.uploadAssemblers.delete(peerId);
+      }
+      this.releaseRoomIfEmpty(key2, entry);
+    }
+    releaseRoomIfEmpty(key2, entry) {
+      if (entry.subscribers.size > 0 || this.rooms.get(key2) !== entry) {
+        return;
+      }
+      entry.unsubscribe();
+      this.rooms.delete(key2);
+      this.notifyDocRoomLeave(entry.room);
+      this.notifyFlockRoomLeave(entry.room);
+    }
+    sendError(connection2, error2) {
+      this.enqueueMessage(connection2, {
+        type: "error",
+        protocolVersion: LOCAL_LORO_DATA_PLANE_PROTOCOL_VERSION,
+        workspaceId: this.options.workspaceId,
+        code: error2.code,
+        ...error2.message ? {
+          message: error2.message
+        } : {},
+        ...error2.peerId ? {
+          peerId: error2.peerId
+        } : {},
+        ...error2.requestId ? {
+          requestId: error2.requestId
+        } : {},
+        ...error2.room ? {
+          room: error2.room
+        } : {},
+        ...error2.terminal ? {
+          terminal: true
+        } : {}
+      });
+    }
+  }
+  function decodeVersion(encoded) {
+    if (!encoded) {
+      return new VersionVector(null);
+    }
+    return VersionVector.decode(base64ToBytes(encoded));
+  }
+  function errorMessage(error2) {
+    return error2 instanceof Error ? error2.message : String(error2);
+  }
   const byteToHex = [];
   for (let i2 = 0; i2 < 256; ++i2) {
     byteToHex.push((i2 + 256).toString(16).slice(1));
@@ -64159,7 +64196,7 @@ ${this.stack.split("\n").slice(1).join("\n")}` : this.toString();
   function requirePermessageDeflate$1() {
     if (hasRequiredPermessageDeflate$1) return permessageDeflate$1;
     hasRequiredPermessageDeflate$1 = 1;
-    const zlib = Ko__default;
+    const zlib = $s__default;
     const bufferUtil2 = requireBufferUtil();
     const Limiter = requireLimiter();
     const { kStatusCode } = requireConstants$5();
@@ -64614,7 +64651,7 @@ ${this.stack.split("\n").slice(1).join("\n")}` : this.toString();
   function requireReceiver$1() {
     if (hasRequiredReceiver$1) return receiver$1;
     hasRequiredReceiver$1 = 1;
-    const { Writable } = un;
+    const { Writable } = Zr;
     const PerMessageDeflate = requirePermessageDeflate$1();
     const { BINARY_TYPES, EMPTY_BUFFER, kStatusCode, kWebSocket } = requireConstants$5();
     const { concat: concat2, toArrayBuffer: toArrayBuffer2, unmask } = requireBufferUtil();
@@ -64981,7 +65018,7 @@ ${this.stack.split("\n").slice(1).join("\n")}` : this.toString();
   function requireSender$1() {
     if (hasRequiredSender$1) return sender$1;
     hasRequiredSender$1 = 1;
-    const { Duplex } = un;
+    const { Duplex } = Zr;
     const { randomFillSync: randomFillSync2 } = crypto__default;
     const PerMessageDeflate = requirePermessageDeflate$1();
     const { EMPTY_BUFFER, kWebSocket, NOOP } = requireConstants$5();
@@ -65718,7 +65755,7 @@ ${this.stack.split("\n").slice(1).join("\n")}` : this.toString();
     const net2 = require$$0$9;
     const tls = require$$4$2;
     const { randomBytes: randomBytes2, createHash: createHash2 } = crypto__default;
-    const { Duplex, Readable: Readable2 } = un;
+    const { Duplex, Readable: Readable2 } = Zr;
     const { URL: URL2 } = require$$7$2;
     const PerMessageDeflate = requirePermessageDeflate$1();
     const Receiver = requireReceiver$1();
@@ -66456,7 +66493,7 @@ ${this.stack.split("\n").slice(1).join("\n")}` : this.toString();
     if (hasRequiredStream$1) return stream$1;
     hasRequiredStream$1 = 1;
     requireWebsocket$1();
-    const { Duplex } = un;
+    const { Duplex } = Zr;
     function emitClose(stream2) {
       stream2.emit("close");
     }
@@ -66607,7 +66644,7 @@ ${this.stack.split("\n").slice(1).join("\n")}` : this.toString();
     hasRequiredWebsocketServer = 1;
     const EventEmitter2 = require$$0$7;
     const http$12 = http;
-    const { Duplex } = un;
+    const { Duplex } = Zr;
     const { createHash: createHash2 } = crypto__default;
     const extension2 = requireExtension();
     const PerMessageDeflate = requirePermessageDeflate$1();
@@ -81391,7 +81428,7 @@ ${val.stack}`;
     if (hasRequiredSupportsColor) return supportsColor_1;
     hasRequiredSupportsColor = 1;
     const os2 = os__default$1;
-    const tty2 = require$$1$3;
+    const tty2 = require$$1$2;
     const hasFlag2 = requireHasFlag$1();
     const { env: env2 } = process;
     let forceColor;
@@ -81499,7 +81536,7 @@ ${val.stack}`;
     if (hasRequiredNode) return node.exports;
     hasRequiredNode = 1;
     (function(module2, exports$1) {
-      const tty2 = require$$1$3;
+      const tty2 = require$$1$2;
       const util2 = require$$0$5;
       exports$1.init = init2;
       exports$1.log = log;
@@ -82669,7 +82706,7 @@ ${val.stack}`;
   }
   const createCliSqliteRepoStore = async (workspaceId) => {
     const baseDir = getLoroRepoStorageBaseDir(workspaceId);
-    await fs__default$3.mkdir(baseDir, {
+    await fs__default$2.mkdir(baseDir, {
       recursive: true
     });
     const dbPath = getLoroRepoSqliteDbPath(workspaceId);
@@ -85963,7 +86000,7 @@ ${val.stack}`;
     if (hasRequiredWebidl) return webidl_1;
     hasRequiredWebidl = 1;
     const { types: types2, inspect: inspect2 } = require$$0$8;
-    const { markAsUncloneable } = require$$1$5;
+    const { markAsUncloneable } = require$$1$4;
     const { toUSVString } = requireUtil$8();
     const webidl = {};
     webidl.converters = {};
@@ -90750,7 +90787,7 @@ ${len2.toString(16)}\r
     if (hasRequiredProxyAgent) return proxyAgent;
     hasRequiredProxyAgent = 1;
     const { kProxy, kClose, kDestroy, kDispatch, kInterceptors } = requireSymbols$4();
-    const { URL: URL2 } = require$$1$6;
+    const { URL: URL2 } = require$$1$5;
     const Agent = requireAgent();
     const Pool = requirePool();
     const DispatcherBase = requireDispatcherBase();
@@ -93252,7 +93289,7 @@ ${len2.toString(16)}\r
     if (hasRequiredPendingInterceptorsFormatter) return pendingInterceptorsFormatter;
     hasRequiredPendingInterceptorsFormatter = 1;
     const { Transform: Transform2 } = require$$0$c;
-    const { Console } = require$$1$7;
+    const { Console } = require$$1$6;
     const PERSISTENT = process.versions.icu ? "\u2705" : "Y ";
     const NOT_PERSISTENT = process.versions.icu ? "\u274C" : "N ";
     pendingInterceptorsFormatter = class PendingInterceptorsFormatter {
@@ -93621,7 +93658,7 @@ ${pendingInterceptorsFormatter2.format(pending2)}
     if (hasRequiredDns) return dns;
     hasRequiredDns = 1;
     const { isIP } = net;
-    const { lookup: lookup2 } = require$$1$8;
+    const { lookup: lookup2 } = require$$1$7;
     const DecoratorHandler = requireDecoratorHandler();
     const { InvalidArgumentError: InvalidArgumentError2, InformationalError } = requireErrors$1();
     const maxInt = Math.pow(2, 31) - 1;
@@ -96720,7 +96757,7 @@ ${pendingInterceptorsFormatter2.format(pending2)}
     const { getEncoding } = requireEncoding();
     const { serializeAMimeType, parseMIMEType } = requireDataUrl();
     const { types: types2 } = require$$0$8;
-    const { StringDecoder: StringDecoder2 } = require$$1$4;
+    const { StringDecoder: StringDecoder2 } = require$$1$3;
     const { btoa: btoa2 } = require$$0$a;
     const staticPropertyDescriptors = {
       enumerable: true,
@@ -98209,7 +98246,7 @@ ${pendingInterceptorsFormatter2.format(pending2)}
     const { webidl } = requireWebidl();
     const { kEnumerableProperty } = requireUtil$8();
     const { kConstruct } = requireSymbols$4();
-    const { MessagePort } = require$$1$5;
+    const { MessagePort } = require$$1$4;
     class MessageEvent extends Event {
       #eventInit;
       constructor(type2, eventInitDict = {}) {
@@ -108772,20 +108809,20 @@ ${value}`;
     };
     const parsed = DaemonUpgradeIntentSchema.parse(value);
     const dir = path.dirname(DAEMON_UPGRADE_INTENT_FILE);
-    await fs$1.mkdir(dir, {
+    await jt.mkdir(dir, {
       recursive: true
     });
     const tmpPath = path.join(dir, `.${path.basename(DAEMON_UPGRADE_INTENT_FILE)}.${process.pid}.tmp`);
-    await fs$1.writeFile(tmpPath, `${JSON.stringify(parsed, null, 2)}
+    await jt.writeFile(tmpPath, `${JSON.stringify(parsed, null, 2)}
 `, {
       encoding: "utf8",
       mode: 384
     });
-    await fs$1.rename(tmpPath, DAEMON_UPGRADE_INTENT_FILE);
+    await jt.rename(tmpPath, DAEMON_UPGRADE_INTENT_FILE);
   };
   const readDaemonUpgradeIntent = async () => {
     try {
-      const raw2 = await fs$1.readFile(DAEMON_UPGRADE_INTENT_FILE, "utf8");
+      const raw2 = await jt.readFile(DAEMON_UPGRADE_INTENT_FILE, "utf8");
       const parsed = DaemonUpgradeIntentSchema.safeParse(JSON.parse(raw2));
       return parsed.success ? parsed.data : null;
     } catch {
@@ -108794,7 +108831,7 @@ ${value}`;
   };
   const clearDaemonUpgradeIntent = async () => {
     try {
-      await fs$1.unlink(DAEMON_UPGRADE_INTENT_FILE);
+      await jt.unlink(DAEMON_UPGRADE_INTENT_FILE);
     } catch {
     }
   };
@@ -111636,7 +111673,7 @@ ${incoming}`).output;
   function requireCrossSpawn() {
     if (hasRequiredCrossSpawn) return crossSpawn.exports;
     hasRequiredCrossSpawn = 1;
-    const cp = require$$1$9;
+    const cp = require$$1$8;
     const parse2 = requireParse();
     const enoent2 = requireEnoent();
     function spawn2(command2, args2, options) {
@@ -111728,7 +111765,7 @@ ${incoming}`).output;
       return String(process.getuid());
     }
     const userInfo2 = os__default.userInfo();
-    return crypto$2.createHash("sha256").update(`${userInfo2.uid}:${userInfo2.username}:${os__default.homedir()}`).digest("hex").slice(0, 16);
+    return crypto__default$1.createHash("sha256").update(`${userInfo2.uid}:${userInfo2.username}:${os__default.homedir()}`).digest("hex").slice(0, 16);
   }
   const MAX_UNIX_SOCKET_PATH_BYTES = 103;
   function getLocalDaemonSocketPath(basename2, platform2) {
@@ -111822,7 +111859,7 @@ ${incoming}`).output;
   function writeLocalDaemonRunFile(runFile, runFilePath = getLocalDaemonRunFilePath()) {
     const parsed = LocalDaemonRunFileSchema.parse(runFile);
     ensureLocalDaemonRunDir(path__default.dirname(runFilePath));
-    const tempPath = `${runFilePath}.${process.pid}.${crypto$2.randomUUID()}.tmp`;
+    const tempPath = `${runFilePath}.${process.pid}.${crypto__default$1.randomUUID()}.tmp`;
     fs__default$1.writeFileSync(tempPath, `${JSON.stringify(parsed, null, 2)}
 `, {
       mode: 384
@@ -113490,6 +113527,9 @@ ${incoming}`).output;
       this.logger = options.logger;
       this.terminalManager = options.terminalManager;
       this.terminalEnabled = options.terminalEnabled ?? true;
+      this.configOptionValues = {
+        ...options.configOptionValues ?? {}
+      };
     }
     connection = null;
     lastSessionUpdateAtMs = Date.now();
@@ -113513,6 +113553,7 @@ ${incoming}`).output;
     sessionWorkdir = null;
     agentMcpCapabilities;
     configOptions = [];
+    configOptionValues;
     legacySessionModelState = null;
     currentModel;
     codexImageGenerationToolCallIds = /* @__PURE__ */ new Set();
@@ -114217,13 +114258,35 @@ ${incoming}`).output;
     getGrokClientIdentifier() {
       return this.options.agentConfig?.cliType === "builtin" && this.options.agentConfig.agentType === "grok" ? `lody:${this.options.sessionId}` : void 0;
     }
-    getGrokSessionMeta() {
+    getSessionStartMeta(forkSessionTurnId) {
       const clientIdentifier = this.getGrokClientIdentifier();
-      return clientIdentifier ? {
+      const lody = {
+        ...forkSessionTurnId !== void 0 ? {
+          forkAtTurn: {
+            version: 1,
+            turnId: forkSessionTurnId
+          }
+        } : {},
+        ...Object.keys(this.configOptionValues).length > 0 ? {
+          sessionConfig: {
+            version: 1,
+            configOptionValues: {
+              ...this.configOptionValues
+            }
+          }
+        } : {}
+      };
+      if (clientIdentifier === void 0 && Object.keys(lody).length === 0) return {};
+      return {
         _meta: {
-          clientIdentifier
+          ...clientIdentifier !== void 0 ? {
+            clientIdentifier
+          } : {},
+          ...Object.keys(lody).length > 0 ? {
+            lody
+          } : {}
         }
-      } : {};
+      };
     }
     isCurrentAcpSession(acpSessionId) {
       return this.acpSessionId !== null && acpSessionId === this.acpSessionId;
@@ -114243,7 +114306,7 @@ ${incoming}`).output;
       const connection2 = new ClientSideConnection(() => this, stream2);
       this.connection = connection2;
       const grokClientIdentifier = this.getGrokClientIdentifier();
-      const grokSessionMeta = this.getGrokSessionMeta();
+      const sessionStartMeta = this.getSessionStartMeta();
       this.logger.debug(`[${this.options.sessionId}] Starting ACP client (workdir=${workdir} resumeSessionId=${resumeSessionId ?? "none"} forkSessionId=${forkSessionId ?? "none"})`);
       if (resumeSessionId && forkSessionId) {
         throw new Error("[ACP_SESSION_START_INVALID] resumeSessionId and forkSessionId are exclusive");
@@ -114439,16 +114502,7 @@ ${incoming}`).output;
             sessionId: forkSessionId,
             cwd: workdir,
             mcpServers,
-            ...forkSessionTurnId ? {
-              _meta: {
-                lody: {
-                  forkAtTurn: {
-                    version: 1,
-                    turnId: forkSessionTurnId
-                  }
-                }
-              }
-            } : {}
+            ...this.getSessionStartMeta(forkSessionTurnId)
           }), startupAbort), this.logger, "connection.unstable_forkSession", this.options.sessionId, ACP_FORK_SESSION_TIMEOUT_MS);
           this.logger.debug(`[${this.options.sessionId}] ACP fork succeeded in ${Math.round(performance$1.now() - forkStart)}ms (sourceAcpSessionId=${forkSessionId}, acpSessionId=${sessionResponse.sessionId})`);
         } catch (error2) {
@@ -114483,7 +114537,7 @@ ${incoming}`).output;
             sessionId: resumeSessionId,
             cwd: workdir,
             mcpServers,
-            ...grokSessionMeta
+            ...sessionStartMeta
           }), startupAbort), this.logger, "connection.loadSession", this.options.sessionId, ACP_LOAD_SESSION_TIMEOUT_MS);
           const loadDurationMs = performance$1.now() - loadStart;
           sessionResponse = {
@@ -114525,7 +114579,7 @@ ${incoming}`).output;
             sessionId: resumeSessionId,
             cwd: workdir,
             mcpServers,
-            ...grokSessionMeta
+            ...sessionStartMeta
           }), startupAbort), this.logger, "connection.resumeSession", this.options.sessionId, ACP_RESUME_SESSION_TIMEOUT_MS);
           const resumeDurationMs = performance$1.now() - resumeStart;
           sessionResponse = {
@@ -114565,7 +114619,7 @@ ${incoming}`).output;
           sessionResponse = await withTimeout$2(withAbort(connection2.newSession({
             cwd: workdir,
             mcpServers,
-            ...grokSessionMeta
+            ...sessionStartMeta
           }), startupAbort), this.logger, "connection.newSession", this.options.sessionId, ACP_NEW_SESSION_TIMEOUT_MS);
         } catch (error2) {
           if (isAcpAuthenticationRequired(error2)) {
@@ -114632,7 +114686,7 @@ ${incoming}`).output;
           return await withTimeout$2(connection2.newSession({
             cwd: workdir,
             mcpServers,
-            ...this.getGrokSessionMeta()
+            ...this.getSessionStartMeta()
           }), this.logger, "connection.newSession.editAndResend", this.options.sessionId, timeoutMs);
         } catch (error2) {
           throw new Error(`[ACP_SESSION_PREPARE_FAILED] ${formatErrorMessage(error2)}`, {
@@ -114648,14 +114702,7 @@ ${incoming}`).output;
           sessionId: sourceSessionId,
           cwd: workdir,
           mcpServers,
-          _meta: {
-            lody: {
-              forkAtTurn: {
-                version: 1,
-                turnId: forkSessionTurnId
-              }
-            }
-          }
+          ...this.getSessionStartMeta(forkSessionTurnId)
         }), this.logger, "connection.unstable_forkSession.editAndResend", this.options.sessionId, timeoutMs);
       } catch (error2) {
         throw new Error(`[ACP_FORK_FAILED] ${formatErrorMessage(error2)}`, {
@@ -114917,6 +114964,7 @@ ${incoming}`).output;
           this.currentModel = this.resolveModelInfo(this.currentModel.modelId);
         }
       }
+      if (result) this.configOptionValues[configId] = value;
       this.logger.debug(`[${this.options.sessionId}] ACP session config option set: ${configId}=${value}`);
       return result?.configOptions;
     }
@@ -116013,7 +116061,7 @@ ${error2.message}` : execaMessage;
   function requireBufferStream() {
     if (hasRequiredBufferStream) return bufferStream;
     hasRequiredBufferStream = 1;
-    const { PassThrough: PassThroughStream } = un;
+    const { PassThrough: PassThroughStream } = Zr;
     bufferStream = (options) => {
       options = {
         ...options
@@ -116062,7 +116110,7 @@ ${error2.message}` : execaMessage;
     if (hasRequiredGetStream) return getStream.exports;
     hasRequiredGetStream = 1;
     const { constants: BufferConstants } = require$$0$6;
-    const stream2 = un;
+    const stream2 = Zr;
     const { promisify: promisify2 } = require$$0$5;
     const bufferStream2 = requireBufferStream();
     const streamPipelinePromisified = promisify2(stream2.pipeline);
@@ -116122,7 +116170,7 @@ ${error2.message}` : execaMessage;
   function requireMergeStream() {
     if (hasRequiredMergeStream) return mergeStream;
     hasRequiredMergeStream = 1;
-    const { PassThrough: PassThrough2 } = un;
+    const { PassThrough: PassThrough2 } = Zr;
     mergeStream = function() {
       var sources = [];
       var output = new PassThrough2({
@@ -116370,7 +116418,7 @@ ${error2.message}` : execaMessage;
     if (hasRequiredExeca) return execa$1.exports;
     hasRequiredExeca = 1;
     const path2 = path__default$1;
-    const childProcess = require$$1$9;
+    const childProcess = require$$1$8;
     const crossSpawn2 = requireCrossSpawn();
     const stripFinalNewline2 = requireStripFinalNewline();
     const npmRunPath2 = requireNpmRunPath();
@@ -117853,7 +117901,7 @@ ${error2.message}` : execaMessage;
       validate: validate2
     });
   };
-  const realZlibConstants = Ko__default.constants || {
+  const realZlibConstants = $s__default.constants || {
     ZLIB_VERNUM: 4736
   };
   const constants = Object.freeze(Object.assign(/* @__PURE__ */ Object.create(null), {
@@ -118013,11 +118061,11 @@ ${error2.message}` : execaMessage;
       this.#flushFlag = opts.flush ?? 0;
       this.#finishFlushFlag = opts.finishFlush ?? 0;
       this.#fullFlushFlag = opts.fullFlushFlag ?? 0;
-      if (typeof Ko[mode2] !== "function") {
+      if (typeof $s[mode2] !== "function") {
         throw new TypeError("Compression method not supported: " + mode2);
       }
       try {
-        this.#handle = new Ko[mode2](opts);
+        this.#handle = new $s[mode2](opts);
       } catch (er) {
         throw new ZlibError(er, this.constructor);
       }
@@ -121032,7 +121080,7 @@ ${error2.message}` : execaMessage;
       return checkCwd(dir, done2);
     }
     if (preserve) {
-      return fs__default$2.mkdir(dir, {
+      return jt__default.mkdir(dir, {
         mode: mode2,
         recursive: true
       }).then((made) => done2(null, made ?? void 0), done2);
@@ -122282,7 +122330,7 @@ ${error2.message}` : execaMessage;
     hasRequiredFdSlicer = 1;
     var fs2 = fs__default;
     var util2 = require$$0$5;
-    var stream2 = un;
+    var stream2 = Zr;
     var Readable2 = stream2.Readable;
     var Writable = stream2.Writable;
     var PassThrough2 = stream2.PassThrough;
@@ -122848,14 +122896,14 @@ ${error2.message}` : execaMessage;
     if (hasRequiredYauzl) return yauzl;
     hasRequiredYauzl = 1;
     var fs2 = fs__default;
-    var zlib = Ko__default;
+    var zlib = $s__default;
     var fd_slicer = requireFdSlicer();
     var crc322 = requireBufferCrc32();
     var util2 = require$$0$5;
     var EventEmitter2 = require$$0$7.EventEmitter;
-    var Transform2 = un.Transform;
-    var PassThrough2 = un.PassThrough;
-    var Writable = un.Writable;
+    var Transform2 = Zr.Transform;
+    var PassThrough2 = Zr.PassThrough;
+    var Writable = Zr.Writable;
     yauzl.open = open2;
     yauzl.fromFd = fromFd;
     yauzl.fromBuffer = fromBuffer;
@@ -124284,60 +124332,154 @@ ${error2.message}` : execaMessage;
       highWaterMark
     }));
   }
-  const version$5 = "1.4.0";
+  const version$7 = "1.6.2";
   const dependencies$1 = {
-    "@openai/codex": "^0.147.0"
+    "@openai/codex": "^0.148.0"
   };
   const codexPackageJson = {
-    version: version$5,
+    version: version$7,
     dependencies: dependencies$1
   };
-  const version$4 = "0.1.0";
+  const version$6 = "0.1.0";
   const grokPackageJson = {
-    version: version$4
+    version: version$6
   };
-  const version$3 = "2.1.220";
+  const version$5 = "2.1.232";
   const platforms = {
     "darwin-arm64": {
-      "checksum": "8addc857f3fe64d5a0368af9ee50321b50afb4a6918ba3ef018ab84f5dbbe081",
-      "size": 256908272
+      "binary": "claude",
+      "checksum": "7b39c1588df919d001dea3ffd5651adb682f2451b5a0e18d42d4233296b53cc7",
+      "size": 306111312
     },
     "darwin-x64": {
-      "checksum": "dca7be0aa7d3d924836d440e0c6d8e3d47ef3c8e61fa5809b54b9017170ce2f3",
-      "size": 266397712
+      "binary": "claude",
+      "checksum": "aa3d606d7bf0ea9739a6d0de11810e72a662e7a4e5061d67ee7f8bc47c8890f9",
+      "size": 314779248
     },
     "linux-arm64": {
-      "checksum": "159e4a51d796f3bf14677577100f7efb845611b1ceaf0c30cbd8d4650d942185",
-      "size": 271825824
+      "binary": "claude",
+      "checksum": "20797ebc644dfc47a69865c46d5cf702c7dbedd48d4268063b8828ebd55b39d0",
+      "size": 320133352
     },
     "linux-x64": {
-      "checksum": "674f61f20ff306f3100cf9200e4c36c4b70278b5bef2884549819b942a89c863",
-      "size": 275012592
+      "binary": "claude",
+      "checksum": "61d23f8749136907d586d5b11831ea8a5234d4c1dea40a5e55c33b52e204c6d1",
+      "size": 323021104
     },
     "linux-arm64-musl": {
-      "checksum": "5eb2697a1500c1b8736e53fd696392196dc6758cf1d470c64d8d2a2fd1629eeb",
-      "size": 265074024
+      "binary": "claude",
+      "checksum": "bf6481aa98b84d3e51460f7cf07fe54cb8d116882b72cee7bff941a2776ac91e",
+      "size": 313278016
     },
     "linux-x64-musl": {
-      "checksum": "f1c20514a3571cdf9982e25c490042d740ed7cfed3f00c64ba92dc7ec47c3c5b",
-      "size": 269636176
+      "binary": "claude",
+      "checksum": "93c8a9ef90adfa5bb8a34dfd5f32fc4e820532ca1e1ec5e6bb2049a5069a03b4",
+      "size": 317165312
     },
     "win32-x64": {
-      "checksum": "af5bf1f1b2aadffc768eccd787084c6fdf9ba81624cbe96c1c6d9ac1a1550231",
-      "size": 265720480
+      "binary": "claude.exe",
+      "checksum": "ec9e32479bc887809003c91384c6c3a26e7691856d1916f72f6f6d21800f3bd6",
+      "size": 319026336
     },
     "win32-arm64": {
-      "checksum": "07343ace8a2e9ba87eed716e9c0261ce4bda8954c316695e4cb26fd0605de13c",
-      "size": 260095648
+      "binary": "claude.exe",
+      "checksum": "301bfd5a624d6280d4d4e4ba7523fafdfa439a33e9530478719eeb6efec51d52",
+      "size": 306950304
     }
   };
   const claudeSdkManifestJson = {
-    version: version$3,
+    version: version$5,
     platforms
   };
-  const version$2 = "0.3.220";
+  const version$4 = "0.3.232";
   const claudeSdkPackageJson = {
-    version: version$2
+    version: version$4
+  };
+  const sdkVersion = "0.3.232";
+  const version$3 = "2.1.232";
+  const artifacts$1 = {
+    "darwin-arm64": {
+      "fileName": "anthropic-ai-claude-agent-sdk-darwin-arm64-0.3.232.tar.zst",
+      "sha256": "09c775adf243d27a5c13e6724b3960409612b0da483c38fa108a1c03be515a5a",
+      "size": 70030420
+    },
+    "darwin-x64": {
+      "fileName": "anthropic-ai-claude-agent-sdk-darwin-x64-0.3.232.tar.zst",
+      "sha256": "68f687528e5d610e14a379ff7ad1e6a60aa7d600b4dc20dc31b4af96fffda570",
+      "size": 74349877
+    },
+    "linux-arm64": {
+      "fileName": "anthropic-ai-claude-agent-sdk-linux-arm64-0.3.232.tar.zst",
+      "sha256": "8c7c75910f5d29c3cf3fe15e4c17abfb05db616db2838b3a764f6b243ad78165",
+      "size": 79104443
+    },
+    "linux-x64": {
+      "fileName": "anthropic-ai-claude-agent-sdk-linux-x64-0.3.232.tar.zst",
+      "sha256": "e0303ad6167b82fad98a80dd6dc3fd23d82562de5181094775c388118951d999",
+      "size": 79732583
+    },
+    "linux-arm64-musl": {
+      "fileName": "anthropic-ai-claude-agent-sdk-linux-arm64-musl-0.3.232.tar.zst",
+      "sha256": "b0dd9da5095baf314160e3a3f6ac1c85a1ef4b4e326c4bde662f92fe8783840b",
+      "size": 77411461
+    },
+    "linux-x64-musl": {
+      "fileName": "anthropic-ai-claude-agent-sdk-linux-x64-musl-0.3.232.tar.zst",
+      "sha256": "989e8148bb5944d038f4ea11595742084ec3b38837e08e5af25229ada27c3730",
+      "size": 77995010
+    },
+    "win32-arm64": {
+      "fileName": "anthropic-ai-claude-agent-sdk-win32-arm64-0.3.232.tar.zst",
+      "sha256": "7cc4f6f2a23fa43993da830e00e3e2ca46b90864a2d38e1f3678f70de9e2f440",
+      "size": 78979373
+    },
+    "win32-x64": {
+      "fileName": "anthropic-ai-claude-agent-sdk-win32-x64-0.3.232.tar.zst",
+      "sha256": "ed09d440d4cf7881439850287485d3198384538c79d8d3e5f0740b1e40b10db3",
+      "size": 82535283
+    }
+  };
+  const claudeRuntimeManifestJson = {
+    sdkVersion,
+    version: version$3,
+    artifacts: artifacts$1
+  };
+  const version$2 = "0.148.0";
+  const artifacts = {
+    "darwin-arm64": {
+      "fileName": "codex-package-aarch64-apple-darwin.tar.zst",
+      "sha256": "dba92ada12f223751f30a9535c81c6a3ac6a2c1b2469d628c92b3e6be38eff66",
+      "size": 76351891
+    },
+    "darwin-x64": {
+      "fileName": "codex-package-x86_64-apple-darwin.tar.zst",
+      "sha256": "ea8a14bca1cfc5a80d2a90e532617cc3c089cb69d2a114a61db645de6d051916",
+      "size": 83818234
+    },
+    "linux-arm64": {
+      "fileName": "codex-package-aarch64-unknown-linux-musl.tar.zst",
+      "sha256": "084e6261fd68bd2a869f319375a022b2294d7d0f4044cbb113b8fa0755b01af9",
+      "size": 79728248
+    },
+    "linux-x64": {
+      "fileName": "codex-package-x86_64-unknown-linux-musl.tar.zst",
+      "sha256": "257701de0d625d46e0e1c0c69db1a8a3fc1265c646a190e9fb965d1f66d54cd2",
+      "size": 85609844
+    },
+    "win32-arm64": {
+      "fileName": "codex-package-aarch64-pc-windows-msvc.tar.zst",
+      "sha256": "e043d518a6ad64271616bf4408737672e2e48b5ce472d2f0a69149434ad0d189",
+      "size": 87165328
+    },
+    "win32-x64": {
+      "fileName": "codex-package-x86_64-pc-windows-msvc.tar.zst",
+      "sha256": "a9fc1afe438a326aa25b11c31ec7586c176f3713d7ee2a0bfd17b869283bd6ff",
+      "size": 93722309
+    }
+  };
+  const codexRuntimeManifestJson = {
+    version: version$2,
+    artifacts
   };
   const version$1 = "0.37.0-lody.753c83056944";
   const minNodeVersion = "22.19.0";
@@ -124443,14 +124585,19 @@ ${error2.message}` : execaMessage;
     }
     return true;
   }
-  const CODEX_RUNTIME_VERSION = resolveSingleDependencyVersion("@openai/codex", codexPackageJson.dependencies["@openai/codex"]);
-  const CLAUDE_AGENT_SDK_VERSION = resolveSingleDependencyVersion("@anthropic-ai/claude-agent-sdk", packageJson.dependencies["@anthropic-ai/claude-agent-sdk"]);
-  if (claudeSdkPackageJson.version !== CLAUDE_AGENT_SDK_VERSION) {
-    throw new Error(`Expected installed @anthropic-ai/claude-agent-sdk ${CLAUDE_AGENT_SDK_VERSION}, received ${claudeSdkPackageJson.version}.`);
+  const CODEX_DEPENDENCY_VERSION = resolveSingleDependencyVersion("@openai/codex", codexPackageJson.dependencies["@openai/codex"]);
+  const CODEX_RUNTIME_VERSION = codexRuntimeManifestJson.version;
+  if (CODEX_RUNTIME_VERSION !== CODEX_DEPENDENCY_VERSION) {
+    throw new Error(`Codex runtime manifest ${CODEX_RUNTIME_VERSION} does not match @openai/codex ${CODEX_DEPENDENCY_VERSION}. Run pnpm mirror:agent-runtimes -- --runtime codex to refresh it.`);
+  }
+  const CLAUDE_DEPENDENCY_VERSION = resolveSingleDependencyVersion("@anthropic-ai/claude-agent-sdk", packageJson.dependencies["@anthropic-ai/claude-agent-sdk"]);
+  const CLAUDE_AGENT_SDK_VERSION = claudeRuntimeManifestJson.sdkVersion;
+  const CLAUDE_CODE_RUNTIME_VERSION = claudeRuntimeManifestJson.version;
+  if (claudeSdkPackageJson.version !== CLAUDE_DEPENDENCY_VERSION || CLAUDE_AGENT_SDK_VERSION !== CLAUDE_DEPENDENCY_VERSION || CLAUDE_CODE_RUNTIME_VERSION !== claudeSdkManifestJson.version) {
+    throw new Error(`Claude runtime manifest ${CLAUDE_AGENT_SDK_VERSION}/${CLAUDE_CODE_RUNTIME_VERSION} does not match @anthropic-ai/claude-agent-sdk ${CLAUDE_DEPENDENCY_VERSION}/${claudeSdkManifestJson.version}. Run pnpm mirror:agent-runtimes -- --runtime claude-code to refresh it.`);
   }
   const CODEX_ACP_ADAPTER_VERSION = codexPackageJson.version;
   const CLAUDE_ACP_ADAPTER_VERSION = packageJson.version;
-  const CLAUDE_CODE_RUNTIME_VERSION = claudeSdkManifestJson.version;
   const KIMI_CODE_VERSION = kimiRuntimeManifestJson.version;
   const GROK_ACP_ADAPTER_VERSION = grokPackageJson.version;
   const GROK_BUILD_RUNTIME_VERSION = runtimeManifest.officialRuntime.version;
@@ -124459,139 +124606,55 @@ ${error2.message}` : execaMessage;
   const BUILTIN_CLAUDE_CAPABILITY_SOURCE_VERSION = `builtin-claude-acp:${CLAUDE_ACP_ADAPTER_VERSION}+agent-sdk:${CLAUDE_AGENT_SDK_VERSION}+claude-code:${CLAUDE_CODE_RUNTIME_VERSION}`;
   const BUILTIN_KIMI_CAPABILITY_SOURCE_VERSION = `builtin-kimi:${KIMI_CODE_VERSION}`;
   const BUILTIN_GROK_CAPABILITY_SOURCE_VERSION = `builtin-grok-acp:${GROK_ACP_ADAPTER_VERSION}+official-grok:${GROK_BUILD_RUNTIME_VERSION}`;
+  function createCodexRuntimeArchive(platform2) {
+    const artifact2 = codexRuntimeManifestJson.artifacts[platform2];
+    return {
+      fileName: artifact2.fileName,
+      sha256: artifact2.sha256,
+      size: artifact2.size,
+      compression: "zstd",
+      cmd: platform2.startsWith("win32-") ? "bin/codex.exe" : "bin/codex"
+    };
+  }
+  function createClaudeRuntimeArchive(platform2) {
+    const artifact2 = claudeRuntimeManifestJson.artifacts[platform2];
+    const executable = claudeSdkManifestJson.platforms[platform2];
+    return {
+      fileName: artifact2.fileName,
+      sha256: artifact2.sha256,
+      size: artifact2.size,
+      compression: "zstd",
+      cmd: platform2.startsWith("win32-") ? "claude.exe" : "claude",
+      stripComponents: 1,
+      executableSha256: executable.checksum,
+      executableSize: executable.size
+    };
+  }
   const RUNTIMES = {
     codex: {
       name: "codex",
       version: CODEX_RUNTIME_VERSION,
       platforms: {
-        "darwin-arm64": {
-          fileName: "codex-package-aarch64-apple-darwin.tar.zst",
-          sha256: "4b0a3c2967f6db11b67dac0a6f0630327077888157b2020b5b1159e8d4a5a01c",
-          size: 77491677,
-          compression: "zstd",
-          cmd: "bin/codex"
-        },
-        "darwin-x64": {
-          fileName: "codex-package-x86_64-apple-darwin.tar.zst",
-          sha256: "373c728c0912b7c65af742bb649f0ff056300f8e8a33a619be0bab62f2afc6ba",
-          size: 85008508,
-          compression: "zstd",
-          cmd: "bin/codex"
-        },
-        "linux-arm64": {
-          fileName: "codex-package-aarch64-unknown-linux-musl.tar.zst",
-          sha256: "692ff5c5d9eb86774c0448d930895e46659eee6a2c12f46b97399da458c1e8b7",
-          size: 80608473,
-          compression: "zstd",
-          cmd: "bin/codex"
-        },
-        "linux-x64": {
-          fileName: "codex-package-x86_64-unknown-linux-musl.tar.zst",
-          sha256: "494368127e27ab625b2a5e759f83447e1d7d00b6ae49a5e2c17df5fd7c4aac1d",
-          size: 86804357,
-          compression: "zstd",
-          cmd: "bin/codex"
-        },
-        "win32-arm64": {
-          fileName: "codex-package-aarch64-pc-windows-msvc.tar.zst",
-          sha256: "0c9d43e1ce013900850c82ab558cbafae9e8b05363689ab68cc0b4c87ac2b267",
-          size: 88080469,
-          compression: "zstd",
-          cmd: "bin/codex.exe"
-        },
-        "win32-x64": {
-          fileName: "codex-package-x86_64-pc-windows-msvc.tar.zst",
-          sha256: "5931e080440a0bff1413d55b62921e26238f5410d82d79e5327202bfef1833a4",
-          size: 95093149,
-          compression: "zstd",
-          cmd: "bin/codex.exe"
-        }
+        "darwin-arm64": createCodexRuntimeArchive("darwin-arm64"),
+        "darwin-x64": createCodexRuntimeArchive("darwin-x64"),
+        "linux-arm64": createCodexRuntimeArchive("linux-arm64"),
+        "linux-x64": createCodexRuntimeArchive("linux-x64"),
+        "win32-arm64": createCodexRuntimeArchive("win32-arm64"),
+        "win32-x64": createCodexRuntimeArchive("win32-x64")
       }
     },
     "claude-code": {
       name: "claude-code",
       version: CLAUDE_CODE_RUNTIME_VERSION,
       platforms: {
-        "darwin-arm64": {
-          fileName: `anthropic-ai-claude-agent-sdk-darwin-arm64-${CLAUDE_AGENT_SDK_VERSION}.tar.zst`,
-          sha256: "2c2f74e529066d85f9f8815e7ff1ef5a5e78107c43b1fa368acec86f07faf57d",
-          size: 60180862,
-          compression: "zstd",
-          cmd: "claude",
-          stripComponents: 1,
-          executableSha256: claudeSdkManifestJson.platforms["darwin-arm64"].checksum,
-          executableSize: claudeSdkManifestJson.platforms["darwin-arm64"].size
-        },
-        "darwin-x64": {
-          fileName: `anthropic-ai-claude-agent-sdk-darwin-x64-${CLAUDE_AGENT_SDK_VERSION}.tar.zst`,
-          sha256: "5c74a294444e69f9b13f4e103247b6b51a7b10c555cfbce9f5434c37e662e9bb",
-          size: 64691464,
-          compression: "zstd",
-          cmd: "claude",
-          stripComponents: 1,
-          executableSha256: claudeSdkManifestJson.platforms["darwin-x64"].checksum,
-          executableSize: claudeSdkManifestJson.platforms["darwin-x64"].size
-        },
-        "linux-arm64": {
-          fileName: `anthropic-ai-claude-agent-sdk-linux-arm64-${CLAUDE_AGENT_SDK_VERSION}.tar.zst`,
-          sha256: "bc41781f1003c2856e3ce0044da3fa752ef279a1cc29a8e23e3ce13c8033650e",
-          size: 69763140,
-          compression: "zstd",
-          cmd: "claude",
-          stripComponents: 1,
-          executableSha256: claudeSdkManifestJson.platforms["linux-arm64"].checksum,
-          executableSize: claudeSdkManifestJson.platforms["linux-arm64"].size
-        },
-        "linux-x64": {
-          fileName: `anthropic-ai-claude-agent-sdk-linux-x64-${CLAUDE_AGENT_SDK_VERSION}.tar.zst`,
-          sha256: "076972a61402e14afffb5d64a40e50ab5074a3a7f3740fed44d64b6cb7839c84",
-          size: 70585519,
-          compression: "zstd",
-          cmd: "claude",
-          stripComponents: 1,
-          executableSha256: claudeSdkManifestJson.platforms["linux-x64"].checksum,
-          executableSize: claudeSdkManifestJson.platforms["linux-x64"].size
-        },
-        "linux-arm64-musl": {
-          fileName: `anthropic-ai-claude-agent-sdk-linux-arm64-musl-${CLAUDE_AGENT_SDK_VERSION}.tar.zst`,
-          sha256: "e9282b3ab96cb89aeb1eecba2bf7ab354486dbd48546ca8c8b0ace0844d88f75",
-          size: 68233742,
-          compression: "zstd",
-          cmd: "claude",
-          stripComponents: 1,
-          executableSha256: claudeSdkManifestJson.platforms["linux-arm64-musl"].checksum,
-          executableSize: claudeSdkManifestJson.platforms["linux-arm64-musl"].size
-        },
-        "linux-x64-musl": {
-          fileName: `anthropic-ai-claude-agent-sdk-linux-x64-musl-${CLAUDE_AGENT_SDK_VERSION}.tar.zst`,
-          sha256: "331f1470a4234ac1636971b7c586f41ae8c76ff987fe8d7e5736214186a93e86",
-          size: 69249229,
-          compression: "zstd",
-          cmd: "claude",
-          stripComponents: 1,
-          executableSha256: claudeSdkManifestJson.platforms["linux-x64-musl"].checksum,
-          executableSize: claudeSdkManifestJson.platforms["linux-x64-musl"].size
-        },
-        "win32-arm64": {
-          fileName: `anthropic-ai-claude-agent-sdk-win32-arm64-${CLAUDE_AGENT_SDK_VERSION}.tar.zst`,
-          sha256: "483e1285703ba75050055cc305a5b47526ac449bc223c2e30acaa3a7ac87560e",
-          size: 69235703,
-          compression: "zstd",
-          cmd: "claude.exe",
-          stripComponents: 1,
-          executableSha256: claudeSdkManifestJson.platforms["win32-arm64"].checksum,
-          executableSize: claudeSdkManifestJson.platforms["win32-arm64"].size
-        },
-        "win32-x64": {
-          fileName: `anthropic-ai-claude-agent-sdk-win32-x64-${CLAUDE_AGENT_SDK_VERSION}.tar.zst`,
-          sha256: "961eeabb2eaf9b3027fdc3caf10417ea738fb3ea64132307a7ae3a1d9f2309b8",
-          size: 71046598,
-          compression: "zstd",
-          cmd: "claude.exe",
-          stripComponents: 1,
-          executableSha256: claudeSdkManifestJson.platforms["win32-x64"].checksum,
-          executableSize: claudeSdkManifestJson.platforms["win32-x64"].size
-        }
+        "darwin-arm64": createClaudeRuntimeArchive("darwin-arm64"),
+        "darwin-x64": createClaudeRuntimeArchive("darwin-x64"),
+        "linux-arm64": createClaudeRuntimeArchive("linux-arm64"),
+        "linux-x64": createClaudeRuntimeArchive("linux-x64"),
+        "linux-arm64-musl": createClaudeRuntimeArchive("linux-arm64-musl"),
+        "linux-x64-musl": createClaudeRuntimeArchive("linux-x64-musl"),
+        "win32-arm64": createClaudeRuntimeArchive("win32-arm64"),
+        "win32-x64": createClaudeRuntimeArchive("win32-x64")
       }
     },
     "kimi-code": {
@@ -125441,6 +125504,7 @@ ${error2.message}` : execaMessage;
     return {
       command: "npx",
       args: [
+        "--force",
         "--prefer-offline",
         "-y",
         ...DEEPSEEK_HARNESS_NPX_PACKAGES.flatMap((packageName) => [
@@ -126857,6 +126921,7 @@ ${fallbackStderrTail}` : errorMessage2;
       machineId: options.machineId,
       terminalManager: options.terminalManager,
       agentConfig: options.agentConfig,
+      configOptionValues: options.configOptionValues,
       launcher: options.launcher,
       terminalEnabled: options.terminalEnabled,
       onStartupStage: options.onStartupStage,
@@ -128923,7 +128988,7 @@ main().catch(() => {});
   }
   const readErrorCode = (error2) => error2 && typeof error2 === "object" ? error2.code : void 0;
   function mapGitSpawnError(error2, cwd) {
-    if (readErrorCode(error2) === "ENOENT" && fs$2.existsSync(cwd)) {
+    if (readErrorCode(error2) === "ENOENT" && fs$1.existsSync(cwd)) {
       return new GitExecutableNotFoundError(error2);
     }
     return error2;
@@ -133928,6 +133993,7 @@ The postId is ${normalizedFeedbackPostId}. Use the feedback-progress-reporter sk
           workspaceId: message.workspaceId,
           agentCliType: acpSessionConfig.cliType,
           agentType: acpSessionConfig.agentType,
+          configOptionValues: acpSessionConfig.configOptionValues,
           mcpServerIds: acpSessionConfig.mcpServerIds ?? [],
           customAcp: resumeCustomAcp,
           runtimeOverrides: resumeRuntimeOverrides,
@@ -134425,6 +134491,7 @@ The postId is ${normalizedFeedbackPostId}. Use the feedback-progress-reporter sk
         workspaceId,
         agentCliType: acpSessionConfig.cliType,
         agentType: acpSessionConfig.agentType,
+        configOptionValues: acpSessionConfig.configOptionValues,
         mcpServerIds: acpSessionConfig.mcpServerIds ?? [],
         agentConfigId: existingMeta?.agentConfigId,
         customAcp: acpSessionConfig.customAcp,
@@ -154681,11 +154748,11 @@ ${entry.text}`).join("\n\n");
       return null;
     }
     try {
-      const stat2 = await fs$1.stat(absolutePath);
+      const stat2 = await jt.stat(absolutePath);
       if (!stat2.isFile() || stat2.size > (options?.maxBytes ?? defaultMaxTextFileBytes)) {
         return null;
       }
-      const content = await fs$1.readFile(absolutePath);
+      const content = await jt.readFile(absolutePath);
       if (content.includes(0)) {
         return null;
       }
@@ -160519,18 +160586,18 @@ ${entry.text}`).join("\n\n");
   };
   async function ensureCatalogDir(filePath) {
     const dir = path__default$1.dirname(filePath);
-    await fs__default$3.mkdir(dir, {
+    await fs__default$2.mkdir(dir, {
       recursive: true,
       mode: 448
     });
     if (process.platform !== "win32") {
-      await fs__default$3.chmod(dir, 448);
+      await fs__default$2.chmod(dir, 448);
     }
   }
   async function readCatalogFile(filePath) {
     let raw2;
     try {
-      raw2 = await fs__default$3.readFile(filePath, "utf8");
+      raw2 = await fs__default$2.readFile(filePath, "utf8");
     } catch (error2) {
       throw mapReadError(filePath, error2);
     }
@@ -160556,21 +160623,21 @@ ${entry.text}`).join("\n\n");
     const parsed = CatalogSnapshotSchema.parse(snapshot);
     await ensureCatalogDir(filePath);
     const tempPath = `${filePath}.${process.pid}.${crypto__default.randomUUID()}.tmp`;
-    await fs__default$3.writeFile(tempPath, `${JSON.stringify(parsed, null, 2)}
+    await fs__default$2.writeFile(tempPath, `${JSON.stringify(parsed, null, 2)}
 `, {
       mode: 384
     });
     if (process.platform !== "win32") {
-      await fs__default$3.chmod(tempPath, 384);
+      await fs__default$2.chmod(tempPath, 384);
     }
-    await fs__default$3.rename(tempPath, filePath);
+    await fs__default$2.rename(tempPath, filePath);
     if (process.platform !== "win32") {
-      await fs__default$3.chmod(filePath, 384);
+      await fs__default$2.chmod(filePath, 384);
     }
   }
   async function backupCorruptCatalog(filePath) {
     const backupPath = `${filePath}.corrupt-${process.pid}-${getServerNow()}`;
-    await fs__default$3.rename(filePath, backupPath);
+    await fs__default$2.rename(filePath, backupPath);
   }
   function makeLocalWorkspaceCatalog(options = {}) {
     const filePath = options.filePath ?? getLocalWorkspaceCatalogPath();
@@ -162624,7 +162691,7 @@ ${escapeHtmlScriptContent(VISUAL_ANNOTATION_INSPECTOR_BROWSER_SCRIPT)}
   const isPreviewRegistryEntry = (value) => typeof value === "object" && value !== null && typeof value.key === "string" && Number.isInteger(value.pid) && typeof value.workspaceId === "string" && typeof value.machineId === "string" && typeof value.sessionId === "string" && typeof value.grantId === "string" && Number.isInteger(value.updatedAt);
   const readPreviewRegistryEntries = async () => {
     try {
-      const raw2 = await fs__default$3.readFile(PREVIEW_REGISTRY_FILE, "utf8");
+      const raw2 = await fs__default$2.readFile(PREVIEW_REGISTRY_FILE, "utf8");
       const parsed = JSON.parse(raw2);
       if (!Array.isArray(parsed)) {
         return [];
@@ -162635,13 +162702,13 @@ ${escapeHtmlScriptContent(VISUAL_ANNOTATION_INSPECTOR_BROWSER_SCRIPT)}
     }
   };
   const writePreviewRegistryEntries = async (entries) => {
-    await fs__default$3.mkdir(path__default$1.dirname(PREVIEW_REGISTRY_FILE), {
+    await fs__default$2.mkdir(path__default$1.dirname(PREVIEW_REGISTRY_FILE), {
       recursive: true
     });
     const tmpPath = `${PREVIEW_REGISTRY_FILE}.${process.pid}.tmp`;
-    await fs__default$3.writeFile(tmpPath, `${JSON.stringify(entries)}
+    await fs__default$2.writeFile(tmpPath, `${JSON.stringify(entries)}
 `, "utf8");
-    await fs__default$3.rename(tmpPath, PREVIEW_REGISTRY_FILE);
+    await fs__default$2.rename(tmpPath, PREVIEW_REGISTRY_FILE);
   };
   const filterLivePreviewRegistryEntries = (entries, now2) => entries.filter((entry) => isProcessAlive$1(entry.pid) && entry.updatedAt <= now2 + PREVIEW_REGISTRY_FUTURE_SKEW_MS);
   const classifyPreviewTunnelCloseError = (error2) => {
@@ -163413,6 +163480,7 @@ ${escapeHtmlScriptContent(VISUAL_ANNOTATION_INSPECTOR_BROWSER_SCRIPT)}
   }
   const ACP_OPERATION_TIMEOUT_MS = 12e4;
   const ACP_PROCESS_EXIT_TIMEOUT_MS = 3e3;
+  const LODY_READ_SESSION_HISTORY_METHOD = "_lody/session/history/read";
   const MAX_LOCAL_PROJECT_HISTORY_CATALOG_SESSIONS = 100;
   function waitForChildProcessExit(child, timeoutMs) {
     if (child.exitCode !== null) {
@@ -163553,7 +163621,7 @@ ${escapeHtmlScriptContent(VISUAL_ANNOTATION_INSPECTOR_BROWSER_SCRIPT)}
     const resolved = path__default$1.resolve(rootPath);
     let real = null;
     try {
-      real = await fs$3.realpath(resolved);
+      real = await fs$2.realpath(resolved);
     } catch {
       real = null;
     }
@@ -163565,6 +163633,36 @@ ${escapeHtmlScriptContent(VISUAL_ANNOTATION_INSPECTOR_BROWSER_SCRIPT)}
     }
     return paths;
   }
+  function getLodyReadSessionHistoryMethod(initResponse) {
+    const meta = initResponse.agentCapabilities?._meta;
+    if (!meta || typeof meta !== "object" || Array.isArray(meta)) return null;
+    const lody = meta.lody;
+    if (!lody || typeof lody !== "object" || Array.isArray(lody)) return null;
+    const capability = lody.readSessionHistory;
+    if (!capability || typeof capability !== "object" || Array.isArray(capability)) return null;
+    const record2 = capability;
+    return record2.version === 1 && record2.method === LODY_READ_SESSION_HISTORY_METHOD ? LODY_READ_SESSION_HISTORY_METHOD : null;
+  }
+  async function requestHistorySessionReplay(args2) {
+    if (args2.provider.cliType === "builtin" && args2.provider.agentType === "codex") {
+      const method = getLodyReadSessionHistoryMethod(args2.initResponse);
+      if (!method) {
+        throw new Error(`${getProviderLabel$1(args2.provider)} ACP agent does not advertise agentCapabilities._meta.lody.readSessionHistory version 1`);
+      }
+      await withTimeout(args2.connection.request(method, {
+        sessionId: args2.acpSessionId
+      }), `${getProviderLabel$1(args2.provider)} ACP readSessionHistory (${args2.acpSessionId})`);
+      return;
+    }
+    if (!args2.initResponse.agentCapabilities?.loadSession) {
+      throw new Error(`${getProviderLabel$1(args2.provider)} ACP agent does not advertise loadSession`);
+    }
+    await withTimeout(args2.connection.loadSession({
+      sessionId: args2.acpSessionId,
+      cwd: args2.cwd,
+      mcpServers: []
+    }), `${getProviderLabel$1(args2.provider)} ACP loadSession (${args2.acpSessionId})`);
+  }
   async function listPaginatedHistorySessions(cwd, listPage, options = {}) {
     const sessions = [];
     const maxSessions = options.maxSessions ?? Number.POSITIVE_INFINITY;
@@ -163634,14 +163732,13 @@ ${escapeHtmlScriptContent(VISUAL_ANNOTATION_INSPECTOR_BROWSER_SCRIPT)}
       logger: args2.logger
     });
     try {
-      if (!initResponse.agentCapabilities?.loadSession) {
-        throw new Error(`${getProviderLabel$1(args2.provider)} ACP agent does not advertise loadSession`);
-      }
-      await withTimeout(connection2.loadSession({
-        sessionId: args2.acpSessionId,
+      await requestHistorySessionReplay({
+        provider: args2.provider,
+        acpSessionId: args2.acpSessionId,
         cwd,
-        mcpServers: []
-      }), `${getProviderLabel$1(args2.provider)} ACP loadSession (${args2.acpSessionId})`);
+        connection: connection2,
+        initResponse
+      });
       return collector.notifications;
     } catch (error2) {
       const message = `Failed to load ${getProviderLabel$1(args2.provider)} session ${args2.acpSessionId}: ${formatErrorMessage(error2)}`;
@@ -163982,6 +164079,7 @@ ${escapeHtmlScriptContent(VISUAL_ANNOTATION_INSPECTOR_BROWSER_SCRIPT)}
   }
   function getHistoryCatalogStatus(existing) {
     if (!existing) return "available";
+    if (existing.meta.externalHistory?.status === "metadata_only") return "available";
     return existing.meta.externalHistory?.status === "sync_conflict" ? "sync_conflict" : "imported";
   }
   function buildCatalogItem(provider, info, existing) {
@@ -164025,17 +164123,6 @@ ${escapeHtmlScriptContent(VISUAL_ANNOTATION_INSPECTOR_BROWSER_SCRIPT)}
       conflictReason: args2.conflictReason
     };
   }
-  function buildMetadataOnlyExternalHistoryMeta(args2) {
-    return {
-      provider: args2.provider,
-      source: "local-acp-history",
-      sourceAcpSessionId: args2.sourceAcpSessionId,
-      sourceUpdatedAt: args2.sourceUpdatedAt ?? void 0,
-      importedTurnCount: 0,
-      lastSyncAt: getServerNow(),
-      status: "metadata_only"
-    };
-  }
   class LocalProjectHistorySyncService {
     constructor(manager, logger2, context2, provider) {
       this.manager = manager;
@@ -164123,10 +164210,23 @@ ${escapeHtmlScriptContent(VISUAL_ANNOTATION_INSPECTOR_BROWSER_SCRIPT)}
           });
           const existing = await this.findExistingHistorySession(args2.localProjectId, selectedId) ?? snapshot.existingByImportKey.get(importKey);
           if (!existing) {
+            const replayNotifications = await loadHistorySessionReplay({
+              provider: this.provider,
+              rootPath: args2.rootPath,
+              acpSessionId,
+              logger: this.logger
+            });
+            const materialized = materializeReplay({
+              provider: this.provider,
+              acpSessionId,
+              replayNotifications,
+              userId: this.context.userId
+            });
             const importedSession = await this.importNewSession({
               info,
               acpSessionId,
-              project
+              project,
+              materialized
             });
             snapshot.existingByImportKey.set(importKey, importedSession);
             summary2.imported += 1;
@@ -164146,7 +164246,7 @@ ${escapeHtmlScriptContent(VISUAL_ANNOTATION_INSPECTOR_BROWSER_SCRIPT)}
             acpSessionId,
             message: formatErrorMessage(error2)
           });
-          this.logger.debug(`[${this.providerKey}-history-sync] Failed to import ${getProviderLabel(this.provider)} session ${acpSessionId}: ${formatErrorMessage(error2)}`);
+          this.logger.warn(`[${this.providerKey}-history-sync] Failed to import ${getProviderLabel(this.provider)} session ${acpSessionId}: ${formatErrorMessage(error2)}`);
         }
       }
       const catalog = await this.writeCatalogResult({
@@ -164401,13 +164501,38 @@ ${escapeHtmlScriptContent(VISUAL_ANNOTATION_INSPECTOR_BROWSER_SCRIPT)}
         title: resolveSessionTitle(args2.info, this.provider),
         titleSource: "draft",
         lastMessageAt,
-        externalHistory: buildMetadataOnlyExternalHistoryMeta({
+        externalHistory: buildExternalHistoryMeta({
           provider: this.provider,
           sourceAcpSessionId: args2.acpSessionId,
-          sourceUpdatedAt: args2.info.updatedAt
+          sourceUpdatedAt: args2.info.updatedAt,
+          materialized: args2.materialized
         })
       };
-      await this.manager.repo.upsertDocMeta(roomId, meta);
+      try {
+        const sessionDoc = await this.manager.getOrCreateSessionDoc(sessionId);
+        await sessionDoc.updateHistory(() => args2.materialized.history);
+        await writeSessionImportedTurnHashes(sessionDoc, args2.materialized.turnHashes);
+        await this.manager.repo.upsertDocMeta(roomId, meta);
+        const synced = await sessionDoc.waitUntilSynced();
+        if (!synced) {
+          this.logger.warn(`[${this.providerKey}-history-sync] Imported history for ${sessionId} did not confirm remote sync before unload; it remains locally durable and will retry sync.`);
+        }
+      } catch (error2) {
+        await this.manager.repo.deleteDoc(roomId).catch((cleanupError) => {
+          this.logger.warn(`[${this.providerKey}-history-sync] Failed to delete incomplete imported session ${sessionId}: ${formatErrorMessage(cleanupError)}`);
+        });
+        await this.manager.cleanSessionDoc(sessionId, {
+          preserveStatus: true
+        }).catch((cleanupError) => {
+          this.logger.warn(`[${this.providerKey}-history-sync] Failed to unload incomplete imported session ${sessionId}: ${formatErrorMessage(cleanupError)}`);
+        });
+        throw error2;
+      }
+      await this.manager.cleanSessionDoc(sessionId, {
+        preserveStatus: true
+      }).catch((cleanupError) => {
+        this.logger.warn(`[${this.providerKey}-history-sync] Failed to unload imported session ${sessionId}: ${formatErrorMessage(cleanupError)}`);
+      });
       return {
         sessionId,
         meta
@@ -164500,7 +164625,7 @@ ${escapeHtmlScriptContent(VISUAL_ANNOTATION_INSPECTOR_BROWSER_SCRIPT)}
       await this.manager.cleanSessionDoc(args2.existing.sessionId, {
         preserveStatus: true
       });
-      return suffix.length > 0 ? "refreshed" : "skipped";
+      return externalHistory.status === "metadata_only" || suffix.length > 0 ? "refreshed" : "skipped";
     }
     async markConflict(sessionId, info, materialized, reason) {
       await this.manager.repo.upsertDocMeta(getSessionRoomId(sessionId), {
@@ -175094,7 +175219,7 @@ export PATH=${toSingleQuotedShellString(ghShimBinDir)}:"$PATH"
     }
     InternalCodec.prototype.encoder = InternalEncoder;
     InternalCodec.prototype.decoder = InternalDecoder;
-    var StringDecoder2 = require$$1$4.StringDecoder;
+    var StringDecoder2 = require$$1$3.StringDecoder;
     if (!StringDecoder2.prototype.end) StringDecoder2.prototype.end = function() {
     };
     function InternalDecoder(options, codec) {
@@ -179203,11 +179328,7 @@ export PATH=${toSingleQuotedShellString(ghShimBinDir)}:"$PATH"
     async startProcess(params, hooks2) {
       const workdir = this.resolveWorkdir(params.cwd);
       const env2 = this.buildEnv(params.env);
-      const formattedCommand = formatCommand(params.command, params.args);
-      const processHandle = await this.sandbox.spawn("bash", [
-        "-lc",
-        formattedCommand
-      ], {
+      const processHandle = await this.sandbox.spawn(params.command, params.args, {
         cwd: workdir,
         env: env2,
         stdio: [
@@ -179256,13 +179377,6 @@ export PATH=${toSingleQuotedShellString(ghShimBinDir)}:"$PATH"
       state2.handle.dispose();
     }
   }
-  function formatCommand(command2, args2) {
-    if (!args2.length) {
-      return command2;
-    }
-    const serializedArgs = args2.map((arg) => `'${arg.replace(/'/g, `'"'"'`)}'`).join(" ");
-    return `${command2} ${serializedArgs}`;
-  }
   function truncateBuffer(buffer2, limit2) {
     if (buffer2.length <= limit2) {
       return buffer2;
@@ -179305,7 +179419,7 @@ export PATH=${toSingleQuotedShellString(ghShimBinDir)}:"$PATH"
     const deps = {
       platform: process.platform,
       setPriority: os__default$1.setPriority,
-      writeFile: fs$3.writeFile,
+      writeFile: fs$2.writeFile,
       ...options.deps ?? {}
     };
     if (deps.platform !== "linux") {
@@ -179357,10 +179471,10 @@ export PATH=${toSingleQuotedShellString(ghShimBinDir)}:"$PATH"
   const defaultSandboxDeps = () => ({
     platform: process.platform,
     cgroupMount: DEFAULT_CGROUP_MOUNT,
-    fs: fs$3,
+    fs: fs$2,
     spawnProcess: spawn,
     readSelfCgroupPath: async () => {
-      const content = await fs$3.readFile("/proc/self/cgroup", "utf8");
+      const content = await fs$2.readFile("/proc/self/cgroup", "utf8");
       const line3 = content.split("\n").map((item) => item.trim()).find((item) => item.startsWith("0::"));
       if (!line3) {
         throw new Error("Unable to determine current cgroup path from /proc/self/cgroup");
@@ -180458,6 +180572,7 @@ export PATH=${toSingleQuotedShellString(ghShimBinDir)}:"$PATH"
               cliType: callbacks.cliType,
               agentType: callbacks.agentType
             },
+            configOptionValues: this.config.configOptionValues,
             launcher,
             workspaceId: this.config.workspaceId,
             machineId: this.config.machineId,
@@ -181187,14 +181302,19 @@ export PATH=${toSingleQuotedShellString(ghShimBinDir)}:"$PATH"
       }
     };
   }
-  function buildSessionPreparationCompatibility(launchSource, mcpServerIds) {
+  function buildSessionPreparationCompatibility(launchSource, mcpServerIds, configOptionValues) {
     return {
       launch: buildSessionLaunchConfig({
         customAcp: launchSource?.customAcp,
         runtimeOverrides: launchSource?.runtimeOverrides,
         env: launchSource?.env
       }),
-      mcpServerIds: normalizeMcpServerIdsForDedup(mcpServerIds)
+      runConfig: normalizeSessionPreparationRunConfigForDedup({
+        mcpServerIds: mcpServerIds ? [
+          ...mcpServerIds
+        ] : void 0,
+        configOptionValues
+      })
     };
   }
   function agentConfigMatchesPreparation(agentConfig, spec, machineId) {
@@ -181309,7 +181429,7 @@ export PATH=${toSingleQuotedShellString(ghShimBinDir)}:"$PATH"
         return null;
       }
       const current2 = resource.readCurrentLaunchConfig(sessionMeta);
-      if (!current2 || !isDeepStrictEqual(resource.compatibility, buildSessionPreparationCompatibility(current2.config, resource.config.mcpServerIds))) {
+      if (!current2 || !isDeepStrictEqual(resource.compatibility, buildSessionPreparationCompatibility(current2.config, resource.config.mcpServerIds, resource.config.configOptionValues))) {
         return null;
       }
       return {
@@ -181350,7 +181470,7 @@ export PATH=${toSingleQuotedShellString(ghShimBinDir)}:"$PATH"
         await this.preparationService.discard(sessionId);
         return await this.createSessionInnerWithAgent(config2, agentStart);
       }
-      const compatibility = buildSessionPreparationCompatibility(config2, config2.mcpServerIds);
+      const compatibility = buildSessionPreparationCompatibility(config2, config2.mcpServerIds, config2.configOptionValues);
       const claim = this.preparationService.claim({
         sessionId,
         requesterUserId: config2.requesterUserId,
@@ -181369,7 +181489,7 @@ export PATH=${toSingleQuotedShellString(ghShimBinDir)}:"$PATH"
             cliType: config2.agentCliType,
             agentType: config2.agentType
           });
-          return current2 !== null && isDeepStrictEqual(resource.compatibility, buildSessionPreparationCompatibility(current2.config, config2.mcpServerIds));
+          return current2 !== null && isDeepStrictEqual(resource.compatibility, buildSessionPreparationCompatibility(current2.config, config2.mcpServerIds, config2.configOptionValues));
         }
       });
       if (claim.status === "miss") {
@@ -181525,6 +181645,7 @@ export PATH=${toSingleQuotedShellString(ghShimBinDir)}:"$PATH"
         agentConfigId: spec.agentConfigId,
         agentCliType: spec.cliType,
         agentType: spec.agentType,
+        configOptionValues: spec.runConfig?.configOptionValues,
         mcpServerIds: spec.runConfig?.mcpServerIds ?? [],
         customAcp: agentConfig.customAcp,
         runtimeOverrides: agentConfig.runtimeOverrides,
@@ -181539,7 +181660,7 @@ export PATH=${toSingleQuotedShellString(ghShimBinDir)}:"$PATH"
         userName: user.name,
         userEmail: user.email
       };
-      const compatibility = buildSessionPreparationCompatibility(config2, config2.mcpServerIds);
+      const compatibility = buildSessionPreparationCompatibility(config2, config2.mcpServerIds, config2.configOptionValues);
       const ghTokenInjected = await this.prepareGitHubRepoSessionConfig(config2);
       signal.throwIfAborted();
       const launch = await resolveACPProcessLaunchAsync({
@@ -184389,7 +184510,7 @@ export PATH=${toSingleQuotedShellString(ghShimBinDir)}:"$PATH"
   async function loadOrCreateLocalIdentity(logger2, options = {}) {
     const identityPath = options.filePath ?? getLocalIdentityPath();
     try {
-      const raw2 = await fs__default$3.readFile(identityPath, "utf-8");
+      const raw2 = await fs__default$2.readFile(identityPath, "utf-8");
       const parsed = JSON.parse(raw2);
       if (typeof parsed.userId === "string" && parsed.userId.startsWith(LOCAL_USER_ID_PREFIX) && typeof parsed.createdAt === "string") {
         return {
@@ -184404,11 +184525,11 @@ export PATH=${toSingleQuotedShellString(ghShimBinDir)}:"$PATH"
       userId: `${LOCAL_USER_ID_PREFIX}${crypto__default.randomUUID().replaceAll("-", "")}`,
       createdAt: new Date(getServerNow()).toISOString()
     };
-    await fs__default$3.mkdir(path__default$1.dirname(identityPath), {
+    await fs__default$2.mkdir(path__default$1.dirname(identityPath), {
       recursive: true,
       mode: 448
     });
-    await fs__default$3.writeFile(identityPath, `${JSON.stringify(identity2, null, 2)}
+    await fs__default$2.writeFile(identityPath, `${JSON.stringify(identity2, null, 2)}
 `, {
       mode: 384
     });
@@ -190667,7 +190788,7 @@ Shutting down gracefully${reason}...`);
   function getUserPipeSuffix() {
     if (typeof process.getuid === "function") return String(process.getuid());
     const userInfo2 = os__default.userInfo();
-    return crypto$2.createHash("sha256").update(`${userInfo2.uid}:${userInfo2.username}:${os__default.homedir()}`).digest("hex").slice(0, 16);
+    return crypto__default$1.createHash("sha256").update(`${userInfo2.uid}:${userInfo2.username}:${os__default.homedir()}`).digest("hex").slice(0, 16);
   }
   function getLocalCliHostEndpoint(platform2) {
     const profile = getInstallationProfile(platform2);
@@ -190745,7 +190866,7 @@ Shutting down gracefully${reason}...`);
   function tokensEqual(actual, expected) {
     const actualBytes = Buffer.from(actual);
     const expectedBytes = Buffer.from(expected);
-    return actualBytes.length === expectedBytes.length && crypto$2.timingSafeEqual(actualBytes, expectedBytes);
+    return actualBytes.length === expectedBytes.length && crypto__default$1.timingSafeEqual(actualBytes, expectedBytes);
   }
   async function createListeningHost(endpoint, record2, shutdownControl) {
     const sockets = /* @__PURE__ */ new Set();
@@ -191027,7 +191148,7 @@ Shutting down gracefully${reason}...`);
     });
     scrubLocalSupervisorCapabilityEnv();
     await traceAsync(logger2, "startup.process_resource_profile", void 0, async () => normalizeCurrentProcessResourceProfile(logger2));
-    for (const diagnostic of getRuntimeDiagnostics(version$7)) {
+    for (const diagnostic of getRuntimeDiagnostics(version$9)) {
       logger2.info(diagnostic);
     }
     if (options.heartbeatLog) {
@@ -192153,7 +192274,7 @@ Shutting down gracefully${reason}...`);
       const defaultOpts = {
         defaultWidth: 0,
         output: process.stdout,
-        tty: require$$1$3
+        tty: require$$1$2
       };
       if (!options) {
         return defaultOpts;
@@ -194507,7 +194628,7 @@ Shutting down gracefully${reason}...`);
   function requireLib$1() {
     if (hasRequiredLib$1) return lib$1;
     hasRequiredLib$1 = 1;
-    const Stream = un;
+    const Stream = Zr;
     class MuteStream2 extends Stream {
       #isTTY = null;
       constructor(opts = {}) {
@@ -200709,7 +200830,7 @@ ${page}${helpTipBottom}${choiceDescription}${error2}${ansiEscapes.cursorHide}`;
     }
     InternalCodec.prototype.encoder = InternalEncoder;
     InternalCodec.prototype.decoder = InternalDecoder;
-    var StringDecoder2 = require$$1$4.StringDecoder;
+    var StringDecoder2 = require$$1$3.StringDecoder;
     if (!StringDecoder2.prototype.end) StringDecoder2.prototype.end = function() {
     };
     function InternalDecoder(options, codec) {
@@ -203985,7 +204106,7 @@ ${page}${helpTipBottom}${choiceDescription}${error2}${ansiEscapes.cursorHide}`;
   function requireStreams() {
     if (hasRequiredStreams) return streams;
     hasRequiredStreams = 1;
-    var Buffer2 = require$$0$6.Buffer, Transform2 = un.Transform;
+    var Buffer2 = require$$0$6.Buffer, Transform2 = Zr.Transform;
     streams = function(iconv2) {
       iconv2.encodeStream = function encodeStream(encoding2, options) {
         return new IconvLiteEncoderStream(iconv2.getEncoder(encoding2, options), options);
@@ -204205,7 +204326,7 @@ ${page}${helpTipBottom}${choiceDescription}${error2}${ansiEscapes.cursorHide}`;
           return length2;
         };
         if (iconv2.supportsStreams) {
-          var Readable2 = un.Readable;
+          var Readable2 = Zr.Readable;
           original.ReadableSetEncoding = Readable2.prototype.setEncoding;
           Readable2.prototype.setEncoding = function setEncoding(enc, options) {
             this._readableState.decoder = iconv2.getDecoder(enc, options);
@@ -204226,7 +204347,7 @@ ${page}${helpTipBottom}${choiceDescription}${error2}${ansiEscapes.cursorHide}`;
         Buffer2.prototype.toString = original.BufferToString;
         Buffer2.prototype.write = original.BufferWrite;
         if (iconv2.supportsStreams) {
-          var Readable2 = un.Readable;
+          var Readable2 = Zr.Readable;
           Readable2.prototype.setEncoding = original.ReadableSetEncoding;
           delete Readable2.prototype.collect;
         }
@@ -204815,7 +204936,7 @@ ${page}${helpTipBottom}${choiceDescription}${error2}${ansiEscapes.cursorHide}`;
       value: true
     });
     var chardet_1 = requireChardet();
-    var child_process_1 = require$$1$9;
+    var child_process_1 = require$$1$8;
     var fs_1 = fs__default;
     var iconv_lite_1 = requireLib();
     var tmp_1 = requireTmp();
@@ -218628,8 +218749,8 @@ ${page}${helpTipBottom}${choiceDescription}${ansiEscapes.cursorHide}`;
     const sessionDir = joinExportPath(args2.outputDir, "sessions", sessionDirName);
     const summary2 = toExportSessionSummary(args2.session, args2.workspaceId);
     const history = await args2.manager.getSessionHistorySnapshot(args2.session.id);
-    const artifacts = buildSessionArtifacts(history);
-    let attachments = artifacts.attachments;
+    const artifacts2 = buildSessionArtifacts(history);
+    let attachments = artifacts2.attachments;
     if (args2.downloadImages) {
       attachments = await mapWithConcurrency$1(attachments, ATTACHMENT_EXPORT_CONCURRENCY, async (attachment) => {
         const downloaded = await downloadSessionAttachment({
@@ -218652,11 +218773,11 @@ ${page}${helpTipBottom}${choiceDescription}${ansiEscapes.cursorHide}`;
     }
     await writeJson(path__default.join(sessionDir, "transcript.json"), {
       session: summary2,
-      turns: artifacts.transcript
+      turns: artifacts2.transcript
     });
     await writeText(path__default.join(sessionDir, "transcript.md"), buildTranscriptMarkdown({
       session: summary2,
-      turns: artifacts.transcript,
+      turns: artifacts2.transcript,
       attachments
     }));
     await writeJson(path__default.join(sessionDir, "artifacts", "attachments", "index.json"), attachments);
@@ -218904,7 +219025,7 @@ ${page}${helpTipBottom}${choiceDescription}${ansiEscapes.cursorHide}`;
       data = createReviewBundleSnapshot(bundle);
     }
     const { injectReviewSnapshot } = await import("./chunks/index-VoI6Ds2-.js");
-    const { resolveReviewViewerTemplate } = await import("./chunks/review-viewer-BPTYS7b4.js").then(async (m) => {
+    const { resolveReviewViewerTemplate } = await import("./chunks/review-viewer-oYzxdgq4.js").then(async (m) => {
       await m.__tla;
       return m;
     });
@@ -220590,9 +220711,9 @@ ${result.stdout ?? ""}`;
     const passthroughArgs = cmd.args;
     captureDaemonEvent("daemon_restart_requested");
     const runningProbeHealth = await fetchLocalProbeHealth();
-    const versionMismatchHealth = runningProbeHealth && runningProbeHealth.cliVersion !== version$7 ? runningProbeHealth : null;
+    const versionMismatchHealth = runningProbeHealth && runningProbeHealth.cliVersion !== version$9 ? runningProbeHealth : null;
     if (versionMismatchHealth) {
-      console.log(`Running daemon uses lody v${versionMismatchHealth.cliVersion}; current CLI is v${version$7}. Restarting with current CLI.`);
+      console.log(`Running daemon uses lody v${versionMismatchHealth.cliVersion}; current CLI is v${version$9}. Restarting with current CLI.`);
     }
     const stopResult = await stopDaemonProcess();
     captureDaemonEvent("daemon_stop_result", {
@@ -220799,7 +220920,7 @@ ${result.stdout ?? ""}`;
     });
     logger2.info(`Daemon watchdog started (PID ${process.pid})`);
     await normalizeCurrentProcessResourceProfile(logger2);
-    for (const diagnostic of getRuntimeDiagnostics(version$7)) {
+    for (const diagnostic of getRuntimeDiagnostics(version$9)) {
       logger2.info(diagnostic);
     }
     const passthroughArgs = cmd.args;
@@ -239432,7 +239553,7 @@ ${result.stdout ?? ""}`;
           cliToken: auth.token,
           source: "mcp",
           feedback: args2.feedback,
-          cliVersion: version$7
+          cliVersion: version$9
         }));
       } catch (error2) {
         return mcpErrorResult(error2);
@@ -241823,7 +241944,7 @@ data:
         cliToken: auth.token,
         source: "cli",
         feedback,
-        cliVersion: version$7
+        cliVersion: version$9
       });
       if (options.json) {
         printJson(result);
@@ -242153,7 +242274,7 @@ Other machines will not see it until this machine syncs.`);
       logger2.warn(`[dns] invalid LODY_DNS_RESULT_ORDER value; expected ipv4first|ipv6first|verbatim|node \u2014 falling back to ipv4first`);
     }
     try {
-      require$$1$8.setDefaultResultOrder(resolution.order);
+      require$$1$7.setDefaultResultOrder(resolution.order);
       logger2.debug(`[dns] default DNS result order set to ${resolution.order} (${resolution.reason})`);
     } catch (error2) {
       logger2.debug(`[dns] failed to set DNS result order: ${error2 instanceof Error ? error2.message : String(error2)}`);
@@ -242168,7 +242289,7 @@ Other machines will not see it until this machine syncs.`);
     logger: getLogger("http-transport")
   });
   program = new Command();
-  program.name("lody").description("Lody Agent CLI tool for managing remote command execution").version(version$7, "-v, --version", "display version number").enablePositionalOptions();
+  program.name("lody").description("Lody Agent CLI tool for managing remote command execution").version(version$9, "-v, --version", "display version number").enablePositionalOptions();
   program.addCommand(loginCommand);
   program.addCommand(logoutCommand);
   program.addCommand(startCommand);