lody 0.88.1 → 0.89.0

package/dist/index.js

@@ -16,25 +16,25 @@ 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 LE__default, { execFile, spawn as spawn$1, execFileSync } from "node:child_process";
+import Gx__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__default$1, { randomFillSync, randomUUID, createHash, randomBytes, timingSafeEqual } from "node:crypto";
 import require$$0$5, { promisify as promisify$1 } from "util";
-import Zr, { Transform as Transform$1, Readable as Readable$1 } from "stream";
+import So, { 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 $s from "zlib";
-import $s__default from "zlib";
+import * as Ei from "zlib";
+import Ei__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 jt from "node:fs/promises";
-import jt__default, { mkdir as mkdir$1, realpath, symlink, mkdtemp, chmod, writeFile, rm, rename, readFile, readdir, stat, lstat, unlink, open, opendir } from "node:fs/promises";
+import * as Yt from "node:fs/promises";
+import Yt__default, { mkdir as mkdir$1, realpath, symlink, mkdtemp, chmod, writeFile, rm, rename, readFile, readdir, stat, lstat, unlink, open, opendir } from "node:fs/promises";
 import zlib__default, { gzip, gunzip as gunzip$1, gunzipSync, brotliDecompressSync } from "node:zlib";
 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, a as isValidContainerId, c as callPendingEvents$3, b as LoroTree, d as LoroText, e as LoroMovableList, f as LoroList, g as LoroMap, V as VersionVector, h as __vite__initWasm, j as decodeImportBlobMeta, __tla as __tla_0 } from "./chunks/loro_wasm_bg-Br-Fa9wV.js";
@@ -66,8 +66,8 @@ import { C as ClientSideConnection, P as PROTOCOL_VERSION, n as ndJsonStream } f
 import { StringDecoder } from "node:string_decoder";
 import { L as LODY_EXTENSION_METHODS, n as normalizeLodyExtensionMethod } from "./chunks/methods-CvEDMahD.js";
 import { pipeline, finished } from "node:stream/promises";
-import { p as packageJson } from "./chunks/package-CNW89xCh.js";
-import { r as runtimeManifest } from "./chunks/runtime-manifest-ByWJfM07.js";
+import { p as packageJson } from "./chunks/package-4KuPYsnp.js";
+import { r as runtimeManifest } from "./chunks/runtime-manifest-DnyvD_EC.js";
 import { AsyncLocalStorage as AsyncLocalStorage$1 } from "async_hooks";
 import { createRequire } from "module";
 import { c as computeLineCounts, a as countTextLines } from "./chunks/diff-line-counts-bmGB_T-n.js";
@@ -4325,7 +4325,7 @@ Upgrade Node, then re-run: npx lody@latest`;
   }
   const name$2 = "lody";
   const name$1 = "@lody/cli-cloud";
-  const version$9 = "0.88.1";
+  const version$9 = "0.89.0";
   const type$2 = "module";
   const scripts = {
     "dev": "node dev.mjs",
@@ -11054,6 +11054,20 @@ Requirements:
       status
     };
   }
+  function getPendingUserTurnActivationId(meta) {
+    const missingUserTurnId = meta.lastMissingHistoryUserMsgId;
+    const settledUserTurnId = meta.settledActivationUserMsgId;
+    if (typeof meta.processingUserMsgId === "string" && meta.processingUserMsgId.length > 0 && meta.processingUserMsgId !== missingUserTurnId && meta.processingUserMsgId !== settledUserTurnId) {
+      return meta.processingUserMsgId;
+    }
+    if (typeof meta.latestUserMsgId === "string" && meta.latestUserMsgId.length > 0 && meta.latestUserMsgId !== meta.lastHandledUserMsgId && meta.latestUserMsgId !== missingUserTurnId && meta.latestUserMsgId !== settledUserTurnId) {
+      return meta.latestUserMsgId;
+    }
+    return void 0;
+  }
+  function hasPendingUserTurnActivation(meta) {
+    return getPendingUserTurnActivationId(meta) !== void 0;
+  }
   const sessionSchema = schema.LoroMap({
     id: schema.String()
   });
@@ -11102,6 +11116,22 @@ Requirements:
   }, {
     required: false
   });
+  const sessionAcpRuntimeConfigDocSchema = schema.LoroMap({
+    acpSessionId: schema.String(),
+    basedOnUserTurnId: schema.String(),
+    revision: schema.Number(),
+    modeId: schema.String({
+      required: false
+    }),
+    modelId: schema.String({
+      required: false
+    }),
+    configOptionValues: schema.Any({
+      required: false
+    })
+  }, {
+    required: false
+  });
   const sessionDocSchema = schema({
     session: sessionSchema,
     history: schema.LoroList(sessionHistorySchema, (item) => item.id),
@@ -11110,7 +11140,8 @@ Requirements:
     }),
     forkOperation: sessionForkOperationDocSchema,
     preview: sessionPreviewDocSchema,
-    externalHistoryCursor: sessionExternalHistoryCursorDocSchema
+    externalHistoryCursor: sessionExternalHistoryCursorDocSchema,
+    acpRuntimeConfig: sessionAcpRuntimeConfigDocSchema
   });
   const resolveActiveAssistantTurnId = (history) => {
     if (!history?.length) {
@@ -11345,7 +11376,7 @@ Requirements:
     command: LocalPathLauncherStringSchema,
     args: array$2(LocalPathLauncherStringSchema).max(64).optional()
   }).strict();
-  discriminatedUnion("kind", [
+  const LaunchLocalPathInputSchema = discriminatedUnion("kind", [
     object$1({
       kind: literal$1("url"),
       url: LocalPathLauncherStringSchema,
@@ -11361,6 +11392,12 @@ Requirements:
       label: string$1().trim().min(1).max(80).optional()
     }).strict()
   ]);
+  object$1({
+    launchers: array$2(object$1({
+      launcherId: string$1().trim().min(1).max(200),
+      input: LaunchLocalPathInputSchema
+    }).strict()).max(30)
+  }).strict();
   const CliRuntimePhaseSchema = _enum$1([
     "starting",
     "running",
@@ -12695,6 +12732,7 @@ Requirements:
     ]),
     authenticationRequestId: string$1().trim().min(1).optional(),
     authorizationCode: string$1().trim().min(1).max(4096).optional(),
+    methodId: string$1().trim().min(1).max(256).optional(),
     configId: AgentConfigIdSchema.optional(),
     cliType: AgentConfigCliTypeSchema,
     agentType: string$1().trim().min(1),
@@ -12739,6 +12777,7 @@ Requirements:
       "cancelled",
       "not-running",
       "input-accepted",
+      "method-required",
       "error"
     ]),
     capabilitiesRefreshed: boolean().optional(),
@@ -14598,12 +14637,12 @@ Requirements:
     {
       id: "codebuddy-code",
       name: "Codebuddy Code",
-      version: "2.140.0",
+      version: "2.142.0",
       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.140.0",
+          package: "@tencent-ai/codebuddy-code@2.142.0",
           args: [
             "--acp"
           ]
@@ -14775,48 +14814,48 @@ Requirements:
     {
       id: "devin",
       name: "Devin",
-      version: "3000.6.2",
+      version: "3000.6.7",
       description: "Devin CLI coding agent by Cognition",
       icon: "https://cdn.agentclientprotocol.com/registry/v1/latest/devin.svg",
       distribution: {
         binary: {
           "darwin-aarch64": {
-            archive: "https://static.devin.ai/cli/3000.6.2/devin-3000.6.2-aarch64-apple-darwin.tar.gz",
+            archive: "https://static.devin.ai/cli/3000.6.7/devin-3000.6.7-aarch64-apple-darwin.tar.gz",
             cmd: "./bin/devin",
             args: [
               "acp"
             ]
           },
           "darwin-x86_64": {
-            archive: "https://static.devin.ai/cli/3000.6.2/devin-3000.6.2-x86_64-apple-darwin.tar.gz",
+            archive: "https://static.devin.ai/cli/3000.6.7/devin-3000.6.7-x86_64-apple-darwin.tar.gz",
             cmd: "./bin/devin",
             args: [
               "acp"
             ]
           },
           "linux-aarch64": {
-            archive: "https://static.devin.ai/cli/3000.6.2/devin-3000.6.2-aarch64-unknown-linux.tar.gz",
+            archive: "https://static.devin.ai/cli/3000.6.7/devin-3000.6.7-aarch64-unknown-linux.tar.gz",
             cmd: "./bin/devin",
             args: [
               "acp"
             ]
           },
           "linux-x86_64": {
-            archive: "https://static.devin.ai/cli/3000.6.2/devin-3000.6.2-x86_64-unknown-linux.tar.gz",
+            archive: "https://static.devin.ai/cli/3000.6.7/devin-3000.6.7-x86_64-unknown-linux.tar.gz",
             cmd: "./bin/devin",
             args: [
               "acp"
             ]
           },
           "windows-aarch64": {
-            archive: "https://static.devin.ai/cli/3000.6.2/devin-3000.6.2-aarch64-pc-windows.zip",
+            archive: "https://static.devin.ai/cli/3000.6.7/devin-3000.6.7-aarch64-pc-windows.zip",
             cmd: "./bin\\devin.exe",
             args: [
               "acp"
             ]
           },
           "windows-x86_64": {
-            archive: "https://static.devin.ai/cli/3000.6.2/devin-3000.6.2-x86_64-pc-windows.zip",
+            archive: "https://static.devin.ai/cli/3000.6.7/devin-3000.6.7-x86_64-pc-windows.zip",
             cmd: "./bin\\devin.exe",
             args: [
               "acp"
@@ -14828,12 +14867,12 @@ Requirements:
     {
       id: "dimcode",
       name: "DimCode",
-      version: "0.3.21",
+      version: "0.3.22",
       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.21",
+          package: "dimcode@0.3.22",
           args: [
             "acp"
           ]
@@ -14843,12 +14882,12 @@ Requirements:
     {
       id: "dirac",
       name: "Dirac",
-      version: "0.5.1",
+      version: "0.5.2",
       description: "Reduces API costs by more than 50%, produces better and faster work. Uses Hash anchored parallel edits, AST manipulation and a whole lot of neat optimizations. Fully Open Source.",
       icon: "https://cdn.agentclientprotocol.com/registry/v1/latest/dirac.svg",
       distribution: {
         npx: {
-          package: "dirac-cli@0.5.1",
+          package: "dirac-cli@0.5.2",
           args: [
             "--acp"
           ]
@@ -14858,12 +14897,12 @@ Requirements:
     {
       id: "factory-droid",
       name: "Factory Droid",
-      version: "0.205.1",
+      version: "0.208.2",
       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.205.1",
+          package: "droid@0.208.2",
           args: [
             "exec",
             "--output-format",
@@ -14912,12 +14951,12 @@ Requirements:
     {
       id: "github-copilot-cli",
       name: "GitHub Copilot",
-      version: "1.0.81",
+      version: "1.0.82",
       description: "GitHub's AI pair programmer",
       icon: "https://cdn.agentclientprotocol.com/registry/v1/latest/github-copilot-cli.svg",
       distribution: {
         npx: {
-          package: "@github/copilot@1.0.81",
+          package: "@github/copilot@1.0.82",
           args: [
             "--acp"
           ]
@@ -14927,12 +14966,12 @@ Requirements:
     {
       id: "glm-acp-agent",
       name: "GLM Agent",
-      version: "1.6.1",
+      version: "1.7.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.6.1"
+          package: "glm-acp-agent@1.7.0"
         }
       }
     },
@@ -14957,13 +14996,13 @@ Requirements:
     {
       id: "harn",
       name: "Harn",
-      version: "0.10.118",
+      version: "0.10.124",
       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.118/harn-aarch64-apple-darwin.tar.gz",
+            archive: "https://github.com/burin-labs/harn/releases/download/v0.10.124/harn-aarch64-apple-darwin.tar.gz",
             cmd: "./harn",
             args: [
               "serve",
@@ -14971,7 +15010,7 @@ Requirements:
             ]
           },
           "darwin-x86_64": {
-            archive: "https://github.com/burin-labs/harn/releases/download/v0.10.118/harn-x86_64-apple-darwin.tar.gz",
+            archive: "https://github.com/burin-labs/harn/releases/download/v0.10.124/harn-x86_64-apple-darwin.tar.gz",
             cmd: "./harn",
             args: [
               "serve",
@@ -14979,7 +15018,7 @@ Requirements:
             ]
           },
           "linux-aarch64": {
-            archive: "https://github.com/burin-labs/harn/releases/download/v0.10.118/harn-aarch64-unknown-linux-gnu.tar.gz",
+            archive: "https://github.com/burin-labs/harn/releases/download/v0.10.124/harn-aarch64-unknown-linux-gnu.tar.gz",
             cmd: "./harn",
             args: [
               "serve",
@@ -14987,7 +15026,7 @@ Requirements:
             ]
           },
           "linux-x86_64": {
-            archive: "https://github.com/burin-labs/harn/releases/download/v0.10.118/harn-x86_64-unknown-linux-gnu.tar.gz",
+            archive: "https://github.com/burin-labs/harn/releases/download/v0.10.124/harn-x86_64-unknown-linux-gnu.tar.gz",
             cmd: "./harn",
             args: [
               "serve",
@@ -14995,7 +15034,7 @@ Requirements:
             ]
           },
           "windows-x86_64": {
-            archive: "https://github.com/burin-labs/harn/releases/download/v0.10.118/harn-x86_64-pc-windows-msvc.zip",
+            archive: "https://github.com/burin-labs/harn/releases/download/v0.10.124/harn-x86_64-pc-windows-msvc.zip",
             cmd: "harn.exe",
             args: [
               "serve",
@@ -15026,47 +15065,47 @@ Requirements:
     {
       id: "kilo",
       name: "Kilo",
-      version: "7.5.5",
+      version: "7.5.6",
       description: "The open source coding agent",
       icon: "https://cdn.agentclientprotocol.com/registry/v1/latest/kilo.svg",
       distribution: {
         npx: {
-          package: "@kilocode/cli@7.5.5",
+          package: "@kilocode/cli@7.5.6",
           args: [
             "acp"
           ]
         },
         binary: {
           "darwin-aarch64": {
-            archive: "https://github.com/Kilo-Org/kilocode/releases/download/v7.5.5/kilo-darwin-arm64.zip",
+            archive: "https://github.com/Kilo-Org/kilocode/releases/download/v7.5.6/kilo-darwin-arm64.zip",
             cmd: "./kilo",
             args: [
               "acp"
             ]
           },
           "darwin-x86_64": {
-            archive: "https://github.com/Kilo-Org/kilocode/releases/download/v7.5.5/kilo-darwin-x64.zip",
+            archive: "https://github.com/Kilo-Org/kilocode/releases/download/v7.5.6/kilo-darwin-x64.zip",
             cmd: "./kilo",
             args: [
               "acp"
             ]
           },
           "linux-aarch64": {
-            archive: "https://github.com/Kilo-Org/kilocode/releases/download/v7.5.5/kilo-linux-arm64.tar.gz",
+            archive: "https://github.com/Kilo-Org/kilocode/releases/download/v7.5.6/kilo-linux-arm64.tar.gz",
             cmd: "./kilo",
             args: [
               "acp"
             ]
           },
           "linux-x86_64": {
-            archive: "https://github.com/Kilo-Org/kilocode/releases/download/v7.5.5/kilo-linux-x64.tar.gz",
+            archive: "https://github.com/Kilo-Org/kilocode/releases/download/v7.5.6/kilo-linux-x64.tar.gz",
             cmd: "./kilo",
             args: [
               "acp"
             ]
           },
           "windows-x86_64": {
-            archive: "https://github.com/Kilo-Org/kilocode/releases/download/v7.5.5/kilo-windows-x64.zip",
+            archive: "https://github.com/Kilo-Org/kilocode/releases/download/v7.5.6/kilo-windows-x64.zip",
             cmd: "./kilo.exe",
             args: [
               "acp"
@@ -15163,7 +15202,7 @@ Requirements:
     {
       id: "opencode",
       name: "OpenCode",
-      version: "1.18.23",
+      version: "1.18.25",
       description: "The open source coding agent",
       icon: "https://cdn.agentclientprotocol.com/registry/v1/latest/opencode.svg",
       distribution: {
@@ -15261,12 +15300,12 @@ Requirements:
     {
       id: "qwen-code",
       name: "Qwen Code",
-      version: "0.22.2",
+      version: "0.22.3",
       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.22.2",
+          package: "@qwen-code/qwen-code@0.22.3",
           args: [
             "--acp",
             "--experimental-skills"
@@ -20647,13 +20686,16 @@ ${tailedOutput}` : null;
   };
   const MACHINE_PROTOCOL_CAPABILITIES = {
     localProjectRemoval: "localProjectRemoval",
-    providerSetup: "providerSetup"
+    providerSetup: "providerSetup",
+    acpProtocolAuthentication: "acpProtocolAuthentication"
   };
   const LOCAL_PROJECT_REMOVAL_PROTOCOL_VERSION = 1;
   const PROVIDER_SETUP_PROTOCOL_VERSION = 1;
