lody 0.102.0 → 0.103.0

package/dist/chunks/{acp-Bsd2Lmd6.js → acp-BzvviK-N.js}

@@ -51,7 +51,9 @@ const DEEPSEEK_HARNESS_AGENT_PRESETS = [
 ];
 const ACP_EXTENSION_DSH_VERSION = "0.2.0";
 const DEEPSEEK_HARNESS_VERSION = "0.1.5-rc.2";
-const ACP_EXTENSION_DSH_PROFILE_REVISION = "v13";
+const DEEPSEEK_HARNESS_PI_AI_VERSION = "0.85.1";
+const DEEPSEEK_HARNESS_SCHEMASTERY_VERSION = "3.18.2";
+const ACP_EXTENSION_DSH_PROFILE_REVISION = "v14";
 const ACP_EXTENSION_DSH_SESSION_ROOT_ENV = "ACP_EXTENSION_DSH_SESSION_ROOT";
 const ACP_EXTENSION_DSH_QUERY_PATH_ENV = "ACP_EXTENSION_DSH_QUERY_PATH";
 const DEEPSEEK_HARNESS_DEFAULT_SESSION_COMPRESSION = "zstd";
@@ -308,7 +310,11 @@ const DEEPSEEK_HARNESS_CORDIS_PACKAGE_VERSIONS = {
   "@deepseek-ai/cordis-plugin-timer": "1.1.4"
 };
 function createDeepSeekHarnessNpxSpecifiers(versions = DEEPSEEK_HARNESS_CORDIS_PACKAGE_VERSIONS) {
-  return DEEPSEEK_HARNESS_NPX_PACKAGES.map((packageName) => `${packageName}@${versions[packageName] ?? DEEPSEEK_HARNESS_VERSION}`);
+  return [
+    ...DEEPSEEK_HARNESS_NPX_PACKAGES.map((packageName) => `${packageName}@${versions[packageName] ?? DEEPSEEK_HARNESS_VERSION}`),
+    `@earendil-works/pi-ai@${DEEPSEEK_HARNESS_PI_AI_VERSION}`,
+    `@deepseek-ai/schemastery@${DEEPSEEK_HARNESS_SCHEMASTERY_VERSION}`
+  ];
 }
 function toAdapterModuleSpecifier(adapterPath, windows = process.platform === "win32") {
   if (adapterPath.startsWith("file:"))
@@ -369,6 +375,14 @@ function createDeepSeekHarnessProfileFiles(config) {
     provider: ${JSON.stringify(provider)}
     model: ${JSON.stringify(model)}
 
+# Dormant until llm-pi-ai.providers in settings.yaml declares a route. The
+# upstream adapter owns profile validation, route lifecycle, and credentials.
+- id: llm-pi-ai
+  name: '@deepseek-ai/dsh-llm-pi-ai'
+  inject: [settings]
+  config:
+    providers: {}
+
 # Preserve the product's three permission modes with client-facing labels.
 - id: permission
   config:
@@ -4929,4 +4943,4 @@ export {
   DEEPSEEK_HARNESS_DEFAULT_MODEL as q,
   DEEPSEEK_HARNESS_PROVIDER as r
 };
-//# sourceMappingURL=acp-Bsd2Lmd6.js.map
+//# sourceMappingURL=acp-BzvviK-N.js.map

package/dist/chunks/{daemon-session-tools-BeXk1A1E.js → daemon-session-tools-DESvdAeY.js}

@@ -28,7 +28,7 @@ import "node:fs/promises";
 import "node:zlib";
 import "child_process";
 import "./plan-mode-D0D5cnMs.js";
-import "./acp-Bsd2Lmd6.js";
+import "./acp-BzvviK-N.js";
 import "node:url";
 import "./subagent-events-BJ9JwZva.js";
 import "./loro_wasm_bg-DIxpLA2J.js";
@@ -94,4 +94,4 @@ async function executeDaemonSessionTool(context, name, args) {
 export {
   executeDaemonSessionTool
 };
-//# sourceMappingURL=daemon-session-tools-BeXk1A1E.js.map
+//# sourceMappingURL=daemon-session-tools-DESvdAeY.js.map

package/dist/chunks/{index-C0n6fro1.js → index-DEdPzgH7.js}

@@ -27455,7 +27455,7 @@ var package_default = {
   },
   dependencies: {
     "@agentclientprotocol/sdk": "^1.4.0",
-    "@openai/codex": "^0.156.0",
+    "@openai/codex": "^0.159.2",
     "acp-extension-core": "0.1.9",
     diff: "^9.0.0",
     open: "^11.0.1",
@@ -35224,4 +35224,4 @@ function startAcpServer() {
   }
   createCodexAcpApp({ name: package_default.name, createAgent }).connect(acpJsonStream);
 }
-//# sourceMappingURL=index-C0n6fro1.js.map
+//# sourceMappingURL=index-DEdPzgH7.js.map

package/dist/chunks/{review-viewer-B6wZ9fN1.js → review-viewer-BZiXmQnJ.js}

@@ -28,7 +28,7 @@ import "node:util";
 import "node:zlib";
 import "child_process";
 import "./plan-mode-D0D5cnMs.js";
-import "./acp-Bsd2Lmd6.js";
+import "./acp-BzvviK-N.js";
 import "node:url";
 import "./subagent-events-BJ9JwZva.js";
 import "./loro_wasm_bg-DIxpLA2J.js";
@@ -68,7 +68,7 @@ import "node:timers/promises";
 import "node:module";
 import "node:v8";
 import "http2";
-const reviewViewerVersion = "0.102.0";
+const reviewViewerVersion = "0.103.0";
 const reviewViewerSha256 = "d1ba5702aa0bd441b40492bd916d6412f8b970e92683f7073878a36efbdb0649";
 const reviewViewerFileName = "standalone.html";
 const DEFAULT_CDN_BASES = ["https://cdn.jsdelivr.net/npm", "https://unpkg.com"];
@@ -143,4 +143,4 @@ async function resolveReviewViewerTemplate() {
 export {
   resolveReviewViewerTemplate
 };
-//# sourceMappingURL=review-viewer-B6wZ9fN1.js.map
+//# sourceMappingURL=review-viewer-BZiXmQnJ.js.map

package/dist/codex-acp.js

@@ -2,5 +2,5 @@ if (!process.env.CODEX_PATH?.trim()) {
   console.error("CODEX_PATH is required for the bundled Codex ACP adapter.");
   process.exit(1);
 }
-await import("./chunks/index-C0n6fro1.js");
+await import("./chunks/index-DEdPzgH7.js");
 //# sourceMappingURL=codex-acp.js.map

package/dist/deepseek-acp.js

@@ -3,7 +3,7 @@ import { o as object, s as string, b as boolean, c as array, l as literal, u as
 import { S as SessionUsageAccumulator, L as LODY_EXTENSION_METHODS, e as supportsLodySubagentEvents, d as LODY_SUBAGENT_EVENT_METHOD } from "./chunks/subagent-events-BJ9JwZva.js";
 import { randomUUID, createHash } from "node:crypto";
 import { Readable, Writable } from "node:stream";
-import { j as DEEPSEEK_HARNESS_BASE_URL_ENV, l as DEEPSEEK_HARNESS_API_KEY_ENV, n as ndJsonStream, o as AgentSideConnection, a as DEEPSEEK_HARNESS_AGENT_PRESETS, R as RequestError, p as ACP_EXTENSION_DSH_VERSION, P as PROTOCOL_VERSION, q as DEEPSEEK_HARNESS_DEFAULT_MODEL, r as DEEPSEEK_HARNESS_PROVIDER } from "./chunks/acp-Bsd2Lmd6.js";
+import { j as DEEPSEEK_HARNESS_BASE_URL_ENV, l as DEEPSEEK_HARNESS_API_KEY_ENV, n as ndJsonStream, o as AgentSideConnection, a as DEEPSEEK_HARNESS_AGENT_PRESETS, R as RequestError, p as ACP_EXTENSION_DSH_VERSION, P as PROTOCOL_VERSION, q as DEEPSEEK_HARNESS_DEFAULT_MODEL, r as DEEPSEEK_HARNESS_PROVIDER } from "./chunks/acp-BzvviK-N.js";
 import { c as createPlanModeConfigOption, L as LODY_PLAN_MODE_CONFIG_ID } from "./chunks/plan-mode-D0D5cnMs.js";
 import { L as LodySubagentEmitter } from "./chunks/subagent-emitter-BsTuVPDw.js";
 import "node:url";
@@ -432,6 +432,7 @@ const MODEL_DISCOVERY_TIMEOUT_MS = 15e3;
 const MODEL_DISCOVERY_MAX_BYTES = 1024 * 1024;
 const MODEL_DISCOVERY_MAX_MODELS = 1e3;
 const MODEL_ID_MAX_LENGTH = 512;
+const ACP_MODEL_ID_PREFIX = "dsh-route:";
 const INVALID_MCP_SERVER_NAME_CHARS = /[^A-Za-z0-9_-]/gu;
 const IMAGE_MEDIA_TYPES = [
   "image/png",
@@ -470,33 +471,60 @@ function resolveAdapterConfig(config) {
     ...config?.stream ? { stream: config.stream } : {}
   };
 }
-async function loadHarnessModels(llm, provider, configuredModel, endpoint) {
-  const listed = endpoint ? (await discoverDeepSeekModelIds(endpoint.baseUrl, endpoint.apiKey)).map((id) => ({
-    provider,
-    id
-  })) : await llm.listModels(provider);
-  const modelIds = [];
-  const ids = /* @__PURE__ */ new Set();
-  for (const model of listed) {
-    if (model.provider !== provider || !model.id.trim())
-      continue;
-    if (ids.has(model.id)) {
-      throw new Error(`acp-extension-dsh: duplicate model ${JSON.stringify(model.id)} for provider ${JSON.stringify(provider)}`);
+async function loadHarnessModels(llm, defaultProvider, configuredModel, endpoint) {
+  const providers = llm.listProviders?.() ?? [{ id: defaultProvider, name: defaultProvider }];
+  if (!providers.some(({ id }) => id === defaultProvider)) {
+    throw new Error(`configured provider ${JSON.stringify(defaultProvider)} is unavailable`);
+  }
+  const identities = [];
+  for (const { id: provider } of providers) {
+    const listed = endpoint && provider === defaultProvider ? (await discoverDeepSeekModelIds(endpoint.baseUrl, endpoint.apiKey)).map((id) => ({
+      provider,
+      id
+    })) : await llm.listModels(provider);
+    const ids = /* @__PURE__ */ new Set();
+    for (const model of listed) {
+      if (model.provider !== provider || !model.id.trim())
+        continue;
+      if (ids.has(model.id)) {
+        throw new Error(`acp-extension-dsh: duplicate model ${JSON.stringify(model.id)} for provider ${JSON.stringify(provider)}`);
+      }
+      ids.add(model.id);
+      identities.push({ provider, model: model.id });
+    }
+    if (endpoint && provider === defaultProvider && ids.size === 0) {
+      throw new Error("the endpoint returned no usable models");
+    }
+    if (provider === defaultProvider && !endpoint && !ids.has(configuredModel)) {
+      identities.unshift({ provider, model: configuredModel });
     }
-    ids.add(model.id);
-    modelIds.push(model.id);
   }
-  if (endpoint && modelIds.length === 0) {
+  const initialSelection = endpoint ? identities.find(({ provider }) => provider === defaultProvider) : { provider: defaultProvider, model: configuredModel };
+  if (!initialSelection)
     throw new Error("the endpoint returned no usable models");
-  }
-  if (!endpoint && !ids.has(configuredModel))
-    modelIds.unshift(configuredModel);
-  const initialModel = endpoint ? modelIds[0] : configuredModel;
   return {
-    models: await Promise.all(modelIds.map((modelId) => resolveHarnessModel(llm, provider, modelId))),
-    initialModel
+    models: await Promise.all(identities.map(({ provider, model }) => resolveHarnessModel(llm, provider, model))),
+    initialSelection
   };
 }
+function encodeAcpModelId(provider, model) {
+  return `${ACP_MODEL_ID_PREFIX}${Buffer.from(JSON.stringify([provider, model])).toString("base64url")}`;
+}
+function decodeAcpModelId(value, legacyProvider) {
+  if (!value.startsWith(ACP_MODEL_ID_PREFIX))
+    return { provider: legacyProvider, model: value };
+  try {
+    const decoded = JSON.parse(Buffer.from(value.slice(ACP_MODEL_ID_PREFIX.length), "base64url").toString("utf8"));
+    if (Array.isArray(decoded) && decoded.length === 2 && decoded.every((part) => typeof part === "string" && part.trim())) {
+      return { provider: decoded[0], model: decoded[1] };
+    }
+  } catch {
+  }
+  throw invalidParams("model route id is invalid");
+}
+function selectedModel(record2) {
+  return record2.models.find((candidate) => candidate.provider === record2.selection.current.provider && candidate.id === record2.selection.current.model);
+}
 function modelDiscoveryUrl(baseUrl) {
   const url = new URL(baseUrl);
   url.pathname = `${url.pathname.replace(/\/+$/u, "")}/models`;
@@ -727,13 +755,13 @@ function configOptions(record2) {
     {
       id: MODEL_CONFIG_ID,
       name: "Model",
-      description: "DeepSeek model used for the session",
+      description: "Provider route and model used for the session",
       category: "model",
       type: "select",
-      currentValue: record2.selection.current.model,
+      currentValue: encodeAcpModelId(record2.selection.current.provider, record2.selection.current.model),
       options: record2.models.map((model2) => ({
-        value: model2.id,
-        name: model2.name,
+        value: encodeAcpModelId(model2.provider, model2.id),
+        name: `${model2.name} (${model2.provider})`,
         description: model2.description ?? null
       }))
     }
@@ -743,7 +771,7 @@ function configOptions(record2) {
     const state = plan.get(record2.agent);
     options.push(createPlanModeConfigOption(state.pending ?? state.active));
   }
-  const model = record2.models.find((candidate) => candidate.id === record2.selection.current.model);
+  const model = selectedModel(record2);
   if (model?.reasoning && record2.selection.current.reasoningEffort) {
     options.push({
       id: REASONING_EFFORT_CONFIG_ID,
@@ -763,16 +791,16 @@ function configOptions(record2) {
 }
 function legacyModels(record2) {
   return {
-    currentModelId: record2.selection.current.model,
+    currentModelId: encodeAcpModelId(record2.selection.current.provider, record2.selection.current.model),
     availableModels: record2.models.flatMap((model) => [
       {
-        modelId: model.id,
-        name: model.name,
+        modelId: encodeAcpModelId(model.provider, model.id),
+        name: `${model.name} (${model.provider})`,
         description: model.description ?? null
       },
       ...model.reasoning?.efforts.map((effort) => ({
-        modelId: `${model.id}[${effort.id}]`,
-        name: `${model.name} (${effort.name})`,
+        modelId: `${encodeAcpModelId(model.provider, model.id)}[${effort.id}]`,
+        name: `${model.name} (${model.provider}, ${effort.name})`,
         description: model.description ?? null
       })) ?? []
     ])
@@ -1440,26 +1468,27 @@ function apply(ctx, rawConfig) {
         throw invalidParams(`failed to select agent preset ${JSON.stringify(value)}: ${errorChain(error)}`);
       });
     } else if (params.configId === MODEL_CONFIG_ID) {
-      return resolveHarnessModel(llm, record2.selection.current.provider, value).then((model) => {
-        const index = record2.models.findIndex((candidate) => candidate.id === value);
+      const selected = decodeAcpModelId(value, record2.selection.current.provider);
+      return resolveHarnessModel(llm, selected.provider, selected.model).then((model) => {
+        const index = record2.models.findIndex((candidate) => candidate.provider === selected.provider && candidate.id === selected.model);
         if (index === -1)
           record2.models.push(model);
         else
           record2.models[index] = model;
         const reasoningEffort = resolveReasoningEffort(model, record2.selection.current.reasoningEffort && model.reasoning?.efforts.some((effort) => effort.id === record2.selection.current.reasoningEffort) ? record2.selection.current.reasoningEffort : void 0);
         record2.selection.current = {
-          provider: record2.selection.current.provider,
-          model: value,
+          provider: selected.provider,
+          model: selected.model,
           ...reasoningEffort ? { reasoningEffort } : {}
         };
         return { configOptions: configOptions(record2) };
       }).catch((error) => {
         if (error instanceof RequestError)
           throw error;
-        throw invalidParams(`failed to resolve model ${JSON.stringify(value)}: ${errorChain(error)}`);
+        throw invalidParams(`failed to resolve model route ${JSON.stringify(selected.provider)} / ${JSON.stringify(selected.model)}: ${errorChain(error)}`);
       });
     } else if (params.configId === REASONING_EFFORT_CONFIG_ID) {
-      const model = record2.models.find((candidate) => candidate.id === record2.selection.current.model);
+      const model = selectedModel(record2);
       if (!model)
         throw internalError("selected model metadata is unavailable");
       const reasoningEffort = resolveReasoningEffort(model, value);
@@ -1519,17 +1548,17 @@ function apply(ctx, rawConfig) {
         } catch (error) {
           throw internalError(`failed to discover models: ${errorChain(error)}`);
         }
-        const { models, initialModel: initialModelId } = catalog;
+        const { models, initialSelection } = catalog;
         const sessionId = randomUUID();
         const questions = new UserQuestionBridge(sessionId, (request) => conn.unstable_createElicitation(request), () => questionCapabilities);
-        const initialModel = models.find((model) => model.id === initialModelId);
+        const initialModel = models.find((model) => model.provider === initialSelection.provider && model.id === initialSelection.model);
         if (!initialModel)
           throw internalError("initial model metadata is unavailable");
         const reasoningEffort = resolveReasoningEffort(initialModel, config.reasoningEffort);
         const selection = {
           current: {
-            provider: config.provider,
-            model: initialModelId,
+            provider: initialSelection.provider,
+            model: initialSelection.model,
             ...reasoningEffort ? { reasoningEffort } : {}
           }
         };
@@ -1545,7 +1574,10 @@ function apply(ctx, rawConfig) {
           handle = await ctx.agents.create({
             sessionId,
             meta: { cwd: params.cwd, agentPreset: requestedPreset },
-            agentOptions: { provider: config.provider, model: initialModelId },
+            agentOptions: {
+              provider: initialSelection.provider,
+              model: initialSelection.model
+            },
             setup: async (agentContext) => {
               if (subagentEvents && !carrierKeyOf) {
                 const scope = await agentContext.loader.import("@deepseek-ai/dsh-scope");

package/dist/index.js

@@ -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-Bsd2Lmd6.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";
@@ -4317,7 +4317,7 @@ function resolvePlatformKind(raw2) {
 }
 const name$3 = "lody";
 const name$2 = "@lody/cli-cloud";
-const version$d = "0.102.0";
+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:" };
@@ -4512,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";
@@ -4572,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;
@@ -4596,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;
 };
@@ -5286,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) => {
@@ -5304,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;
@@ -5329,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);
 };
@@ -5514,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") {
@@ -5528,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;
@@ -8336,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) {
@@ -8353,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;
@@ -8367,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) {
@@ -8408,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);
@@ -8442,7 +8442,7 @@ function normalizeLegacySessionProject(message) {
   return normalized;
 }
 function normalizeLegacyAcpSessionConfig(value) {
-  if (!isRecord$d(value)) {
+  if (!isRecord$e(value)) {
     return value;
   }
   const normalized = { ...value };
@@ -8475,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);
@@ -13894,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 }),
@@ -13990,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";
@@ -14440,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";
@@ -14469,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;
@@ -14477,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":
@@ -14536,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;
@@ -14653,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(
@@ -16584,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";
@@ -16669,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(
@@ -16702,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(
@@ -16722,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}`);
     }
   }
@@ -19074,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;
@@ -19106,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();
@@ -25997,6 +26082,10 @@ const machineFlockKeys = {
     "acpCapability",
     configId
   ],
+  acpModelCapability: (configId) => [
+    "acpModelCapability",
+    configId
+  ],
   rateLimit: (cliType, limitId) => [
     "rateLimit",
     cliType,
@@ -26080,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 {
@@ -26125,6 +26222,7 @@ const MACHINE_FLOCK_ROW_FAMILY_PREFIXES = {
   providerSetupCancellation: ["providerSetupCancellation"],
   agentConfigIndex: ["agentConfigIndex"],
   acpCapability: ["acpCapability"],
+  acpModelCapability: ["acpModelCapability"],
   rateLimit: ["rateLimit"],
   builtinAgentOptOut: ["builtinAgentOptOut"],
   sessionLaunchConfig: ["sessionLaunchConfig"]
@@ -26161,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";
@@ -26188,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;
 }
@@ -26471,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": {
@@ -112583,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");
@@ -112602,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);
@@ -122461,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
@@ -122494,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
@@ -125658,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.
@@ -125688,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' };
 };
 `;
@@ -136683,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
@@ -136696,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;
@@ -150953,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,
@@ -152014,7 +152169,10 @@ class SessionExecutionService {
         capabilities.modelReasoningEfforts,
         capabilities.acknowledgedSteer,
         capabilities.goalActions,
-        { sessionTitle: capabilities.sessionTitle }
+        {
+          sessionTitle: capabilities.sessionTitle,
+          modelCapabilities: capabilities.modelCapabilities
+        }
       );
       this.acpCapabilityLaunchInputFingerprints.set(
         agentConfigId,
@@ -152444,6 +152602,7 @@ class SessionExecutionService {
         sessionTitle,
         goalActions,
         modelReasoningEfforts,
+        modelCapabilities,
         capabilitySourceVersion
       } = await this.deps.fetchAcpCapabilities(
         message.cliType,
@@ -152483,7 +152642,7 @@ class SessionExecutionService {
         modelReasoningEfforts,
         acknowledgedSteer,
         goalActions,
-        { signal: options.signal, sessionTitle }
+        { signal: options.signal, sessionTitle, modelCapabilities }
       );
       this.acpCapabilityLaunchInputFingerprints.set(
         message.configId,
@@ -155183,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
@@ -155196,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 {
@@ -155211,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,
@@ -167726,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,
@@ -168060,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" };
@@ -172872,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(
@@ -172887,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;
@@ -172900,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;
     })
   );
@@ -172978,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)];
 }
@@ -189920,7 +190098,7 @@ class MessageHandler {
         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-BeXk1A1E.js");
+        const { executeDaemonSessionTool } = await import("./chunks/daemon-session-tools-DESvdAeY.js");
         return this.withSessionCommandEnvironment(
           () => executeDaemonSessionTool(
             {
@@ -194822,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;
       }
@@ -196512,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;
@@ -198221,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);
@@ -198340,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;
@@ -198494,6 +198683,29 @@ 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);
@@ -233168,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);
@@ -234136,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-B6wZ9fN1.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);
@@ -253927,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) => {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "lody",
-  "version": "0.102.0",
+  "version": "0.103.0",
   "description": "Lody Agent CLI tool for managing remote command execution",
   "type": "module",
   "main": "dist/index.js",