@akagilnc/pi-workflow-roles 0.1.3986 → 0.1.3995

package/dist/acp-host/production-host.js

@@ -178,13 +178,20 @@ function resolveEngineName(getFlag) {
   }
   return engineNameFromEnv();
 }
-var ENGINE_DETOUR_TOOL_NAME, AK_ROLE_ENGINE_ENV, ENGINE_FLAG_NAME, ENGINE_DETOUR_STAGED_PROMPT_TOKEN, ENGINE_DETOUR_EMPTY_STDOUT_DIAGNOSTIC;
+function resolveEngineModel(getFlag) {
+  if (getFlag === void 0) return void 0;
+  const flag = getFlag(ENGINE_MODEL_FLAG_NAME);
+  if (typeof flag !== "string") return void 0;
+  return normalizeEngineName(flag);
+}
+var ENGINE_DETOUR_TOOL_NAME, AK_ROLE_ENGINE_ENV, ENGINE_FLAG_NAME, ENGINE_MODEL_FLAG_NAME, ENGINE_DETOUR_STAGED_PROMPT_TOKEN, ENGINE_DETOUR_EMPTY_STDOUT_DIAGNOSTIC;
 var init_engine_detour = __esm({
   "src/engine-detour.ts"() {
     "use strict";
     ENGINE_DETOUR_TOOL_NAME = "ak_engine_detour";
     AK_ROLE_ENGINE_ENV = "AK_ROLE_ENGINE";
     ENGINE_FLAG_NAME = "ak-engine";
+    ENGINE_MODEL_FLAG_NAME = "ak-engine-model";
     ENGINE_DETOUR_STAGED_PROMPT_TOKEN = "<<ak-engine-staged-prompt>>";
     ENGINE_DETOUR_EMPTY_STDOUT_DIAGNOSTIC = "\u52B3\u52A1\u5F15\u64CE stdout \u4E3A\u7A7A";
   }
@@ -1009,6 +1016,84 @@ var init_gatekeeper_output = __esm({
   }
 });
 
+// src/package-resources/engine-material.ts
+import { existsSync as existsSync2, readdirSync } from "node:fs";
+import { join as join6 } from "node:path";
+function pickEngineAxis(source) {
+  return {
+    ...source.engine === void 0 ? {} : { engine: source.engine },
+    ...source.engineModel === void 0 ? {} : { engineModel: source.engineModel }
+  };
+}
+function assertLegalEngineModel(model) {
+  if (typeof model !== "string" || model.trim() === "" || model.trim() !== model) {
+    throw new Error(`illegal engine model: ${JSON.stringify(model)}`);
+  }
+  return model;
+}
+function isEngineNameSyntax(name) {
+  if (typeof name !== "string") return false;
+  if (name.length === 0 || name.trim() !== name) return false;
+  if (name === "." || name === "..") return false;
+  if (name.includes("/") || name.includes("\\") || name.includes("\0")) return false;
+  return true;
+}
+function resolveEngineMaterialDirectory(packageRoot) {
+  return join6(packageRoot, ENGINE_MATERIAL_RELATIVE_ROOT);
+}
+function resolveEngineMaterialPath(packageRoot, name) {
+  const legal = assertLegalEngineName(name);
+  return join6(resolveEngineMaterialDirectory(packageRoot), `${legal}.md`);
+}
+function assertLegalEngineName(name) {
+  if (!isEngineNameSyntax(name)) {
+    throw new Error(`illegal engine name: ${name}`);
+  }
+  return name;
+}
+function engineSessionMaterialFromOptions(options) {
+  if (options.engine === void 0) return void 0;
+  if (options.packageRoot === void 0 || options.packageRoot.trim() === "") {
+    throw new Error("packageRoot is required when engine is configured");
+  }
+  const name = assertLegalEngineName(options.engine);
+  const model = options.engineModel === void 0 ? void 0 : assertLegalEngineModel(options.engineModel);
+  const materialPath = resolveEngineMaterialPath(options.packageRoot, name);
+  const modelField = model === void 0 ? {} : { model };
+  if (existsSync2(materialPath)) {
+    return Object.freeze({ name, materialPath, ...modelField });
+  }
+  return Object.freeze({ name, ...modelField });
+}
+function appendEngineSessionMaterial(lines, engineMaterial) {
+  if (engineMaterial === void 0) {
+    return [...lines];
+  }
+  const out = [...lines];
+  out.push("");
+  if (engineMaterial.materialPath !== void 0) {
+    out.push("\u672C\u6B21\u914D\u7F6E\u7684\u52B3\u52A1\u5F15\u64CE\u53CA\u5176\u624B\u518C\uFF1A");
+    out.push(`- engine: ${engineMaterial.name}`);
+    if (engineMaterial.model !== void 0) {
+      out.push(`- engineModel: ${engineMaterial.model}`);
+    }
+    out.push(`- ${engineMaterial.materialPath}`);
+  } else {
+    out.push(`- engine: ${engineMaterial.name}`);
+    if (engineMaterial.model !== void 0) {
+      out.push(`- engineModel: ${engineMaterial.model}`);
+    }
+  }
+  return out;
+}
+var ENGINE_MATERIAL_RELATIVE_ROOT;
+var init_engine_material = __esm({
+  "src/package-resources/engine-material.ts"() {
+    "use strict";
+    ENGINE_MATERIAL_RELATIVE_ROOT = "resources/engines";
+  }
+});
+
 // src/pi/durable-principal.ts
 var durable_principal_exports = {};
 __export(durable_principal_exports, {
@@ -1016,25 +1101,25 @@ __export(durable_principal_exports, {
   piDurablePrincipalAuthority: () => piDurablePrincipalAuthority
 });
 import { lstat } from "node:fs/promises";
-import { join as join6 } from "node:path";
+import { join as join7 } from "node:path";
 function encode(coordinates) {
   return coordinates;
 }
 function issuePiDurablePrincipalCoordinates(request) {
   const ledgerHome = resolveActivationLedgerHome(request.home);
   const bookKey = resolveBookKeyFromGit(request.cwd);
-  const runDirectory = join6(
+  const runDirectory = join7(
     activationBookDirectory(ledgerHome, bookKey),
     "runs",
     `${request.runId}@${request.role}`
   );
-  const sessionDirectory = join6(runDirectory, "session");
+  const sessionDirectory = join7(runDirectory, "session");
   return {
     ledgerHome,
     bookKey,
     runDirectory,
     sessionDirectory,
-    sessionFile: join6(sessionDirectory, "session.jsonl")
+    sessionFile: join7(sessionDirectory, "session.jsonl")
   };
 }
 var piDurablePrincipalAuthority;
@@ -1067,7 +1152,7 @@ var init_durable_principal = __esm({
         }
         return {
           sessionDirectory: record4.sessionDirectory,
-          sessionFile: typeof record4.sessionFile === "string" && record4.sessionFile.trim() !== "" ? record4.sessionFile : join6(record4.sessionDirectory, "session.jsonl")
+          sessionFile: typeof record4.sessionFile === "string" && record4.sessionFile.trim() !== "" ? record4.sessionFile : join7(record4.sessionDirectory, "session.jsonl")
         };
       },
       async isAvailable(principal) {
@@ -1945,12 +2030,12 @@ var init_sitian_contracts = __esm({
 import { createHash as createHash2, randomUUID } from "node:crypto";
 import {
   appendFileSync,
-  existsSync as existsSync2,
+  existsSync as existsSync3,
   readFileSync as readFileSync2,
   unlinkSync,
   writeFileSync as writeFileSync2
 } from "node:fs";
-import { basename as basename3, dirname as dirname5, join as join7, resolve as resolve5 } from "node:path";
+import { basename as basename3, dirname as dirname5, join as join8, resolve as resolve5 } from "node:path";
 function isRecord(value) {
   return typeof value === "object" && value !== null && !Array.isArray(value);
 }
@@ -1965,14 +2050,14 @@ function createExclusiveFile(path, contents) {
   writeFileSync2(path, contents, { encoding: "utf8", flag: "wx" });
 }
 function sealTornTail(recordFile) {
-  if (!existsSync2(recordFile)) return;
+  if (!existsSync3(recordFile)) return;
   const buffer = readFileSync2(recordFile);
   if (buffer.length > 0 && buffer[buffer.length - 1] !== 10) {
     appendFileSync(recordFile, "\n", "utf8");
   }
 }
 function findIdentityPointer(recordFile, identity, kind, level) {
-  if (!existsSync2(recordFile)) return void 0;
+  if (!existsSync3(recordFile)) return void 0;
   const text = readFileSync2(recordFile, "utf8");
   for (const line2 of text.split("\n")) {
     const trimmed = line2.trim();
@@ -2089,7 +2174,7 @@ function resolveSitianRecordPathInLedger(input, ledgerHome) {
   const category = resolveSitianVolumeCategory(input.kind);
   let sessionDir;
   if (input.sessionParent !== void 0 && input.sessionParent.length > 0 && physicallyContainedIn(ledgerHome, input.sessionParent)) {
-    sessionDir = join7(dirname5(input.sessionParent), category);
+    sessionDir = join8(dirname5(input.sessionParent), category);
   } else {
     const bookKey = safeBookKey(cwd);
     const bookDir = activationBookDirectory(ledgerHome, bookKey);
@@ -2103,12 +2188,12 @@ function resolveSitianRecordPathInLedger(input, ledgerHome) {
         subjectStr = JSON.stringify(input.subject);
       }
       const digest = createHash2("sha256").update(subjectStr).digest("hex").slice(0, 32);
-      sessionDir = join7(bookDir, category, digest);
+      sessionDir = join8(bookDir, category, digest);
     } else {
-      sessionDir = join7(bookDir, category);
+      sessionDir = join8(bookDir, category);
     }
   }
-  const recordFile = join7(sessionDir, "records.jsonl");
+  const recordFile = join8(sessionDir, "records.jsonl");
   return { sessionDir, recordFile, ledgerHome };
 }
 function resolveSitianRecordPath(input) {
@@ -2165,13 +2250,13 @@ var init_sitian_appender = __esm({
 });
 
 // src/sitian-reader.ts
-import { existsSync as existsSync3 } from "node:fs";
+import { existsSync as existsSync4 } from "node:fs";
 import { readFile } from "node:fs/promises";
 function isRecord2(value) {
   return typeof value === "object" && value !== null && !Array.isArray(value);
 }
 async function readSitianRecords(recordFile) {
-  if (!existsSync3(recordFile)) {
+  if (!existsSync4(recordFile)) {
     return { records: [], diagnostics: [] };
   }
   const text = await readFile(recordFile, "utf8");
@@ -2240,12 +2325,12 @@ __export(role_turn_host_exports, {
 import { execFile, spawn as spawn2 } from "node:child_process";
 import { constants } from "node:fs";
 import { access, appendFile, readFile as readFile2, realpath } from "node:fs/promises";
-import { basename as basename4, delimiter, dirname as dirname6, isAbsolute as isAbsolute3, join as join8, resolve as resolve6 } from "node:path";
+import { basename as basename4, delimiter, dirname as dirname6, isAbsolute as isAbsolute3, join as join9, resolve as resolve6 } from "node:path";
 import { platform } from "node:process";
 import { promisify } from "node:util";
 import { randomUUID as randomUUID2 } from "node:crypto";
 function resolveInternalRoleEntrypoint(packageRoot) {
-  return join8(packageRoot, INTERNAL_ROLE_ENTRYPOINT_RELATIVE);
+  return join9(packageRoot, INTERNAL_ROLE_ENTRYPOINT_RELATIVE);
 }
 function buildExplicitInternalActivationArgs(selectedRoleEntry, extraArgs = []) {
   return ["--no-extensions", "-e", selectedRoleEntry, ...extraArgs];
@@ -2649,7 +2734,7 @@ var init_host_descriptions = __esm({
 
 // src/run-ticket-number.ts
 import { readFile as readFile3 } from "node:fs/promises";
-import { join as join9 } from "node:path";
+import { join as join10 } from "node:path";
 function isEnoent(error) {
   return error instanceof Error && "code" in error && error.code === "ENOENT";
 }
@@ -2662,7 +2747,7 @@ function ticketFromRecord(record4) {
 }
 async function readPageTicketNumber(runDirectory, page) {
   try {
-    const raw = JSON.parse(await readFile3(join9(runDirectory, page), "utf8"));
+    const raw = JSON.parse(await readFile3(join10(runDirectory, page), "utf8"));
     if (raw === null || typeof raw !== "object" || Array.isArray(raw)) {
       return void 0;
     }
@@ -3954,9 +4039,9 @@ var init_uuidv7 = __esm({
 
 // src/typed-provider-http.ts
 import { readFile as readFile7, unlink, writeFile as writeFile2 } from "node:fs/promises";
-import { join as join10 } from "node:path";
+import { join as join11 } from "node:path";
 function typedProviderHttpPath(runDirectory) {
-  return join10(runDirectory, TYPED_HTTP_FILE);
+  return join11(runDirectory, TYPED_HTTP_FILE);
 }
 async function clearTypedProviderHttpObservation(runDirectory) {
   try {
@@ -4015,64 +4100,6 @@ var init_typed_provider_http = __esm({
   }
 });
 
-// src/package-resources/engine-material.ts
-import { existsSync as existsSync4, readdirSync } from "node:fs";
-import { join as join11 } from "node:path";
-function isEngineNameSyntax(name) {
-  if (typeof name !== "string") return false;
-  if (name.length === 0 || name.trim() !== name) return false;
-  if (name === "." || name === "..") return false;
-  if (name.includes("/") || name.includes("\\") || name.includes("\0")) return false;
-  return true;
-}
-function resolveEngineMaterialDirectory(packageRoot) {
-  return join11(packageRoot, ENGINE_MATERIAL_RELATIVE_ROOT);
-}
-function resolveEngineMaterialPath(packageRoot, name) {
-  const legal = assertLegalEngineName(name);
-  return join11(resolveEngineMaterialDirectory(packageRoot), `${legal}.md`);
-}
-function assertLegalEngineName(name) {
-  if (!isEngineNameSyntax(name)) {
-    throw new Error(`illegal engine name: ${name}`);
-  }
-  return name;
-}
-function engineSessionMaterialFromOptions(options) {
-  if (options.engine === void 0) return void 0;
-  if (options.packageRoot === void 0 || options.packageRoot.trim() === "") {
-    throw new Error("packageRoot is required when engine is configured");
-  }
-  const name = assertLegalEngineName(options.engine);
-  const materialPath = resolveEngineMaterialPath(options.packageRoot, name);
-  if (existsSync4(materialPath)) {
-    return Object.freeze({ name, materialPath });
-  }
-  return Object.freeze({ name });
-}
-function appendEngineSessionMaterial(lines, engineMaterial) {
-  if (engineMaterial === void 0) {
-    return [...lines];
-  }
-  const out = [...lines];
-  out.push("");
-  if (engineMaterial.materialPath !== void 0) {
-    out.push("\u672C\u6B21\u914D\u7F6E\u7684\u52B3\u52A1\u5F15\u64CE\u53CA\u5176\u624B\u518C\uFF1A");
-    out.push(`- engine: ${engineMaterial.name}`);
-    out.push(`- ${engineMaterial.materialPath}`);
-  } else {
-    out.push(`- engine: ${engineMaterial.name}`);
-  }
-  return out;
-}
-var ENGINE_MATERIAL_RELATIVE_ROOT;
-var init_engine_material = __esm({
-  "src/package-resources/engine-material.ts"() {
-    "use strict";
-    ENGINE_MATERIAL_RELATIVE_ROOT = "resources/engines";
-  }
-});
-
 // src/public-cli/run-lifecycle.ts
 import { chmod, open, readdir as readdir2, readFile as readFile8, unlink as unlink2, writeFile as writeFile3 } from "node:fs/promises";
 import { join as join12 } from "node:path";
@@ -4084,8 +4111,8 @@ function buildResumeContinuationPrompt(options) {
   return selectResumeContinuationPrompt(
     options.message,
     engineSessionMaterialFromOptions({
-      ...options.engine === void 0 ? {} : { engine: options.engine },
-      packageRoot: options.packageRoot
+      packageRoot: options.packageRoot,
+      ...pickEngineAxis(options)
     })
   );
 }
@@ -4277,7 +4304,7 @@ async function markRunAdmitted(admitted, authority) {
     ...admitted.role === "coder" || admitted.role === "fixer" ? { phase: admitted.phase } : {}
   });
 }
-async function markRunRunning(runDirectory, effectiveModel, effectiveEngine, effectiveHost) {
+async function markRunRunning(runDirectory, effectiveModel, effectiveEngine, effectiveHost, effectiveEngineModel) {
   const current = await readRoleRunStateDisk(runDirectory);
   if (current === void 0) {
     throw new Error("cannot mark running: run state missing");
@@ -4299,7 +4326,9 @@ async function markRunRunning(runDirectory, effectiveModel, effectiveEngine, eff
     effectiveModel,
     // Authoritative seat projection: absent engine ⇒ null (delete).
     effectiveEngine === void 0 ? null : effectiveEngine,
-    effectiveHost
+    effectiveHost,
+    // Authoritative with engine: absent model ⇒ null (delete) when engine axis is written.
+    effectiveEngine === void 0 ? null : effectiveEngineModel === void 0 ? null : effectiveEngineModel
   );
 }
 async function markRunResumable(runDirectory, observation) {
@@ -6065,8 +6094,10 @@ var init_option_definitions = __esm({
         usage: [
           "ak-role config set <seat> <provider/model[:thinking]> [<seat> <spec> ...]",
           "ak-role config unset <gatekeeper|inspector|notary>",
-          "ak-role config set-engine <seat> <name>",
+          "ak-role config set-engine <seat> <name> [model]",
           "ak-role config unset-engine <seat>",
+          "ak-role config set-engine-model <seat> <model>",
+          "ak-role config unset-engine-model <seat>",
           "ak-role config set-host <seat> <name>",
           "ak-role config unset-host <seat>",
           "ak-role config set-auto-resume-limit <N>"
@@ -6075,6 +6106,8 @@ var init_option_definitions = __esm({
           "ak-role config set judge openai-codex/gpt-5.6-sol:high",
           "ak-role config unset gatekeeper",
           "ak-role config set-engine judge opus",
+          "ak-role config set-engine coder cursor cursor-grok-4.6-high",
+          "ak-role config set-engine-model coder cursor-grok-4.6-high",
           "ak-role config set-host judge grok-build",
           "ak-role config set-auto-resume-limit 3"
         ]
@@ -6250,7 +6283,7 @@ async function writeRoleInvocationLedger(source, role, effectiveModel) {
     "utf8"
   );
 }
-async function recordEffectiveInvocationModel(runDirectory, model, engine, host) {
+async function recordEffectiveInvocationModel(runDirectory, model, engine, host, engineModel) {
   const ledgerPath = join14(runDirectory, "invocation.json");
   const current = JSON.parse(await readFile9(ledgerPath, "utf8"));
   const next = { ...current };
@@ -6268,6 +6301,11 @@ async function recordEffectiveInvocationModel(runDirectory, model, engine, host)
   } else if (engine !== void 0) {
     next.engine = engine;
   }
+  if (engineModel === null) {
+    delete next.engineModel;
+  } else if (engineModel !== void 0) {
+    next.engineModel = engineModel;
+  }
   if (host !== void 0) {
     next.host = host;
   }
@@ -8843,6 +8881,7 @@ __export(config_exports, {
   setAutoResumeLimit: () => setAutoResumeLimit,
   setPersistentSeatConfig: () => setPersistentSeatConfig,
   setPersistentSeatEngine: () => setPersistentSeatEngine,
+  setPersistentSeatEngineModel: () => setPersistentSeatEngineModel,
   setPersistentSeatHost: () => setPersistentSeatHost,
   validatePublicCliConfigAxes: () => validatePublicCliConfigAxes
 });
@@ -8891,7 +8930,7 @@ function setPersistentSeatConfig(config, seat, selection) {
       [seat]: {
         ...selection,
         // Model rewrite preserves a previously configured engine axis.
-        ...previous?.engine === void 0 ? {} : { engine: previous.engine },
+        ...pickEngineAxis(previous ?? {}),
         ...previous?.host === void 0 ? {} : { host: previous.host }
       }
     }
@@ -8906,7 +8945,7 @@ function clearPersistentSeatConfig(config, seat) {
       seats: {
         ...config.seats,
         [seat]: {
-          ...previous.engine === void 0 ? {} : { engine: previous.engine },
+          ...pickEngineAxis(previous),
           ...previous.host === void 0 ? {} : { host: previous.host }
         }
       }
@@ -8922,7 +8961,7 @@ function setPersistentSeatHost(config, seat, host) {
   }
   if (host === void 0) {
     const { host: _dropped, ...rest } = previous;
-    if (seatModelOnly(rest) === void 0 && rest.engine === void 0) {
+    if (seatModelOnly(rest) === void 0 && rest.engine === void 0 && rest.engineModel === void 0) {
       const { [seat]: _row, ...seats } = config.seats;
       return { ...config, seats };
     }
@@ -8931,7 +8970,7 @@ function setPersistentSeatHost(config, seat, host) {
   const registered = assertRegisteredHostName(host);
   return { ...config, seats: { ...config.seats, [seat]: { ...previous, host: registered } } };
 }
-function setPersistentSeatEngine(config, seat, engine) {
+function setPersistentSeatEngine(config, seat, engine, engineModel) {
   const previous = config.seats[seat];
   if (previous === void 0) {
     throw new Error(
@@ -8939,7 +8978,7 @@ function setPersistentSeatEngine(config, seat, engine) {
     );
   }
   if (engine === void 0) {
-    const { engine: _dropped, ...modelOnly } = previous;
+    const { engine: _dropped, engineModel: _droppedModel, ...modelOnly } = previous;
     if (seatModelOnly(modelOnly) === void 0 && modelOnly.host === void 0) {
       const { [seat]: _row, ...seats } = config.seats;
       return { ...config, seats };
@@ -8952,11 +8991,38 @@ function setPersistentSeatEngine(config, seat, engine) {
       }
     };
   }
+  const { engineModel: _priorModel, ...withoutModel } = previous;
+  const next = engineModel === void 0 ? { ...withoutModel, engine } : { ...withoutModel, engine, engineModel };
   return {
     ...config,
     seats: {
       ...config.seats,
-      [seat]: { ...previous, engine }
+      [seat]: next
+    }
+  };
+}
+function setPersistentSeatEngineModel(config, seat, engineModel) {
+  const previous = config.seats[seat];
+  if (previous === void 0 || previous.engine === void 0) {
+    throw new Error(
+      `config seat ${seat} has no persistent engine; set-engine before engine model`
+    );
+  }
+  if (engineModel === void 0) {
+    const { engineModel: _dropped, ...rest } = previous;
+    return {
+      ...config,
+      seats: {
+        ...config.seats,
+        [seat]: rest
+      }
+    };
+  }
+  return {
+    ...config,
+    seats: {
+      ...config.seats,
+      [seat]: { ...previous, engineModel }
     }
   };
 }
@@ -8984,6 +9050,21 @@ function validatePublicCliConfigAxes(config, _packageRoot) {
         );
       }
     }
+    if (row?.engineModel !== void 0) {
+      if (row.engine === void 0) {
+        throw new Error(
+          `config seat ${seat} engineModel requires engine`
+        );
+      }
+      try {
+        assertLegalEngineModel(row.engineModel);
+      } catch (error) {
+        throw new Error(
+          `config seat ${seat} engineModel is illegal: ${row.engineModel}`,
+          { cause: error }
+        );
+      }
+    }
     if (row?.host !== void 0) {
       try {
         assertRegisteredHostName(row.host);
@@ -9098,13 +9179,19 @@ function parseSeatModelConfig(value, seat) {
   if (raw.engine !== void 0 && typeof raw.engine !== "string") {
     throw new Error(`config seat ${seat} engine must be a string`);
   }
+  if (raw.engineModel !== void 0 && typeof raw.engineModel !== "string") {
+    throw new Error(`config seat ${seat} engineModel must be a string`);
+  }
   if (!hasProvider) {
     if ((seat === "notary" || seat === "inspector") && (typeof raw.engine === "string" || typeof raw.host === "string")) {
       if (raw.thinking !== void 0) {
         throw new Error(`config seat ${seat} thinking requires provider/model`);
       }
       return {
-        ...raw.engine === void 0 ? {} : { engine: raw.engine },
+        ...pickEngineAxis({
+          engine: typeof raw.engine === "string" ? raw.engine : void 0,
+          engineModel: typeof raw.engineModel === "string" ? raw.engineModel : void 0
+        }),
         ...raw.host === void 0 ? {} : { host: raw.host }
       };
     }
@@ -9123,7 +9210,10 @@ function parseSeatModelConfig(value, seat) {
     provider: raw.provider,
     model: raw.model,
     ...raw.thinking === void 0 ? {} : { thinking: raw.thinking },
-    ...raw.engine === void 0 ? {} : { engine: raw.engine },
+    ...pickEngineAxis({
+      engine: typeof raw.engine === "string" ? raw.engine : void 0,
+      engineModel: typeof raw.engineModel === "string" ? raw.engineModel : void 0
+    }),
     ...raw.host === void 0 ? {} : { host: raw.host }
   };
   return parsed;
@@ -9158,18 +9248,26 @@ function attachEngineAxis(seat, config, invocation) {
       engineSource: "unconfigured"
     };
   }
-  const persistentEngine = config.seats[seat.seat]?.engine;
+  const persistentRow = config.seats[seat.seat];
+  const persistentEngine = persistentRow?.engine;
+  const persistentEngineModel = persistentRow?.engineModel;
   if (invocation?.engine !== void 0) {
     return {
       ...seat,
-      engine: invocation.engine,
+      ...pickEngineAxis({
+        engine: invocation.engine,
+        engineModel: invocation.engineModel
+      }),
       engineSource: "invocation"
     };
   }
   if (persistentEngine !== void 0) {
     return {
       ...seat,
-      engine: persistentEngine,
+      ...pickEngineAxis({
+        engine: persistentEngine,
+        engineModel: persistentEngineModel
+      }),
       engineSource: "persistent"
     };
   }
@@ -15555,7 +15653,13 @@ async function dispatchPostAdmissionTurn(input) {
         )
       };
     }
-    await markRunRunning(admitted.runDirectory, env.model, effectiveEngine, env.host);
+    await markRunRunning(
+      admitted.runDirectory,
+      env.model,
+      effectiveEngine,
+      env.host,
+      env.engineModel
+    );
     let result;
     try {
       result = await env.roleTurnHost.executeTurn(turnRequest);
@@ -15789,7 +15893,7 @@ ${body}`;
     } else {
       prompt = buildResumeContinuationPrompt({
         packageRoot: env.packageRoot,
-        ...env.engine === void 0 ? {} : { engine: env.engine },
+        ...pickEngineAxis(env),
         message: request.message
       });
     }
@@ -15808,7 +15912,7 @@ ${GATE_DOSSIER_POINTER_PREFIX}${path}`;
   } else {
     prompt = buildResumeContinuationPrompt({
       packageRoot: env.packageRoot,
-      ...env.engine === void 0 ? {} : { engine: env.engine }
+      ...pickEngineAxis(env)
     });
   }
   return {
@@ -15816,7 +15920,7 @@ ${GATE_DOSSIER_POINTER_PREFIX}${path}`;
     home: env.home,
     agentDir: env.agentDir,
     ...env.model === void 0 ? {} : { model: env.model },
-    ...env.engine === void 0 ? {} : { engine: env.engine },
+    ...pickEngineAxis(env),
     ...env.timeoutMs === void 0 ? {} : { timeoutMs: env.timeoutMs },
     ...admitted.correlationId === void 0 && env.correlationId === void 0 ? {} : { correlationId: admitted.correlationId ?? env.correlationId },
     continuation: {
@@ -16008,7 +16112,6 @@ async function runPostAdmissionSeatResume(input) {
   }
 }
 async function runPostAdmissionOneShot(input) {
-  const engine = input.effectiveEngine ?? input.env.engine;
   return await runPostAdmissionResumable({
     admitted: input.admitted,
     env: input.env,
@@ -16020,7 +16123,10 @@ async function runPostAdmissionOneShot(input) {
         kind: "resume",
         prompt: buildResumeContinuationPrompt({
           packageRoot: input.env.packageRoot,
-          ...engine === void 0 ? {} : { engine }
+          ...pickEngineAxis({
+            engine: input.effectiveEngine ?? input.env.engine,
+            engineModel: input.env.engineModel
+          })
         })
       }
     }),
@@ -16133,6 +16239,7 @@ var init_post_admission = __esm({
     init_cli_errors();
     init_invocation();
     init_activation_ledger_topology();
+    init_engine_material();
     init_session_identity();
     init_case_dossier_delivery();
     init_host_transition_prior_native();
@@ -16161,7 +16268,7 @@ function projectRoleTurnRequest(admitted, roleDetails, options) {
     methods: roleDetails.methods ?? [],
     continuation: options.continuation,
     ...options.model === void 0 ? {} : { model: options.model },
-    ...options.engine === void 0 ? {} : { engine: options.engine },
+    ...pickEngineAxis(options),
     cwd,
     home: options.home,
     agentDir: options.agentDir,
@@ -16175,6 +16282,7 @@ function projectRoleTurnRequest(admitted, roleDetails, options) {
 var init_turn_request = __esm({
   "src/public-cli/turn-request.ts"() {
     "use strict";
+    init_engine_material();
   }
 });
 
@@ -16268,7 +16376,7 @@ async function runPublicNotary(argv, env, io, parseNotaryArgv2) {
   }
   await markRunAdmitted(admitted, env.principalAuthority);
   const engineMaterial = engineSessionMaterialFromOptions({
-    ...env.engine === void 0 ? {} : { engine: env.engine },
+    ...pickEngineAxis(env),
     packageRoot: env.packageRoot
   });
   const turnRequest = buildNotaryTurnRequest(admitted, {
@@ -16276,7 +16384,7 @@ async function runPublicNotary(argv, env, io, parseNotaryArgv2) {
     home: env.home,
     agentDir: env.agentDir,
     ...env.model === void 0 ? {} : { model: env.model },
-    ...env.engine === void 0 ? {} : { engine: env.engine },
+    ...pickEngineAxis(env),
     ...env.timeoutMs === void 0 ? {} : { timeoutMs: env.timeoutMs },
     ...env.correlationId === void 0 || env.correlationId.trim() === "" ? {} : { correlationId: env.correlationId },
     continuation: {
@@ -16440,7 +16548,7 @@ async function runPublicInspector(argv, env, io, parseInspectorArgv2) {
   }
   await markRunAdmitted(admitted, env.principalAuthority);
   const engineMaterial = engineSessionMaterialFromOptions({
-    ...env.engine === void 0 ? {} : { engine: env.engine },
+    ...pickEngineAxis(env),
     packageRoot: env.packageRoot
   });
   const turnRequest = buildInspectorTurnRequest(admitted, {
@@ -16448,7 +16556,7 @@ async function runPublicInspector(argv, env, io, parseInspectorArgv2) {
     home: env.home,
     agentDir: env.agentDir,
     ...env.model === void 0 ? {} : { model: env.model },
-    ...env.engine === void 0 ? {} : { engine: env.engine },
+    ...pickEngineAxis(env),
     ...env.timeoutMs === void 0 ? {} : { timeoutMs: env.timeoutMs },
     ...env.correlationId === void 0 || env.correlationId.trim() === "" ? {} : { correlationId: env.correlationId },
     continuation: {
@@ -16738,7 +16846,7 @@ async function runPublicInstructionSeat(argv, env, io, role, parseArgv) {
         home: env.home,
         agentDir: env.agentDir,
         ...env.model === void 0 ? {} : { model: env.model },
-        ...env.engine === void 0 ? {} : { engine: env.engine },
+        ...pickEngineAxis(env),
         ...env.timeoutMs === void 0 ? {} : { timeoutMs: env.timeoutMs },
         ...env.correlationId === void 0 || env.correlationId.trim() === "" ? {} : { correlationId: env.correlationId },
         continuation: {
@@ -16746,7 +16854,7 @@ async function runPublicInstructionSeat(argv, env, io, role, parseArgv) {
           prompt: buildInstructionTransportPrompt(
             admitted,
             engineSessionMaterialFromOptions({
-              ...env.engine === void 0 ? {} : { engine: env.engine },
+              ...pickEngineAxis(env),
               packageRoot: env.packageRoot
             })
           )
@@ -16838,7 +16946,7 @@ async function runPublicJudge(argv, env, io, parseJudgeArgv2) {
       home: env.home,
       agentDir: env.agentDir,
       ...env.model === void 0 ? {} : { model: env.model },
-      ...env.engine === void 0 ? {} : { engine: env.engine },
+      ...pickEngineAxis(env),
       ...env.timeoutMs === void 0 ? {} : { timeoutMs: env.timeoutMs },
       ...admitted.correlationId === void 0 && env.correlationId === void 0 ? {} : { correlationId: admitted.correlationId ?? env.correlationId },
       continuation: {
@@ -16846,7 +16954,7 @@ async function runPublicJudge(argv, env, io, parseJudgeArgv2) {
         prompt: buildJudgeTransportPrompt(
           admitted,
           engineSessionMaterialFromOptions({
-            ...env.engine === void 0 ? {} : { engine: env.engine },
+            ...pickEngineAxis(env),
             packageRoot: env.packageRoot
           })
         )
@@ -16857,14 +16965,14 @@ async function runPublicJudge(argv, env, io, parseJudgeArgv2) {
       home: env.home,
       agentDir: env.agentDir,
       ...env.model === void 0 ? {} : { model: env.model },
-      ...env.engine === void 0 ? {} : { engine: env.engine },
+      ...pickEngineAxis(env),
       ...env.timeoutMs === void 0 ? {} : { timeoutMs: env.timeoutMs },
       ...admitted.correlationId === void 0 && env.correlationId === void 0 ? {} : { correlationId: admitted.correlationId ?? env.correlationId },
       continuation: {
         kind: "resume",
         prompt: buildResumeContinuationPrompt({
           packageRoot: env.packageRoot,
-          ...env.engine === void 0 ? {} : { engine: env.engine }
+          ...pickEngineAxis(env)
         })
       }
     }),
@@ -16944,12 +17052,18 @@ async function runPublicDoctor(argv, env, io, parseDoctorArgv2) {
     home: env.home,
     agentDir: env.agentDir,
     ...env.model === void 0 ? {} : { model: env.model },
-    ...env.engine === void 0 ? {} : { engine: env.engine },
+    ...pickEngineAxis(env),
     ...env.timeoutMs === void 0 ? {} : { timeoutMs: env.timeoutMs },
     ...env.correlationId === void 0 || env.correlationId.trim() === "" ? {} : { correlationId: env.correlationId },
     continuation: {
       kind: "initial",
-      prompt: buildDoctorTransportPrompt(admitted, engineSessionMaterialFromOptions({ ...env.engine === void 0 ? {} : { engine: env.engine }, packageRoot: env.packageRoot }))
+      prompt: buildDoctorTransportPrompt(
+        admitted,
+        engineSessionMaterialFromOptions({
+          ...pickEngineAxis(env),
+          packageRoot: env.packageRoot
+        })
+      )
     }
   });
   return await runPostAdmissionOneShot({
@@ -17082,7 +17196,7 @@ async function runPublicDiarist(argv, env, io, parseDiaristArgv2) {
     home: env.home,
     agentDir: env.agentDir,
     ...env.model === void 0 ? {} : { model: env.model },
-    ...env.engine === void 0 ? {} : { engine: env.engine },
+    ...pickEngineAxis(env),
     ...env.timeoutMs === void 0 ? {} : { timeoutMs: env.timeoutMs },
     ...env.correlationId === void 0 || env.correlationId.trim() === "" ? {} : { correlationId: env.correlationId },
     continuation: {
@@ -17090,7 +17204,7 @@ async function runPublicDiarist(argv, env, io, parseDiaristArgv2) {
       prompt: buildInstructionTransportPrompt(
         admitted,
         engineSessionMaterialFromOptions({
-          ...env.engine === void 0 ? {} : { engine: env.engine },
+          ...pickEngineAxis(env),
           packageRoot: env.packageRoot
         })
       )
@@ -17235,7 +17349,7 @@ async function resolveSummonHome(options) {
   return packageMachineHome2();
 }
 function projectSeatEngine(seat) {
-  return seat.engine === void 0 ? {} : { engine: seat.engine };
+  return pickEngineAxis(seat);
 }
 function projectSeatHost(seat) {
   return seat.host === void 0 ? {} : { host: seat.host };
@@ -17476,6 +17590,7 @@ var AK_ROLE_PACKAGE_ROOT_ENV;
 var init_public_role_summons = __esm({
   "src/public-role-summons.ts"() {
     "use strict";
+    init_engine_material();
     AK_ROLE_PACKAGE_ROOT_ENV = "AK_ROLE_PACKAGE_ROOT";
   }
 });
@@ -18158,10 +18273,12 @@ function isCallerCancellation(error, signal) {
 }
 function createEngineDetourToolDefinition(input) {
   const engineName = input.engineName;
+  const engineModel = input.engineModel;
+  const engineCoord = engineModel === void 0 ? `engine=${engineName}` : `engine=${engineName}, model=${engineModel}`;
   return {
     name: ENGINE_DETOUR_TOOL_NAME,
     label: "\u52B3\u52A1\u5F15\u64CE",
-    description: `\u8FD0\u884C\u4E00\u6B21\u52B3\u52A1\u5F15\u64CE\u5B50\u8FDB\u7A0B\uFF08engine=${engineName}\uFF09\uFF0Cstdout \u8FD4\u56DE\u672C session\u3002`,
+    description: `\u8FD0\u884C\u4E00\u6B21\u52B3\u52A1\u5F15\u64CE\u5B50\u8FDB\u7A0B\uFF08${engineCoord}\uFF09\uFF0Cstdout \u8FD4\u56DE\u672C session\u3002`,
     promptSnippet: "\u8FD0\u884C\u914D\u7F6E\u7684\u52B3\u52A1\u5F15\u64CE\u4E00\u6B21\u5E76\u8FD4\u56DE stdout",
     parameters: engineDetourArgsSchema,
     async execute(toolCallId, params, signal, _onUpdate, ctx) {
@@ -18205,12 +18322,15 @@ function createEngineDetourToolDefinition(input) {
   };
 }
 function registerEngineDetourTool(roleHost, hostActions) {
-  const engineName = resolveEngineName((name) => roleHost.getFlag(name));
+  const getFlag = (name) => roleHost.getFlag(name);
+  const engineName = resolveEngineName(getFlag);
   if (engineName === void 0) {
     return false;
   }
+  const engineModel = resolveEngineModel(getFlag);
   const definition = createEngineDetourToolDefinition({
     engineName,
+    ...engineModel === void 0 ? {} : { engineModel },
     fail(error, toolCallId, ctx) {
       hostActions.failInfrastructure(error, ctx, toolCallId);
     }
@@ -22587,6 +22707,7 @@ async function prepareRoleEnvelope(options) {
   }
   const flags = projectActivationFlags(request);
   flags.set(ENGINE_FLAG_NAME, normalizeEngineName(request.engine) ?? "");
+  flags.set(ENGINE_MODEL_FLAG_NAME, normalizeEngineName(request.engineModel) ?? "");
   const tools = /* @__PURE__ */ new Map();
   const handlers = /* @__PURE__ */ new Map();
   const calls = [];