+  const ACP_PROTOCOL_AUTHENTICATION_VERSION = 1;
   const CURRENT_MACHINE_PROTOCOL_CAPABILITIES = {
     [MACHINE_PROTOCOL_CAPABILITIES.localProjectRemoval]: LOCAL_PROJECT_REMOVAL_PROTOCOL_VERSION,
-    [MACHINE_PROTOCOL_CAPABILITIES.providerSetup]: PROVIDER_SETUP_PROTOCOL_VERSION
+    [MACHINE_PROTOCOL_CAPABILITIES.providerSetup]: PROVIDER_SETUP_PROTOCOL_VERSION,
+    [MACHINE_PROTOCOL_CAPABILITIES.acpProtocolAuthentication]: ACP_PROTOCOL_AUTHENTICATION_VERSION
   };
   const isLoroRepoDocDeleted = (value) => {
     if (!value || typeof value !== "object") {
@@ -23312,6 +23354,10 @@ ${context2.authorReply.trim()}
       cliType,
       limitId
     ],
+    builtinAgentOptOut: (agentType) => [
+      "builtinAgentOptOut",
+      agentType
+    ],
     sessionLaunchConfig: (sessionId) => [
       "sessionLaunchConfig",
       sessionId
@@ -23404,6 +23450,13 @@ ${context2.authorReply.trim()}
         limitId: key2[2]
       };
     }
+    if (key2.length === 2 && key2[0] === "builtinAgentOptOut" && typeof key2[1] === "string" && isManagedBuiltinAgentType(key2[1])) {
+      return {
+        kind: "builtinAgentOptOut",
+        key: machineFlockKeys.builtinAgentOptOut(key2[1]),
+        agentType: key2[1]
+      };
+    }
     if (key2.length === 2 && key2[0] === "sessionLaunchConfig" && isNonEmptyString$2(key2[1])) {
       const sessionId = key2[1];
       return {
@@ -23452,6 +23505,9 @@ ${context2.authorReply.trim()}
     rateLimit: [
       "rateLimit"
     ],
+    builtinAgentOptOut: [
+      "builtinAgentOptOut"
+    ],
     sessionLaunchConfig: [
       "sessionLaunchConfig"
     ]
@@ -23496,6 +23552,7 @@ ${context2.authorReply.trim()}
   const isMachineFlockProviderSetupRow = (row) => row.key[0] === "providerSetup";
   const isMachineFlockProviderSetupCancellationRow = (row) => row.key[0] === "providerSetupCancellation";
   const isMachineFlockRateLimitRow = (row) => row.key[0] === "rateLimit";
+  const isMachineFlockBuiltinAgentOptOutRow = (row) => row.key[0] === "builtinAgentOptOut";
   const isMachineFlockSessionLaunchConfigRow = (row) => row.key[0] === "sessionLaunchConfig";
   const getMachineFlockRateLimitEntryKey = (cliType, limitId) => `${cliType}::${limitId.trim() || cliType}`;
   function getMachineFlockLocalProjects(rows) {
@@ -23565,8 +23622,11 @@ ${context2.authorReply.trim()}
     const rows = readMachineFlockRowsFromFlock(flock, {
       prefixes: [
         machineFlockKeys.providerSetupCancellation(cancellation.id),
-        machineFlockKeys.providerSetup(cancellation.id),
-        machineFlockKeys.agentConfig(cancellation.id)
+        machineFlockKeys.providerSetup(cancellation.id)
+      ],
+      families: [
+        "agentConfig",
+        "builtinAgentOptOut"
       ]
     });
     const existingCancellation = getMachineFlockProviderSetupCancellations(rows)[cancellation.id];
@@ -23582,6 +23642,10 @@ ${context2.authorReply.trim()}
       flock.delete(machineFlockKeys.providerSetup(cancellation.id), nowMs2);
     }
     if (config2) {
+      const optOut = planBuiltinAgentOptOutForDeletedConfig(rows, config2, nowMs2);
+      if (optOut) {
+        flock.set(optOut.key, optOut.value, nowMs2);
+      }
       flock.delete(machineFlockKeys.agentConfig(cancellation.id), nowMs2);
     }
     flock.commit();
@@ -23597,6 +23661,101 @@ ${context2.authorReply.trim()}
     }
     return rateLimits;
   }
