lody 0.101.1 → 0.103.0

package/dist/index.js

@@ -13,7 +13,7 @@ import crypto__default, { createHash as createHash$1, randomUUID as randomUUID$1
 import os__default, { homedir, userInfo, cpus } from "node:os";
 import * as path from "node:path";
 import path__default, { posix as posix$1, basename, win32, join as join$2, resolve, relative as relative$1, dirname as dirname$1, isAbsolute as isAbsolute$2, sep as sep$1, delimiter, normalize } from "node:path";
-import { _ as _coercedNumber, Z as ZodNumber, o as object, s as string$1, l as literal$1, b as boolean, a as _enum, n as number$4, d as discriminatedUnion, c as array$2, r as record$3, u as unknown, e as union$7, f as custom$1, g as ZodObject, h as ZodLiteral, j as json$1, p as preprocess, i as ZodError, k as safeParse, m as ZodOptional, q as ZodNullable, t as ZodPipe, v as ZodUnion, w as ZodArray, x as ZodNever, y as ZodDiscriminatedUnion, z as _instanceof, A as uuid, N as NEVER, B as _null, C as lazy, D as looseObject, E as intersection, F as optional$1, G as datetime, H as url, I as any, J as toJSONSchema, K as date, L as email, M as never$1, O as xor } from "./chunks/schemas-9JpFbIUJ.js";
+import { _ as _coercedNumber, Z as ZodNumber, o as object, s as string$1, l as literal$1, b as boolean, a as _enum, n as number$4, d as discriminatedUnion, c as array$2, r as record$3, u as unknown, e as union$7, f as custom$1, g as ZodObject, h as ZodLiteral, j as json$1, p as preprocess, i as ZodError, k as safeParse, m as ZodOptional, q as ZodNullable, t as ZodPipe, v as ZodUnion, w as ZodArray, x as ZodNever, y as ZodDiscriminatedUnion, z as _instanceof, A as uuid, N as NEVER, B as _null, C as looseObject, D as lazy, E as intersection, F as optional$1, G as datetime, H as url, I as any, J as toJSONSchema, K as date, L as email, M as xor, O as never$1 } from "./chunks/schemas-WuyisFi9.js";
 import require$$0$4, { EventEmitter as EventEmitter$1, once as once$1 } from "node:events";
 import require$$1$2, { execFile, spawn as spawn$1, execFileSync } from "node:child_process";
 import process$2 from "node:process";
@@ -37,7 +37,7 @@ import fs__default$2, { readFile, readdir, rm, mkdir as mkdir$1, mkdtemp, chmod,
 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 { c as createPlanModeConfigOption, L as LODY_PLAN_MODE_CONFIG_ID } from "./chunks/plan-mode-D0D5cnMs.js";
-import { D as DEEPSEEK_HARNESS_PERMISSION_MODES, a as DEEPSEEK_HARNESS_AGENT_PRESETS, A as ACP_EXTENSION_DSH_CAPABILITY_SOURCE_VERSION, c as createDeepSeekHarnessProfileFiles, b as DEEPSEEK_HARNESS_PROFILE_NAME, d as DEEPSEEK_HARNESS_PROFILE_FILENAMES, e as ACP_EXTENSION_DSH_QUERY_PATH_ENV, f as ACP_EXTENSION_DSH_SESSION_ROOT_ENV, g as createDeepSeekHarnessNpxSpecifiers, h as DEEPSEEK_HARNESS_DEFAULT_SESSION_COMPRESSION, i as DEEPSEEK_HARNESS_VERSION, j as DEEPSEEK_HARNESS_BASE_URL_ENV, R as RequestError$1, C as ClientSideConnection, P as PROTOCOL_VERSION, n as ndJsonStream, k as client$2, m as methods$1 } from "./chunks/acp-w0Ug9k0u.js";
+import { D as DEEPSEEK_HARNESS_PERMISSION_MODES, a as DEEPSEEK_HARNESS_AGENT_PRESETS, A as ACP_EXTENSION_DSH_CAPABILITY_SOURCE_VERSION, c as createDeepSeekHarnessProfileFiles, b as DEEPSEEK_HARNESS_PROFILE_NAME, d as DEEPSEEK_HARNESS_PROFILE_FILENAMES, e as ACP_EXTENSION_DSH_QUERY_PATH_ENV, f as ACP_EXTENSION_DSH_SESSION_ROOT_ENV, g as createDeepSeekHarnessNpxSpecifiers, h as DEEPSEEK_HARNESS_DEFAULT_SESSION_COMPRESSION, i as DEEPSEEK_HARNESS_VERSION, j as DEEPSEEK_HARNESS_BASE_URL_ENV, R as RequestError$1, C as ClientSideConnection, P as PROTOCOL_VERSION, n as ndJsonStream, k as client$2, m as methods$1 } from "./chunks/acp-BzvviK-N.js";
 import { i as isLodySubagentProgress, a as isLodySubagentSnapshot, b as isLodySubagentEvent, c as isLodySubagentOutput, L as LODY_EXTENSION_METHODS, M as MAX_USAGE_SCOPE_ID_LENGTH, n as normalizeLodyExtensionMethod, d as LODY_SUBAGENT_EVENT_METHOD } from "./chunks/subagent-events-BJ9JwZva.js";
 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 } from "./chunks/loro_wasm_bg-DIxpLA2J.js";
 import { performance as performance$1 } from "perf_hooks";
@@ -62,17 +62,18 @@ import require$$1$4, { Worker as Worker$1 } from "node:worker_threads";
 import require$$1$5, { fileURLToPath, pathToFileURL } from "node:url";
 import require$$1$6 from "node:console";
 import require$$1$7 from "node:dns";
-import { C as CodeCollabV2FileIndexRequestSchema, a as CodeCollabV2OpenTextRequestSchema, b as CodeCollabV2RefreshTextRequestSchema, c as CodeCollabV2SaveTextRequestSchema, d as CodeCollabV2OpenCurrentDiffRequestSchema, e as CodeCollabV2OpenAllChangesDiffRequestSchema, f as CodeCollabV2OpenTurnDiffRequestSchema, g as CodeCollabV2InitDirectoryRequestSchema, h as CodeCollabV2FileIndexSnapshotSchema, i as CodeCollabV2OpenTextOkSchema, j as CodeCollabV2RefreshTextResponseSchema, k as CodeCollabV2SaveTextResponseSchema, l as CodeCollabV2OpenCurrentDiffResponseSchema, m as CodeCollabV2OpenAllChangesDiffResponseSchema, n as CodeCollabV2OpenTurnDiffResponseSchema, o as CodeCollabV2InitDirectoryOkSchema, p as CodeCollabV2LspUnsupportedSchema, q as CodeCollabV2ErrorSchema, r as CodeCollabV2RpcContentEnvelopeSchema, s as deriveCodeCollabV2ContentKeyId, t as CodeCollabV2ErrorCodeSchema, u as CodeCollabV2RpcResponseSchema, v as deriveCodeCollabV2ContentKeyBytes, w as readCodeCollabFileIndexSignalFromFlock, x as writeCodeCollabFileIndexSignalToFlock, y as writeCodeCollabFileIndexToFlock, z as buildCodeCollabFileIndexState, A as CODE_COLLAB_V2_TEXT_LIMITS, B as CODE_COLLAB_V2_ALL_CHANGES_DIFF_LIMITS, D as computeAllChanges, E as codeCollabFileIndexStatesEqual, F as scanGitDirectoryEntries, G as closeDirectoryQuietly } from "./chunks/directory-handle-CjQk33eZ.js";
+import { C as CodeCollabV2FileIndexRequestSchema, a as CodeCollabV2OpenTextRequestSchema, b as CodeCollabV2RefreshTextRequestSchema, c as CodeCollabV2SaveTextRequestSchema, d as CodeCollabV2OpenCurrentDiffRequestSchema, e as CodeCollabV2OpenAllChangesDiffRequestSchema, f as CodeCollabV2OpenTurnDiffRequestSchema, g as CodeCollabV2InitDirectoryRequestSchema, h as CodeCollabV2FileIndexSnapshotSchema, i as CodeCollabV2OpenTextOkSchema, j as CodeCollabV2RefreshTextResponseSchema, k as CodeCollabV2SaveTextResponseSchema, l as CodeCollabV2OpenCurrentDiffResponseSchema, m as CodeCollabV2OpenAllChangesDiffResponseSchema, n as CodeCollabV2OpenTurnDiffResponseSchema, o as CodeCollabV2InitDirectoryOkSchema, p as CodeCollabV2LspUnsupportedSchema, q as CodeCollabV2ErrorSchema, r as CodeCollabV2RpcContentEnvelopeSchema, s as deriveCodeCollabV2ContentKeyId, t as CodeCollabV2ErrorCodeSchema, u as CodeCollabV2RpcResponseSchema, v as deriveCodeCollabV2ContentKeyBytes, w as readCodeCollabFileIndexSignalFromFlock, x as writeCodeCollabFileIndexSignalToFlock, y as writeCodeCollabFileIndexToFlock, z as buildCodeCollabFileIndexState, A as CODE_COLLAB_V2_TEXT_LIMITS, B as CODE_COLLAB_V2_ALL_CHANGES_DIFF_LIMITS, D as computeAllChanges, E as codeCollabFileIndexStatesEqual, F as scanGitDirectoryEntries, G as closeDirectoryQuietly } from "./chunks/directory-handle-CtdCjbNh.js";
 import { finished, pipeline } from "node:stream/promises";
 import { StringDecoder } from "node:string_decoder";
 import { p as packageJson } from "./chunks/package-BoOO46ct.js";
+import { L as LODY_TOOL_NAMES } from "./chunks/session-DyqwlJbY.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-DDGc5P-T.js";
 import { r as runDiffWorkerTask } from "./chunks/diff-worker-task-MZsLArT5.js";
 import { C as CODE_COLLAB_IGNORED_DIRECTORY_NAMES, p as parseWorkspaceWatchChildMessage } from "./chunks/workspace-watch-protocol-POg9Lpeq.js";
 import { Resolver } from "node:dns/promises";
-import { C as CloudflaredError } from "./chunks/cloudflared-native-BPe7OSUZ.js";
+import { C as CloudflaredError } from "./chunks/cloudflared-native-DbUToPHH.js";
 import { setTimeout as setTimeout$1 } from "node:timers/promises";
 import { createRequire as createRequire$1 } from "node:module";
 import v8 from "node:v8";
@@ -4316,7 +4317,7 @@ function resolvePlatformKind(raw2) {
 }
 const name$3 = "lody";
 const name$2 = "@lody/cli-cloud";
-const version$d = "0.101.1";
+const version$d = "0.103.0";
 const type = "module";
 const scripts = { "dev": "node dev.mjs", "dev:staging": "LODY_ENV=staging NODE_ENV=production node dev.mjs", "build": "node build.mjs", "prepare:publish": "node prepare-publish.js", "test": "node --test pnpm-runner.test.mjs vite-config.test.mjs" };
 const devDependencies = { "dotenv": "^16.6.1", "vite": "^7.0.0", "vite-plugin-wasm": "catalog:" };
@@ -4511,7 +4512,7 @@ async function getOrCreateStableMachineIdAsync() {
   if (machineId) return machineId;
   return createMachineId(crypto__default.randomUUID());
 }
-function isRecord$g(value) {
+function isRecord$h(value) {
   return typeof value === "object" && value !== null;
 }
 const LODY_CLAUDE_TASK_LIFECYCLE_RAW_INPUT_KEY = "lodyClaudeTaskLifecycle";
@@ -4571,7 +4572,7 @@ const LodyTaskMetaSchema = object({
   skipTranscript: boolean().optional()
 });
 const parseLodyTaskMeta = (meta) => {
-  if (!isRecord$g(meta) || !isRecord$g(meta.lody)) return null;
+  if (!isRecord$h(meta) || !isRecord$h(meta.lody)) return null;
   const parsed = LodyTaskMetaSchema.safeParse(meta.lody.task);
   if (!parsed.success) return null;
   const task = parsed.data;
@@ -4595,9 +4596,9 @@ const parseLodyTaskMeta = (meta) => {
   };
 };
 const parseSubagentTaskWire = (rawInput) => {
-  if (!isRecord$g(rawInput)) return null;
+  if (!isRecord$h(rawInput)) return null;
   const carrier = rawInput[LODY_SUBAGENT_TASK_LIFECYCLE_RAW_INPUT_KEY] ?? rawInput[LODY_CLAUDE_TASK_LIFECYCLE_RAW_INPUT_KEY];
-  if (!isRecord$g(carrier)) return null;
+  if (!isRecord$h(carrier)) return null;
   const parsed = SubagentTaskPayloadSchema.safeParse(carrier);
   return parsed.success ? parsed.data : null;
 };
@@ -4611,9 +4612,6 @@ const mergeSubagentTaskPayload = (prev, incoming) => {
   }
   return merged;
 };
-const LODY_TOOL_NAMES = {
-  imageGeneration: "ImageGeneration"
-};
 const MANAGED_BUILTIN_RUNTIMES = [
   { runtimeName: "kimi-code", agentType: "kimi", displayName: "Kimi Code" },
   { runtimeName: "grok-build", agentType: "grok", displayName: "Grok" },
@@ -5288,7 +5286,7 @@ const MESSAGE_TEXT_SPAN_KINDS = [
 ];
 const MAX_MESSAGE_TEXT_SPAN_MARK_LENGTH = 16;
 const SPAN_KINDS = new Set(MESSAGE_TEXT_SPAN_KINDS);
-const isRecord$f = (value) => typeof value === "object" && value !== null && !Array.isArray(value);
+const isRecord$g = (value) => typeof value === "object" && value !== null && !Array.isArray(value);
 const isTextOffset = (value) => typeof value === "number" && Number.isInteger(value) && value >= 0;
 const isOffset = isTextOffset;
 const dropOverlappingRanges = (ranges) => {
@@ -5306,7 +5304,7 @@ const sanitizeMessageTextSpans = (text, spans) => {
   if (!Array.isArray(spans) || spans.length === 0) return void 0;
   const candidates = [];
   for (const span2 of spans) {
-    if (!isRecord$f(span2)) continue;
+    if (!isRecord$g(span2)) continue;
     const { start: start2, end: end2, kind: kind2, label: label2, target, mark: mark2 } = span2;
     if (!isOffset(start2) || !isOffset(end2)) continue;
     if (end2 <= start2 || end2 > text.length) continue;
@@ -5331,7 +5329,7 @@ const reanchorMessageTextSpansForTrim = (originalText, trimmedText, spans) => {
   const leading = originalText.length - originalText.trimStart().length;
   if (leading === 0) return sanitizeMessageTextSpans(trimmedText, spans);
   const shifted = spans.map(
-    (span2) => isRecord$f(span2) && isOffset(span2.start) && isOffset(span2.end) ? { ...span2, start: span2.start - leading, end: span2.end - leading } : span2
+    (span2) => isRecord$g(span2) && isOffset(span2.start) && isOffset(span2.end) ? { ...span2, start: span2.start - leading, end: span2.end - leading } : span2
   );
   return sanitizeMessageTextSpans(trimmedText, shifted);
 };
@@ -5516,12 +5514,12 @@ function resolveBaseBranchPreference(options) {
 const isMcpTransport = (value) => value === "stdio" || value === "http";
 const ENV_VAR_NAME_PATTERN = /^[A-Za-z_][A-Za-z0-9_]*$/;
 const ENV_VAR_PATTERN = /\$\{([A-Za-z_][A-Za-z0-9_]*)\}/g;
-const isRecord$e = (value) => typeof value === "object" && value !== null && !Array.isArray(value);
-const isStringRecord$2 = (value) => isRecord$e(value) && Object.values(value).every((entry) => typeof entry === "string");
+const isRecord$f = (value) => typeof value === "object" && value !== null && !Array.isArray(value);
+const isStringRecord$2 = (value) => isRecord$f(value) && Object.values(value).every((entry) => typeof entry === "string");
 const isStringArray = (value) => Array.isArray(value) && value.every((entry) => typeof entry === "string");
 const isOptionalString = (value) => value === void 0 || typeof value === "string";
 const isMcpConnectionSpec = (value) => {
-  if (!isRecord$e(value) || !isMcpTransport(value.transport)) {
+  if (!isRecord$f(value) || !isMcpTransport(value.transport)) {
     return false;
   }
   if (value.transport === "stdio") {
@@ -5530,7 +5528,7 @@ const isMcpConnectionSpec = (value) => {
   return typeof value.url === "string" && isOptionalString(value.bearerToken) && (value.headers === void 0 || isStringRecord$2(value.headers));
 };
 const isWorkspaceMcpServerMeta = (value) => {
-  if (!isRecord$e(value) || typeof value.id !== "string" || value.id.trim().length === 0 || typeof value.name !== "string" || value.name.trim().length === 0 || !isMcpTransport(value.transport) || typeof value.createdAt !== "number" || !Number.isFinite(value.createdAt) || typeof value.updatedAt !== "number" || !Number.isFinite(value.updatedAt) || value.description !== void 0 && typeof value.description !== "string" || value.enabledByDefault !== void 0 && typeof value.enabledByDefault !== "boolean" || value.createdBy !== void 0 && typeof value.createdBy !== "string") {
+  if (!isRecord$f(value) || typeof value.id !== "string" || value.id.trim().length === 0 || typeof value.name !== "string" || value.name.trim().length === 0 || !isMcpTransport(value.transport) || typeof value.createdAt !== "number" || !Number.isFinite(value.createdAt) || typeof value.updatedAt !== "number" || !Number.isFinite(value.updatedAt) || value.description !== void 0 && typeof value.description !== "string" || value.enabledByDefault !== void 0 && typeof value.enabledByDefault !== "boolean" || value.createdBy !== void 0 && typeof value.createdBy !== "string") {
     return false;
   }
   return value.connection === void 0 || isMcpConnectionSpec(value.connection) && value.connection.transport === value.transport;
@@ -8338,7 +8336,7 @@ const MessageContentSchema = union$7([NonSystemNoticeMessageContentSchema, Syste
 });
 const LEGACY_DEFAULT_BRANCH = "main";
 const LEGACY_BUILTIN_CLI_TYPES = /* @__PURE__ */ new Set(["claude", "codex"]);
-function isRecord$d(value) {
+function isRecord$e(value) {
   return typeof value === "object" && value !== null;
 }
 function getTrimmedString(value) {
@@ -8355,7 +8353,7 @@ function isAgentConfigCliTypeString(value) {
   return value === "builtin" || value === "registry" || value === "custom";
 }
 function normalizeLegacyProjectRef(value) {
-  if (!isRecord$d(value)) {
+  if (!isRecord$e(value)) {
     return value;
   }
   const kind2 = value.kind;
@@ -8369,13 +8367,13 @@ function normalizeLegacyProjectRef(value) {
     normalized.branch = existingBranch;
   } else {
     const legacyBranchFromString = getTrimmedString(legacyProject);
-    const legacyBranchFromObject = isRecord$d(legacyProject) ? getTrimmedString(legacyProject.branch) ?? getTrimmedString(legacyProject.project) : void 0;
+    const legacyBranchFromObject = isRecord$e(legacyProject) ? getTrimmedString(legacyProject.branch) ?? getTrimmedString(legacyProject.project) : void 0;
     const resolvedBranch = legacyBranchFromString ?? legacyBranchFromObject;
     if (resolvedBranch) {
       normalized.branch = resolvedBranch;
     }
   }
-  if (isRecord$d(legacyProject)) {
+  if (isRecord$e(legacyProject)) {
     if (kind2 === "github" && !getTrimmedString(normalized.repoFullName)) {
       const repoFullName = getTrimmedString(legacyProject.repoFullName);
       if (repoFullName) {
@@ -8410,7 +8408,7 @@ function normalizeLegacySessionProject(message) {
   const normalized = { ...message };
   normalized.project = normalizeLegacyProjectRef(normalized.project);
   const currentProject = normalized.project;
-  const projectRecord = isRecord$d(currentProject) ? currentProject : void 0;
+  const projectRecord = isRecord$e(currentProject) ? currentProject : void 0;
   const explicitBranch = getTrimmedString(normalized.branch) ?? getTrimmedString(currentProject) ?? (projectRecord ? getTrimmedString(projectRecord.branch) ?? getTrimmedString(projectRecord.project) : void 0);
   const repoFullName = (projectRecord ? getTrimmedString(projectRecord.repoFullName) : void 0) ?? getTrimmedString(normalized.repoFullName) ?? getTrimmedString(normalized.githubRepo);
   const localProjectId = (projectRecord ? getTrimmedString(projectRecord.localProjectId) : void 0) ?? getTrimmedString(normalized.localProjectId);
@@ -8444,7 +8442,7 @@ function normalizeLegacySessionProject(message) {
   return normalized;
 }
 function normalizeLegacyAcpSessionConfig(value) {
-  if (!isRecord$d(value)) {
+  if (!isRecord$e(value)) {
     return value;
   }
   const normalized = { ...value };
@@ -8477,13 +8475,13 @@ function normalizeLegacyAcpSessionConfig(value) {
   return normalized;
 }
 function normalizeLegacySessionMessage(parsed) {
-  if (!isRecord$d(parsed)) {
+  if (!isRecord$e(parsed)) {
     return parsed;
   }
   const messageType = parsed.type;
   if (messageType === "session/create" || messageType === "session/chat") {
     const normalized = normalizeLegacySessionProject(parsed);
-    if (!isRecord$d(normalized)) {
+    if (!isRecord$e(normalized)) {
       return normalized;
     }
     normalized.acpSessionConfig = normalizeLegacyAcpSessionConfig(normalized.acpSessionConfig);
@@ -13896,8 +13894,8 @@ const parseRateLimitEntryKey = (key2) => {
   };
 };
 const historyItemAnySchema = schema.Any({ defaultLoroText: false });
-const isRecord$c = (value) => typeof value === "object" && value !== null && !Array.isArray(value);
-const isWorktreeScriptHistoryStep = (value) => isRecord$c(value) && typeof value.command === "string" && (value.status === "in_progress" || value.status === "completed" || value.status === "failed") && typeof value.output === "string";
+const isRecord$d = (value) => typeof value === "object" && value !== null && !Array.isArray(value);
+const isWorktreeScriptHistoryStep = (value) => isRecord$d(value) && typeof value.command === "string" && (value.status === "in_progress" || value.status === "completed" || value.status === "failed") && typeof value.output === "string";
 const historyNestedPayloadSchema = schema.Any({ defaultLoroText: false });
 const historyToolContentSchema = schema.LoroMap({
   type: schema.String({ required: false }),
@@ -13992,7 +13990,7 @@ const historyMessageItemSchema = schema.LoroMap(
           return typeof v2.name === "string" ? true : "Missing name";
         case "operation_progress":
           return typeof v2.operationId === "string" && (v2.operationKind === "session_create" || v2.operationKind === "session_create_many") && Array.isArray(v2.items) && v2.items.every(
-            (item) => isRecord$c(item) && isRecord$c(item.target) && typeof item.target.sessionId === "string" && typeof item.target.userTurnId === "string" && (item.label === void 0 || typeof item.label === "string") && typeof item.status === "string" && ["created", "running", "succeeded", "failed", "cancelled"].includes(item.status)
+            (item) => isRecord$d(item) && isRecord$d(item.target) && typeof item.target.sessionId === "string" && typeof item.target.userTurnId === "string" && (item.label === void 0 || typeof item.label === "string") && typeof item.status === "string" && ["created", "running", "succeeded", "failed", "cancelled"].includes(item.status)
           ) ? true : "Missing operation progress metadata";
         case "operation_completion":
           return typeof v2.deliveryId === "string" && typeof v2.operationId === "string" && typeof v2.operationKind === "string" && typeof v2.completion === "object" && v2.completion !== null ? true : "Missing operation completion metadata";
@@ -14442,7 +14440,7 @@ function assertHistoryJson(value, path2 = [], ancestors = /* @__PURE__ */ new Se
   ancestors.delete(value);
 }
 const CID_KEY$1 = "$cid";
-const isRecord$b = (value) => typeof value === "object" && value !== null && !Array.isArray(value) && !(value instanceof Date) && !(value instanceof RegExp) && typeof value !== "function";
+const isRecord$c = (value) => typeof value === "object" && value !== null && !Array.isArray(value) && !(value instanceof Date) && !(value instanceof RegExp) && typeof value !== "function";
 const isMapSchema = (schema2) => schema2?.type === "loro-map";
 const isListSchema = (schema2) => schema2?.type === "loro-list" || schema2?.type === "loro-movable-list";
 const isAnySchema = (schema2) => schema2?.type === "any";
@@ -14471,7 +14469,7 @@ function applySchemaToInfer(schema2, base) {
   return next2;
 }
 function inferContainerType(value, infer) {
-  if (isRecord$b(value)) return "Map";
+  if (isRecord$c(value)) return "Map";
   if (Array.isArray(value)) return infer?.defaultMovableList ? "MovableList" : "List";
   if (typeof value === "string") return infer?.defaultLoroText ? "Text" : void 0;
   return void 0;
@@ -14479,7 +14477,7 @@ function inferContainerType(value, infer) {
 function matchesContainerType(type2, value) {
   switch (type2) {
     case "Map":
-      return isRecord$b(value);
+      return isRecord$c(value);
     case "List":
     case "MovableList":
     case "Tree":
@@ -14538,7 +14536,7 @@ function insertContainerIntoList(list2, schema2, index, value, infer) {
 function populateContainer(container2, schema2, value, infer) {
   const kind2 = container2.kind();
   if (kind2 === "Map") {
-    if (!isRecord$b(value)) return;
+    if (!isRecord$c(value)) return;
     populateMap(container2, isMapSchema(schema2) ? schema2 : void 0, value, infer);
   } else if (kind2 === "List" || kind2 === "MovableList") {
     if (!Array.isArray(value)) return;
@@ -14655,7 +14653,7 @@ function diffHistoryContainer(container2, schema2, oldValue, newValue, infer) {
   const effective = applySchemaToInfer(schema2, infer);
   const kind2 = container2.kind();
   if (kind2 === "Map") {
-    if (!isRecord$b(oldValue) || !isRecord$b(newValue)) {
+    if (!isRecord$c(oldValue) || !isRecord$c(newValue)) {
       throw new Error("Failed to diff container(map). Old and new state must be objects");
     }
     diffMap(
@@ -16586,6 +16584,80 @@ function collectScheduleIds(roomIds, rows) {
   }
   return [...ids2].sort();
 }
+const isRecord$b = (value) => typeof value === "object" && value !== null && !Array.isArray(value);
+const parseModelControls = (value) => {
+  if (!isRecord$b(value)) return void 0;
+  const controls = {};
+  if (value.effortValues !== void 0) {
+    if (!Array.isArray(value.effortValues) || !value.effortValues.every((effort) => typeof effort === "string")) {
+      return void 0;
+    }
+    controls.effortValues = [...value.effortValues];
+  }
+  if (value.fastMode !== void 0) {
+    if (typeof value.fastMode !== "boolean") return void 0;
+    controls.fastMode = value.fastMode;
+  }
+  return controls;
+};
+const parseModels = (value) => {
+  if (!isRecord$b(value)) return void 0;
+  const models = {};
+  for (const [modelId, controls] of Object.entries(value)) {
+    const parsed = parseModelControls(controls);
+    if (!parsed) return void 0;
+    models[modelId] = parsed;
+  }
+  return Object.keys(models).length > 0 ? models : void 0;
+};
+const readAcpModelCapabilitiesMeta = (sessionResponse) => {
+  if (!isRecord$b(sessionResponse) || !isRecord$b(sessionResponse._meta)) return void 0;
+  const lody = sessionResponse._meta.lody;
+  if (!isRecord$b(lody) || !isRecord$b(lody.modelCapabilities)) return void 0;
+  const declaration = lody.modelCapabilities;
+  return declaration.version === 1 ? parseModels(declaration.models) : void 0;
+};
+const isAcpModelCapabilities = (value) => isRecord$b(value) && value.version === 1 && typeof value.sourceVersion === "string" && parseModels(value.models) !== void 0;
+const getDeclaredModelControls = (entry, modelId) => modelId ? entry?.declaredModelControls?.[modelId] : void 0;
+const BUILTIN_MODEL_CONTROL_BINDINGS = {
+  claude: {
+    effortConfigId: "effort",
+    effortLabel: "Effort",
+    providerDefaultEffort: "default",
+    omittedEffortMeansUnsupported: true,
+    fastConfigId: "fast"
+  },
+  codex: {
+    effortConfigId: "reasoning_effort",
+    effortLabel: "Reasoning effort",
+    omittedEffortMeansUnsupported: false,
+    fastConfigId: "fast-mode"
+  }
+};
+const getBuiltinModelControlBinding = (agent2) => agent2?.cliType === "builtin" && agent2.agentType ? BUILTIN_MODEL_CONTROL_BINDINGS[agent2.agentType.toLowerCase()] : void 0;
+const defaultEffortValue = (values) => values.includes("medium") ? "medium" : values[0] ?? "";
+const resolveDeclaredEffortSupport = (entry, modelId) => {
+  const controls = getDeclaredModelControls(entry, modelId);
+  if (!controls) return { state: "unknown" };
+  const binding = getBuiltinModelControlBinding(entry);
+  const levels2 = controls.effortValues;
+  if (levels2 === void 0) {
+    return binding?.omittedEffortMeansUnsupported ? { state: "unsupported" } : { state: "unknown" };
+  }
+  if (levels2.length === 0) return { state: "unsupported" };
+  const providerDefault = binding?.providerDefaultEffort;
+  return {
+    state: "supported",
+    values: providerDefault ? [providerDefault, ...levels2] : [...levels2],
+    fallbackValue: providerDefault ?? defaultEffortValue(levels2)
+  };
+};
+const getModelEffortChoices = (entry, modelId) => {
+  const declared = resolveDeclaredEffortSupport(entry, modelId);
+  if (declared.state === "supported") return declared.values;
+  if (declared.state === "unsupported") return [];
+  return modelId ? entry?.modelReasoningEfforts?.[modelId] : void 0;
+};
 const ACP_FAST_MODE_CONFIG_IDS = ["fast-mode", "fast"];
 const ACP_COLLABORATION_MODE_CONFIG_ID = "collaboration_mode";
 const ACP_COLLABORATION_MODE_DEFAULT_VALUE = "default";
@@ -16671,11 +16743,10 @@ const listModels = (capability) => {
   return (capability?.models ?? []).map((model) => ({ id: model.modelId, name: model.name }));
 };
 const summarizeAgentRunConfigCapabilities = (capability) => {
-  const perModelEfforts = capability?.modelReasoningEfforts;
   const measuredForModelId = findCurrentModelId(capability);
   return {
     models: listModels(capability).map((model) => {
-      const efforts = perModelEfforts?.[model.id];
+      const efforts = getModelEffortChoices(capability, model.id);
       return { ...model, ...efforts ? { reasoningEffortValues: efforts } : {} };
     }),
     reasoningEffortValues: (findReasoningEffortOption(capability)?.options ?? []).map(
@@ -16704,11 +16775,14 @@ const resolveAgentRunConfigSelection = (selection, capability) => {
   let modeId;
   if (selection.reasoningEffort !== void 0) {
     const option2 = findReasoningEffortOption(capability);
-    const targetModelEfforts = targetModelId ? capability.modelReasoningEfforts?.[targetModelId] : void 0;
+    const targetModelEfforts = getModelEffortChoices(capability, targetModelId);
     if (!option2 && !targetModelEfforts) {
       throw new Error("The selected agent does not offer a reasoning effort option.");
     }
-    const configId = option2?.id ?? ACP_REASONING_EFFORT_CONFIG_ID;
+    if (targetModelEfforts?.length === 0) {
+      throw new Error(`Model ${targetModelId} does not offer a reasoning effort option.`);
+    }
+    const configId = option2?.id ?? getBuiltinModelControlBinding(capability)?.effortConfigId ?? ACP_REASONING_EFFORT_CONFIG_ID;
     if (targetModelEfforts) {
       if (!targetModelEfforts.includes(selection.reasoningEffort)) {
         throw new Error(
@@ -16724,11 +16798,20 @@ const resolveAgentRunConfigSelection = (selection, capability) => {
   }
   if (selection.fastMode !== void 0) {
     const option2 = findFastModeOption(capability);
-    if (!option2) {
+    const declaredFast = getDeclaredModelControls(capability, targetModelId)?.fastMode;
+    const builtinFastId = getBuiltinModelControlBinding(capability)?.fastConfigId;
+    if (declaredFast === false) {
+      if (selection.fastMode) throw new Error(`Model ${targetModelId} does not offer fast mode.`);
+    } else if (option2) {
+      configOptionValues[option2.id] = toggleValue(option2, selection.fastMode);
+      if (declaredFast) validatedConfigIds.push(option2.id);
+    } else if (declaredFast && builtinFastId) {
+      configOptionValues[builtinFastId] = selection.fastMode;
+      validatedConfigIds.push(builtinFastId);
+    } else {
       throw new Error("The selected agent does not offer a fast mode option.");
     }
-    configOptionValues[option2.id] = toggleValue(option2, selection.fastMode);
-    if (switchesModel) {
+    if (switchesModel && declaredFast === void 0) {
       unverifiedSelections.push(`fastMode=${selection.fastMode}`);
     }
   }
@@ -19076,7 +19159,7 @@ const DevinSubagentContextSchema = object({
   parentAgentId: string$1().min(1)
 });
 const parseDevinSubagentTaskMeta = (meta) => {
-  if (!isRecord$g(meta)) return null;
+  if (!isRecord$h(meta)) return null;
   const completed = DevinSubagentCompletedSchema.safeParse(meta[DEVIN_SUBAGENT_COMPLETED_META_KEY]);
   if (completed.success) {
     const c = completed.data;
@@ -19108,12 +19191,12 @@ const parseDevinSubagentTaskMeta = (meta) => {
   return null;
 };
 const getDevinSubagentContextId = (meta) => {
-  if (!isRecord$g(meta)) return null;
+  if (!isRecord$h(meta)) return null;
   const parsed = DevinSubagentContextSchema.safeParse(meta[DEVIN_SUBAGENT_CONTEXT_META_KEY]);
   if (!parsed.success || parsed.data.parentAgentId === "root") return null;
   return parsed.data.parentAgentId;
 };
-const hasOtherDevinSubagentMeta = (meta) => isRecord$g(meta) && Object.keys(meta).some(
+const hasOtherDevinSubagentMeta = (meta) => isRecord$h(meta) && Object.keys(meta).some(
   (key2) => key2.startsWith("cognition.ai/subagent") && key2 !== DEVIN_SUBAGENT_CONTEXT_META_KEY
 );
 const zMeta = record$3(string$1(), unknown()).nullish();
@@ -25999,6 +26082,10 @@ const machineFlockKeys = {
     "acpCapability",
     configId
   ],
+  acpModelCapability: (configId) => [
+    "acpModelCapability",
+    configId
+  ],
   rateLimit: (cliType, limitId) => [
     "rateLimit",
     cliType,
@@ -26082,6 +26169,14 @@ const parseMachineFlockKey = (key2) => {
       agentConfigId
     };
   }
+  if (key2.length === 2 && key2[0] === "acpModelCapability" && isNonEmptyString$2(key2[1])) {
+    const configId = key2[1];
+    return {
+      kind: "acpModelCapability",
+      key: machineFlockKeys.acpModelCapability(configId),
+      configId
+    };
+  }
   if (key2.length === 2 && key2[0] === "acpCapability" && isNonEmptyString$2(key2[1])) {
     const configId = key2[1];
     return {
@@ -26127,6 +26222,7 @@ const MACHINE_FLOCK_ROW_FAMILY_PREFIXES = {
   providerSetupCancellation: ["providerSetupCancellation"],
   agentConfigIndex: ["agentConfigIndex"],
   acpCapability: ["acpCapability"],
+  acpModelCapability: ["acpModelCapability"],
   rateLimit: ["rateLimit"],
   builtinAgentOptOut: ["builtinAgentOptOut"],
   sessionLaunchConfig: ["sessionLaunchConfig"]
@@ -26163,6 +26259,7 @@ function readMachineFlockRowsFromFlock(flock, options) {
 const isMachineFlockLocalProjectRow = (row) => row.key[0] === "localProject";
 const isMachineFlockDeleteLocalProjectCommandRow = (row) => row.key[0] === "cmd" && row.key[1] === "deleteLocalProject";
 const isMachineFlockAcpCapabilityRow = (row) => row.key[0] === "acpCapability";
+const isMachineFlockAcpModelCapabilityRow = (row) => row.key[0] === "acpModelCapability";
 const isMachineFlockAgentConfigRow = (row) => row.key[0] === "agentConfig";
 const isMachineFlockProviderSetupRow = (row) => row.key[0] === "providerSetup";
 const isMachineFlockProviderSetupCancellationRow = (row) => row.key[0] === "providerSetupCancellation";
@@ -26190,13 +26287,35 @@ function getMachineFlockDeleteLocalProjectEntries(rows) {
   }
   return entries;
 }
+const ACP_CAPABILITY_ROW_FAMILIES = ["acpCapability", "acpModelCapability"];
+const mergedAcpCapabilityEntries = /* @__PURE__ */ new WeakMap();
+const withDeclaredModelControls = (entry, declaration) => {
+  let byDeclaration = mergedAcpCapabilityEntries.get(entry);
+  if (!byDeclaration) {
+    byDeclaration = /* @__PURE__ */ new WeakMap();
+    mergedAcpCapabilityEntries.set(entry, byDeclaration);
+  }
+  let merged = byDeclaration.get(declaration);
+  if (!merged) {
+    merged = { ...entry, declaredModelControls: declaration.models };
+    byDeclaration.set(declaration, merged);
+  }
+  return merged;
+};
 function getMachineFlockAcpCapabilities(rows) {
   const capabilities = {};
   for (const row of Object.values(rows)) {
-    if (!isMachineFlockAcpCapabilityRow(row)) {
-      continue;
+    if (isMachineFlockAcpCapabilityRow(row)) {
+      capabilities[getAcpCapabilityCacheKey(row.key[1])] = row.value;
+    }
+  }
+  for (const row of Object.values(rows)) {
+    if (!isMachineFlockAcpModelCapabilityRow(row)) continue;
+    const key2 = getAcpCapabilityCacheKey(row.key[1]);
+    const entry = capabilities[key2];
+    if (entry && entry.sourceVersion === row.value.sourceVersion) {
+      capabilities[key2] = withDeclaredModelControls(entry, row.value);
     }
-    capabilities[getAcpCapabilityCacheKey(row.key[1])] = row.value;
   }
   return capabilities;
 }
@@ -26473,6 +26592,8 @@ function parseMachineFlockRow(key2, value) {
     }
     case "acpCapability":
       return isAcpCapabilityCacheEntry(value) ? { key: parsedKey.key, value } : void 0;
+    case "acpModelCapability":
+      return isAcpModelCapabilities(value) ? { key: parsedKey.key, value } : void 0;
     case "rateLimit":
       return isRecord$8(value) ? { key: parsedKey.key, value } : void 0;
     case "builtinAgentOptOut": {
@@ -27051,7 +27172,23 @@ const SessionActiveInvocationContextResultSchema = discriminatedUnion("active",
     inputConfig: record$3(string$1(), unknown())
   }).strict()
 ]);
+const SessionToolResultSchema = object({
+  type: literal$1("session/tool-result"),
+  content: array$2(object({ type: literal$1("text"), text: string$1() }).strict()),
+  isError: boolean().optional()
+}).strict();
 const LocalMachineRpcRequestSchema = discriminatedUnion("method", [
+  BaseLocalMachineRpcRequestSchema.extend({
+    method: literal$1("session/call-tool"),
+    params: object({
+      sessionId: SessionIdSchema$1,
+      name: string$1().min(1).max(100),
+      arguments: record$3(string$1(), json$1()).refine(
+        (value) => new TextEncoder().encode(JSON.stringify(value)).byteLength <= 256 * 1024,
+        "Session tool arguments exceed 256 KiB"
+      )
+    }).strict()
+  }).strict(),
   BaseLocalMachineRpcRequestSchema.extend({
     method: literal$1("session/get-active-invocation-context"),
     params: object({
@@ -27219,6 +27356,7 @@ const LocalMachineRpcRequestSchema = discriminatedUnion("method", [
   }).strict()
 ]);
 const LocalMachineRpcResultSchema = union$7([
+  SessionToolResultSchema,
   SessionActiveInvocationContextResultSchema,
   CodeCollabV2FileIndexSnapshotSchema,
   CodeCollabV2OpenTextOkSchema,
@@ -112568,18 +112706,20 @@ class MachineDocument {
     const existing = getMachineFlockAcpCapabilities(
       readMachineFlockRowsFromFlock(handle.flock, { families: ["acpCapability"] })
     )[capabilityKey];
-    if (existing && serializeAcpCapabilityWithoutFetchTime(existing) === serializeAcpCapabilityWithoutFetchTime(entry) && // Unchanged content is still rewritten once it is old enough: the refresh
+    const modelCapabilitiesChanged = options.modelCapabilities !== void 0 && writeMachineFlockRowToFlock(handle.flock, {
+      key: machineFlockKeys.acpModelCapability(configId),
+      value: { version: 1, sourceVersion: sourceVersion2, models: options.modelCapabilities }
+    });
+    const capabilityUnchanged = existing && serializeAcpCapabilityWithoutFetchTime(existing) === serializeAcpCapabilityWithoutFetchTime(entry) && // Unchanged content is still rewritten once it is old enough: the refresh
     // cache trusts `fetchedAt`, and an entry never renewed would expire once
     // and then miss on every later request, re-probing forever.
-    !shouldRenewAcpCapabilityFetchTime(existing, entry.fetchedAt)) {
-      return existing;
-    }
+    !shouldRenewAcpCapabilityFetchTime(existing, entry.fetchedAt);
     options.signal?.throwIfAborted();
-    const changed = writeMachineFlockRowToFlock(handle.flock, {
+    const changed = !capabilityUnchanged && writeMachineFlockRowToFlock(handle.flock, {
       key: machineFlockKeys.acpCapability(configId),
       value: entry
     });
-    if (changed) {
+    if (changed || modelCapabilitiesChanged) {
       await this.repo.flush();
       if (this.markMachineFlockDirty) {
         this.markMachineFlockDirty("acp-capability-update");
@@ -112587,7 +112727,7 @@ class MachineDocument {
         await handle.syncOnce().catch(() => void 0);
       }
     }
-    return entry;
+    return (capabilityUnchanged ? existing : void 0) ?? entry;
   }
   async getAcpCapabilities(configId) {
     const key2 = getAcpCapabilityCacheKey(configId);
@@ -122446,7 +122586,7 @@ async function decompressStream(input2, options) {
   }, new ByteLengthQueuingStrategy({ highWaterMark }));
 }
 const version$b = "1.12.0";
-const dependencies = { "@openai/codex": "^0.156.0" };
+const dependencies = { "@openai/codex": "^0.159.2" };
 const codexPackageJson = {
   version: version$b,
   dependencies
@@ -122479,8 +122619,8 @@ const claudeRuntimeManifestJson = {
   version: version$6,
   artifacts: artifacts$2
 };
-const version$5 = "0.156.0";
-const artifacts$1 = { "darwin-arm64": { "fileName": "codex-package-aarch64-apple-darwin.tar.zst", "sha256": "27a4c6ad8d63ab0988eb2a6699fb092d999b78845c75edad1eef674064a026de", "size": 91943742 }, "darwin-x64": { "fileName": "codex-package-x86_64-apple-darwin.tar.zst", "sha256": "545de467983f6d1fa1ee67266b0df4fcdd864bf1e8681254ee3691a48ea296fd", "size": 101404952 }, "linux-arm64": { "fileName": "codex-package-aarch64-unknown-linux-musl.tar.zst", "sha256": "cb2573ebaa76503f763cf2ac858219114c69a2000961ca14330e5a4a9ebd734f", "size": 100178344 }, "linux-x64": { "fileName": "codex-package-x86_64-unknown-linux-musl.tar.zst", "sha256": "30933220521da2a9eef5ca7be5cbb215edcb088835d0a55ba7488168da5b341f", "size": 106005443 }, "win32-arm64": { "fileName": "codex-package-aarch64-pc-windows-msvc.tar.zst", "sha256": "3041dfb02eff1f8e68bbbcc7603534b02ee0bb55b7b93bdd522b12dc3e12162f", "size": 106301619 }, "win32-x64": { "fileName": "codex-package-x86_64-pc-windows-msvc.tar.zst", "sha256": "887cc9593dbb59b3122afe4c8520c32e633ab644d685c95bcba23e115e56fcaf", "size": 115013735 } };
+const version$5 = "0.159.2";
+const artifacts$1 = { "darwin-arm64": { "fileName": "codex-package-aarch64-apple-darwin.tar.zst", "sha256": "2958825ae590c52093e13dc5e00bdeab5d84947d9a1c76c91f3c42338444909b", "size": 93587821 }, "darwin-x64": { "fileName": "codex-package-x86_64-apple-darwin.tar.zst", "sha256": "22609e143919c817c642c0a801ad67874b5395dfdd118e077b5699697629618b", "size": 102536488 }, "linux-arm64": { "fileName": "codex-package-aarch64-unknown-linux-musl.tar.zst", "sha256": "1017b8175e4c4c6529866ed4b67c8e93ad7f0169ad89888068f0ad9707c5999d", "size": 109213770 }, "linux-x64": { "fileName": "codex-package-x86_64-unknown-linux-musl.tar.zst", "sha256": "fbca2d1e23dc9f827fe6eb19cbca2942140f99a48769f62355d647f5d75ee91e", "size": 115217118 }, "win32-arm64": { "fileName": "codex-package-aarch64-pc-windows-msvc.tar.zst", "sha256": "47d79aa012f3f04fc89a70a9a3ad555def7c83384b3f24d8ba1d3ac5610cb25f", "size": 108217158 }, "win32-x64": { "fileName": "codex-package-x86_64-pc-windows-msvc.tar.zst", "sha256": "57133a65c41976304cfcd24367c4b7e297562ffe2efe4a6ebe560c9a8843aeb8", "size": 116901172 } };
 const codexRuntimeManifestJson = {
   version: version$5,
   artifacts: artifacts$1
@@ -125643,9 +125783,27 @@ const readManagedCandidate = async (repoFullName, source, invalidatedPersonalTok
   }, 15000);
   if (!response || !response.ok) throw new Error('GitHub credential service is unavailable; no operation was attempted.');
   const body = await response.json();
-  if (body.available === false) return null;
+  if (body.available === false) return { token: null, reason: typeof body.reason === 'string' ? body.reason : null };
   if (!body.token || body.tokenSource !== source) throw new Error('Invalid GitHub credential response.');
-  return body.token;
+  return { token: body.token, reason: null };
+};
+
+// Why the personal identity was skipped, in words the user can act on. Never
+// includes token material; reasons are backend policy codes or preflight states.
+const describePersonalUnavailable = (repo, reason) => {
+  switch (reason) {
+    case 'personal_auth_missing':
+      return 'your personal GitHub account is not authorized yet (Settings > Integrations > GitHub > Authorize)';
+    case 'personal_token_expired':
+    case 'personal_token_refresh_failed':
+      return 'your personal GitHub authorization has expired or been revoked; re-authorize in Settings > Integrations > GitHub';
+    case 'no_repository_access':
+      return 'your GitHub account cannot access ' + repo + ' with the required permission';
+    case 'token_invalid':
+      return 'GitHub rejected your personal token; re-authorize in Settings > Integrations > GitHub';
+    default:
+      return reason ? 'personal access is unavailable (' + reason + ')' : 'personal access is unavailable';
+  }
 };
 
 // Read-only preflight. Never replay an actual write with another identity.
@@ -125673,33 +125831,38 @@ const checkRepositoryCredential = async (token, repo, requireWrite, requirePubli
 };
 
 const selectGitHubCredential = async (repo, policy, localCandidate, requireWrite, anonymousCandidate) => {
-  let personalUnavailable = false;
+  let personalUnavailable = null;
   if (policy.personalEnabled) {
-    let token = await readManagedCandidate(repo, 'personal');
+    let candidate = await readManagedCandidate(repo, 'personal');
+    let token = candidate.token;
+    personalUnavailable = candidate.reason;
     if (token) {
       let status = await checkRepositoryCredential(token, repo, requireWrite);
       if (status === 'invalid') {
-        token = await readManagedCandidate(repo, 'personal', token);
+        candidate = await readManagedCandidate(repo, 'personal', token);
+        token = candidate.token;
+        personalUnavailable = candidate.reason ?? 'token_invalid';
         if (token) status = await checkRepositoryCredential(token, repo, requireWrite);
       }
       if (token && status === 'usable') return { token, source: 'personal' };
+      if (token) personalUnavailable = status === 'invalid' ? 'token_invalid' : 'no_repository_access';
     }
-    personalUnavailable = true;
+    personalUnavailable = describePersonalUnavailable(repo, personalUnavailable);
   }
   if (policy.allowLocalAuth) {
     const local = await localCandidate();
     if (local) {
-      if (personalUnavailable) console.error('[Lody] Personal GitHub access is unavailable for ' + repo + '; using machine-local credentials.');
+      if (personalUnavailable) console.error('[Lody] Using machine-local GitHub credentials for ' + repo + ': ' + personalUnavailable + '.');
       return { ...local, source: 'local' };
     }
   }
-  const token = await readManagedCandidate(repo, 'app');
+  const token = (await readManagedCandidate(repo, 'app')).token;
   if (!token && !requireWrite && anonymousCandidate && await anonymousCandidate()) {
     console.error('[Lody] Reading public GitHub repository ' + repo + ' anonymously (no applicable credential).');
     return { token: null, source: 'anonymous' };
   }
   if (!token) throw new Error('No GitHub credential is available for ' + repo + '.');
-  console.error('[Lody] Using GitHub App identity for ' + repo + (personalUnavailable ? ' (personal access unavailable).' : '.'));
+  console.error('[Lody] Using GitHub App identity for ' + repo + (personalUnavailable ? ': ' + personalUnavailable + '.' : '.'));
   return { token, source: 'app' };
 };
 `;
@@ -127633,10 +127796,15 @@ const ProfileRecordSchema = object({
   configId: string$1().min(1),
   profile: CodexAuthProfileSchema,
   state: _enum(["pending", "ready", "removed"]),
+  authStore: _enum(["codex-default", "keyring"]).optional(),
   activeGeneration: uuid().optional(),
   generations: array$2(uuid()),
   credentialsRemoved: boolean().optional()
 }).strict();
+function resolveAuthStore(record2) {
+  if (record2.authStore) return record2.authStore;
+  return record2.profile.mode === "chatgpt" && record2.state !== "pending" ? "keyring" : "codex-default";
+}
 const identity$1 = (owner) => createHash("sha256").update(JSON.stringify([owner.workspaceId, owner.machineId, owner.configId])).digest("hex");
 class CodexProfileStore {
   constructor(root = path__default.join(getLodyDataDir(), "codex-profiles"), vault = new SystemCodexCredentialVault(), logout = logoutNativeProfile) {
@@ -127724,7 +127892,14 @@ class CodexProfileStore {
       if (!record2) {
         if (!allowPending)
           throw new Error("This Codex account has not been authenticated on this machine");
-        record2 = { version: 1, ...owner, profile, state: "pending", generations: [] };
+        record2 = {
+          version: 1,
+          ...owner,
+          profile,
+          state: "pending",
+          authStore: "codex-default",
+          generations: []
+        };
         await this.write(directory, record2);
       }
       this.assertBinding(record2, owner, profile);
@@ -127736,7 +127911,7 @@ class CodexProfileStore {
       });
       if ((await lstat(home)).isSymbolicLink() || await realpath(home) !== home)
         throw new Error("Invalid Codex account home");
-      return { ...owner, profile, home };
+      return { ...owner, profile, home, authStore: resolveAuthStore(record2) };
     });
   }
   credentialId(owner, profileId, generation) {
@@ -127797,7 +127972,7 @@ class CodexProfileStore {
       const record2 = await this.read(directory);
       if (!record2) throw new Error("Codex account is unavailable");
       this.assertBinding(record2, resolved, resolved.profile);
-      await this.write(directory, { ...record2, state: "ready" });
+      await this.write(directory, { ...record2, state: "ready", authStore: resolved.authStore });
     });
   }
   async remove(resolved) {
@@ -127807,7 +127982,7 @@ class CodexProfileStore {
       if (!record2) return true;
       if (identity$1(record2) !== identity$1(resolved)) throw new Error("Codex account owner mismatch");
       if (record2.credentialsRemoved) return true;
-      await this.write(directory, { ...record2, state: "removed" });
+      await this.write(directory, { ...record2, state: "removed", authStore: resolved.authStore });
       if (record2.profile.mode === "chatgpt") {
         if (!await reconcileCodexProfileProcesses(resolved)) return false;
         const lease = await registerCodexProfileProcess(resolved, {
@@ -127826,6 +128001,7 @@ class CodexProfileStore {
       await this.write(directory, {
         ...record2,
         state: "removed",
+        authStore: resolved.authStore,
         generations: [],
         activeGeneration: void 0,
         credentialsRemoved: true
@@ -127864,7 +128040,11 @@ class CodexProfileStore {
       const directory = await this.directory(entry.name);
       const record2 = await this.read(directory);
       if (record2?.workspaceId === workspaceId)
-        profiles.push({ ...record2, home: path__default.join(directory, "home") });
+        profiles.push({
+          ...record2,
+          home: path__default.join(directory, "home"),
+          authStore: resolveAuthStore(record2)
+        });
     }
     return profiles;
   }
@@ -127884,7 +128064,10 @@ async function logoutNativeProfile(profile, lease) {
   await new Promise((resolve2, reject2) => {
     const child = execFile(
       launch.command,
-      ["-c", 'cli_auth_credentials_store="keyring"', "logout"],
+      [
+        ...profile.authStore === "keyring" ? ["-c", 'cli_auth_credentials_store="keyring"'] : [],
+        "logout"
+      ],
       { env: env2, timeout: 2e4, windowsHide: true },
       (error2) => {
         if (error2) reject2(new Error("Codex account cleanup could not complete"));
@@ -136648,6 +136831,7 @@ function normalizeAcpSessionCapabilities(sessionResponse, lifecycleCapabilities
   const legacyModels = readLegacySessionModelState(sessionResponse)?.availableModels ?? [];
   const models = modelsFromConfigOptions.length > 0 ? modelsFromConfigOptions : legacyModels;
   const availableCommands = readSessionAvailableCommands(sessionResponse);
+  const modelCapabilities = readAcpModelCapabilitiesMeta(sessionResponse);
   const modelReasoningEfforts = {
     ...readLodyModelReasoningEfforts(sessionResponse),
     ...usesCodexModelEffortIds(lifecycleCapabilities.agent) ? deriveModelReasoningEffortsFromLegacyModelIds(legacyModels.map((model) => model.modelId)) : void 0
@@ -136661,7 +136845,8 @@ function normalizeAcpSessionCapabilities(sessionResponse, lifecycleCapabilities
     acknowledgedSteer: lifecycleCapabilities.acknowledgedSteer === true,
     sessionTitle: lifecycleCapabilities.sessionTitle === true,
     ...lifecycleCapabilities.goalActions?.length ? { goalActions: lifecycleCapabilities.goalActions } : {},
-    ...Object.keys(modelReasoningEfforts).length > 0 ? { modelReasoningEfforts } : {}
+    ...Object.keys(modelReasoningEfforts).length > 0 ? { modelReasoningEfforts } : {},
+    ...modelCapabilities ? { modelCapabilities } : {}
   };
 }
 const MAX_LISTED_IDS = 12;
@@ -142036,7 +142221,7 @@ async function startCodexCredentialBroker(options) {
 }
 function codexProfileConfig(profile, baseUrl) {
   const base = {
-    cli_auth_credentials_store: "keyring",
+    ...profile.authStore === "keyring" ? { cli_auth_credentials_store: "keyring" } : {},
     check_for_update_on_startup: false,
     shell_environment_policy: {
       inherit: "all",
@@ -142849,7 +143034,7 @@ function getBuiltinDisplayName(agentType) {
 function formatAuthenticationExitError(agentType, displayName, exitCode) {
   const base = `${displayName} authentication exited with code ${exitCode ?? "unknown"}`;
   if (agentType !== "codex") return base;
-  return `${base}. Make sure device-code login is enabled in your ChatGPT security settings or workspace permissions, then try again.`;
+  return `${base}. Check the Codex login log on the execution machine for the cause, then try again.`;
 }
 async function buildAuthenticationProcessEnv(options) {
   const loginShellEnv = await options.resolveLoginShellEnv();
@@ -142973,8 +143158,6 @@ class AcpAuthenticationManager {
     this.resolveLoginShellEnv = options.resolveLoginShellEnv ?? getLoginShellEnv;
     this.resolveAuthenticationProcessLaunch = options.resolveAuthenticationProcessLaunch ?? resolveBuiltinAuthenticationProcessLaunch;
   }
-  // Each builtin provider has one shared credential store, so concurrent login
-  // attempts are intentionally keyed by agent type.
   runningByAgentType = /* @__PURE__ */ new Map();
   authenticationTimeoutMs;
   terminationGraceMs;
@@ -143094,13 +143277,7 @@ class AcpAuthenticationManager {
       options.onProgress?.({ status: "starting" });
       const child = this.spawnProcess(
         launch.command,
-        options.codexProfile ? [
-          "-c",
-          'cli_auth_credentials_store="keyring"',
-          "-c",
-          'forced_login_method="chatgpt"',
-          ...launch.args
-        ] : launch.args,
+        options.codexProfile ? ["-c", 'forced_login_method="chatgpt"', ...launch.args] : launch.args,
         {
           cwd: os__default$1.homedir(),
           env: env2,
@@ -150926,13 +151103,18 @@ class SessionExecutionService {
       let staleAcpPromptRecoveryAttempted = false;
       let baseCommitHash = null;
       let turnStartWorkingTreeDiff = null;
+      const gitIdentityOptions = yield* self2.tryPromise(async () => {
+        try {
+          return await self2.deps.sessionManager.resolveGitIdentityOptions(message.userId);
+        } catch {
+          return { preferMachineIdentity: message.userId === self2.deps.userId };
+        }
+      });
       const bindReadySession = (nextSession) => {
         activeSession = nextSession;
         session2 = nextSession;
         ctx.bindSession(nextSession);
-        nextSession.updateGitIdentity(userName, userEmail, message.userId, {
-          preferMachineIdentity: message.userId === self2.deps.userId
-        });
+        nextSession.updateGitIdentity(userName, userEmail, message.userId, gitIdentityOptions);
       };
       const sessionInputBlocks = normalizeSessionInputBlocks(
         acpSessionConfig.inputBlocks,
@@ -151987,7 +152169,10 @@ class SessionExecutionService {
         capabilities.modelReasoningEfforts,
         capabilities.acknowledgedSteer,
         capabilities.goalActions,
-        { sessionTitle: capabilities.sessionTitle }
+        {
+          sessionTitle: capabilities.sessionTitle,
+          modelCapabilities: capabilities.modelCapabilities
+        }
       );
       this.acpCapabilityLaunchInputFingerprints.set(
         agentConfigId,
@@ -152417,6 +152602,7 @@ class SessionExecutionService {
         sessionTitle,
         goalActions,
         modelReasoningEfforts,
+        modelCapabilities,
         capabilitySourceVersion
       } = await this.deps.fetchAcpCapabilities(
         message.cliType,
@@ -152456,7 +152642,7 @@ class SessionExecutionService {
         modelReasoningEfforts,
         acknowledgedSteer,
         goalActions,
-        { signal: options.signal, sessionTitle }
+        { signal: options.signal, sessionTitle, modelCapabilities }
       );
       this.acpCapabilityLaunchInputFingerprints.set(
         message.configId,
@@ -155156,10 +155342,9 @@ const normalizeName$1 = (name2, email2) => {
   }
   return email2;
 };
-const readGitConfig = (key2, cwd) => {
+const readGitConfig = (key2) => {
   try {
-    const output = execFileSync("git", ["config", key2], {
-      cwd,
+    const output = execFileSync("git", ["config", "--global", key2], {
       encoding: "utf8",
       stdio: ["ignore", "pipe", "ignore"],
       windowsHide: true
@@ -155169,13 +155354,18 @@ const readGitConfig = (key2, cwd) => {
     return void 0;
   }
 };
-const readHostDefaultGitIdentity = (cwd) => ({
-  name: trimNonEmpty$1(process.env.GIT_AUTHOR_NAME) ?? trimNonEmpty$1(process.env.GIT_COMMITTER_NAME) ?? readGitConfig("user.name", cwd),
-  email: trimNonEmpty$1(process.env.GIT_AUTHOR_EMAIL) ?? trimNonEmpty$1(process.env.GIT_COMMITTER_EMAIL) ?? readGitConfig("user.email", cwd)
+const readHostDefaultGitIdentity = () => ({
+  name: trimNonEmpty$1(process.env.GIT_AUTHOR_NAME) ?? trimNonEmpty$1(process.env.GIT_COMMITTER_NAME) ?? readGitConfig("user.name"),
+  email: trimNonEmpty$1(process.env.GIT_AUTHOR_EMAIL) ?? trimNonEmpty$1(process.env.GIT_COMMITTER_EMAIL) ?? readGitConfig("user.email")
 });
 const resolveSessionGitIdentity = (requested, options) => {
+  const requestedEmail = trimNonEmpty$1(requested.email);
+  const requestedIdentity = isUsableEmail(requestedEmail) ? { name: normalizeName$1(trimNonEmpty$1(requested.name), requestedEmail), email: requestedEmail } : void 0;
+  if (options.personalIdentityEnabled && requestedIdentity) {
+    return requestedIdentity;
+  }
   if (options.preferMachineIdentity) {
-    const machineIdentity = options.machineIdentity ?? readHostDefaultGitIdentity(options.cwd);
+    const machineIdentity = options.machineIdentity ?? readHostDefaultGitIdentity();
     const machineEmail = trimNonEmpty$1(machineIdentity.email);
     if (isUsableEmail(machineEmail)) {
       return {
@@ -155184,12 +155374,8 @@ const resolveSessionGitIdentity = (requested, options) => {
       };
     }
   }
-  const requestedEmail = trimNonEmpty$1(requested.email);
-  if (isUsableEmail(requestedEmail)) {
-    return {
-      name: normalizeName$1(trimNonEmpty$1(requested.name), requestedEmail),
-      email: requestedEmail
-    };
+  if (requestedIdentity) {
+    return requestedIdentity;
   }
   return {
     name: DEFAULT_AI_GIT_AUTHOR_NAME,
@@ -158335,12 +158521,13 @@ class LodyOperationCoordinator {
         }
         claimedMaterialization = true;
         try {
-          await this.options.workspaceDocument.syncRemoteDocOrThrow(
-            getSessionRoomId(target.sessionId),
-            {
-              reason: `orchestration.materialize:${operation.operationId}:${index}`
-            }
-          );
+          const docId = getSessionRoomId(target.sessionId);
+          const reason = `orchestration.materialize:${operation.operationId}:${index}`;
+          if (this.options.confirmTargetReadable) {
+            await this.options.confirmTargetReadable(docId, reason);
+          } else {
+            await this.options.workspaceDocument.syncRemoteDocOrThrow(docId, { reason });
+          }
         } catch (error2) {
           if (signal.aborted) return item;
           if (!isAtDeadline()) {
@@ -159099,6 +159286,40 @@ class LodyOperationCoordinator {
     });
   }
 }
+const environments = new AsyncLocalStorage();
+const getSessionCommandEnvironment = () => environments.getStore();
+const runWithSessionCommandEnvironment = (environment2, run2) => environments.run(environment2, run2);
+function createLocalSessionCommandEnvironment(args2) {
+  const { manager, workspaceId, machineId, userId } = args2;
+  return {
+    auth: {
+      token: "",
+      userId,
+      userName: userId,
+      userEmail: "",
+      machineId,
+      machineName: args2.machineName
+    },
+    workspace: { id: workspaceId, name: "Lody", slug: "local", role: "owner" },
+    manager,
+    host: args2.host,
+    async checkMachineAccess(target) {
+      if (target.workspaceId !== workspaceId || target.requesterUserId !== userId)
+        return { allowed: false, reason: "requester_not_member" };
+      if (target.machineId !== machineId)
+        return { allowed: false, reason: "machine_not_registered" };
+      const row = await manager.repo.getDocMeta(getMachineRoomId(machineId));
+      if (!row?.meta || isLoroRepoDocDeleted(row) || row.meta.ownerUserId !== userId)
+        return { allowed: false, reason: "not_visible" };
+      if (target.localProjectId) {
+        const projects = await readMachineLocalProjects(manager.repo, workspaceId, machineId);
+        const project = Object.values(projects).find((entry) => entry.id === target.localProjectId);
+        if (!project) return { allowed: false, reason: "project_not_shared" };
+      }
+      return { allowed: true };
+    }
+  };
+}
 function hasSessionDispatchEvidence(meta, history, userTurnId) {
   const user = history.find((entry) => entry.id === userTurnId && entry.role === "user");
   return !!user && (meta.latestUserMsgId === userTurnId || meta.processingUserMsgId === userTurnId || meta.lastHandledUserMsgId === userTurnId || user.status === "handled" || user.status === "failed" || user.status === "canceled" || history.some(
@@ -167332,6 +167553,25 @@ async function canUseMachineForCliToken(input2) {
     throw error2;
   }
 }
+const MISSING_PUBLIC_FUNCTION_ERROR = /Could not find (public )?function/;
+async function canDelegateMachineUseForCliToken(input2) {
+  const client2 = createAuthConvexClient();
+  try {
+    const raw2 = await client2.query(api.machines.canDelegateMachineUseFromCliToken, {
+      cliToken: input2.token,
+      workspaceId: input2.workspaceId,
+      machineId: input2.machineId,
+      requesterUserId: input2.requesterUserId,
+      ...input2.localProjectId !== void 0 ? { localProjectId: input2.localProjectId } : {}
+    });
+    return MachineAccessCheckResultSchema.parse(raw2);
+  } catch (error2) {
+    if (error2 instanceof Error && MISSING_PUBLIC_FUNCTION_ERROR.test(error2.message)) {
+      return null;
+    }
+    throw error2;
+  }
+}
 async function canRequestMachineForCliToken(input2) {
   const client2 = createAuthConvexClient();
   const raw2 = await client2.query(api.machines.canRequestMachineFromCliToken, {
@@ -167645,6 +167885,11 @@ const PRICE_DATA = {
     cacheReadInputTokenCost: 1e-6,
     outputCostPerToken: 5e-5
   },
+  "gpt-6.1-sol": {
+    inputCostPerToken: 2e-6,
+    cacheReadInputTokenCost: 1e-7,
+    outputCostPerToken: 1e-5
+  },
   "gpt-6-sol": {
     inputCostPerToken: 2e-6,
     cacheReadInputTokenCost: 2e-7,
@@ -167979,8 +168224,13 @@ class GitHubTokenManager {
       })
     );
     if (!result.success) {
-      if (result.errorCode === "repo_not_linked" || source2 === "personal" && result.errorCode === "personal_unavailable")
-        return null;
+      if (result.errorCode === "repo_not_linked") return null;
+      if (source2 === "personal" && result.errorCode === "personal_unavailable") {
+        this.logger.debug(
+          `[github-token] Personal GitHub identity unavailable for ${repoFullName} (requester ${context2.requesterUserId}): ${result.errorMessage}`
+        );
+        return { available: false, reason: result.errorMessage };
+      }
       throw new GitHubTokenFetchError(result.errorCode, result.errorMessage);
     }
     return { token: result.token, tokenSource: result.tokenSource ?? "app" };
@@ -168755,6 +169005,8 @@ function selectWorkspaceSummary(workspaces, selector) {
   );
 }
 function getAuthContextOrThrow$1(loggerName) {
+  const environment2 = getSessionCommandEnvironment();
+  if (environment2) return environment2.auth;
   const authClient = new AuthClient(getLogger(loggerName));
   const authInfo = authClient.getAuthInfo();
   if (!authInfo) {
@@ -168770,11 +169022,22 @@ function getAuthContextOrThrow$1(loggerName) {
   };
 }
 async function resolveWorkspaceOrThrow$1(auth, selector) {
+  const environment2 = getSessionCommandEnvironment();
+  if (environment2) {
+    if (auth !== environment2.auth) throw new Error("Session command identity mismatch");
+    return selectWorkspaceSummary([environment2.workspace], selector);
+  }
   const workspaces = await listWorkspacesForToken(auth.token);
   const effectiveSelector = normalizeCliValue(selector) ?? normalizeCliValue(process.env.LODY_WORKSPACE_ID);
   return selectWorkspaceSummary(workspaces, effectiveSelector);
 }
 async function withWorkspaceManager$1(auth, workspace, loggerName, fn) {
+  const environment2 = getSessionCommandEnvironment();
+  if (environment2) {
+    if (auth !== environment2.auth || workspace.id !== environment2.workspace.id)
+      throw new Error("Session command workspace mismatch");
+    return fn(environment2.manager);
+  }
   if (!LODY_AUTH_URL) {
     throw new Error("Cloud workspace commands require LODY_AUTH_URL");
   }
@@ -171026,8 +171289,6 @@ class ResourceDiscovery {
       const modeId = role.runConfig.modeId ?? role.runConfig.configOptionValues?._permission;
       if (state2.state === "available" && capability && modeId && !(permission ? permission.options.some((option2) => option2.value === modeId) : capability.modes.some((mode2) => mode2.id === modeId)))
         state2 = { state: "unavailable", reason: "mode_unavailable" };
-      if (state2.state === "available" && source2.roleMachineScope && role.machineId !== source2.roleMachineScope)
-        state2 = { state: "unavailable", reason: "outside_work_context" };
       return {
         id: role.id,
         name: role.name,
@@ -171075,14 +171336,6 @@ class ResourceDiscovery {
 async function createResourceDiscovery(args2) {
   const { manager, auth, workspaceId } = args2;
   if (!args2.offline) await syncWorkspaceMetaForRead(manager, "resource.discovery");
-  let roleMachineScope;
-  if (args2.requesterSessionId) {
-    const record2 = await manager.repo.getDocMeta(getSessionRoomId(args2.requesterSessionId));
-    if (!record2?.meta || isLoroRepoDocDeleted(record2))
-      throw new Error("Requester Session not found.");
-    const session2 = record2.meta;
-    if (session2.project?.kind !== "github") roleMachineScope = session2.machineId;
-  }
   const synced = /* @__PURE__ */ new Set();
   async function sync2(id2) {
     if (!args2.offline && !synced.has(id2)) {
@@ -171094,9 +171347,8 @@ async function createResourceDiscovery(args2) {
     workspaceId,
     userId: args2.delegatedRequester?.userId ?? auth.userId,
     selectedMcpServerIds: args2.selectedMcpServerIds,
-    roleMachineScope,
     machines: async () => (await listAliveDocMetas(manager, isMachineDocRoomId)).map((row) => row.meta),
-    onlineMachineIds: async () => args2.offline ? null : manager.getOnlineMachineIds(),
+    onlineMachineIds: async () => getSessionCommandEnvironment() ? /* @__PURE__ */ new Set([auth.machineId]) : args2.offline ? null : manager.getOnlineMachineIds(),
     canAccess: async (machineId, localProjectId) => (await readSessionMachineAccess({
       auth,
       workspaceId,
@@ -172789,11 +173041,10 @@ function validateModelDependentTurnConfigOptionValues(values, capability, target
   const optionsById = new Map(
     (capability.configOptions ?? []).map((option2) => [option2.id, option2])
   );
+  const efforts = getModelEffortChoices(capability, targetModelId);
+  const declaredFast = getDeclaredModelControls(capability, targetModelId)?.fastMode;
   for (const [id2, value] of Object.entries(values)) {
-    const option2 = optionsById.get(id2);
-    const isEffort = isAcpThoughtLevelConfigOption(option2 ?? { id: id2 }) || id2 === "effort";
-    if (isEffort) {
-      const efforts = capability.modelReasoningEfforts?.[targetModelId];
+    if (isTurnEffortEntry(optionsById, id2)) {
       if (efforts !== void 0) {
         if (typeof value !== "string" || !efforts.includes(value)) {
           throw new Error(
@@ -172804,12 +173055,20 @@ function validateModelDependentTurnConfigOptionValues(values, capability, target
       } else if (targetModelId !== probedModelId) {
         validatedIds.add(id2);
       }
-    } else if (isAcpFastModeConfigId(id2) && targetModelId !== probedModelId) {
-      validatedIds.add(id2);
+    } else if (isAcpFastModeConfigId(id2)) {
+      if (declaredFast === false && (value === true || value === ACP_CONFIG_OPTION_ON_VALUE)) {
+        throw new Error(`Model ${targetModelId} does not offer fast mode.`);
+      }
+      if (declaredFast !== void 0 || targetModelId !== probedModelId) {
+        validatedIds.add(id2);
+      }
     }
   }
   return validatedIds;
 }
+function isTurnEffortEntry(optionsById, id2) {
+  return isAcpThoughtLevelConfigOption(optionsById.get(id2) ?? { id: id2 }) || id2 === "effort";
+}
 function filterCompatibleTurnConfigOptionValues(values, capability, targetModelId) {
   if (!values || !capability) {
     return void 0;
@@ -172817,24 +173076,24 @@ function filterCompatibleTurnConfigOptionValues(values, capability, targetModelI
   const optionsById = new Map(
     (capability.configOptions ?? []).map((option2) => [option2.id, option2])
   );
-  const probedModelId = capability.configOptions?.find(
-    (option2) => option2.category === "model"
-  )?.currentValue;
+  const probedModelId = findTurnConfigOptionByCategory(capability, "model")?.currentValue;
+  const efforts = getModelEffortChoices(capability, targetModelId);
+  const declared = getDeclaredModelControls(capability, targetModelId);
+  const keepUnverified = targetModelId !== probedModelId || declared !== void 0;
   const compatible = Object.fromEntries(
     Object.entries(values).filter(([id2, value]) => {
-      const option2 = optionsById.get(id2);
       if (targetModelId) {
-        const isEffort = isAcpThoughtLevelConfigOption(option2 ?? { id: id2 }) || id2 === "effort";
-        if (isEffort) {
-          const efforts = capability.modelReasoningEfforts?.[targetModelId];
+        if (isTurnEffortEntry(optionsById, id2)) {
           if (efforts !== void 0) return typeof value === "string" && efforts.includes(value);
-        }
-        if (targetModelId !== probedModelId) {
-          if (isEffort) return typeof value === "string";
-          if (isAcpFastModeConfigId(id2))
-            return typeof value === "boolean" || value === "on" || value === "off";
+          if (keepUnverified) return typeof value === "string";
+        } else if (isAcpFastModeConfigId(id2)) {
+          if (declared?.fastMode === false) return false;
+          if (keepUnverified) {
+            return typeof value === "boolean" || value === ACP_CONFIG_OPTION_ON_VALUE || value === ACP_CONFIG_OPTION_OFF_VALUE;
+          }
         }
       }
+      const option2 = optionsById.get(id2);
       return option2 !== void 0 && validateConfigOptionValue(option2, value) === void 0;
     })
   );
@@ -172895,7 +173154,9 @@ async function readAgentAcpCapability(args2) {
     getMachineFlockDocId(args2.workspaceId, args2.machineId)
   );
   const capabilities = getMachineFlockAcpCapabilities(
-    readMachineFlockRowsFromFlock(handle.flock, { families: ["acpCapability"] })
+    readMachineFlockRowsFromFlock(handle.flock, {
+      families: ACP_CAPABILITY_ROW_FAMILIES
+    })
   );
   return capabilities[getAcpCapabilityCacheKey(args2.agentConfigId)];
 }
@@ -173136,6 +173397,12 @@ async function withMachineRpcClient(args2, fn) {
   }
 }
 async function ensureTargetMachineOnline(args2) {
+  const environment2 = getSessionCommandEnvironment();
+  if (environment2) {
+    if (args2.workspaceId !== environment2.workspace.id || args2.machineId !== environment2.auth.machineId)
+      throw new Error("Target machine is unavailable in this workspace");
+    return;
+  }
   if (args2.machineId === args2.auth.machineId) {
     await ensureLocalRuntimeAvailable(args2.machineId, args2.workspaceId);
     return;
@@ -173176,16 +173443,48 @@ async function readSessionMachineAccess(args2) {
     ...args2.localProjectId ? { localProjectId: args2.localProjectId } : {}
   });
 }
+const defaultMachineAccessReaders = {
+  delegated: canDelegateMachineUseForCliToken,
+  asTokenUser: canRequestMachineForCliToken,
+  asServedRequester: canUseMachineForCliToken
+};
+async function readDelegatedMachineAccess(input2, readers = defaultMachineAccessReaders) {
+  const target = {
+    token: input2.token,
+    workspaceId: input2.workspaceId,
+    machineId: input2.machineId,
+    ...input2.localProjectId ? { localProjectId: input2.localProjectId } : {}
+  };
+  const verdict = await readers.delegated({ ...target, requesterUserId: input2.requesterUserId });
+  if (verdict) {
+    return verdict;
+  }
+  const owner = await readers.asTokenUser({ ...target, requesterUserId: input2.tokenUserId });
+  if (!owner.allowed || input2.requesterUserId === input2.tokenUserId) {
+    return owner;
+  }
+  return await readers.asServedRequester({ ...target, requesterUserId: input2.requesterUserId });
+}
 async function readResolvedSessionMachineAccess(args2) {
-  const readAccess = args2.requester.isDelegated ? canUseMachineForCliToken : canRequestMachineForCliToken;
-  return await readMachineAccessWithBoundedRetry({
-    verify: async () => await readAccess({
-      token: args2.auth.token,
+  const environment2 = getSessionCommandEnvironment();
+  if (environment2) {
+    if (args2.auth !== environment2.auth) throw new Error("Session command identity mismatch");
+    return environment2.checkMachineAccess({
       workspaceId: args2.workspaceId,
       machineId: args2.machineId,
       requesterUserId: args2.requester.userId,
-      ...args2.localProjectId ? { localProjectId: args2.localProjectId } : {}
-    }),
+      localProjectId: args2.localProjectId
+    });
+  }
+  const target = {
+    token: args2.auth.token,
+    workspaceId: args2.workspaceId,
+    machineId: args2.machineId,
+    requesterUserId: args2.requester.userId,
+    ...args2.localProjectId ? { localProjectId: args2.localProjectId } : {}
+  };
+  return await readMachineAccessWithBoundedRetry({
+    verify: async () => args2.requester.isDelegated ? await readDelegatedMachineAccess({ ...target, tokenUserId: args2.auth.userId }) : await canRequestMachineForCliToken(target),
     onRetry: ({ attempt, maxAttempts, delayMs, error: error2 }) => {
       getLogger("session").warn(
         `Machine access verification unavailable; retrying (attempt=${attempt}/${maxAttempts} delayMs=${delayMs}): ${error2}`
@@ -173200,6 +173499,11 @@ async function assertMachineAccess(args2) {
   }
 }
 async function dispatchTurnFastPath(args2) {
+  const environment2 = getSessionCommandEnvironment();
+  if (environment2) {
+    await environment2.host.dispatchSession(args2.sessionId);
+    return;
+  }
   if (!args2.inputConfig) {
     return;
   }
@@ -173430,6 +173734,8 @@ async function resolveAgentConfigForCreate(args2) {
   );
 }
 async function assertGitHubRepoAccess(args2) {
+  if (getSessionCommandEnvironment())
+    throw new Error("Hosted repository contexts are unavailable; use a registered local project.");
   const repos = await listWorkspaceGitHubRepositoriesForCliToken({
     token: args2.auth.token,
     workspaceId: args2.workspaceId,
@@ -174175,6 +174481,22 @@ async function readSessionLiveStatus(args2) {
   }
 }
 async function readSessionLiveStatusesMany(args2) {
+  const environment2 = getSessionCommandEnvironment();
+  if (environment2) {
+    const output2 = /* @__PURE__ */ new Map();
+    for (const session2 of args2.sessions) {
+      output2.set(
+        session2.id,
+        session2.machineId === environment2.auth.machineId ? await environment2.host.readLiveStatus(session2.id) : {
+          sessionId: session2.id,
+          machineOnline: false,
+          fresh: false,
+          reason: "Machine unavailable in local workspace"
+        }
+      );
+    }
+    return output2;
+  }
   const groups = /* @__PURE__ */ new Map();
   for (const session2 of args2.sessions) {
     const group = groups.get(session2.machineId) ?? [];
@@ -175019,6 +175341,7 @@ const session = /* @__PURE__ */ Object.freeze(/* @__PURE__ */ Object.definePrope
   normalizeLocalProjectPathSelector,
   prepareSessionInput,
   readAgentAcpCapability,
+  readDelegatedMachineAccess,
   readLocalProjectGitStateOnMachine,
   readSessionLiveStatusesMany,
   readSessionMachineAccess,
@@ -185761,7 +186084,14 @@ class MessageHandler {
       dispatchWatcher: this.sessionDispatchWatcher,
       userResolver: this.sessionUserResolver,
       logger: this.logger,
-      materializeTarget: async (operation, item, index) => await this.materializeOperationTarget(operation, item, index)
+      ...this.cloudPort.kind === "local" ? {
+        confirmTargetReadable: async () => {
+          await this.workspaceDocument.repo.flush();
+        }
+      } : {},
+      materializeTarget: async (operation, item, index) => await this.withSessionCommandEnvironment(
+        () => this.materializeOperationTarget(operation, item, index)
+      )
     });
     this.setupSessionEventHandlers();
     this.setupSessionLifecycleWatchers();
@@ -187348,7 +187678,7 @@ class MessageHandler {
     if (!prompt2) {
       throw new Error(`Operation ${operation.operationId} item ${index} has no prompt.`);
     }
-    const auth = {
+    const auth = getSessionCommandEnvironment()?.auth ?? {
       token: this.token,
       userId: this.userId,
       userName: this.userId,
@@ -189681,6 +190011,61 @@ class MessageHandler {
     const ownerUserId = args2.ownerMeta?.userId?.trim();
     return requester === ownerUserId || requester === this.userId;
   }
+  withSessionCommandEnvironment(run2) {
+    if (this.cloudPort.kind !== "local") return run2();
+    return runWithSessionCommandEnvironment(
+      createLocalSessionCommandEnvironment({
+        manager: this.workspaceDocument,
+        workspaceId: this.workspaceId,
+        machineId: this.machineId,
+        machineName: this.machineName,
+        userId: this.userId,
+        host: {
+          readInvocation: (sessionId) => {
+            const invocation = this.executionService.getActiveInvocationContext(sessionId);
+            return invocation ? {
+              type: "session/active-invocation-context",
+              sessionId,
+              active: true,
+              ...invocation
+            } : { type: "session/active-invocation-context", sessionId, active: false };
+          },
+          readLiveStatus: async (sessionId) => {
+            const live = resolveSessionLiveStatus({
+              presence: this.sessionActivePresence.getStatus(sessionId),
+              execution: this.executionService.getExecutionSnapshot(sessionId),
+              hasPendingDispatch: this.sessionDispatchWatcher.hasPendingDispatch(sessionId)
+            });
+            return {
+              sessionId,
+              machineOnline: true,
+              fresh: true,
+              state: live.state,
+              observedAt: getServerNow()
+            };
+          },
+          cancelSession: async (sessionId, turnId) => {
+            const targetTurnId = turnId ?? this.executionService.getExecutionSnapshot(sessionId).activeTurnId;
+            if (!targetTurnId) return { success: false, error: "Session has no active turn" };
+            return this.executionService.cancelSession(
+              {
+                type: "session/cancel",
+                machineId: this.machineId,
+                workspaceId: this.workspaceId,
+                sessionId,
+                turnId: targetTurnId
+              },
+              { pendingInput: "promote", prePromptSession: "discard" }
+            );
+          },
+          dispatchSession: async (sessionId) => {
+            void this.sessionDispatchWatcher.enqueueSessionCheck(sessionId);
+          }
+        }
+      }),
+      run2
+    );
+  }
   async handleLocalMachineRpc(request2) {
     try {
       const result = await this.dispatchLocalMachineRpc(request2);
@@ -189707,6 +190092,27 @@ class MessageHandler {
       }
     };
     switch (request2.method) {
+      case "session/call-tool": {
+        if (this.cloudPort.kind !== "local")
+          throw new Error("Daemon Session tools require a local workspace");
+        const { sessionId, name: name2, arguments: args2 } = request2.params;
+        if (request2.workspaceId !== this.workspaceId || request2.machineId !== this.machineId || request2.ownerSessionId !== sessionId)
+          throw new Error("Session tool scope mismatch");
+        const { executeDaemonSessionTool } = await import("./chunks/daemon-session-tools-DESvdAeY.js");
+        return this.withSessionCommandEnvironment(
+          () => executeDaemonSessionTool(
+            {
+              machineId: this.machineId,
+              workspaceId: this.workspaceId,
+              sessionId,
+              localControlSocketPath: void 0,
+              workdir: process.cwd()
+            },
+            name2,
+            args2
+          )
+        );
+      }
       case "code-collab/get-file-index":
         await assertOwner(request2.params.sessionId);
         return await this.codeCollabV2Service.getFileIndex(request2.params);
@@ -194594,7 +195000,9 @@ const createGitCredentialBrokerHandler = (options) => {
         if (!isContextCurrent()) return;
         res.writeHead(200, { "Content-Type": "application/json" });
         res.end(
-          JSON.stringify(candidate ? { ...candidate, available: true } : { available: false })
+          JSON.stringify(
+            candidate && "token" in candidate ? { ...candidate, available: true } : { available: false, ...candidate?.reason ? { reason: candidate.reason } : {} }
+          )
         );
         return;
       }
@@ -194750,6 +195158,11 @@ class GitCredentialBroker {
     this.startHealthCheck();
     return this.env;
   }
+  /** Rotate only sessions that opted into managed credentials during preparation. */
+  refreshSessionContext(context2) {
+    if (!this.sessionContextTokens.has(context2.sessionId)) return void 0;
+    return this.activateSessionContext(context2);
+  }
   activateSessionContext(context2) {
     const existingToken = this.sessionContextTokens.get(context2.sessionId);
     if (existingToken) {
@@ -196279,12 +196692,15 @@ class Session extends EventEmitter {
     const configEnv = this.config.env ?? {};
     if (this.config.githubCredentialPolicy) {
       this.config.githubCredentialPolicy.allowLocalAuth = options.preferMachineIdentity;
+      if (options.personalIdentityEnabled !== void 0) {
+        this.config.githubCredentialPolicy.personalEnabled = options.personalIdentityEnabled;
+      }
     }
     const { name: name2, email: email2 } = resolveSessionGitIdentity(
       { name: userName, email: userEmail },
       {
         preferMachineIdentity: options.preferMachineIdentity,
-        cwd: this.getWorkdir()
+        personalIdentityEnabled: options.personalIdentityEnabled ?? this.config.githubCredentialPolicy?.personalEnabled ?? false
       }
     );
     configEnv.GIT_AUTHOR_NAME = name2;
@@ -197988,9 +198404,12 @@ class SessionManager extends EventEmitter {
         "session.createSessionInner.prepared",
         sessionId
       );
-      session2.updateGitIdentity(config2.userName, config2.userEmail, config2.requesterUserId, {
-        preferMachineIdentity: config2.requesterUserId === this.cloudPort.identity.userId
-      });
+      session2.updateGitIdentity(
+        config2.userName,
+        config2.userEmail,
+        config2.requesterUserId,
+        await this.resolveGitIdentityOptions(config2.requesterUserId)
+      );
       const acpSessionId = await prepared.agentResult;
       const sessionDoc = await this.workspaceDocument.getOrCreateSessionDoc(sessionId);
       await sessionDoc.setACPSessionId(acpSessionId);
@@ -198107,9 +198526,12 @@ class SessionManager extends EventEmitter {
     );
     const sessionId = config2.sessionId;
     this.logger.debug(`[${sessionId}] Session workdir resolved: ${session2.getWorkdir()}`);
-    session2.updateGitIdentity(config2.userName, config2.userEmail, config2.requesterUserId, {
-      preferMachineIdentity: config2.requesterUserId === this.cloudPort.identity.userId
-    });
+    session2.updateGitIdentity(
+      config2.userName,
+      config2.userEmail,
+      config2.requesterUserId,
+      await this.resolveGitIdentityOptions(config2.requesterUserId)
+    );
     let acpSessionId;
     const launchResolutionStartedAt = performance.now();
     let managedRuntimeReadyLogged = false;
@@ -198261,7 +198683,31 @@ class SessionManager extends EventEmitter {
       runtimeOverrides: config2.runtimeOverrides
     });
   }
+  /**
+   * Commit identity follows the same precedence as GitHub credentials: a
+   * requester who enabled "Act as you" commits as themselves; otherwise the
+   * machine owner may use the machine's global Git identity. Policy lookup
+   * failures degrade to "not enabled" rather than blocking the turn.
+   */
+  async resolveGitIdentityOptions(requesterUserId) {
+    const preferMachineIdentity = requesterUserId === this.cloudPort.identity.userId;
+    const tokenManager = this.getGitHubTokenManager();
+    if (!tokenManager) return { preferMachineIdentity, personalIdentityEnabled: false };
+    try {
+      const policy = await tokenManager.getCredentialPolicy({
+        requesterUserId,
+        machineId: this.machineId
+      });
+      return { preferMachineIdentity, personalIdentityEnabled: policy.personalEnabled };
+    } catch (error2) {
+      this.logger.warn(
+        `Could not read the GitHub identity preference for ${requesterUserId}; committing without personal identity: ${formatErrorMessage(error2)}`
+      );
+      return { preferMachineIdentity, personalIdentityEnabled: false };
+    }
+  }
   async prepareGitHubRepoSessionConfig(config2) {
+    if (config2.project?.kind === "local") return;
     const githubRepo = config2.githubRepo ?? tryDeriveGitHubRepoFromUrl(config2.githubRepoUrl);
     if (githubRepo) {
       config2.githubRepo = githubRepo;
@@ -198340,7 +198786,7 @@ class SessionManager extends EventEmitter {
     };
   }
   async refreshGhTokenForSession(session2, _githubRepo, requesterUserId) {
-    const contextToken = this.gitCredentialBroker?.activateSessionContext({
+    const contextToken = this.gitCredentialBroker?.refreshSessionContext({
       sessionId: session2.sessionId,
       requesterUserId,
       machineId: this.machineId
@@ -232934,7 +233380,7 @@ function mergeRateLimits(legacyRateLimits, flockRateLimits) {
 async function mergeMachineFlockJsonState(repo, workspaceId, machine, includeAcpCapabilities) {
   const handle = await repo.openFlockDoc(getMachineFlockDocId(workspaceId, machine.id));
   const rows = readMachineFlockRowsFromFlock(handle.flock, {
-    families: includeAcpCapabilities ? ["acpCapability", "rateLimit"] : ["rateLimit"]
+    families: includeAcpCapabilities ? [...ACP_CAPABILITY_ROW_FAMILIES, "rateLimit"] : ["rateLimit"]
   });
   const acpCapabilities = includeAcpCapabilities ? getMachineFlockAcpCapabilities(rows) : {};
   const rateLimits = getMachineFlockRateLimits(rows);
@@ -233902,7 +234348,7 @@ async function runRender(file2, options) {
     data = createReviewBundleSnapshot(bundle);
   }
   const { injectReviewSnapshot } = await import("./chunks/index-BeRTvYK1.js");
-  const { resolveReviewViewerTemplate } = await import("./chunks/review-viewer-CEUQAboP.js");
+  const { resolveReviewViewerTemplate } = await import("./chunks/review-viewer-BZiXmQnJ.js");
   const template = await resolveReviewViewerTemplate();
   const html = injectReviewSnapshot(template, data);
   const outputPath = options.output ? path__default.resolve(options.output) : defaultHtmlOutputPath(inputPath);
@@ -252338,7 +252784,7 @@ async function configureWorkspaceMcpServer(manager, workspaceId, userId, rawInpu
     };
   });
 }
-function registerDiscoveryTools(server, withDiscovery) {
+function registerDiscoveryTools(registerTool, withDiscovery) {
   const descriptions = {
     machine: "List readable machines, including offline machines, with online/offline/unknown presence and protocol capabilities.",
     project: "List readable local projects across machines and enabled GitHub repositories. kind and machineId restrict the catalog. Local project identity includes machineId.",
@@ -252364,7 +252810,7 @@ function registerDiscoveryTools(server, withDiscovery) {
     }
   };
   for (const resource of Object.keys(ResourceListSchemas)) {
-    server.registerTool(
+    registerTool(
       `lody_${resource}_list`,
       {
         description: `${descriptions[resource]} Returns a bounded page (default 20, maximum 100); follow nextCursor with the same filters to enumerate all entries.`,
@@ -252375,7 +252821,7 @@ function registerDiscoveryTools(server, withDiscovery) {
     );
   }
   for (const resource of ["agent_config", "agent_role"]) {
-    server.registerTool(
+    registerTool(
       `lody_${resource}_get`,
       {
         description: `Read one ${resource} by stable id from its list tool.`,
@@ -252386,6 +252832,20 @@ function registerDiscoveryTools(server, withDiscovery) {
     );
   }
 }
+function createSessionToolRegistrar(server, route2, handlers) {
+  return (name2, config2, callback) => {
+    handlers?.set(name2, async (args2) => callback(await config2.inputSchema.parseAsync(args2)));
+    const inputSchema = config2.inputSchema;
+    return server.registerTool(
+      name2,
+      { ...config2, inputSchema },
+      async (args2) => (
+        // The SDK has already parsed MCP input; only direct daemon calls need parsing here.
+        route2(name2, args2, () => callback(args2))
+      )
+    );
+  };
+}
 const PREVIEW_TOOL_NAME = "lody_report_preview_candidate";
 const IMAGE_UPLOAD_TOOL_NAME = "lody_upload_images";
 const FILE_UPLOAD_TOOL_NAME = "lody_upload_files";
@@ -252850,6 +253310,8 @@ const postSessionControl = async (request2, localControlSocketPath, timeoutMs =
   return responses.map((response2) => LocalSessionControlResponseSchema.parse(response2));
 };
 const readActiveInvocationContext = async (ctx) => {
+  const environment2 = getSessionCommandEnvironment();
+  if (environment2) return environment2.host.readInvocation(ctx.sessionId);
   const response2 = await runPromise(
     makeLocalControlClientAuto({ socketPath: ctx.localControlSocketPath }).machineRpc(
       {
@@ -253035,13 +253497,6 @@ const resolveMcpSessionCreate = (input2, invoking, requester, role) => {
     );
   }
   const project = requester.project;
-  if (project?.kind !== "github" && role.machineId !== requester.machineId) {
-    throw new LodyOperationStoreError(
-      "AGENT_ROLE_MACHINE_MISMATCH",
-      project?.kind === "local" ? `Agent Role ${role.name} must run on the Local Project's Machine.` : `Agent Role ${role.name} must run on the current Machine in a chat Session.`,
-      false
-    );
-  }
   let useCurrentSessionAsParent = input2.useCurrentSessionAsParent;
   let workContext = input2.workContext;
   if (project?.kind === "github" && useCurrentSessionAsParent !== true && workContext === void 0) {
@@ -253050,7 +253505,7 @@ const resolveMcpSessionCreate = (input2, invoking, requester, role) => {
       repo: project.repoFullName,
       ...project.branch ? { branch: project.branch } : {}
     };
-  } else if (project?.kind === "local" && useCurrentSessionAsParent === void 0 && workContext === void 0) {
+  } else if (project?.kind === "local" && role.machineId === requester.machineId && useCurrentSessionAsParent === void 0 && workContext === void 0) {
     useCurrentSessionAsParent = true;
   }
   const resolvedInput = {
@@ -253684,7 +254139,9 @@ const assertDifferentMcpSession = (source2, target) => {
 const readMachineAcpCapabilities = async (manager, workspaceId, machineId) => {
   const handle = await manager.repo.openFlockDoc(getMachineFlockDocId(workspaceId, machineId));
   return getMachineFlockAcpCapabilities(
-    readMachineFlockRowsFromFlock(handle.flock, { families: ["acpCapability"] })
+    readMachineFlockRowsFromFlock(handle.flock, {
+      families: ACP_CAPABILITY_ROW_FAMILIES
+    })
   );
 };
 const buildSessionWorkContext = async (manager, workspaceId, session2) => {
@@ -253851,7 +254308,7 @@ const buildSessionCreateOptions = async (input2) => {
       )
     );
     const repoQuery = normalizeCliValue(input2.repoQuery)?.toLowerCase();
-    const repos = repoQuery ? (await listWorkspaceGitHubRepositoriesForCliToken({
+    const repos = repoQuery && !getSessionCommandEnvironment() ? (await listWorkspaceGitHubRepositoriesForCliToken({
       token: auth.token,
       workspaceId,
       requesterUserId,
@@ -254731,6 +255188,9 @@ const ReviewSubmitToolInputSchema = object({
   summary: string$1().trim().max(2e3).optional()
 }).strict();
 function buildLodyMcpServer() {
+  return buildSessionToolServer();
+}
+function buildSessionToolServer(handlers) {
   initCliAnalytics();
   const server = new McpServer(
     {
@@ -254755,10 +255215,41 @@ function buildLodyMcpServer() {
       });
     }
   });
-  registerDiscoveryTools(server, async (read) => {
-    if (getCliPlatformKind() === "local") {
-      throw new Error("Workspace catalog discovery is unavailable on the local platform.");
-    }
+  const registerSessionTool = createSessionToolRegistrar(
+    server,
+    async (name2, args2, execute) => {
+      if (getCliPlatformKind() !== "local" || getSessionCommandEnvironment()) return execute();
+      try {
+        const ctx = getSessionContext();
+        const outcome = await runPromise(
+          makeLocalControlClientAuto({ socketPath: ctx.localControlSocketPath }).machineRpc(
+            {
+              method: "session/call-tool",
+              machineId: ctx.machineId,
+              workspaceId: ctx.workspaceId,
+              ownerSessionId: ctx.sessionId,
+              params: {
+                sessionId: ctx.sessionId,
+                name: name2,
+                arguments: record$3(string$1(), json$1()).parse(args2)
+              }
+            },
+            { timeoutMs: SESSION_CONTROL_TIMEOUT_MS }
+          ).pipe(either)
+        );
+        if (outcome._tag === "Left") throw classifyLocalDaemonIpcError(outcome.left);
+        const response2 = outcome.right;
+        if (!response2.ok) throw new Error(response2.error);
+        if (!("type" in response2.result) || response2.result.type !== "session/tool-result")
+          throw new Error("Unexpected Session tool response");
+        return { content: response2.result.content, isError: response2.result.isError };
+      } catch (error2) {
+        return mcpErrorResult(error2);
+      }
+    },
+    handlers
+  );
+  registerDiscoveryTools(registerSessionTool, async (read) => {
     const ctx = getSessionContext();
     const source2 = await resolveInvokingTurnSource();
     const auth = getAuthContextOrThrow$1("mcp");
@@ -254772,7 +255263,6 @@ function buildLodyMcpServer() {
           manager,
           auth,
           workspaceId: workspace.id,
-          requesterSessionId: ctx.sessionId,
           delegatedRequester: { userId: source2.userId },
           selectedMcpServerIds: source2.inputConfig.mcpServerIds
         })
@@ -255014,7 +255504,7 @@ ${lines2.join("\n")}` : ""}${suffix}`
       }
     }
   );
-  server.registerTool(
+  registerSessionTool(
     SESSION_CREATE_OPTIONS_TOOL_NAME,
     {
       title: "List session create options",
@@ -255029,11 +255519,11 @@ ${lines2.join("\n")}` : ""}${suffix}`
       }
     }
   );
-  server.registerTool(
+  registerSessionTool(
     SESSION_CREATE_TOOL_NAME,
     {
       title: "Create a Lody session",
-      description: "Start durable asynchronous work that creates a Lody session. Supply operationId; the result arrives automatically as a continuation, so do not poll operation_get. To use an Agent Role, pass agentRoleId; the current workspace catalog row supplies the exact Machine, Agent config, model, reasoning, and permission mode. If manual machine or run-config fields are also present, the Role takes precedence and those fields are ignored. To recover an already accepted create without resending its prompt, send only operationId with resume=true. useCurrentSessionAsParent=true and workContext are mutually exclusive schema branches. Machine/config ids and runConfig values for non-Role creates come from lody_session_create_options. The wait field is temporary legacy compatibility only.",
+      description: "Start durable asynchronous work that creates a Lody session. Supply operationId; the result arrives automatically as a continuation, so do not poll operation_get. To use an Agent Role, pass agentRoleId; the current workspace catalog row supplies the exact Machine, Agent config, model, reasoning, and permission mode. If manual machine or run-config fields are also present, the Role takes precedence and those fields are ignored. A Role may run on any Machine the owner of this Machine can use; to work in a project there, pass workContext for a local project on that Machine (find it with lody_session_create_options machineId + localProjectQuery). Without workContext a Role on another Machine starts as a plain chat there. To recover an already accepted create without resending its prompt, send only operationId with resume=true. useCurrentSessionAsParent=true and workContext are mutually exclusive schema branches. Machine/config ids and runConfig values for non-Role creates come from lody_session_create_options. The wait field is temporary legacy compatibility only.",
       inputSchema: SessionCreateToolInputSchema
     },
     async (input2) => {
@@ -255117,7 +255607,7 @@ ${lines2.join("\n")}` : ""}${suffix}`
       }
     }
   );
-  server.registerTool(
+  registerSessionTool(
     SESSION_CHAT_TOOL_NAME,
     {
       title: "Send a prompt to a Lody session",
@@ -255180,7 +255670,7 @@ ${lines2.join("\n")}` : ""}${suffix}`
       }
     }
   );
-  server.registerTool(
+  registerSessionTool(
     SESSION_CREATE_MANY_TOOL_NAME,
     {
       title: "Create multiple Lody sessions",
@@ -255196,7 +255686,7 @@ ${lines2.join("\n")}` : ""}${suffix}`
       }
     }
   );
-  server.registerTool(
+  registerSessionTool(
     SESSION_CHAT_MANY_TOOL_NAME,
     {
       title: "Chat multiple Lody sessions",
@@ -255211,7 +255701,7 @@ ${lines2.join("\n")}` : ""}${suffix}`
       }
     }
   );
-  server.registerTool(
+  registerSessionTool(
     SESSION_CANCEL_TOOL_NAME,
     {
       title: "Cancel a Lody session turn",
@@ -255223,6 +255713,14 @@ ${lines2.join("\n")}` : ""}${suffix}`
         const ctx = getSessionContext();
         const auth = getAuthContextOrThrow$1("mcp");
         await resolveWorkspaceOrThrow$1(auth, getMcpWorkspaceId(ctx));
+        const environment2 = getSessionCommandEnvironment();
+        if (environment2) {
+          const sessionId = resolveMcpSessionId(args2.sessionId, ctx);
+          const session2 = await readCurrentSessionMeta(environment2.manager, sessionId);
+          if (!session2 || session2.machineId !== auth.machineId)
+            throw new Error("Session not found on this machine");
+          return jsonTextResult(await environment2.host.cancelSession(sessionId));
+        }
         return jsonTextResult(
           await runLodyCliJson([
             "session",
@@ -255238,7 +255736,7 @@ ${lines2.join("\n")}` : ""}${suffix}`
       }
     }
   );
-  server.registerTool(
+  registerSessionTool(
     "lody_operation_list",
     {
       description: "List durable Operation summaries owned by the current Session and invoking user. Optional state filter and keyset pagination. Completion is automatic; do not poll.",
@@ -255266,7 +255764,7 @@ ${lines2.join("\n")}` : ""}${suffix}`
       }
     }
   );
-  server.registerTool(
+  registerSessionTool(
     OPERATION_GET_TOOL_NAME,
     {
       title: "Get a Lody Operation snapshot",
@@ -255284,7 +255782,7 @@ ${lines2.join("\n")}` : ""}${suffix}`
       }
     }
   );
-  server.registerTool(
+  registerSessionTool(
     OPERATION_CANCEL_TOOL_NAME,
     {
       title: "Cancel a Lody Operation",
@@ -255302,12 +255800,13 @@ ${lines2.join("\n")}` : ""}${suffix}`
           (store) => store.cancel(requesterSessionId, args2.operationId)
         );
         if (cancellation.didCancel && before.state === "active") {
+          const environment2 = getSessionCommandEnvironment();
           const startedTargets = before.items.filter(
             (item) => item.status === "active" && item.inputDurable
           );
           await Promise.allSettled(
             startedTargets.map(
-              (item) => item.status === "active" ? runLodyCliJson(buildOperationTargetCancelArgs(getMcpWorkspaceId(ctx), item)) : Promise.resolve()
+              (item) => item.status === "active" ? environment2 ? environment2.host.cancelSession(item.target.sessionId, item.target.userTurnId) : runLodyCliJson(buildOperationTargetCancelArgs(getMcpWorkspaceId(ctx), item)) : Promise.resolve()
             )
           );
         }
@@ -255319,7 +255818,7 @@ ${lines2.join("\n")}` : ""}${suffix}`
       }
     }
   );
-  server.registerTool(
+  registerSessionTool(
     SESSION_RENAME_TOOL_NAME,
     {
       title: "Rename a Lody session",
@@ -255340,7 +255839,7 @@ ${lines2.join("\n")}` : ""}${suffix}`
       }
     }
   );
-  server.registerTool(
+  registerSessionTool(
     SESSION_RENAME_MANY_TOOL_NAME,
     {
       title: "Rename multiple Lody sessions",
@@ -255386,7 +255885,7 @@ ${lines2.join("\n")}` : ""}${suffix}`
       }
     }
   );
-  server.registerTool(
+  registerSessionTool(
     SESSION_LIST_TOOL_NAME,
     {
       title: "List Lody sessions",
@@ -255401,7 +255900,7 @@ ${lines2.join("\n")}` : ""}${suffix}`
       }
     }
   );
-  server.registerTool(
+  registerSessionTool(
     SESSION_STATUS_MANY_TOOL_NAME,
     {
       title: "Get Lody session statuses",
@@ -255416,7 +255915,7 @@ ${lines2.join("\n")}` : ""}${suffix}`
       }
     }
   );
-  server.registerTool(
+  registerSessionTool(
     SESSION_HISTORY_TOOL_NAME,
     {
       title: "Read Lody session history",
@@ -257141,7 +257640,13 @@ void (async () => {
   }
 })();
 export {
+  SessionToolResultSchema as S,
+  getSessionCommandEnvironment as a,
+  getSessionRoomId as b,
+  buildSessionToolServer as c,
   program as default,
-  getLodyDataDir as g
+  getLodyDataDir as g,
+  isLoroRepoDocDeleted as i,
+  runWithMcpSessionContext as r
 };
 //# sourceMappingURL=index.js.map