+  function getMachineFlockBuiltinAgentOptOuts(rows) {
+    const optedOut = /* @__PURE__ */ new Set();
+    for (const row of Object.values(rows)) {
+      if (!isMachineFlockBuiltinAgentOptOutRow(row)) {
+        continue;
+      }
+      optedOut.add(row.key[1]);
+    }
+    return optedOut;
+  }
+  function getBuiltinAgentOptOutAgentType(config2) {
+    if (config2.cliType !== "builtin" || !isManagedBuiltinAgentType(config2.agentType)) {
+      return null;
+    }
+    return config2.agentType;
+  }
+  function planBuiltinAgentOptOutForDeletedConfig(rows, config2, nowMs2) {
+    const agentType = getBuiltinAgentOptOutAgentType(config2);
+    if (agentType === null) {
+      return null;
+    }
+    const key2 = machineFlockKeys.builtinAgentOptOut(agentType);
+    if (serializeMachineFlockKey(key2) in rows) {
+      return null;
+    }
+    const remaining = Object.values(getMachineFlockAgentConfigs(rows)).some((other) => other.id !== config2.id && getBuiltinAgentOptOutAgentType(other) === agentType);
+    if (remaining) {
+      return null;
+    }
+    return {
+      key: key2,
+      value: {
+        v: 1,
+        removedAt: nowMs2
+      }
+    };
+  }
+  function findBuiltinAgentOptOutToRetract(rows, config2) {
+    const agentType = getBuiltinAgentOptOutAgentType(config2);
+    if (agentType === null) {
+      return null;
+    }
+    const key2 = machineFlockKeys.builtinAgentOptOut(agentType);
+    return serializeMachineFlockKey(key2) in rows ? key2 : null;
+  }
+  function writeAgentConfigToFlock(flock, config2, nowMs2) {
+    const rows = readMachineFlockRowsFromFlock(flock, {
+      prefixes: [
+        machineFlockKeys.agentConfig(config2.id),
+        ...getBuiltinAgentOptOutAgentType(config2) === null ? [] : [
+          MACHINE_FLOCK_ROW_FAMILY_PREFIXES.builtinAgentOptOut
+        ]
+      ]
+    });
+    const key2 = machineFlockKeys.agentConfig(config2.id);
+    const normalized = parseMachineFlockRow(key2, config2);
+    if (!normalized) {
+      return false;
+    }
+    const rowChanged = !machineFlockRowsEqual(rows[serializeMachineFlockKey(key2)], normalized);
+    const retractKey = findBuiltinAgentOptOutToRetract(rows, config2);
+    if (!rowChanged && !retractKey) {
+      return false;
+    }
+    if (rowChanged) {
+      flock.set(normalized.key, normalized.value, nowMs2);
+    }
+    if (retractKey) {
+      flock.delete(retractKey, nowMs2);
+    }
+    flock.commit();
+    return true;
+  }
+  function deleteAgentConfigFromFlock(flock, config2, nowMs2) {
+    const rows = readMachineFlockRowsFromFlock(flock, {
+      families: [
+        "agentConfig",
+        "builtinAgentOptOut"
+      ]
+    });
+    const key2 = machineFlockKeys.agentConfig(config2.id);
+    const rowExists = serializeMachineFlockKey(key2) in rows;
+    const optOut = planBuiltinAgentOptOutForDeletedConfig(rows, config2, nowMs2);
+    if (!rowExists && !optOut) {
+      return false;
+    }
+    if (optOut) {
+      flock.set(optOut.key, optOut.value, nowMs2);
+    }
+    if (rowExists) {
+      flock.delete(key2, nowMs2);
+    }
+    flock.commit();
+    return true;
+  }
   function getMachineFlockSessionLaunchConfig(rows, sessionId) {
     const row = rows[serializeMachineFlockKey(machineFlockKeys.sessionLaunchConfig(sessionId))];
     if (!row || !isMachineFlockSessionLaunchConfigRow(row)) {
@@ -23746,6 +23905,13 @@ ${context2.authorReply.trim()}
           key: parsedKey.key,
           value
         } : void 0;
+      case "builtinAgentOptOut": {
+        const optOut = normalizeBuiltinAgentOptOut(value);
+        return optOut ? {
+          key: parsedKey.key,
+          value: optOut
+        } : void 0;
+      }
       case "sessionLaunchConfig": {
         const config2 = normalizeSessionLaunchConfig(value);
         return config2 ? {
@@ -24070,6 +24236,15 @@ ${context2.authorReply.trim()}
       cancelledAt: value.cancelledAt
     };
   };
+  const normalizeBuiltinAgentOptOut = (value) => {
+    if (!isRecord$8(value) || value.v !== 1 || typeof value.removedAt !== "number" || !Number.isFinite(value.removedAt)) {
+      return void 0;
+    }
+    return {
+      v: 1,
+      removedAt: value.removedAt
+    };
+  };
   const normalizeAgentConfigListSummary = (value) => {
     if (!isRecord$8(value) || !isNonEmptyString$2(value.id) || !isNonEmptyString$2(value.machineId) || !isNonEmptyString$2(value.name) || !isMissing(value.description) && typeof value.description !== "string" || !isAgentConfigCliType$1(value.cliType) || !isNonEmptyString$2(value.agentType) || !isMissing(value.brandId) && typeof value.brandId !== "string") {
       return void 0;
@@ -26231,7 +26406,7 @@ ${context2.authorReply.trim()}
     if (hasRequiredCommand$1) return command$1;
     hasRequiredCommand$1 = 1;
     const EventEmitter2 = require$$0$4.EventEmitter;
-    const childProcess = LE__default;
+    const childProcess = Gx__default;
     const path2 = path__default;
     const fs2 = fs__default$1;
     const process2 = process$2;
@@ -31173,7 +31348,7 @@ ${originalIndentation}`;
   function requireStream$3() {
     if (hasRequiredStream$3) return stream$3;
     hasRequiredStream$3 = 1;
-    stream$3 = Zr;
+    stream$3 = So;
     return stream$3;
   }
   var destroy_1;
@@ -34764,7 +34939,7 @@ ${originalIndentation}`;
     if (hasRequiredReadable$1) return readable$1.exports;
     hasRequiredReadable$1 = 1;
     (function(module2, exports$1) {
-      var Stream = Zr;
+      var Stream = So;
       if (process.env.READABLE_STREAM === "disable" && Stream) {
         module2.exports = Stream.Readable;
         Object.assign(module2.exports, Stream);
@@ -37670,7 +37845,7 @@ ${originalIndentation}`;
     const fs2 = fs__default;
     const path2 = path__default$1;
     const asyncSeries = requireSeries();
-    const zlib = $s__default;
+    const zlib = Ei__default;
     const { MESSAGE } = requireTripleBeam();
     const { Stream, PassThrough: PassThrough2 } = requireReadable$1();
     const TransportStream = requireWinstonTransport();
@@ -44607,10 +44782,10 @@ ${originalIndentation}`;
     const os2 = os__default$1;
     const path2 = path__default$1;
     const util2 = require$$0$5;
-    const zlib = $s__default;
+    const zlib = Ei__default;
     const hash2 = requireObjectHash();
     const MESSAGE = requireTripleBeam().MESSAGE;
-    const PassThrough2 = Zr.PassThrough;
+    const PassThrough2 = So.PassThrough;
     const Transport = requireWinstonTransport();
     const loggerDefaults = {
       json: false,
@@ -45062,7 +45237,7 @@ ${value.slice(value.length - safeTailChars)}`;
     return files;
   }
   async function readDailyLogFile(file2) {
-    const raw2 = await jt__default.readFile(file2.path);
+    const raw2 = await Yt__default.readFile(file2.path);
     if (!file2.compressed) return raw2.toString("utf8");
     return (await gunzip(raw2)).toString("utf8");
   }
@@ -64977,7 +65152,7 @@ ${peerId}`;
   function requirePermessageDeflate$1() {
     if (hasRequiredPermessageDeflate$1) return permessageDeflate$1;
     hasRequiredPermessageDeflate$1 = 1;
-    const zlib = $s__default;
+    const zlib = Ei__default;
     const bufferUtil2 = requireBufferUtil();
     const Limiter = requireLimiter();
     const { kStatusCode } = requireConstants$5();
@@ -65432,7 +65607,7 @@ ${peerId}`;
   function requireReceiver$1() {
     if (hasRequiredReceiver$1) return receiver$1;
     hasRequiredReceiver$1 = 1;
-    const { Writable } = Zr;
+    const { Writable } = So;
     const PerMessageDeflate = requirePermessageDeflate$1();
     const { BINARY_TYPES, EMPTY_BUFFER, kStatusCode, kWebSocket } = requireConstants$5();
     const { concat: concat2, toArrayBuffer: toArrayBuffer2, unmask } = requireBufferUtil();
@@ -65799,7 +65974,7 @@ ${peerId}`;
   function requireSender$1() {
     if (hasRequiredSender$1) return sender$1;
     hasRequiredSender$1 = 1;
-    const { Duplex } = Zr;
+    const { Duplex } = So;
     const { randomFillSync: randomFillSync2 } = crypto__default;
     const PerMessageDeflate = requirePermessageDeflate$1();
     const { EMPTY_BUFFER, kWebSocket, NOOP } = requireConstants$5();
@@ -66536,7 +66711,7 @@ ${peerId}`;
     const net2 = require$$0$9;
     const tls = require$$4$2;
     const { randomBytes: randomBytes2, createHash: createHash2 } = crypto__default;
-    const { Duplex, Readable: Readable2 } = Zr;
+    const { Duplex, Readable: Readable2 } = So;
     const { URL: URL2 } = require$$7$2;
     const PerMessageDeflate = requirePermessageDeflate$1();
     const Receiver = requireReceiver$1();
@@ -67274,7 +67449,7 @@ ${peerId}`;
     if (hasRequiredStream$1) return stream$1;
     hasRequiredStream$1 = 1;
     requireWebsocket$1();
-    const { Duplex } = Zr;
+    const { Duplex } = So;
     function emitClose(stream2) {
       stream2.emit("close");
     }
@@ -67425,7 +67600,7 @@ ${peerId}`;
     hasRequiredWebsocketServer = 1;
     const EventEmitter2 = require$$0$7;
     const http$12 = http;
-    const { Duplex } = Zr;
+    const { Duplex } = So;
     const { createHash: createHash2 } = crypto__default;
     const extension2 = requireExtension();
     const PerMessageDeflate = requirePermessageDeflate$1();
@@ -83503,6 +83678,14 @@ ${val.stack}`;
       baseDir
     };
   };
+  async function readMachineBuiltinAgentOptOuts(repo, workspaceId, machineId) {
+    const handle = await repo.openFlockDoc(getMachineFlockDocId(workspaceId, machineId));
+    return getMachineFlockBuiltinAgentOptOuts(readMachineFlockRowsFromFlock(handle.flock, {
+      families: [
+        "builtinAgentOptOut"
+      ]
+    }));
+  }
   async function readMachineAgentConfigs(repo, workspaceId, machineId) {
     const handle = await repo.openFlockDoc(getMachineFlockDocId(workspaceId, machineId));
     return getMachineFlockAgentConfigs(readMachineFlockRowsFromFlock(handle.flock, {
@@ -83562,10 +83745,7 @@ ${val.stack}`;
   }
   async function upsertMachineAgentConfig(repo, workspaceId, config2, options = {}) {
     const handle = await repo.openFlockDoc(getMachineFlockDocId(workspaceId, config2.machineId));
-    const changed = writeMachineFlockRowToFlock(handle.flock, {
-      key: machineFlockKeys.agentConfig(config2.id),
-      value: config2
-    });
+    const changed = writeAgentConfigToFlock(handle.flock, config2);
     if (!changed) {
       await deleteLoroRepoMetaAgentConfigIfPresent(repo, config2.id);
       return;
@@ -83582,7 +83762,7 @@ ${val.stack}`;
   }
   async function deleteMachineAgentConfig(repo, workspaceId, config2, options = {}) {
     const handle = await repo.openFlockDoc(getMachineFlockDocId(workspaceId, config2.machineId));
-    const changed = deleteMachineFlockRowFromFlock(handle.flock, machineFlockKeys.agentConfig(config2.id));
+    const changed = deleteAgentConfigFromFlock(handle.flock, config2, getServerNow());
     if (!changed) {
       await deleteLoroRepoMetaAgentConfigIfPresent(repo, config2.id);
       return;
@@ -101750,7 +101930,7 @@ ${value}`;
         return "internal";
     }
   }
-  async function withDeadline(operation, options) {
+  async function withDeadline$1(operation, options) {
     const { timeoutMs, signal } = options;
     if (timeoutMs === void 0 && !signal) return operation;
     if (signal?.aborted) options.onAbort();
@@ -102082,7 +102262,7 @@ ${value}`;
       });
     }
     awaitWithDeadline(operation, options, ctx) {
-      return withDeadline(operation, {
+      return withDeadline$1(operation, {
         timeoutMs: options?.timeout,
         signal: options?.signal,
         onTimeout: () => {
@@ -104269,6 +104449,9 @@ ${value}`;
       }
       return false;
     }
+    async getBuiltinAgentOptOuts(machineId) {
+      return await readMachineBuiltinAgentOptOuts(this.repo, this.workspaceId, machineId);
+    }
     async getAgentConfigById(agentConfigId, machineId) {
       if (machineId) {
         return (await readMergedAgentConfigById(this.repo, this.workspaceId, machineId, agentConfigId)).config;
@@ -104451,6 +104634,13 @@ ${value}`;
       }
     }
   }
+  const configOptionValuesEqual = (left2, right2) => {
+    if (left2 === right2) return true;
+    if (!left2 || !right2) return false;
+    const leftKeys = Object.keys(left2);
+    return leftKeys.length === Object.keys(right2).length && leftKeys.every((key2) => left2[key2] === right2[key2]);
+  };
+  const acpRuntimeConfigEqual = (left2, right2) => left2.acpSessionId === right2.acpSessionId && left2.basedOnUserTurnId === right2.basedOnUserTurnId && left2.modeId === right2.modeId && left2.modelId === right2.modelId && configOptionValuesEqual(left2.configOptionValues, right2.configOptionValues);
   const EDITING_LEASE_MS = 5 * 60 * 1e3;
   class SessionDocument {
     constructor(repo, sessionId, unloadDocRoom, logger2 = getLogger("loro")) {
@@ -104746,7 +104936,8 @@ ${value}`;
         mq: state2.mq,
         forkOperation: state2.forkOperation,
         preview: state2.preview,
-        externalHistoryCursor: state2.externalHistoryCursor
+        externalHistoryCursor: state2.externalHistoryCursor,
+        acpRuntimeConfig: state2.acpRuntimeConfig
       };
     }
     async waitUntilSynced(options = {}) {
@@ -104792,6 +104983,60 @@ ${value}`;
         return prev;
       });
     }
+    applyAcpRuntimeConfigPatch(basedOnUserTurnId, patch2) {
+      if (!this.mirror) {
+        throw new Error("SessionDocument not initialized");
+      }
+      const durablePatch = patch2.configOptionValues === void 0 ? patch2 : {
+        ...patch2,
+        configOptionValues: Object.fromEntries(Object.entries(patch2.configOptionValues).filter(([configId]) => !isSensitiveAcpConfigOptionId(configId)))
+      };
+      const state2 = this.mirror.getState();
+      const incomingTurnIndex = state2.history.findIndex((entry) => entry.role === "user" && entry.id === basedOnUserTurnId);
+      let latestUserTurnIndex = -1;
+      for (let index = state2.history.length - 1; index >= 0; index -= 1) {
+        if (state2.history[index]?.role === "user") {
+          latestUserTurnIndex = index;
+          break;
+        }
+      }
+      if (incomingTurnIndex < 0 || incomingTurnIndex !== latestUserTurnIndex) {
+        return false;
+      }
+      const current2 = state2.acpRuntimeConfig;
+      const currentTurnIndex = current2 ? state2.history.findIndex((entry) => entry.role === "user" && entry.id === current2.basedOnUserTurnId) : -1;
+      if (currentTurnIndex > incomingTurnIndex) {
+        return false;
+      }
+      const continuesCurrentSnapshot = current2?.acpSessionId === durablePatch.acpSessionId && current2.basedOnUserTurnId === basedOnUserTurnId;
+      const nextWithoutRevision = {
+        ...continuesCurrentSnapshot ? {
+          ...current2.modeId !== void 0 ? {
+            modeId: current2.modeId
+          } : {},
+          ...current2.modelId !== void 0 ? {
+            modelId: current2.modelId
+          } : {},
+          ...current2.configOptionValues !== void 0 ? {
+            configOptionValues: current2.configOptionValues
+          } : {}
+        } : {},
+        ...durablePatch,
+        basedOnUserTurnId
+      };
+      if (current2 && acpRuntimeConfigEqual(current2, nextWithoutRevision)) {
+        return false;
+      }
+      const next2 = {
+        ...nextWithoutRevision,
+        revision: (current2?.revision ?? 0) + 1
+      };
+      this.mirror.setState((prev) => {
+        prev.acpRuntimeConfig = next2;
+        return prev;
+      });
+      return true;
+    }
     async markHistoryAsSeen(turnId) {
       if (!this.mirror) {
         throw new Error("SessionDocument not initialized");
@@ -105135,6 +105380,18 @@ ${value}`;
         throw error2;
       }
     }
+    async appendUserTurn(entry) {
+      if (entry.role !== "user") {
+        throw new Error(`appendUserTurn requires a user entry, received role "${entry.role}" for ${entry.id}`);
+      }
+      await this.updateHistory((history) => [
+        ...history,
+        entry
+      ]);
+      await this.repo.upsertDocMeta(this.roomId, {
+        latestUserMsgId: entry.id
+      });
+    }
     summarizeHistoryTailForDiagnostics(history) {
       const last2 = history.length > 0 ? history[history.length - 1] : void 0;
       const lastItems = last2 && Array.isArray(last2.items) ? last2.items : [];
@@ -105802,6 +106059,7 @@ ${value}`;
       ]),
       authenticationRequestId: string$1().trim().min(1).optional(),
       authorizationCodeEnvelope: RpcSecretEnvelopeSchema.optional(),
+      methodId: string$1().trim().min(1).max(256).optional(),
       configId: AgentConfigIdSchema.optional(),
       cliType: AgentConfigCliTypeSchema,
       agentType: string$1().trim().min(1),
@@ -107176,6 +107434,9 @@ ${value}`;
             action: options.action,
             authenticationRequestId,
             authorizationCodeEnvelope,
+            ...options.methodId ? {
+              methodId: options.methodId
+            } : {},
             configId: options.configId,
             cliType: options.cliType,
             agentType: options.agentType,
@@ -108418,6 +108679,7 @@ ${value}`;
                 action: request2.params.action,
                 authenticationRequestId: request2.params.authenticationRequestId,
                 authorizationCode,
+                methodId: request2.params.methodId,
                 configId: request2.params.configId,
                 cliType: request2.params.cliType,
                 agentType: request2.params.agentType,
@@ -109289,6 +109551,9 @@ ${value}`;
           machineFlockKeys.providerSetup(setupId),
           machineFlockKeys.providerSetupCancellation(setupId),
           machineFlockKeys.agentConfig(setupId)
+        ],
+        families: [
+          "builtinAgentOptOut"
         ]
       });
       const cancellation = getMachineFlockProviderSetupCancellations(rows)[setupId];
@@ -109313,6 +109578,10 @@ ${value}`;
       const now2 = getServerNow();
       const flock = handle.flock;
       flock.set(machineFlockKeys.agentConfig(setupId), setup.config, now2);
+      const optOutKey = findBuiltinAgentOptOutToRetract(rows, setup.config);
+      if (optOutKey) {
+        flock.delete(optOutKey, now2);
+      }
       flock.delete(machineFlockKeys.providerSetup(setupId), now2);
       flock.commit();
       await this.repo.flush();
@@ -109594,20 +109863,20 @@ ${value}`;
     };
     const parsed = DaemonUpgradeIntentSchema.parse(value);
     const dir = path.dirname(DAEMON_UPGRADE_INTENT_FILE);
-    await jt.mkdir(dir, {
+    await Yt.mkdir(dir, {
       recursive: true
     });
     const tmpPath = path.join(dir, `.${path.basename(DAEMON_UPGRADE_INTENT_FILE)}.${process.pid}.tmp`);
-    await jt.writeFile(tmpPath, `${JSON.stringify(parsed, null, 2)}
+    await Yt.writeFile(tmpPath, `${JSON.stringify(parsed, null, 2)}
 `, {
       encoding: "utf8",
       mode: 384
     });
-    await jt.rename(tmpPath, DAEMON_UPGRADE_INTENT_FILE);
+    await Yt.rename(tmpPath, DAEMON_UPGRADE_INTENT_FILE);
   };
   const readDaemonUpgradeIntent = async () => {
     try {
-      const raw2 = await jt.readFile(DAEMON_UPGRADE_INTENT_FILE, "utf8");
+      const raw2 = await Yt.readFile(DAEMON_UPGRADE_INTENT_FILE, "utf8");
       const parsed = DaemonUpgradeIntentSchema.safeParse(JSON.parse(raw2));
       return parsed.success ? parsed.data : null;
     } catch {
@@ -109616,7 +109885,7 @@ ${value}`;
   };
   const clearDaemonUpgradeIntent = async () => {
     try {
-      await jt.unlink(DAEMON_UPGRADE_INTENT_FILE);
+      await Yt.unlink(DAEMON_UPGRADE_INTENT_FILE);
     } catch {
     }
   };
@@ -111967,6 +112236,80 @@ ${incoming}`).output;
     }
     return void 0;
   };
+  const FILTERED_ACP_CONFIG_OPTION_IDS = /* @__PURE__ */ new Set([
+    "agent"
+  ]);
+  function filterAcpConfigOptions(options) {
+    return options.filter((opt) => !FILTERED_ACP_CONFIG_OPTION_IDS.has(opt.id));
+  }
+  const readConfigOption = (value) => {
+    if (!value || typeof value !== "object" || Array.isArray(value)) {
+      return null;
+    }
+    const option2 = value;
+    if (typeof option2.id !== "string" || isSensitiveAcpConfigOptionId(option2.id)) {
+      return null;
+    }
+    if ((option2.type !== "select" || typeof option2.currentValue !== "string") && (option2.type !== "boolean" || typeof option2.currentValue !== "boolean")) {
+      return null;
+    }
+    return {
+      id: option2.id,
+      ...typeof option2.category === "string" ? {
+        category: option2.category
+      } : {},
+      currentValue: option2.currentValue
+    };
+  };
+  const getAcpRuntimeConfigPatchFromOptions = (acpSessionId, configOptions) => {
+    const options = filterAcpConfigOptions(configOptions.map(readConfigOption).filter((option2) => option2 !== null));
+    const configOptionValues = Object.fromEntries(options.map((option2) => [
+      option2.id,
+      option2.currentValue
+    ]));
+    const mode2 = options.find((option2) => option2.category === "mode");
+    const model = options.find((option2) => option2.category === "model");
+    return {
+      acpSessionId,
+      configOptionValues,
+      ...typeof mode2?.currentValue === "string" ? {
+        modeId: mode2.currentValue
+      } : {},
+      ...typeof model?.currentValue === "string" ? {
+        modelId: model.currentValue
+      } : {}
+    };
+  };
+  const getAcpRuntimeConfigPatch = (notification) => {
+    const update2 = notification.update;
+    if (update2.sessionUpdate === "current_mode_update") {
+      return {
+        acpSessionId: notification.sessionId,
+        modeId: update2.currentModeId
+      };
+    }
+    if (update2.sessionUpdate !== "config_option_update") {
+      return null;
+    }
+    return getAcpRuntimeConfigPatchFromOptions(notification.sessionId, update2.configOptions);
+  };
+  const mergeAcpRuntimeConfigUpdates = (notifications) => {
+    let merged = null;
+    for (const notification of notifications) {
+      const patch2 = getAcpRuntimeConfigPatch(notification);
+      if (!patch2) continue;
+      if (merged && merged.acpSessionId === patch2.acpSessionId) {
+        const previous = merged;
+        merged = {
+          ...previous,
+          ...patch2
+        };
+      } else {
+        merged = patch2;
+      }
+    }
+    return merged;
+  };
   var crossSpawn = {
     exports: {}
   };
@@ -113523,12 +113866,6 @@ ${incoming}`).output;
       tier: "A"
     });
   }
-  const FILTERED_ACP_CONFIG_OPTION_IDS = /* @__PURE__ */ new Set([
-    "agent"
-  ]);
-  function filterAcpConfigOptions(options) {
-    return options.filter((opt) => !FILTERED_ACP_CONFIG_OPTION_IDS.has(opt.id));
-  }
   function isSelectGroup$1(item) {
     return typeof item === "object" && item !== null && "group" in item;
   }
@@ -114828,6 +115165,9 @@ ${incoming}`).output;
         return;
       }
       const notification = parseSessionNotification(params);
+      if (notification.update.sessionUpdate === "config_option_update") {
+        this.applyConfigOptionsState(notification.update.configOptions, true);
+      }
       this.handleGoalSessionInfoUpdate(notification);
       this.handleCodexWarningSessionInfoUpdate(notification);
       this.handleAgentSessionTitleUpdate(notification);
@@ -115399,9 +115739,9 @@ ${incoming}`).output;
       return this.acpSessionId !== null && acpSessionId === this.acpSessionId;
     }
     applySessionResponseState(sessionResponse) {
-      this.configOptions = filterAcpConfigOptions(sessionResponse.configOptions ?? []);
-      this.legacySessionModelState = readLegacySessionModelState(sessionResponse) ?? null;
       this.currentModel = void 0;
+      this.applyConfigOptionsState(sessionResponse.configOptions ?? [], sessionResponse.configOptions !== void 0);
+      this.legacySessionModelState = readLegacySessionModelState(sessionResponse) ?? null;
       const initialModelOption = this.findConfigOptionByCategory("model");
       if (initialModelOption?.type === "select" && typeof initialModelOption.currentValue === "string") {
         this.currentModel = this.resolveModelInfo(initialModelOption.currentValue);
@@ -115409,6 +115749,46 @@ ${incoming}`).output;
         this.currentModel = this.resolveModelInfo(this.legacySessionModelState.currentModelId);
       }
     }
+    applyConfigOptionsState(configOptions, replaceConfigOptionValues) {
+      this.configOptions = filterAcpConfigOptions(configOptions);
+      if (replaceConfigOptionValues) {
+        for (const configId of Object.keys(this.configOptionValues)) {
+          delete this.configOptionValues[configId];
+        }
+        for (const option2 of this.configOptions) {
+          if (typeof option2.currentValue === "string" || typeof option2.currentValue === "boolean") {
+            this.configOptionValues[option2.id] = option2.currentValue;
+          }
+        }
+      }
+      const modelOption = this.findConfigOptionByCategory("model");
+      if (modelOption?.type === "select" && typeof modelOption.currentValue === "string") {
+        this.currentModel = this.resolveModelInfo(modelOption.currentValue);
+      } else if (this.currentModel) {
+        this.currentModel = this.resolveModelInfo(this.currentModel.modelId);
+      } else {
+        this.currentModel = void 0;
+      }
+    }
+    retainLegacyConfigOptionValue(configId, value) {
+      this.configOptionValues[configId] = value;
+      this.configOptions = this.configOptions.map((option2) => {
+        if (option2.id !== configId) return option2;
+        if (option2.type === "select" && typeof value === "string") {
+          return {
+            ...option2,
+            currentValue: value
+          };
+        }
+        if (option2.type === "boolean" && typeof value === "boolean") {
+          return {
+            ...option2,
+            currentValue: value
+          };
+        }
+        return option2;
+      });
+    }
     async startSession(stream2, workdir, resumeSessionId, timeoutOptions = {}, startupAbort, resolveSessionStart, forkSessionId, forkSessionTurnId) {
       const connection2 = new ClientSideConnection(() => this, stream2);
       this.connection = connection2;
@@ -116041,13 +116421,11 @@ ${incoming}`).output;
         }
         return void 0;
       }, this.logger, "setSessionConfigOption", this.options.sessionId);
-      if (result?.configOptions) {
-        this.configOptions = filterAcpConfigOptions(result.configOptions);
-        if (this.currentModel) {
-          this.currentModel = this.resolveModelInfo(this.currentModel.modelId);
-        }
+      if (result?.configOptions !== void 0) {
+        this.applyConfigOptionsState(result.configOptions, true);
+      } else if (result) {
+        this.retainLegacyConfigOptionValue(configId, value);
       }
-      if (result) this.configOptionValues[configId] = value;
       this.logger.debug(`[${this.options.sessionId}] ACP session config option set: ${configId}=${value}`);
       return result?.configOptions;
     }
@@ -117144,7 +117522,7 @@ ${error2.message}` : execaMessage;
   function requireBufferStream() {
     if (hasRequiredBufferStream) return bufferStream;
     hasRequiredBufferStream = 1;
-    const { PassThrough: PassThroughStream } = Zr;
+    const { PassThrough: PassThroughStream } = So;
     bufferStream = (options) => {
       options = {
         ...options
@@ -117193,7 +117571,7 @@ ${error2.message}` : execaMessage;
     if (hasRequiredGetStream) return getStream.exports;
     hasRequiredGetStream = 1;
     const { constants: BufferConstants } = require$$0$6;
-    const stream2 = Zr;
+    const stream2 = So;
     const { promisify: promisify2 } = require$$0$5;
     const bufferStream2 = requireBufferStream();
     const streamPipelinePromisified = promisify2(stream2.pipeline);
@@ -117253,7 +117631,7 @@ ${error2.message}` : execaMessage;
   function requireMergeStream() {
     if (hasRequiredMergeStream) return mergeStream;
     hasRequiredMergeStream = 1;
-    const { PassThrough: PassThrough2 } = Zr;
+    const { PassThrough: PassThrough2 } = So;
     mergeStream = function() {
       var sources = [];
       var output = new PassThrough2({
@@ -118984,7 +119362,7 @@ ${error2.message}` : execaMessage;
       validate: validate2
     });
   };
-  const realZlibConstants = $s__default.constants || {
+  const realZlibConstants = Ei__default.constants || {
     ZLIB_VERNUM: 4736
   };
   const constants = Object.freeze(Object.assign(/* @__PURE__ */ Object.create(null), {
@@ -119144,11 +119522,11 @@ ${error2.message}` : execaMessage;
       this.#flushFlag = opts.flush ?? 0;
       this.#finishFlushFlag = opts.finishFlush ?? 0;
       this.#fullFlushFlag = opts.fullFlushFlag ?? 0;
-      if (typeof $s[mode2] !== "function") {
+      if (typeof Ei[mode2] !== "function") {
         throw new TypeError("Compression method not supported: " + mode2);
       }
       try {
-        this.#handle = new $s[mode2](opts);
+        this.#handle = new Ei[mode2](opts);
       } catch (er) {
         throw new ZlibError(er, this.constructor);
       }
@@ -122163,7 +122541,7 @@ ${error2.message}` : execaMessage;
       return checkCwd(dir, done2);
     }
     if (preserve) {
-      return jt__default.mkdir(dir, {
+      return Yt__default.mkdir(dir, {
         mode: mode2,
         recursive: true
       }).then((made) => done2(null, made ?? void 0), done2);
@@ -123413,7 +123791,7 @@ ${error2.message}` : execaMessage;
     hasRequiredFdSlicer = 1;
     var fs2 = fs__default;
     var util2 = require$$0$5;
-    var stream2 = Zr;
+    var stream2 = So;
     var Readable2 = stream2.Readable;
     var Writable = stream2.Writable;
     var PassThrough2 = stream2.PassThrough;
@@ -123979,14 +124357,14 @@ ${error2.message}` : execaMessage;
     if (hasRequiredYauzl) return yauzl;
     hasRequiredYauzl = 1;
     var fs2 = fs__default;
-    var zlib = $s__default;
+    var zlib = Ei__default;
     var fd_slicer = requireFdSlicer();
     var crc322 = requireBufferCrc32();
     var util2 = require$$0$5;
     var EventEmitter2 = require$$0$7.EventEmitter;
-    var Transform2 = Zr.Transform;
-    var PassThrough2 = Zr.PassThrough;
-    var Writable = Zr.Writable;
+    var Transform2 = So.Transform;
+    var PassThrough2 = So.PassThrough;
+    var Writable = So.Writable;
     yauzl.open = open2;
     yauzl.fromFd = fromFd;
     yauzl.fromBuffer = fromBuffer;
@@ -125417,7 +125795,7 @@ ${error2.message}` : execaMessage;
   }
   const version$7 = "1.6.2";
   const dependencies$1 = {
-    "@openai/codex": "^0.148.0"
+    "@openai/codex": "^0.151.0"
   };
   const codexPackageJson = {
     version: version$7,
@@ -125427,99 +125805,99 @@ ${error2.message}` : execaMessage;
   const grokPackageJson = {
     version: version$6
   };
-  const version$5 = "2.1.232";
+  const version$5 = "2.1.251";
   const platforms = {
     "darwin-arm64": {
       "binary": "claude",
-      "checksum": "7b39c1588df919d001dea3ffd5651adb682f2451b5a0e18d42d4233296b53cc7",
-      "size": 306111312
+      "checksum": "625869b01e0050f260b2980fac248fd9cef9e462612bded4ec9d3d49ff8969a5",
+      "size": 197171680
     },
     "darwin-x64": {
       "binary": "claude",
-      "checksum": "aa3d606d7bf0ea9739a6d0de11810e72a662e7a4e5061d67ee7f8bc47c8890f9",
-      "size": 314779248
+      "checksum": "44221d72a3f35772faa85ad9a36a678084a516f720e64b45e26eb9015315500b",
+      "size": 205778256
     },
     "linux-arm64": {
       "binary": "claude",
-      "checksum": "20797ebc644dfc47a69865c46d5cf702c7dbedd48d4268063b8828ebd55b39d0",
-      "size": 320133352
+      "checksum": "65445bd4dd042079cc3fa43791b561370a05c8599e8ec47580e25a81050abbdd",
+      "size": 213835016
     },
     "linux-x64": {
       "binary": "claude",
-      "checksum": "61d23f8749136907d586d5b11831ea8a5234d4c1dea40a5e55c33b52e204c6d1",
-      "size": 323021104
+      "checksum": "fd5f10ff0eb58daec04900466b143ea98aab50abf208a422bc008eaec13f61f7",
+      "size": 214326616
     },
     "linux-arm64-musl": {
       "binary": "claude",
-      "checksum": "bf6481aa98b84d3e51460f7cf07fe54cb8d116882b72cee7bff941a2776ac91e",
-      "size": 313278016
+      "checksum": "165f6236abf5b0c42892b164c2299c82023421805e0c3eaddf925a3195513f84",
+      "size": 206648896
     },
     "linux-x64-musl": {
       "binary": "claude",
-      "checksum": "93c8a9ef90adfa5bb8a34dfd5f32fc4e820532ca1e1ec5e6bb2049a5069a03b4",
-      "size": 317165312
+      "checksum": "5056970c13f46dd2bff2c44dd2a7f766553a63392615412d5711278264730e07",
+      "size": 208301944
     },
     "win32-x64": {
       "binary": "claude.exe",
-      "checksum": "ec9e32479bc887809003c91384c6c3a26e7691856d1916f72f6f6d21800f3bd6",
-      "size": 319026336
+      "checksum": "8d1229a281281b98fd2dee72b3253a704be4fce4d45207200cd32a9bb5a6c909",
+      "size": 217360032
     },
     "win32-arm64": {
       "binary": "claude.exe",
-      "checksum": "301bfd5a624d6280d4d4e4ba7523fafdfa439a33e9530478719eeb6efec51d52",
-      "size": 306950304
+      "checksum": "89e91fed2dc6f6278fa1e179e6401c0a1c252fe80c57ee47f17f10f7f7b4e99c",
+      "size": 208465056
     }
   };
   const claudeSdkManifestJson = {
     version: version$5,
     platforms
   };
-  const version$4 = "0.3.232";
+  const version$4 = "0.3.251";
   const claudeSdkPackageJson = {
     version: version$4
   };
-  const sdkVersion = "0.3.232";
-  const version$3 = "2.1.232";
+  const sdkVersion = "0.3.251";
+  const version$3 = "2.1.251";
   const artifacts$1 = {
     "darwin-arm64": {
-      "fileName": "anthropic-ai-claude-agent-sdk-darwin-arm64-0.3.232.tar.zst",
-      "sha256": "09c775adf243d27a5c13e6724b3960409612b0da483c38fa108a1c03be515a5a",
-      "size": 70030420
+      "fileName": "anthropic-ai-claude-agent-sdk-darwin-arm64-0.3.251.tar.zst",
+      "sha256": "536a3755844d168b87250af3ee6e3dd103391305514f28abe564f91a5aa856ee",
+      "size": 71945899
     },
     "darwin-x64": {
-      "fileName": "anthropic-ai-claude-agent-sdk-darwin-x64-0.3.232.tar.zst",
-      "sha256": "68f687528e5d610e14a379ff7ad1e6a60aa7d600b4dc20dc31b4af96fffda570",
-      "size": 74349877
+      "fileName": "anthropic-ai-claude-agent-sdk-darwin-x64-0.3.251.tar.zst",
+      "sha256": "68e88be76d4399d1dea054d9dbbf7106c393578fa1fa5714c9a8890b6ff3213c",
+      "size": 75692035
     },
     "linux-arm64": {
-      "fileName": "anthropic-ai-claude-agent-sdk-linux-arm64-0.3.232.tar.zst",
-      "sha256": "8c7c75910f5d29c3cf3fe15e4c17abfb05db616db2838b3a764f6b243ad78165",
-      "size": 79104443
+      "fileName": "anthropic-ai-claude-agent-sdk-linux-arm64-0.3.251.tar.zst",
+      "sha256": "92e61ffb31b8beae919beb6a9458f4a376067bf25d4df7e5c8fe29b84ed1edaa",
+      "size": 81951594
     },
     "linux-x64": {
-      "fileName": "anthropic-ai-claude-agent-sdk-linux-x64-0.3.232.tar.zst",
-      "sha256": "e0303ad6167b82fad98a80dd6dc3fd23d82562de5181094775c388118951d999",
-      "size": 79732583
+      "fileName": "anthropic-ai-claude-agent-sdk-linux-x64-0.3.251.tar.zst",
+      "sha256": "9e51358bb06885a29c0cdcaff6ffbbed47718e3210b8e92ae074802440a46dd3",
+      "size": 81994218
     },
     "linux-arm64-musl": {
-      "fileName": "anthropic-ai-claude-agent-sdk-linux-arm64-musl-0.3.232.tar.zst",
-      "sha256": "b0dd9da5095baf314160e3a3f6ac1c85a1ef4b4e326c4bde662f92fe8783840b",
-      "size": 77411461
+      "fileName": "anthropic-ai-claude-agent-sdk-linux-arm64-musl-0.3.251.tar.zst",
+      "sha256": "bfad7556c20b01776c2205898c7f76a31448e42b7c2e7254476d25aac9c0d84c",
+      "size": 80166022
     },
     "linux-x64-musl": {
-      "fileName": "anthropic-ai-claude-agent-sdk-linux-x64-musl-0.3.232.tar.zst",
-      "sha256": "989e8148bb5944d038f4ea11595742084ec3b38837e08e5af25229ada27c3730",
-      "size": 77995010
+      "fileName": "anthropic-ai-claude-agent-sdk-linux-x64-musl-0.3.251.tar.zst",
+      "sha256": "143efe291c6cd6501681fff2930c58c9eeeef5f924dded6b340e84a9e069e1d1",
+      "size": 80324347
     },
     "win32-arm64": {
-      "fileName": "anthropic-ai-claude-agent-sdk-win32-arm64-0.3.232.tar.zst",
-      "sha256": "7cc4f6f2a23fa43993da830e00e3e2ca46b90864a2d38e1f3678f70de9e2f440",
-      "size": 78979373
+      "fileName": "anthropic-ai-claude-agent-sdk-win32-arm64-0.3.251.tar.zst",
+      "sha256": "0d70dd262d40b39fe354e3b7c0e5a1b3a4895beef2692509a3830511ff184023",
+      "size": 81916953
     },
     "win32-x64": {
-      "fileName": "anthropic-ai-claude-agent-sdk-win32-x64-0.3.232.tar.zst",
-      "sha256": "ed09d440d4cf7881439850287485d3198384538c79d8d3e5f0740b1e40b10db3",
-      "size": 82535283
+      "fileName": "anthropic-ai-claude-agent-sdk-win32-x64-0.3.251.tar.zst",
+      "sha256": "db8bcee96e0f0bc42b01977c1897977c204d5cee07464656ec49fa44d31014aa",
+      "size": 84974808
     }
   };
   const claudeRuntimeManifestJson = {
@@ -125527,49 +125905,49 @@ ${error2.message}` : execaMessage;
     version: version$3,
     artifacts: artifacts$1
   };
-  const version$2 = "0.148.0";
+  const version$2 = "0.151.0";
   const artifacts = {
     "darwin-arm64": {
       "fileName": "codex-package-aarch64-apple-darwin.tar.zst",
-      "sha256": "dba92ada12f223751f30a9535c81c6a3ac6a2c1b2469d628c92b3e6be38eff66",
-      "size": 76351891
+      "sha256": "c7414e579bb36eba0c8f6cb45fe0ce4cd2724deeb0c3ec3a08c1babfb59ec6e6",
+      "size": 84213361
     },
     "darwin-x64": {
       "fileName": "codex-package-x86_64-apple-darwin.tar.zst",
-      "sha256": "ea8a14bca1cfc5a80d2a90e532617cc3c089cb69d2a114a61db645de6d051916",
-      "size": 83818234
+      "sha256": "41cd66b0ba1279213d2d1e17fef0fc30421e524406cb5954d84d568688c8b118",
+      "size": 92568101
     },
     "linux-arm64": {
       "fileName": "codex-package-aarch64-unknown-linux-musl.tar.zst",
-      "sha256": "084e6261fd68bd2a869f319375a022b2294d7d0f4044cbb113b8fa0755b01af9",
-      "size": 79728248
+      "sha256": "3ae57da8bc5f8fd065f0352cc14cb10e02be779186bdac989ad0e2622d8cacbb",
+      "size": 89411447
     },
     "linux-x64": {
       "fileName": "codex-package-x86_64-unknown-linux-musl.tar.zst",
-      "sha256": "257701de0d625d46e0e1c0c69db1a8a3fc1265c646a190e9fb965d1f66d54cd2",
-      "size": 85609844
+      "sha256": "e2dbacd77547f2d3afb3b1864f92926d936c12d8b822bbac98a766d943656494",
+      "size": 95540316
     },
     "win32-arm64": {
       "fileName": "codex-package-aarch64-pc-windows-msvc.tar.zst",
-      "sha256": "e043d518a6ad64271616bf4408737672e2e48b5ce472d2f0a69149434ad0d189",
-      "size": 87165328
+      "sha256": "bfd73f646fe3c3335049617e35a85e04ecf42609fc591e2b4a246e312fd41cfd",
+      "size": 98552597
     },
     "win32-x64": {
       "fileName": "codex-package-x86_64-pc-windows-msvc.tar.zst",
-      "sha256": "a9fc1afe438a326aa25b11c31ec7586c176f3713d7ee2a0bfd17b869283bd6ff",
-      "size": 93722309
+      "sha256": "02338bb9b9c9d991fed3d0446cfcb4d54ce9a271e70097e9f4c1e099ba304f3c",
+      "size": 106201360
     }
   };
   const codexRuntimeManifestJson = {
     version: version$2,
     artifacts
   };
-  const version$1 = "0.37.0-lody.753c83056944";
+  const version$1 = "0.39.1-lody.f255222661c9";
   const minNodeVersion = "22.19.0";
   const artifact = {
-    "fileName": "lody-kimi-code-0.37.0-lody.753c83056944-037255b0bcbb3afe.tar.zst",
-    "sha256": "037255b0bcbb3afe2ce0456b8a9fa419b18ada24f8d90049696efe11d311b00b",
-    "size": 3253568,
+    "fileName": "lody-kimi-code-0.39.1-lody.f255222661c9-a4bfb622023ceaf2.tar.zst",
+    "sha256": "a4bfb622023ceaf249faecf8da8508ee400af242de2d4590b72d64e95a0bbbb8",
+    "size": 3335953,
     "compression": "zstd",
     "cmd": "package/dist/main.mjs"
   };
@@ -125789,57 +126167,57 @@ ${error2.message}` : execaMessage;
       platforms: {
         "darwin-arm64": {
           fileName: `xai-official-grok-darwin-arm64-${GROK_BUILD_RUNTIME_VERSION}.tar.zst`,
-          sha256: "63aa0a0a95e7a555a372f1a501dcf59151376d7e4d900e24e1c591ff6cc8f818",
-          size: 46222120,
+          sha256: "82ffbd254fb76ae5e6be651342e902184a024f78bbe1cf6c8f48854d9f9b1594",
+          size: 46850248,
           compression: "zstd",
           cmd: "grok",
-          executableSha256: "13c7f4f0b9abb00bf38216302ea4bab31f03e13555e3576620eca1de572a8d21",
-          executableSize: 131817232
+          executableSha256: "8669e0fdadceec25b8c159c355f427ffbd82583525d774b6ab1522197ea83b80",
+          executableSize: 133486016
         },
         "darwin-x64": {
           fileName: `xai-official-grok-darwin-x64-${GROK_BUILD_RUNTIME_VERSION}.tar.zst`,
-          sha256: "7bf0af43ba1f3dc8e860e7f887b75966ece7bb6102cc7a3b2fb5af275f757c8a",
-          size: 50590131,
+          sha256: "4f48fbc4280a033da3e763e4c19585014917677d9e5c4c8405d2f80f9d21ed7a",
+          size: 51374009,
           compression: "zstd",
           cmd: "grok",
-          executableSha256: "a82210a961deac9f0cb72ec6c334196abf76a587be4593bc59db2deab85ee6dc",
-          executableSize: 147358e3
+          executableSha256: "8eacec87f5ecdb9259c6d812d12ce9e2d405b1526e36ae9d7fc81ec31dbd74d6",
+          executableSize: 149694528
         },
         "linux-arm64": {
           fileName: `xai-official-grok-linux-arm64-${GROK_BUILD_RUNTIME_VERSION}.tar.zst`,
-          sha256: "c888d404ad218caa251cbdbbd0da5836c807957be5a83fd8ab21b69de93469d9",
-          size: 49704069,
+          sha256: "676d6795d6e558adb9749f002d9dadc950acc2c5effee839cb9e1f47f8480b03",
+          size: 50397485,
           compression: "zstd",
           cmd: "grok",
-          executableSha256: "bb7c51116564a2219f6a49850815060f416918ac407f1f2ba82c53c0b0d4383f",
-          executableSize: 133745832
+          executableSha256: "b926fc5308374396e260e7efbd6107231a8dae13c084ddaf0fe89b7ebb3edd25",
+          executableSize: 135641288
         },
         "linux-x64": {
           fileName: `xai-official-grok-linux-x64-${GROK_BUILD_RUNTIME_VERSION}.tar.zst`,
-          sha256: "7d0bb4309e634e0ecb63403f35fa468120f5ecf2173feb6518371be1633ecd99",
-          size: 53264623,
+          sha256: "358061308ca5c06832d62c079644f51ef355d820d94a9ca11513c09fb4160049",
+          size: 54001005,
           compression: "zstd",
           cmd: "grok",
-          executableSha256: "28dbc967a5843dae2374b6834dadbab95354e685c7e5c8dc750b92a4e5fc7c3e",
-          executableSize: 163676672
+          executableSha256: "edf79521581bb5e6b95abef848491a6a742e860da3e237ebe86a280d30dce4c1",
+          executableSize: 166079904
         },
         "win32-arm64": {
           fileName: `xai-official-grok-win32-arm64-${GROK_BUILD_RUNTIME_VERSION}.tar.zst`,
-          sha256: "c821de276cb1fa835567bd6c5589709e6ba29182d6b0c9ad7c160cc3df91145c",
-          size: 45241480,
+          sha256: "243aaca666d4375980905c30b5a33e5b0c9a82e9e2c9bc3fd5b6cdf47819e9ad",
+          size: 45479753,
           compression: "zstd",
           cmd: "grok.exe",
-          executableSha256: "9d41447b6eee77cfb7359b7f50935ae64b4e7b7e7ef56c40e6d203f5660317e1",
-          executableSize: 121471488
+          executableSha256: "7325ad53988f9c5ca2a35e79b83280441e64d132a9046a947fd14ebb22f48db0",
+          executableSize: 121991168
         },
         "win32-x64": {
           fileName: `xai-official-grok-win32-x64-${GROK_BUILD_RUNTIME_VERSION}.tar.zst`,
-          sha256: "5d66d3e0c1e54b050c76b77dfc1dadefbf3e909459a31b4361d8307a671c179c",
-          size: 48124303,
+          sha256: "e5a50bceb2caba7bef83ef7581b50c4f4db480174a2ed44c4785f77dd9520214",
+          size: 48377036,
           compression: "zstd",
           cmd: "grok.exe",
-          executableSha256: "d546dbc995c2ce9ba97c044d6af6b53f8c11c414a6355bf006802d07c572f406",
-          executableSize: 139903488
+          executableSha256: "6caf906d6ef968004b5ff33422c84e33d51a1cd7b4ee5acd19ff695aaa92672e",
+          executableSize: 140801024
         }
       }
     }
@@ -128755,12 +129133,17 @@ ${fallbackStderrTail}` : errorMessage2;
     }
     return hasDomain(url.hostname, "kimi.com") && url.pathname.startsWith("/code/authorize_device");
   }
-  function findAuthorizationUrl(agentType, output) {
+  const AUTHORIZATION_URL_HINT_PATTERN = /(^|[/?&=_-])(oauth|oauth2|authorize|authorization|device|signin|sign-in|login)([/?&=_-]|$)/iu;
+  function isLikelyAuthorizationUrl(url) {
+    if (url.protocol !== "https:") return false;
+    return AUTHORIZATION_URL_HINT_PATTERN.test(url.pathname) || AUTHORIZATION_URL_HINT_PATTERN.test(url.search);
+  }
+  function findAuthorizationUrl(isAuthorizationUrl, output) {
     for (const match5 of output.matchAll(AUTHORIZATION_URL_PATTERN)) {
       const candidate = match5[0].replace(/[),.;]+$/u, "");
       try {
         const url = new URL(candidate);
-        if (isTrustedAuthorizationUrl(agentType, url)) return url;
+        if (isAuthorizationUrl(url)) return url;
       } catch {
       }
     }
@@ -128773,8 +129156,8 @@ ${fallbackStderrTail}` : errorMessage2;
     if (minutes2) return Number.parseInt(minutes2, 10) * 60;
     return void 0;
   }
-  function parseAuthorization(agentType, output) {
-    const authorizationUrl = findAuthorizationUrl(agentType, output);
+  function parseAuthorization(isAuthorizationUrl, acceptsAuthorizationCode, output) {
+    const authorizationUrl = findAuthorizationUrl(isAuthorizationUrl, output);
     if (!authorizationUrl) return void 0;
     const userCode = authorizationUrl.searchParams.get("user_code") ?? DEVICE_USER_CODE_PATTERN.exec(output)?.[0];
     const expiresInSeconds = parseExpiresInSeconds(output);
@@ -128783,7 +129166,7 @@ ${fallbackStderrTail}` : errorMessage2;
       ...userCode ? {
         userCode
       } : {},
-      ...agentType === "claude" ? {
+      ...acceptsAuthorizationCode ? {
         acceptsAuthorizationCode: true
       } : {},
       ...expiresInSeconds !== void 0 ? {
@@ -128791,15 +129174,16 @@ ${fallbackStderrTail}` : errorMessage2;
       } : {}
     };
   }
-  class BuiltinAuthenticationOutputParser {
-    constructor(agentType) {
-      this.agentType = agentType;
+  class AuthorizationOutputParser {
+    constructor(isAuthorizationUrl, acceptsAuthorizationCode) {
+      this.isAuthorizationUrl = isAuthorizationUrl;
+      this.acceptsAuthorizationCode = acceptsAuthorizationCode;
     }
     output = "";
     lastAuthorization = "";
     push(chunk) {
       this.output = `${this.output}${stripVTControlCharacters(chunk)}`.slice(-32768);
-      const authorization = parseAuthorization(this.agentType, this.output);
+      const authorization = parseAuthorization(this.isAuthorizationUrl, this.acceptsAuthorizationCode, this.output);
       if (!authorization) return void 0;
       const fingerprint = JSON.stringify(authorization);
       if (fingerprint === this.lastAuthorization) return void 0;
@@ -128807,6 +129191,227 @@ ${fallbackStderrTail}` : errorMessage2;
       return authorization;
     }
   }
+  class BuiltinAuthenticationOutputParser extends AuthorizationOutputParser {
+    constructor(agentType) {
+      super((url) => isTrustedAuthorizationUrl(agentType, url), agentType === "claude");
+    }
+  }
+  class AcpAgentAuthorizationOutputParser extends AuthorizationOutputParser {
+    constructor() {
+      super(isLikelyAuthorizationUrl, false);
+    }
+  }
+  const ACP_AUTHENTICATION_INITIALIZE_TIMEOUT_MS = 6e4;
+  const AUTHENTICATION_TERMINATION_GRACE_MS = 3e3;
+  function normalizeAcpAuthMethod(method) {
+    const record2 = method;
+    const id2 = typeof record2.id === "string" ? record2.id.trim() : "";
+    if (!id2) return null;
+    const type2 = record2.type === "terminal" || record2.type === "env_var" ? record2.type : "agent";
+    const args2 = Array.isArray(record2.args) && record2.args.every((arg) => typeof arg === "string") ? record2.args : void 0;
+    const env2 = typeof record2.env === "object" && record2.env !== null ? Object.fromEntries(Object.entries(record2.env).filter((entry) => typeof entry[1] === "string")) : void 0;
+    return {
+      type: type2,
+      id: id2,
+      ...typeof record2.name === "string" ? {
+        name: record2.name
+      } : {},
+      ...typeof record2.description === "string" ? {
+        description: record2.description
+      } : {},
+      ...args2 ? {
+        args: args2
+      } : {},
+      ...env2 && Object.keys(env2).length > 0 ? {
+        env: env2
+      } : {}
+    };
+  }
+  function describeAcpAuthMethod(method) {
+    return method.name?.trim() ? method.name : method.id;
+  }
+  function formatEnvVarAuthMethodError(method, normalized) {
+    const vars = method.vars;
+    const names2 = Array.isArray(vars) ? vars.map((entry) => typeof entry === "object" && entry !== null && typeof entry.name === "string" ? entry.name : null).filter((name2) => Boolean(name2)) : [];
+    const suffix = names2.length > 0 ? `: ${names2.join(", ")}` : "";
+    return `${describeAcpAuthMethod(normalized)} authenticates through environment variables. Add them to this agent's environment in its settings${suffix}.`;
+  }
+  function selectAuthMethod(methods2, methodId) {
+    for (const method of methods2) {
+      const normalized = normalizeAcpAuthMethod(method);
+      if (!normalized) continue;
+      if (methodId === void 0 || normalized.id === methodId) {
+        return {
+          method,
+          normalized
+        };
+      }
+    }
+    return null;
+  }
+  function withDeadline(promise2, timeoutMs, label2) {
+    let timeoutHandle;
+    const timeout2 = new Promise((_resolve, reject2) => {
+      timeoutHandle = setTimeout(() => reject2(new Error(`${label2} timed out after ${Math.round(timeoutMs / 1e3)}s`)), timeoutMs);
+      timeoutHandle.unref?.();
+    });
+    return Promise.race([
+      promise2,
+      timeout2
+    ]).finally(() => {
+      if (timeoutHandle) clearTimeout(timeoutHandle);
+    });
+  }
+  async function runAcpProtocolAuthentication(options) {
+    options.signal?.throwIfAborted();
+    const child = spawnAcpProcess({
+      cliType: options.cliType,
+      agentType: options.agentType,
+      workdir: options.workdir,
+      env: options.env,
+      command: options.launch.command,
+      args: options.launch.args,
+      spawnImpl: options.spawnProcess
+    });
+    options.attachProcess?.(child);
+    let stderrTail = "";
+    const parser = new AcpAgentAuthorizationOutputParser();
+    child.stderr?.setEncoding("utf8");
+    child.stderr?.on("data", (chunk) => {
+      if (!chunk) return;
+      stderrTail = appendStderrTail(stderrTail, chunk);
+      const authorization = parser.push(chunk);
+      if (authorization) {
+        options.onProgress?.({
+          status: "authorization",
+          ...authorization
+        });
+      }
+    });
+    let rejectProcessFailure;
+    const processFailure = new Promise((_resolve, reject2) => {
+      rejectProcessFailure = reject2;
+    });
+    const handleExit = (code2, signal) => {
+      rejectProcessFailure?.(new Error(`${options.agentType} exited during authentication (code ${code2 ?? "null"}${signal ? `, signal ${signal}` : ""})${stderrTail ? `: ${stderrTail}` : ""}`));
+    };
+    const handleError2 = (error2) => {
+      rejectProcessFailure?.(new Error(`${options.agentType} failed to start: ${error2.message}`));
+    };
+    child.once("exit", handleExit);
+    child.once("error", handleError2);
+    processFailure.catch(() => void 0);
+    const handleAbort = () => {
+      rejectProcessFailure?.(new DOMException("ACP authentication was cancelled", "AbortError"));
+    };
+    options.signal?.addEventListener("abort", handleAbort, {
+      once: true
+    });
+    const terminate = () => {
+      child.off("exit", handleExit);
+      child.off("error", handleError2);
+      options.signal?.removeEventListener("abort", handleAbort);
+      void shutdownLocalAcpAgent({
+        agentProcess: child,
+        logger: options.logger,
+        sessionLabel: `acp-auth-protocol:${options.agentType}`,
+        exitTimeoutMs: AUTHENTICATION_TERMINATION_GRACE_MS
+      }).catch((error2) => {
+        options.logger.debug(`[acp-auth] Failed to stop ${options.agentType} after authentication: ${formatErrorMessage(error2)}`);
+      });
+    };
+    try {
+      if (!child.stdout || !child.stdin) {
+        throw new Error("Agent process stdio is not available");
+      }
+      const stream2 = ndJsonStream(createStdinWritableStream(child.stdin), createStdoutReadableStream(child.stdout));
+      const connection2 = new ClientSideConnection(() => ({
+        requestPermission: async () => ({
+          outcome: {
+            outcome: "cancelled"
+          }
+        }),
+        sessionUpdate: () => {
+        }
+      }), stream2);
+      const initializeResponse = await Promise.race([
+        withDeadline(connection2.initialize({
+          protocolVersion: PROTOCOL_VERSION,
+          clientCapabilities: {
+            terminal: false,
+            fs: {
+              readTextFile: false,
+              writeTextFile: false
+            },
+            auth: {
+              terminal: true
+            }
+          }
+        }), Math.max(1, options.initializeTimeoutMs ?? ACP_AUTHENTICATION_INITIALIZE_TIMEOUT_MS), `${options.agentType} initialize`),
+        processFailure
+      ]);
+      options.signal?.throwIfAborted();
+      const advertised = initializeResponse.authMethods ?? [];
+      if (advertised.length === 0) {
+        return {
+          kind: "error",
+          error: `${options.agentType} does not advertise an authentication method. Check the agent's own setup instructions or configure its credentials in this agent's environment.`
+        };
+      }
+      const selected = selectAuthMethod(advertised, options.methodId);
+      if (!selected) {
+        if (options.methodId !== void 0) {
+          return {
+            kind: "error",
+            error: `${options.agentType} no longer advertises the authentication method "${options.methodId}"`
+          };
+        }
+        return {
+          kind: "error",
+          error: `${options.agentType} advertised no usable authentication method`
+        };
+      }
+      const normalizedMethods = advertised.map(normalizeAcpAuthMethod).filter((method) => method !== null);
+      if (options.methodId === void 0 && normalizedMethods.length > 1) {
+        return {
+          kind: "method-required",
+          authMethods: normalizedMethods
+        };
+      }
+      if (selected.normalized.type === "env_var") {
+        return {
+          kind: "error",
+          error: formatEnvVarAuthMethodError(selected.method, selected.normalized)
+        };
+      }
+      if (selected.normalized.type === "terminal") {
+        return {
+          kind: "terminal-method",
+          method: selected.normalized
+        };
+      }
+      options.logger.debug(`[acp-auth] ${options.agentType} authenticate methodId=${selected.normalized.id}`);
+      await Promise.race([
+        connection2.authenticate({
+          methodId: selected.normalized.id
+        }),
+        processFailure
+      ]);
+      return {
+        kind: "authenticated"
+      };
+    } catch (error2) {
+      if (error2 instanceof DOMException && error2.name === "AbortError") {
+        throw error2;
+      }
+      return {
+        kind: "error",
+        error: formatErrorMessage(error2)
+      };
+    } finally {
+      terminate();
+    }
+  }
   const DEFAULT_AUTHENTICATION_TIMEOUT_MS = 285e3;
   const DEFAULT_TERMINATION_GRACE_MS$1 = 3e3;
   const DEFAULT_STATUS_PROBE_TIMEOUT_MS = 15e3;
@@ -128995,15 +129600,8 @@ ${fallbackStderrTail}` : errorMessage2;
     spawnProcess;
     resolveLoginShellEnv;
     async authenticate(options) {
-      if (options.cliType !== "builtin" || !isManagedBuiltinAgentType(options.agentType)) {
-        return {
-          success: false,
-          disposition: "error",
-          error: `Authentication is not supported for ${options.agentType}`
-        };
-      }
-      const displayName = getBuiltinDisplayName(options.agentType);
-      const agentType = options.agentType;
+      const managedBuiltinAgentType = options.cliType === "builtin" && isManagedBuiltinAgentType(options.agentType) ? options.agentType : null;
+      const displayName = managedBuiltinAgentType ? getBuiltinDisplayName(managedBuiltinAgentType) : options.agentType;
       if (this.runningByAgentType.has(options.agentType)) {
         return {
           success: false,
@@ -129017,7 +129615,8 @@ ${fallbackStderrTail}` : errorMessage2;
         timedOut: false,
         terminating: false,
         acceptsAuthorizationCode: false,
-        authorizationCodeSubmitted: false
+        authorizationCodeSubmitted: false,
+        abort: new AbortController()
       };
       this.runningByAgentType.set(options.agentType, running2);
       let timeoutHandle;
@@ -129055,99 +129654,18 @@ ${fallbackStderrTail}` : errorMessage2;
       }, this.authenticationTimeoutMs);
       timeoutHandle.unref?.();
       try {
-        const launch = await resolveBuiltinAuthenticationProcessLaunch({
-          cliType: options.cliType,
-          agentType: options.agentType,
-          runtimeOverrides: options.runtimeOverrides,
-          action: "login"
-        });
-        if (!launch) {
-          throw new Error(`${displayName} authentication is unavailable`);
-        }
-        const launchInterruption = interruptedResult();
-        if (launchInterruption) return launchInterruption;
-        const env2 = await buildAuthenticationProcessEnv({
-          launch,
-          agentType: options.agentType,
-          env: options.env,
-          resolveLoginShellEnv: this.resolveLoginShellEnv
-        });
-        const preparationInterruption = interruptedResult();
-        if (preparationInterruption) return preparationInterruption;
-        options.onProgress?.({
-          status: "starting"
-        });
-        const child = this.spawnProcess(launch.command, launch.args, {
-          cwd: os__default$1.homedir(),
-          env: env2,
-          stdio: [
-            "pipe",
-            "pipe",
-            "pipe"
-          ],
-          detached: process.platform !== "win32",
-          windowsHide: true
-        });
-        running2.child = child;
-        child.stdin?.on("error", (error2) => {
-          this.logger.debug(`[acp-auth] ${displayName} authorization input failed: ${formatErrorMessage(error2)}`);
-        });
-        const outputParser = new BuiltinAuthenticationOutputParser(agentType);
-        const emitOutput = (stream2, chunk) => {
-          const output = String(chunk);
-          if (output.length === 0) return;
-          const authorization = outputParser.push(output);
-          if (authorization) {
-            running2.acceptsAuthorizationCode = authorization.acceptsAuthorizationCode === true;
-            options.onProgress?.({
-              status: "authorization",
-              ...authorization
-            });
-          }
-          options.onProgress?.({
-            status: "output",
-            stream: stream2,
-            output: output.slice(0, 16384)
-          });
-        };
-        child.stdout?.on("data", (chunk) => emitOutput("stdout", chunk));
-        child.stderr?.on("data", (chunk) => emitOutput("stderr", chunk));
-        const exit2 = await new Promise((resolve2) => {
-          let settled = false;
-          const finish = (result) => {
-            if (settled) return;
-            settled = true;
-            resolve2(result);
-          };
-          child.once("error", (error2) => finish({
-            code: null,
-            error: error2
-          }));
-          child.once("exit", (code2) => finish({
-            code: code2
-          }));
-        });
-        const processInterruption = interruptedResult();
-        if (processInterruption) return processInterruption;
-        if (exit2.error !== void 0 || exit2.code !== 0) {
-          const error2 = exit2.error !== void 0 ? formatErrorMessage(exit2.error) : formatAuthenticationExitError(agentType, displayName, exit2.code);
-          options.onProgress?.({
-            status: "error",
-            error: error2
-          });
-          return {
-            success: false,
-            disposition: "error",
-            error: error2
-          };
-        }
-        options.onProgress?.({
-          status: "authenticated"
+        const result = managedBuiltinAgentType ? await this.runBuiltinLogin({
+          options,
+          running: running2,
+          interruptedResult,
+          agentType: managedBuiltinAgentType,
+          displayName
+        }) : await this.runProtocolAuthentication({
+          options,
+          running: running2,
+          interruptedResult
         });
-        return {
-          success: true,
-          disposition: "authenticated"
-        };
+        return result;
       } catch (error2) {
         const interruption2 = interruptedResult();
         if (interruption2) return interruption2;
@@ -129170,6 +129688,241 @@ ${fallbackStderrTail}` : errorMessage2;
         }
       }
     }
+    async runBuiltinLogin(ctx) {
+      const { options, interruptedResult, agentType, displayName } = ctx;
+      const launch = await resolveBuiltinAuthenticationProcessLaunch({
+        cliType: options.cliType,
+        agentType: options.agentType,
+        runtimeOverrides: options.runtimeOverrides,
+        action: "login"
+      });
+      if (!launch) {
+        throw new Error(`${displayName} authentication is unavailable`);
+      }
+      const launchInterruption = interruptedResult();
+      if (launchInterruption) return launchInterruption;
+      const env2 = await buildAuthenticationProcessEnv({
+        launch,
+        agentType: options.agentType,
+        env: options.env,
+        resolveLoginShellEnv: this.resolveLoginShellEnv
+      });
+      const preparationInterruption = interruptedResult();
+      if (preparationInterruption) return preparationInterruption;
+      options.onProgress?.({
+        status: "starting"
+      });
+      return await this.runLoginProcess({
+        ...ctx,
+        displayName,
+        command: launch.command,
+        args: launch.args,
+        env: env2,
+        parser: new BuiltinAuthenticationOutputParser(agentType),
+        formatExitError: (code2) => formatAuthenticationExitError(agentType, displayName, code2),
+        acceptsAuthorizationCodeOnStdin: true
+      });
+    }
+    async runProtocolAuthentication(ctx) {
+      const { options, running: running2, interruptedResult } = ctx;
+      const launch = await resolveACPProcessLaunchAsync({
+        cliType: options.cliType,
+        agentType: options.agentType,
+        customAcp: options.customAcp,
+        runtimeOverrides: options.runtimeOverrides,
+        signal: running2.abort.signal
+      });
+      const launchInterruption = interruptedResult();
+      if (launchInterruption) return launchInterruption;
+      const env2 = await this.buildAcpAuthenticationProcessEnv(launch, options, {
+        protocolStdio: true
+      });
+      const preparationInterruption = interruptedResult();
+      if (preparationInterruption) return preparationInterruption;
+      options.onProgress?.({
+        status: "starting"
+      });
+      const outcome = await runAcpProtocolAuthentication({
+        launch: {
+          command: launch.command,
+          args: launch.args
+        },
+        cliType: options.cliType,
+        agentType: options.agentType,
+        workdir: os__default$1.homedir(),
+        env: env2,
+        methodId: options.methodId,
+        logger: this.logger,
+        signal: running2.abort.signal,
+        onProgress: options.onProgress,
+        attachProcess: (child) => {
+          running2.child = child;
+        },
+        spawnProcess: this.spawnProcess
+      });
+      const outcomeInterruption = interruptedResult();
+      if (outcomeInterruption) return outcomeInterruption;
+      if (outcome.kind === "authenticated") {
+        options.onProgress?.({
+          status: "authenticated"
+        });
+        return {
+          success: true,
+          disposition: "authenticated"
+        };
+      }
+      if (outcome.kind === "method-required") {
+        return {
+          success: true,
+          disposition: "method-required",
+          authMethods: outcome.authMethods.map((method) => ({
+            type: method.type,
+            id: method.id,
+            ...method.name ? {
+              name: method.name
+            } : {},
+            ...method.description ? {
+              description: method.description
+            } : {}
+          }))
+        };
+      }
+      if (outcome.kind === "terminal-method") {
+        running2.child = void 0;
+        return await this.runTerminalAuthMethod(ctx, outcome.method);
+      }
+      options.onProgress?.({
+        status: "error",
+        error: outcome.error
+      });
+      return {
+        success: false,
+        disposition: "error",
+        error: outcome.error
+      };
+    }
+    async runTerminalAuthMethod(ctx, method) {
+      const { options, interruptedResult } = ctx;
+      const displayName = describeAcpAuthMethod(method);
+      const launch = await resolveACPProcessLaunchAsync({
+        cliType: options.cliType,
+        agentType: options.agentType,
+        customAcp: options.customAcp,
+        runtimeOverrides: options.runtimeOverrides,
+        extraArgs: [
+          ...method.args ?? []
+        ],
+        signal: ctx.running.abort.signal
+      });
+      const launchInterruption = interruptedResult();
+      if (launchInterruption) return launchInterruption;
+      const env2 = await this.buildAcpAuthenticationProcessEnv(launch, options, {
+        methodEnv: method.env
+      });
+      const preparationInterruption = interruptedResult();
+      if (preparationInterruption) return preparationInterruption;
+      return await this.runLoginProcess({
+        ...ctx,
+        displayName,
+        command: launch.command,
+        args: launch.args,
+        env: env2,
+        parser: new AcpAgentAuthorizationOutputParser(),
+        formatExitError: (code2) => `${options.agentType} authentication exited with code ${code2 ?? "unknown"}`,
+        acceptsAuthorizationCodeOnStdin: false
+      });
+    }
+    async buildAcpAuthenticationProcessEnv(launch, options, settings = {}) {
+      const env2 = await buildAuthenticationProcessEnv({
+        launch,
+        agentType: options.agentType,
+        env: settings.methodEnv ? {
+          ...options.env,
+          ...settings.methodEnv
+        } : options.env,
+        resolveLoginShellEnv: this.resolveLoginShellEnv
+      });
+      if (settings.protocolStdio) {
+        delete env2.TERM;
+      }
+      return withLodyNpmCacheForNpx(launch.command, env2);
+    }
+    async runLoginProcess(ctx) {
+      const { options, running: running2, interruptedResult, displayName } = ctx;
+      const child = this.spawnProcess(ctx.command, ctx.args, {
+        cwd: os__default$1.homedir(),
+        env: ctx.env,
+        stdio: [
+          "pipe",
+          "pipe",
+          "pipe"
+        ],
+        detached: process.platform !== "win32",
+        windowsHide: true
+      });
+      running2.child = child;
+      if (running2.cancelled || running2.timedOut) {
+        this.terminateAuthentication(options.agentType, running2, running2.cancelled ? "cancelled" : "timed out");
+      }
+      child.stdin?.on("error", (error2) => {
+        this.logger.debug(`[acp-auth] ${displayName} authorization input failed: ${formatErrorMessage(error2)}`);
+      });
+      const emitOutput = (stream2, chunk) => {
+        const output = String(chunk);
+        if (output.length === 0) return;
+        const authorization = ctx.parser.push(output);
+        if (authorization) {
+          running2.acceptsAuthorizationCode = ctx.acceptsAuthorizationCodeOnStdin && authorization.acceptsAuthorizationCode === true;
+          options.onProgress?.({
+            status: "authorization",
+            ...authorization
+          });
+        }
+        options.onProgress?.({
+          status: "output",
+          stream: stream2,
+          output: output.slice(0, 16384)
+        });
+      };
+      child.stdout?.on("data", (chunk) => emitOutput("stdout", chunk));
+      child.stderr?.on("data", (chunk) => emitOutput("stderr", chunk));
+      const exit2 = await new Promise((resolve2) => {
+        let settled = false;
+        const finish = (result) => {
+          if (settled) return;
+          settled = true;
+          resolve2(result);
+        };
+        child.once("error", (error2) => finish({
+          code: null,
+          error: error2
+        }));
+        child.once("exit", (code2) => finish({
+          code: code2
+        }));
+      });
+      const processInterruption = interruptedResult();
+      if (processInterruption) return processInterruption;
+      if (exit2.error !== void 0 || exit2.code !== 0) {
+        const error2 = exit2.error !== void 0 ? formatErrorMessage(exit2.error) : ctx.formatExitError(exit2.code);
+        options.onProgress?.({
+          status: "error",
+          error: error2
+        });
+        return {
+          success: false,
+          disposition: "error",
+          error: error2
+        };
+      }
+      options.onProgress?.({
+        status: "authenticated"
+      });
+      return {
+        success: true,
+        disposition: "authenticated"
+      };
+    }
     cancel(agentType, requestId) {
       const running2 = this.runningByAgentType.get(agentType);
       if (!running2 || running2.requestId !== requestId) {
@@ -129244,6 +129997,7 @@ ${fallbackStderrTail}` : errorMessage2;
       }
     }
     terminateAuthentication(agentType, running2, reason) {
+      running2.abort.abort();
       if (running2.terminating || !running2.child) return;
       running2.terminating = true;
       void shutdownLocalAcpAgent({
@@ -133184,18 +133938,13 @@ The postId is ${normalizedFeedbackPostId}. Use the feedback-progress-reporter sk
       await withAbortSignal(sleep2(retryDelayMs), options.signal);
     }
   }
-  function getPendingUserTurnActivationId(meta) {
-    const missingUserTurnId = meta.lastMissingHistoryUserMsgId;
-    if (typeof meta.processingUserMsgId === "string" && meta.processingUserMsgId.length > 0 && meta.processingUserMsgId !== missingUserTurnId) {
-      return meta.processingUserMsgId;
-    }
-    if (typeof meta.latestUserMsgId === "string" && meta.latestUserMsgId.length > 0 && meta.latestUserMsgId !== meta.lastHandledUserMsgId && meta.latestUserMsgId !== missingUserTurnId) {
-      return meta.latestUserMsgId;
+  function isActivationAwaitingHistory(history, pendingUserTurnId) {
+    const entry = history.find((item) => item.role === "user" && item.id === pendingUserTurnId);
+    if (!entry) {
+      return true;
     }
-    return void 0;
-  }
-  function hasPendingUserTurnActivation(meta) {
-    return getPendingUserTurnActivationId(meta) !== void 0;
+    const status = resolveSessionHistoryStatus(entry);
+    return status !== "handled" && status !== "failed" && status !== "canceled";
   }
   function shouldWatchSession(snapshot) {
     const { meta, hasUnprocessedCancelRequest, hasRpcTurnOffer, hasAccessRetry } = snapshot;
@@ -134134,7 +134883,10 @@ The postId is ${normalizedFeedbackPostId}. Use the feedback-progress-reporter sk
           return preConfigRejection;
         }
         if (steerCapability.configPolicy === "apply") {
-          await this.deps.applyAcpModeAndModel(runtime.session, options.inputConfig);
+          await this.deps.applyAcpModeAndModel(runtime.session, options.inputConfig, {
+            sessionDoc,
+            basedOnUserTurnId: options.userTurnId
+          });
         }
         const preSubmitRejection = await rejectBeforeProviderSubmission();
         if (preSubmitRejection) {
@@ -134529,7 +135281,9 @@ The postId is ${normalizedFeedbackPostId}. Use the feedback-progress-reporter sk
       }
       runtime.prePromptFailureRecorded = true;
       const message = formatErrorMessage(error2);
-      if (isGitExecutableNotFoundError(error2)) {
+      if (error2 instanceof AcpAuthenticationRequiredError) {
+        await this.deps.recordChatFailure(sessionDoc, "acp_auth_required", message);
+      } else if (isGitExecutableNotFoundError(error2)) {
         await this.deps.recordChatFailure(sessionDoc, "turn_pre_prompt_failed", message, GIT_EXECUTABLE_NOT_FOUND_CODE);
       } else {
         await this.deps.recordChatFailure(sessionDoc, "turn_pre_prompt_failed", message);
@@ -135653,6 +136407,9 @@ The postId is ${normalizedFeedbackPostId}. Use the feedback-progress-reporter sk
         }, async () => await self2.deps.applyAcpModeAndModel(targetSession, {
           ...acpSessionConfig,
           configOptionValues: acpSessionConfig.configOptionValues
+        }, {
+          sessionDoc,
+          basedOnUserTurnId: executionUserTurnId
         })));
         const refreshPromptGitHubToken = (targetSession, triggerReason) => gen(function* () {
           if (!project) {
@@ -136157,6 +136914,9 @@ The postId is ${normalizedFeedbackPostId}. Use the feedback-progress-reporter sk
           }, async () => await self2.deps.applyAcpModeAndModel(session2, {
             ...agentConfig,
             configOptionValues: agentConfig.configOptionValues
+          }, {
+            sessionDoc,
+            basedOnUserTurnId: userTurnId
           })));
           yield* abortIfCancelled();
           const containerWorkdir = session2.getWorkdir();
@@ -136472,8 +137232,20 @@ The postId is ${normalizedFeedbackPostId}. Use the feedback-progress-reporter sk
         customAcp: message.customAcp,
         runtimeOverrides: message.runtimeOverrides,
         env: message.env,
+        methodId: message.methodId,
         onProgress
       });
+      if (result.disposition === "method-required") {
+        return {
+          ...base,
+          success: true,
+          disposition: "method-required",
+          authRequired: true,
+          authMethods: result.authMethods.map((method) => ({
+            ...method
+          }))
+        };
+      }
       if (result.success && result.disposition === "authenticated" && message.configId) {
         const refresh = await this.refreshMachineAcpCapabilities({
           type: "machine/acp-capabilities-refresh",
@@ -137419,7 +138191,7 @@ The postId is ${normalizedFeedbackPostId}. Use the feedback-progress-reporter sk
       }
       const now2 = Date.now();
       for (const [userTurnId, stashed] of stash) {
-        const isTerminal2 = meta.lastHandledUserMsgId === userTurnId || this.deps.executionService.getTerminalUserTurnStatusWithoutEntry?.(sessionId, userTurnId) !== void 0 || history.some((entry) => entry.id === userTurnId && entry.role === "user" && (entry.status === "handled" || entry.status === "failed" || entry.status === "canceled"));
+        const isTerminal2 = meta.lastHandledUserMsgId === userTurnId || this.deps.executionService.getTerminalUserTurnStatusWithoutEntry?.(sessionId, userTurnId) !== void 0 || !isActivationAwaitingHistory(history, userTurnId);
         if (stashed.expiresAtMs <= now2 || isTerminal2) {
           stash.delete(userTurnId);
           continue;
@@ -137825,7 +138597,7 @@ The postId is ${normalizedFeedbackPostId}. Use the feedback-progress-reporter sk
           return;
         }
         if (!nextUserTurn) {
-          if (this.hasPendingUserTurnSignal(meta)) {
+          if (hasPendingUserTurnActivation(meta)) {
             outcome = "missing-history";
             await this.markMissingUserTurnRecovery(sessionId, sessionDoc, meta);
           } else {
@@ -138329,10 +139101,7 @@ The postId is ${normalizedFeedbackPostId}. Use the feedback-progress-reporter sk
           ...pendingEntry,
           id: queuedTurnId
         };
-        await sessionDoc.updateHistory((prevHistory) => [
-          ...prevHistory,
-          entry
-        ]);
+        await sessionDoc.appendUserTurn(entry);
         return entry;
       } finally {
         releaseQueueMutation();
@@ -138363,20 +139132,50 @@ The postId is ${normalizedFeedbackPostId}. Use the feedback-progress-reporter sk
     }
     async findOrAwaitDispatchableTurn(sessionId, sessionDoc, meta, lifecycleGeneration) {
       const isActive = () => this.isLifecycleActive(lifecycleGeneration);
-      const turn = await this.checkHistoryAndQueue(sessionDoc, meta, isActive);
+      const { turn, history } = await this.checkHistoryAndQueue(sessionDoc, meta, isActive);
       if (!isActive()) {
         return null;
       }
       if (turn) {
         return turn;
       }
-      if (this.hasPendingUserTurnSignal(meta)) {
-        return await this.waitForPendingUserTurnHistorySync(sessionId, sessionDoc, meta, lifecycleGeneration);
+      const pendingUserTurnId = getPendingUserTurnActivationId(meta);
+      if (!pendingUserTurnId) {
+        return null;
+      }
+      if (!isActivationAwaitingHistory(history, pendingUserTurnId)) {
+        if (await this.settleTerminalActivation(sessionId, pendingUserTurnId)) {
+          return null;
+        }
       }
-      return null;
+      return await this.waitForPendingUserTurnHistorySync(sessionId, sessionDoc, meta, lifecycleGeneration);
     }
-    hasPendingUserTurnSignal(meta) {
-      return hasPendingUserTurnActivation(meta);
+    async settleTerminalActivation(sessionId, terminalUserTurnId) {
+      const roomId = getSessionRoomId(sessionId);
+      const record2 = await this.deps.workspaceDocument.repo.getDocMeta(roomId);
+      const meta = isLoroRepoDocDeleted(record2) ? void 0 : record2?.meta;
+      if (!meta) {
+        return false;
+      }
+      const clearsProcessing = meta.processingUserMsgId === terminalUserTurnId;
+      const retiresLatest = meta.latestUserMsgId === terminalUserTurnId;
+      const patch2 = {
+        ...clearsProcessing ? {
+          processingUserMsgId: void 0
+        } : {},
+        ...retiresLatest ? {
+          settledActivationUserMsgId: terminalUserTurnId
+        } : {}
+      };
+      if (!clearsProcessing && !retiresLatest) {
+        return false;
+      }
+      this.deps.logger.debug(`[${sessionId}] Settling stale activation ${terminalUserTurnId}; its history entry is already terminal`);
+      await this.deps.workspaceDocument.repo.upsertDocMeta?.(roomId, patch2);
+      return !hasPendingUserTurnActivation({
+        ...meta,
+        ...patch2
+      });
     }
     async waitForPendingUserTurnHistorySync(sessionId, sessionDoc, meta, lifecycleGeneration) {
       const isActive = () => this.isLifecycleActive(lifecycleGeneration);
@@ -138384,7 +139183,7 @@ The postId is ${normalizedFeedbackPostId}. Use the feedback-progress-reporter sk
         return null;
       }
       const pendingUserTurnId = getPendingUserTurnActivationId(meta);
-      this.deps.logger.debug(`[${sessionId}] Pending user turn ${getPendingUserTurnActivationId(meta) ?? "unknown"} metadata is visible but history is missing it; waiting up to ${SessionDispatchWatcher.HISTORY_SYNC_WAIT_TIMEOUT_MS / 1e3}s for history CRDT sync (pendingUserMsgId=${pendingUserTurnId ?? "unknown"})`);
+      this.deps.logger.debug(`[${sessionId}] Pending user turn ${pendingUserTurnId ?? "unknown"} has no history entry yet; waiting up to ${SessionDispatchWatcher.HISTORY_SYNC_WAIT_TIMEOUT_MS / 1e3}s for history CRDT sync`);
       return await new Promise((resolve2) => {
         let settled = false;
         let currentMeta = meta;
@@ -138437,7 +139236,7 @@ The postId is ${normalizedFeedbackPostId}. Use the feedback-progress-reporter sk
             try {
               while (checkRequested) {
                 checkRequested = false;
-                const turn = await this.checkHistoryAndQueue(sessionDoc, currentMeta, isActive);
+                const { turn } = await this.checkHistoryAndQueue(sessionDoc, currentMeta, isActive);
                 if (settled || !isActive()) {
                   finish(null);
                   return;
@@ -138568,7 +139367,7 @@ The postId is ${normalizedFeedbackPostId}. Use the feedback-progress-reporter sk
             finish(null);
             return;
           }
-          if (!this.hasPendingUserTurnSignal(currentMeta)) {
+          if (!hasPendingUserTurnActivation(currentMeta)) {
             this.deps.logger.debug(`[${sessionId}] Pending user turn pointer cleared during pre-wait sync; exiting wait`);
             exitWhenCheckIsEmpty = true;
           }
@@ -138592,7 +139391,7 @@ The postId is ${normalizedFeedbackPostId}. Use the feedback-progress-reporter sk
       } catch (error2) {
         this.deps.logger.debug(`[${sessionId}] Failed to refresh metadata before dispatch recovery: ${formatErrorMessage(error2)}`);
       }
-      if (meta.machineId !== this.deps.machineId || meta.isArchived || !this.hasPendingUserTurnSignal(meta)) {
+      if (meta.machineId !== this.deps.machineId || meta.isArchived || !hasPendingUserTurnActivation(meta)) {
         return;
       }
       const pendingUserMsgId = getPendingUserTurnActivationId(meta);
@@ -138622,7 +139421,10 @@ The postId is ${normalizedFeedbackPostId}. Use the feedback-progress-reporter sk
     async checkHistoryAndQueue(sessionDoc, meta, isActive = () => true) {
       const history = await sessionDoc.getHistory();
       if (!isActive()) {
-        return null;
+        return {
+          turn: null,
+          history
+        };
       }
       const turn = findNextDispatchableUserTurn(history, meta);
       if (turn) {
@@ -138631,20 +139433,35 @@ The postId is ${normalizedFeedbackPostId}. Use the feedback-progress-reporter sk
           return await this.checkHistoryAndQueue(sessionDoc, meta, isActive);
         }
         this.consumeStashedRpcTurn(meta.id, turn.id);
-        return turn;
+        return {
+          turn,
+          history
+        };
       }
       if (!isActive()) {
-        return null;
+        return {
+          turn: null,
+          history
+        };
       }
       const promoted = await this.promoteNextQueuedMessage(sessionDoc, meta, history);
       if (!isActive()) {
-        return null;
+        return {
+          turn: null,
+          history
+        };
       }
       if (promoted) {
         this.turnSourceHints.set(`${meta.id}:${promoted.id}`, "queue");
-        return promoted;
+        return {
+          turn: promoted,
+          history
+        };
       }
-      return this.peekStashedRpcTurn(meta.id, meta, history);
+      return {
+        turn: this.peekStashedRpcTurn(meta.id, meta, history),
+        history
+      };
     }
     async maybeRepairAlreadyHandledTurn(sessionDoc, meta, turn, history) {
       const sessionId = meta.id;
@@ -140270,14 +141087,14 @@ The postId is ${normalizedFeedbackPostId}. Use the feedback-progress-reporter sk
     return serialized;
   };
   const fingerprintLodyCommand = (kind, canonical) => createHash("sha256").update(kind).update("\0").update(canonical).digest("hex");
-  const getLodyOperationStorePath = (machineId = process.env.LODY_MCP_MACHINE_ID ?? process.env.LODY_PREVIEW_MCP_MACHINE_ID ?? "local", homeDir = os__default.homedir()) => {
+  const getLodyOperationStorePath = (machineId, homeDir = os__default.homedir()) => {
     const machineKey = createHash("sha256").update(machineId).digest("hex").slice(0, 24);
     return path__default.join(getLodyDataDir(void 0, homeDir), "orchestration", machineKey, "operations.sqlite3");
   };
   const getOperationDeliveryId = (requesterSessionId, operationId) => `operation:${requesterSessionId}:${operationId}:completion`;
   const getOperationCompletionTurnId = (requesterSessionId, operationId) => `operation-completion:${requesterSessionId}:${operationId}`;
   class LodyOperationStore {
-    constructor(dbPath = getLodyOperationStorePath(), now2 = Date.now, options = {}) {
+    constructor(dbPath, now2 = Date.now, options = {}) {
       this.now = now2;
       const storeDirectory = path__default.dirname(dbPath);
       mkdirSync$2(storeDirectory, {
@@ -140702,6 +141519,7 @@ The postId is ${normalizedFeedbackPostId}. Use the feedback-progress-reporter sk
   const TARGET_OUTPUT_PREVIEW_MAX_BYTES = 8 * 1024;
   const MATERIALIZATION_RETRY_MIN_MS = 1e3;
   const MATERIALIZATION_RETRY_MAX_MS = 3e4;
+  const DELIVERY_EXPIRY_GRACE_MS = 8 * 60 * 60 * 1e3;
   const truncateTargetOutput = (text) => {
     const originalBytes = Buffer.byteLength(text, "utf8");
     if (originalBytes <= TARGET_OUTPUT_PREVIEW_MAX_BYTES) return {
@@ -141229,9 +142047,13 @@ The postId is ${normalizedFeedbackPostId}. Use the feedback-progress-reporter sk
         this.consumeDelivery(delivery, reason, continuationEvidence);
         return;
       }
+      const operation = this.withStore((store) => store.get(delivery.requesterSessionId, delivery.operationId));
+      if (this.now() >= Date.parse(operation.deadlineAt) + DELIVERY_EXPIRY_GRACE_MS) {
+        this.consumeDelivery(delivery, reason, "expired_stale");
+        return;
+      }
       if (execution.hasActiveTurn) return;
       if (this.options.dispatchWatcher.hasPendingDispatch(delivery.requesterSessionId)) return;
-      const operation = this.withStore((store) => store.get(delivery.requesterSessionId, delivery.operationId));
       const configuration = await this.resolveFrozenConfiguration(operation, delivery, reason);
       if (configuration === "unknown") {
         this.armConfigurationRetry(delivery.requesterSessionId);
@@ -154465,45 +155287,84 @@ ${entry.text}`).join("\n\n");
     }
     return response2;
   }
-  async function resolveLocalProjectBranchOnMachine(args2) {
-    if (!args2.requestedBranch?.trim() && args2.useWorktree !== true) {
-      return void 0;
-    }
-    const response2 = await readLocalProjectGitStateOnMachine(args2);
-    if (!response2.success) {
-      if (args2.requestedBranch || args2.useWorktree === true) {
-        throw new Error(response2.message ?? response2.error);
-      }
+  function selectWorkspaceRepoFullName(githubRepoFullName, workspaceRepositories) {
+    const repoFullName = normalizeCliValue(githubRepoFullName);
+    if (!repoFullName) {
       return void 0;
     }
-    if (!response2.state.git) {
+    const normalized = repoFullName.toLowerCase();
+    return workspaceRepositories.find((repo) => repo.fullName.toLowerCase() === normalized)?.fullName;
+  }
+  function resolveLocalProjectCreateGitContext(args2) {
+    const requestedBranch = normalizeCliValue(args2.requestedBranch);
+    if (!args2.gitState.git) {
       if (args2.useWorktree === true) {
         throw new Error("Cannot use --worktree with a local project that is not a git repository.");
       }
-      if (args2.requestedBranch) {
+      if (requestedBranch) {
         throw new Error("Cannot use --branch with a local project that is not a git repository.");
       }
-      return void 0;
+      return {};
     }
-    if (response2.state.branches.length === 0) {
-      if (args2.requestedBranch?.trim()) {
-        throw new Error(`Local project branch not found: ${args2.requestedBranch.trim()}`);
-      }
-      if (args2.useWorktree === true) {
-        throw new Error("The local project does not have a branch to use as a worktree base.");
+    const githubRepoFullName = selectWorkspaceRepoFullName(args2.gitState.githubRepoFullName, args2.workspaceRepositories);
+    const identity2 = githubRepoFullName ? {
+      githubRepoFullName
+    } : {};
+    if (!requestedBranch && args2.useWorktree !== true) {
+      return identity2;
+    }
+    if (args2.gitState.branches.length === 0) {
+      if (requestedBranch) {
+        throw new Error(`Local project branch not found: ${requestedBranch}`);
       }
-      return void 0;
+      throw new Error("The local project does not have a branch to use as a worktree base.");
     }
     const branch = resolveBaseBranchPreference({
-      preferredBranch: args2.requestedBranch,
-      baseBranch: response2.state.currentBranch,
-      fallbackBranch: response2.state.defaultBranch ?? response2.state.branches[0]
+      preferredBranch: requestedBranch,
+      baseBranch: args2.gitState.currentBranch,
+      fallbackBranch: args2.gitState.defaultBranch ?? args2.gitState.branches[0]
     });
-    const selected = selectLocalProjectBranchSelector(response2.state.branches, branch);
+    const selected = selectLocalProjectBranchSelector(args2.gitState.branches, branch);
     if (!selected) {
       throw new Error(`Local project branch not found: ${branch}`);
     }
-    return selected;
+    return {
+      branch: selected,
+      ...identity2
+    };
+  }
+  async function listWorkspaceGitHubRepositoriesBestEffort(args2) {
+    try {
+      return await listWorkspaceGitHubRepositoriesForCliToken({
+        token: args2.auth.token,
+        workspaceId: args2.workspaceId,
+        requesterUserId: resolveSessionCommandRequesterUserId(args2.auth, args2.requesterUserId),
+        enabledOnly: true
+      });
+    } catch (error2) {
+      getLogger("session").warn(`Workspace GitHub repositories unavailable; creating the local session without repository identity: ${formatErrorMessage(error2)}`);
+      return [];
+    }
+  }
+  async function resolveLocalProjectCreateGitContextOnMachine(args2) {
+    const response2 = await readLocalProjectGitStateOnMachine(args2);
+    if (!response2.success) {
+      if (normalizeCliValue(args2.requestedBranch) || args2.useWorktree === true) {
+        throw new Error(response2.message ?? response2.error);
+      }
+      return {};
+    }
+    const workspaceRepositories = response2.state.git && normalizeCliValue(response2.state.githubRepoFullName) ? await listWorkspaceGitHubRepositoriesBestEffort(args2) : [];
+    return resolveLocalProjectCreateGitContext({
+      gitState: response2.state,
+      workspaceRepositories,
+      ...args2.requestedBranch ? {
+        requestedBranch: args2.requestedBranch
+      } : {},
+      ...args2.useWorktree !== void 0 ? {
+        useWorktree: args2.useWorktree
+      } : {}
+    });
   }
   async function resolveLocalProjectRefOnMachineOrThrow(manager, workspaceId, auth, machineId, selector, requesterUserId, requestedBranch, useWorktree) {
     await syncMachineFlockDocsForRead(manager, workspaceId, [
@@ -154535,7 +155396,7 @@ ${entry.text}`).join("\n\n");
       throw new Error(`Local project selector is ambiguous on ${machineId}: ${normalizedSelector}. Use a project id instead.`);
     }
     const project = matches[0];
-    const branch = await resolveLocalProjectBranchOnMachine({
+    const { branch, githubRepoFullName } = await resolveLocalProjectCreateGitContextOnMachine({
       auth,
       workspaceId,
       machineId,
@@ -154551,6 +155412,9 @@ ${entry.text}`).join("\n\n");
       ...branch ? {
         branch
       } : {},
+      ...githubRepoFullName ? {
+        githubRepoFullName
+      } : {},
       ...useWorktree === true ? {
         useWorktree: true
       } : {}
@@ -156108,6 +156972,7 @@ ${entry.text}`).join("\n\n");
     resolveCreateAgentSelector,
     resolveCreateCurrentSessionId,
     resolveLocalProjectBranchForCreate,
+    resolveLocalProjectCreateGitContext,
     resolveLocalProjectRefOrThrow,
     resolveOpenedBySessionRelation,
     resolvePromptCandidate,
@@ -156253,11 +157118,11 @@ ${entry.text}`).join("\n\n");
       return null;
     }
     try {
-      const stat2 = await jt.stat(absolutePath);
+      const stat2 = await Yt.stat(absolutePath);
       if (!stat2.isFile() || stat2.size > (options?.maxBytes ?? defaultMaxTextFileBytes)) {
         return null;
       }
-      const content = await jt.readFile(absolutePath);
+      const content = await Yt.readFile(absolutePath);
       if (content.includes(0)) {
         return null;
       }
@@ -156676,11 +157541,14 @@ ${entry.text}`).join("\n\n");
       logger2.debug(`[${sessionId}] applyAcpSessionRunConfig skipped (agentClient not ready)`);
       return {
         rejectedSelections: [],
-        warningSelections: []
+        warningSelections: [],
+        runtimeConfigPatch: null
       };
     }
     const rejectedSelections = [];
     const warningSelections = [];
+    let confirmedLegacyModeId;
+    let confirmedLegacyModelId;
     const agentConfigOptions = agentClient.getConfigOptions?.() ?? [];
     const suppressKnownRunConfigWarnings = isCodexOrClaudeRunConfig(config2);
     const recordRejection = (selection, suppressWarning) => {
@@ -156696,6 +157564,7 @@ ${entry.text}`).join("\n\n");
     if (config2.modeId) {
       try {
         await agentClient.setSessionMode?.(acpSessionId, config2.modeId);
+        confirmedLegacyModeId = config2.modeId;
       } catch (error2) {
         recordRejection(`mode=${JSON.stringify(config2.modeId)}`, suppressKnownRunConfigWarnings && config2.modeId === ACP_PLAN_PERMISSION_MODE_ID);
         logger2.debug(`[${sessionId}] Failed to set ACP mode ${JSON.stringify(config2.modeId)}: ${String(error2)}`);
@@ -156704,6 +157573,7 @@ ${entry.text}`).join("\n\n");
     if (config2.modelId) {
       try {
         await agentClient.unstable_setSessionModel?.(acpSessionId, config2.modelId);
+        confirmedLegacyModelId = config2.modelId;
       } catch (error2) {
         recordRejection(`model=${JSON.stringify(config2.modelId)}`, suppressKnownRunConfigWarnings);
         logger2.debug(`[${sessionId}] Failed to set ACP model ${JSON.stringify(config2.modelId)}: ${String(error2)}`);
@@ -156714,6 +157584,7 @@ ${entry.text}`).join("\n\n");
         if (!config2.modeId && typeof value === "string") {
           try {
             await agentClient.setSessionMode?.(acpSessionId, value);
+            confirmedLegacyModeId = value;
           } catch (error2) {
             logger2.debug(`[${sessionId}] Failed to set ACP mode option ${configId}=${formatAcpConfigValueForLog(configId, value)}: ${String(error2)}`);
           }
@@ -156724,6 +157595,7 @@ ${entry.text}`).join("\n\n");
         if (!config2.modelId && typeof value === "string") {
           try {
             await agentClient.unstable_setSessionModel?.(acpSessionId, value);
+            confirmedLegacyModelId = value;
           } catch (error2) {
             logger2.debug(`[${sessionId}] Failed to set ACP model option ${configId}=${formatAcpConfigValueForLog(configId, value)}: ${String(error2)}`);
           }
@@ -156745,9 +157617,23 @@ ${entry.text}`).join("\n\n");
       }
     }
     logger2.debug(`[${sessionId}] applyAcpSessionRunConfig completed`);
+    const runtimeConfigPatch = getAcpRuntimeConfigPatchFromOptions(acpSessionId, agentClient.getConfigOptions());
+    if (confirmedLegacyModeId) {
+      runtimeConfigPatch.modeId = confirmedLegacyModeId;
+      if (!isSensitiveAcpConfigOptionId(modeConfigId) && agentConfigOptions.some((option2) => option2.id === modeConfigId)) {
+        runtimeConfigPatch.configOptionValues = {
+          ...runtimeConfigPatch.configOptionValues,
+          [modeConfigId]: confirmedLegacyModeId
+        };
+      }
+    }
+    if (confirmedLegacyModelId && !runtimeConfigPatch.modelId) {
+      runtimeConfigPatch.modelId = confirmedLegacyModelId;
+    }
     return {
       rejectedSelections,
-      warningSelections
+      warningSelections,
+      runtimeConfigPatch
     };
   }
   function trimmed(value) {
@@ -163691,6 +164577,27 @@ ${escapeHtmlScriptContent(VISUAL_ANNOTATION_INSPECTOR_BROWSER_SCRIPT)}
     if (value instanceof ArrayBuffer) return Buffer$1.from(new Uint8Array(value));
     return Buffer$1.from(value.buffer, value.byteOffset, value.byteLength);
   };
+  const WEBSOCKET_CLOSE_CODE_NO_STATUS = 1005;
+  const WEBSOCKET_CLOSE_CODE_ABNORMAL = 1006;
+  const isSendableWebSocketCloseCode = (code2) => code2 >= 1e3 && code2 <= 1014 && code2 !== 1004 && code2 !== WEBSOCKET_CLOSE_CODE_NO_STATUS && code2 !== WEBSOCKET_CLOSE_CODE_ABNORMAL || code2 >= 3e3 && code2 <= 4999;
+  const mirrorWebSocketClose = (peer, code2, reason) => {
+    if (peer.readyState === LocalWebSocket.CLOSING || peer.readyState === LocalWebSocket.CLOSED) {
+      return;
+    }
+    if (code2 === WEBSOCKET_CLOSE_CODE_ABNORMAL) {
+      peer.terminate();
+      return;
+    }
+    if (code2 === WEBSOCKET_CLOSE_CODE_NO_STATUS) {
+      peer.close();
+      return;
+    }
+    if (!isSendableWebSocketCloseCode(code2)) {
+      peer.close(1011, "Local preview WebSocket closed with an unsendable status code");
+      return;
+    }
+    peer.close(code2, reason.toString("utf8"));
+  };
   class LocalPreviewProxyManager {
     constructor(deps) {
       this.deps = deps;
@@ -163891,9 +164798,7 @@ ${escapeHtmlScriptContent(VISUAL_ANNOTATION_INSPECTOR_BROWSER_SCRIPT)}
         }
       });
       browserSocket.on("close", (code2, reason) => {
-        if (localSocket.readyState === LocalWebSocket.OPEN || localSocket.readyState === LocalWebSocket.CONNECTING) {
-          localSocket.close(code2, reason.toString("utf8"));
-        }
+        mirrorWebSocketClose(localSocket, code2, reason);
       });
       browserSocket.on("error", () => {
         localSocket.terminate();
@@ -163914,12 +164819,13 @@ ${escapeHtmlScriptContent(VISUAL_ANNOTATION_INSPECTOR_BROWSER_SCRIPT)}
         }
       });
       localSocket.on("close", (code2, reason) => {
-        if (browserSocket.readyState === LocalWebSocket.OPEN) {
-          browserSocket.close(code2, reason.toString("utf8"));
-        }
+        mirrorWebSocketClose(browserSocket, code2, reason);
       });
       localSocket.on("error", (error2) => {
         this.deps.logger.debug(`Local preview WebSocket failed: ${formatErrorMessage(error2)}`);
+        if (localOpen) {
+          return;
+        }
         if (browserSocket.readyState === LocalWebSocket.OPEN) {
           browserSocket.close(1011, "Local preview WebSocket failed");
         }
@@ -166873,7 +167779,7 @@ ${escapeHtmlScriptContent(VISUAL_ANNOTATION_INSPECTOR_BROWSER_SCRIPT)}
         hasPromptOutputForTurn: (sessionId, turnId) => this.hasPromptOutputForTurn(sessionId, turnId),
         observePromptOutputForTurn: (sessionId, turnId) => this.observePromptOutputForTurn(sessionId, turnId),
         buildAcpPromptBlocks: async (args2) => await this.buildAcpPromptBlocks(args2),
-        applyAcpModeAndModel: async (session2, acpConfig) => await this.applyAcpModeAndModel(session2, acpConfig),
+        applyAcpModeAndModel: async (session2, acpConfig, context2) => await this.applyAcpModeAndModel(session2, acpConfig, context2),
         createAssistantEntryForTurn: async (sessionId, sessionDoc, turnId, modelInfo, userTurnId) => await this.createAssistantEntryForTurn(sessionId, sessionDoc, turnId, modelInfo, userTurnId),
         turnFinalization: {
           finalizeACPState: async (sessionId, turnId) => await this.finalizeACPState(sessionId, turnId),
@@ -166995,7 +167901,7 @@ ${escapeHtmlScriptContent(VISUAL_ANNOTATION_INSPECTOR_BROWSER_SCRIPT)}
             onAcpBinaryProgress,
             signal
           }),
-          authenticateMachineAcp: async ({ requestId, action, authenticationRequestId, authorizationCode, configId, cliType, agentType, customAcp, runtimeOverrides, env: env2, onProgress }) => await this.authenticateMachineAcpAndResumeSetup({
+          authenticateMachineAcp: async ({ requestId, action, authenticationRequestId, authorizationCode, methodId, configId, cliType, agentType, customAcp, runtimeOverrides, env: env2, onProgress }) => await this.authenticateMachineAcpAndResumeSetup({
             type: "machine/acp-authenticate",
             machineId: this.machineId,
             workspaceId: this.workspaceId,
@@ -167003,6 +167909,7 @@ ${escapeHtmlScriptContent(VISUAL_ANNOTATION_INSPECTOR_BROWSER_SCRIPT)}
             action,
             authenticationRequestId,
             authorizationCode,
+            methodId,
             configId,
             cliType,
             agentType,
@@ -167851,12 +168758,22 @@ ${escapeHtmlScriptContent(VISUAL_ANNOTATION_INSPECTOR_BROWSER_SCRIPT)}
         ];
       });
     }
-    async applyAcpModeAndModel(session2, config2) {
-      const { warningSelections } = await applyAcpSessionRunConfig({
+    async applyAcpModeAndModel(session2, config2, context2) {
+      const { runtimeConfigPatch, warningSelections } = await applyAcpSessionRunConfig({
         session: session2,
         config: config2,
         logger: this.logger
       });
+      if (runtimeConfigPatch && context2.basedOnUserTurnId) {
+        const basedOnUserTurnId = context2.basedOnUserTurnId;
+        const persistRuntimeConfig = async () => {
+          await this.awaitTurnHistoryGate(session2.sessionId);
+          context2.sessionDoc.applyAcpRuntimeConfigPatch(basedOnUserTurnId, runtimeConfigPatch);
+        };
+        void persistRuntimeConfig().catch((error2) => {
+          this.logger.warn(`[${session2.sessionId}] Failed to persist ACP runtime config: ${formatErrorMessage(error2)}`);
+        });
+      }
       if (warningSelections.length > 0) {
         void this.recordAgentWarning(session2.sessionId, {
           message: `The agent rejected part of the requested run configuration (${warningSelections.join(", ")}) and is using its own values instead. Reasoning effort and fast mode depend on the selected model.`,
@@ -170010,6 +170927,12 @@ ${escapeHtmlScriptContent(VISUAL_ANNOTATION_INSPECTOR_BROWSER_SCRIPT)}
             persistedNotifications: 0
           };
           try {
+            const runtimeConfigPatch = mergeAcpRuntimeConfigUpdates(group.updates.map((update2) => update2.notification));
+            if (runtimeConfigPatch && group.target.userTurnId) {
+              sessionDoc.applyAcpRuntimeConfigPatch(group.target.userTurnId, runtimeConfigPatch);
+            } else if (runtimeConfigPatch) {
+              this.logger.debug(`[${sessionId}] Ignoring ACP runtime config update without a driving user turn`);
+            }
             await this.appendACPUpdatesToAssistantEntry({
               sessionId,
               sessionDoc,
@@ -173327,10 +174250,7 @@ ${escapeHtmlScriptContent(VISUAL_ANNOTATION_INSPECTOR_BROWSER_SCRIPT)}
       if (!meta) {
         return false;
       }
-      if (meta.processingUserMsgId) {
-        return true;
-      }
-      return Boolean(meta.latestUserMsgId && meta.latestUserMsgId !== meta.lastHandledUserMsgId);
+      return hasPendingUserTurnActivation(meta);
     }
     async hasActiveGoal(sessionId) {
       const sessionDoc = await this.workspaceDocument.getOrCreateSessionDoc(sessionId);
@@ -184389,11 +185309,16 @@ export PATH=${toSingleQuotedShellString(ghShimBinDir)}:"$PATH"
         this.logger.debug(`[agent-config] Machine Flock sync is not complete for workspace ${this.workspaceId} machine ${this.machineId}; skipping builtin agent registration for this attempt`);
         return false;
       }
+      const optedOut = await this.documentManager.getBuiltinAgentOptOuts(this.machineId);
       for (const cliType of cliTypes) {
         const builtinRuntime = getManagedBuiltinRuntimeByAgentType(cliType);
         if (!builtinRuntime) {
           continue;
         }
+        if (optedOut.has(cliType)) {
+          this.logger.debug(`[agent-config] Skipping builtin agent registration for ${cliType} on machine ${this.machineId}; the user removed it on this machine`);
+          continue;
+        }
         const has2 = await this.documentManager.hasAgentConfig("builtin", cliType, this.machineId);
         if (!has2) {
           await this.documentManager.createAgentConfig("builtin", cliType, this.machineId, builtinRuntime.displayName);
@@ -189625,12 +190550,12 @@ ${trimmed2}${closing}`;
   }
   const MAX_AUTHOR_REPLY_CHARS = 4e3;
   const entryText = (entry) => (entry?.items ?? []).map((item) => item.text ?? "").filter(Boolean).join("\n").trim();
-  const isSessionBusy = (facts) => {
-    const type2 = facts.status?.type;
+  const isSessionBusy = (meta) => {
+    const type2 = meta.status?.type;
     if (type2 === "running" || type2 === "initializing" || type2 === "requestPermission") {
       return true;
     }
-    return Boolean(facts.latestUserMsgId) && facts.latestUserMsgId !== facts.lastHandledUserMsgId;
+    return hasPendingUserTurnActivation(meta);
   };
   const createReviewAutomation = (options) => {
     const { documentManager, workspaceId, machineId, logger: logger2 } = options;
@@ -196232,7 +197157,7 @@ Shutting down gracefully${reason}...`);
   function requireLib$1() {
     if (hasRequiredLib$1) return lib$1;
     hasRequiredLib$1 = 1;
-    const Stream = Zr;
+    const Stream = So;
     class MuteStream2 extends Stream {
       #isTTY = null;
       constructor(opts = {}) {
@@ -205710,7 +206635,7 @@ ${page}${helpTipBottom}${choiceDescription}${error2}${ansiEscapes.cursorHide}`;
   function requireStreams() {
     if (hasRequiredStreams) return streams;
     hasRequiredStreams = 1;
-    var Buffer2 = require$$0$6.Buffer, Transform2 = Zr.Transform;
+    var Buffer2 = require$$0$6.Buffer, Transform2 = So.Transform;
     streams = function(iconv2) {
       iconv2.encodeStream = function encodeStream(encoding2, options) {
         return new IconvLiteEncoderStream(iconv2.getEncoder(encoding2, options), options);
@@ -205930,7 +206855,7 @@ ${page}${helpTipBottom}${choiceDescription}${error2}${ansiEscapes.cursorHide}`;
           return length2;
         };
         if (iconv2.supportsStreams) {
-          var Readable2 = Zr.Readable;
+          var Readable2 = So.Readable;
           original.ReadableSetEncoding = Readable2.prototype.setEncoding;
           Readable2.prototype.setEncoding = function setEncoding(enc, options) {
             this._readableState.decoder = iconv2.getDecoder(enc, options);
@@ -205951,7 +206876,7 @@ ${page}${helpTipBottom}${choiceDescription}${error2}${ansiEscapes.cursorHide}`;
         Buffer2.prototype.toString = original.BufferToString;
         Buffer2.prototype.write = original.BufferWrite;
         if (iconv2.supportsStreams) {
-          var Readable2 = Zr.Readable;
+          var Readable2 = So.Readable;
           Readable2.prototype.setEncoding = original.ReadableSetEncoding;
           delete Readable2.prototype.collect;
         }
@@ -220629,7 +221554,7 @@ ${page}${helpTipBottom}${choiceDescription}${ansiEscapes.cursorHide}`;
       data = createReviewBundleSnapshot(bundle);
     }
     const { injectReviewSnapshot } = await import("./chunks/index-VoI6Ds2-.js");
-    const { resolveReviewViewerTemplate } = await import("./chunks/review-viewer-GDxDN5px.js").then(async (m) => {
+    const { resolveReviewViewerTemplate } = await import("./chunks/review-viewer-Ce9GBF8u.js").then(async (m) => {
       await m.__tla;
       return m;
     });
@@ -239335,12 +240260,18 @@ ${result.stdout ?? ""}`;
     workdir: readOptionalEnv("LODY_MCP_WORKDIR", "LODY_PREVIEW_MCP_WORKDIR") ?? process.cwd(),
     taskToolsEnabled: readOptionalEnv("LODY_MCP_TASK_TOOLS_ENABLED") === "1"
   };
-  let sharedOperationStore;
+  const sharedOperationStores = /* @__PURE__ */ new Map();
+  const resolveOperationStorePathForContext = () => getLodyOperationStorePath(getSessionContext().machineId);
   const getSharedOperationStore = () => {
-    sharedOperationStore ??= new LodyOperationStore(void 0, void 0, {
-      maintenance: false
-    });
-    return sharedOperationStore;
+    const storePath = resolveOperationStorePathForContext();
+    let store = sharedOperationStores.get(storePath);
+    if (!store) {
+      store = new LodyOperationStore(storePath, void 0, {
+        maintenance: false
+      });
+      sharedOperationStores.set(storePath, store);
+    }
+    return store;
   };
   const withOperationStore = (fn) => runWithOperationStoreBusyRetry(() => fn(getSharedOperationStore()));
   const assertBatchSize = (length2, maximum) => {
@@ -239733,7 +240664,7 @@ ${prompt2}` : prompt2;
       sessionDoc.getDocState()
     ]);
     const activeTurnId = resolveActiveAssistantTurnId(history);
-    const queuedTurnCount = docState?.mq?.length ?? (hasPendingDispatchPointer(session2) && !activeTurnId ? 1 : 0);
+    const queuedTurnCount = docState?.mq?.length ?? (hasPendingUserTurnActivation(session2) && !activeTurnId ? 1 : 0);
     return resolveSessionExecutionSnapshot({
       live,
       ...activeTurnId ? {
@@ -239742,7 +240673,6 @@ ${prompt2}` : prompt2;
       queuedTurnCount
     });
   };
-  const hasPendingDispatchPointer = (session2) => Boolean(session2.processingUserMsgId || session2.latestUserMsgId && session2.latestUserMsgId !== session2.lastHandledUserMsgId);
   const resolveSessionLiveWorking = (session2, opts) => {
     const viewedField = opts.viewed ? {
       viewed: true
@@ -239769,7 +240699,7 @@ ${prompt2}` : prompt2;
         ...viewedField
       };
     }
-    if (hasPendingDispatchPointer(session2)) {
+    if (hasPendingUserTurnActivation(session2)) {
       const dispatchedAtMs = session2.lastMessageAt ?? Date.parse(session2.createdAt);
       if (Number.isFinite(dispatchedAtMs) && opts.nowMs - dispatchedAtMs < MCP_PRE_START_WINDOW_MS) {
         return {
@@ -240337,6 +241267,7 @@ ${prompt2}` : prompt2;
       });
       const localProjects = await readMachineLocalProjects(manager.repo, workspaceId, session2.machineId);
       const localProject = localProjects[project.localProjectId];
+      const githubRepo = resolveProjectGitHubRepo(project);
       return {
         kind: "local",
         projectId: project.localProjectId,
@@ -240346,6 +241277,9 @@ ${prompt2}` : prompt2;
         ...localProject?.rootPath ? {
           rootPath: localProject.rootPath
         } : {},
+        ...githubRepo ? {
+          githubRepo
+        } : {},
         ...project.useWorktree === true || session2.isWorktree === true ? {
           worktree: true
         } : {}