@ycodium-ai/agent-grok 0.2.3710 → 0.2.3799

package/dist/index.js

@@ -6,6 +6,11 @@ var __export = (target, all) => {
 
 // src/index.ts
 import { definePlugin } from "@ycodium-ai/plugin-api";
+import {
+  EXECUTOR_EFFECTIVE_PAYLOAD_SCHEMA,
+  executorHomeEffectiveValue,
+  readExecutorEffectiveRequest
+} from "@ycodium-ai/plugin-api/executor";
 
 // src/card.ts
 var GROK_DRIVER_KIND = "grok";
@@ -23,6 +28,8 @@ var GROK_CARD = {
   // `grokInstance.startSession` 里按用户选择拼。
   launchArgs: "agent stdio",
   homeEnvVar: "GROK_HOME",
+  // 设置表单里留空的格子此刻会用什么，见 index.ts 的同名命令。
+  effectiveCommand: "effectiveConfig",
   // 只有一个账户目录，它同时装着会话历史：换目录，已开的 thread 就接不上这个实例了。
   accountDirectory: {
     configKeys: ["homePath"],
@@ -81,7 +88,10 @@ var GROK_CARD = {
     // 压缩生命周期事件报；CLI 没宣告这条命令时 `compactContext` 拒绝，不退回发文本。
     contextCompaction: "native",
     // 子 agent 经父会话上的 subagent_* 通知报成 task.*（grokSubagents.ts）。
-    reportsSpawnedAgents: true
+    reportsSpawnedAgents: true,
+    // 插话：起会话前在配置里打开 `follow_up_behavior = "steer"`（grokFollowUpSteer.ts），运行中再发的 prompt
+    // 由 grok 在下一个工具调用结束时并进这一轮（1.0.70 ACP 模式实测）；执行器不等前一条应答就写出去。
+    turnSteering: true
   },
   // 凭据由 CLI 自己保管在 `<GROK_HOME>/auth.json`，宿主读它只认 `/token`。
   credentialSources: [
@@ -161,6 +171,166 @@ var GROK_CARD = {
   }
 };
 
+// src/grokHome.ts
+import * as NodeCrypto from "node:crypto";
+import * as NodeOS from "node:os";
+import * as NodePath2 from "node:path";
+import { mergeLaunchEnv } from "@ycodium-ai/plugin-api/executor";
+
+// src/grokAccount.ts
+import * as NodeFS from "node:fs";
+import * as NodePath from "node:path";
+var AUTH_FILE_NAME = "auth.json";
+var isRecord = (value) => typeof value === "object" && value !== null && !Array.isArray(value);
+var readString = (record4, key) => {
+  const value = record4[key];
+  if (typeof value !== "string") return void 0;
+  const trimmed3 = value.trim();
+  return trimmed3.length > 0 ? trimmed3 : void 0;
+};
+var parseJsonRecord = (raw) => {
+  let parsed;
+  try {
+    parsed = JSON.parse(raw);
+  } catch {
+    return void 0;
+  }
+  return isRecord(parsed) ? parsed : void 0;
+};
+var directoryExists = (homePath) => {
+  try {
+    return NodeFS.statSync(homePath).isDirectory();
+  } catch {
+    return false;
+  }
+};
+var readCredentialFile = (path) => {
+  try {
+    return NodeFS.readFileSync(path, "utf8");
+  } catch {
+    return void 0;
+  }
+};
+var signedOutProbe = (exists) => ({
+  state: "signed-out",
+  directoryExists: exists,
+  email: void 0,
+  name: void 0,
+  expiresAt: void 0
+});
+var unreadableProbe = (exists) => ({
+  state: "unreadable",
+  directoryExists: exists,
+  email: void 0,
+  name: void 0,
+  expiresAt: void 0
+});
+var joinName = (record4) => {
+  const first = readString(record4, "first_name");
+  const last = readString(record4, "last_name");
+  const joined = [first, last].filter((part) => part !== void 0).join(" ");
+  return joined.length > 0 ? joined : void 0;
+};
+var findIdentityEntry = (parsed) => {
+  for (const value of Object.values(parsed)) {
+    if (!isRecord(value)) continue;
+    if (readString(value, "email") !== void 0 || readString(value, "user_id") !== void 0) {
+      return value;
+    }
+  }
+  return void 0;
+};
+var isExpired = (expiresAt, nowMs) => {
+  if (expiresAt === void 0) return false;
+  const parsed = Date.parse(expiresAt);
+  return Number.isNaN(parsed) ? false : parsed <= nowMs;
+};
+var readGrokAccount = (homePath) => {
+  const exists = directoryExists(homePath);
+  const raw = readCredentialFile(NodePath.join(homePath, AUTH_FILE_NAME));
+  if (raw === void 0) return signedOutProbe(exists);
+  const parsed = parseJsonRecord(raw);
+  const identity = parsed === void 0 ? void 0 : findIdentityEntry(parsed);
+  if (identity === void 0) return unreadableProbe(exists);
+  const expiresAt = readString(identity, "expires_at");
+  return {
+    state: isExpired(expiresAt, Date.now()) ? "expired" : "signed-in",
+    directoryExists: exists,
+    email: readString(identity, "email"),
+    name: joinName(identity),
+    expiresAt
+  };
+};
+
+// src/grokHome.ts
+function expandHomePath(value) {
+  if (value === "~") return NodeOS.homedir();
+  if (value.startsWith("~/") || value.startsWith("~\\")) {
+    return NodePath2.join(NodeOS.homedir(), value.slice(2));
+  }
+  return value;
+}
+function resolveGrokHomePath(value) {
+  const trimmed3 = value.trim();
+  if (trimmed3.length === 0) return NodePath2.join(NodeOS.homedir(), ".grok");
+  return NodePath2.resolve(expandHomePath(trimmed3));
+}
+function probeGrokAccount(accountPath) {
+  const resolved = resolveGrokHomePath(accountPath);
+  const account = readGrokAccount(resolved);
+  return {
+    accountPath: resolved,
+    state: account.state,
+    ...account.email === void 0 ? {} : { email: account.email },
+    ...account.name === void 0 ? {} : { name: account.name },
+    ...account.expiresAt === void 0 ? {} : { expiresAt: account.expiresAt }
+  };
+}
+function grokContinuationKey(recipe) {
+  return `grok:home:${resolveGrokHomePath(recipe.homePath)}`;
+}
+function resolveAccountHomePath(recipe, configuredHome) {
+  const fromEnvironment = recipe.environment["GROK_HOME"]?.trim();
+  if (fromEnvironment !== void 0 && fromEnvironment.length > 0) {
+    return NodePath2.resolve(expandHomePath(fromEnvironment));
+  }
+  return resolveGrokHomePath(configuredHome);
+}
+function absentPath() {
+  return NodePath2.join(
+    NodeOS.tmpdir(),
+    `ycodium-grok-no-auth-${NodeCrypto.randomUUID()}`,
+    "auth.json"
+  );
+}
+function ownEndpointAuthGuard(recipe) {
+  const connectivity = GROK_CARD.modelConnectivity;
+  const baseUrlKey = connectivity.baseUrlEnvKey;
+  if (baseUrlKey === void 0 || (recipe.environment[baseUrlKey]?.trim() ?? "") === "") return {};
+  const guard = {};
+  for (const entry of connectivity.extraEnv ?? []) {
+    if (entry.value === "$absentPath") guard[entry.name] = absentPath();
+  }
+  return guard;
+}
+function buildSignInEnv(recipe) {
+  const configuredHome = recipe.homePath;
+  const homeInjection = configuredHome.trim().length > 0 ? { [GROK_CARD.homeEnvVar]: resolveGrokHomePath(configuredHome) } : {};
+  return mergeLaunchEnv({
+    accountHome: homeInjection,
+    instanceTable: recipe.environment,
+    handOverrides: { GROK_OAUTH2_REFERRER: "ycodium" }
+  });
+}
+function buildSpawnEnv(recipe, resolvedHomePath, homeConfigured) {
+  const homeInjection = homeConfigured ? { [GROK_CARD.homeEnvVar]: resolvedHomePath } : {};
+  return mergeLaunchEnv({
+    accountHome: { ...homeInjection, ...ownEndpointAuthGuard(recipe) },
+    instanceTable: recipe.environment,
+    handOverrides: { GROK_OAUTH2_REFERRER: "ycodium" }
+  });
+}
+
 // src/grokInstance.ts
 import * as NodeCrypto3 from "node:crypto";
 import {
@@ -169,7 +339,7 @@ import {
 import { nodeStreamsFromHandle as nodeStreamsFromHandle2 } from "@ycodium-ai/plugin-api/process-stdin";
 
 // ../../packages/ycodium-acp-executor/src/executor.ts
-import * as NodeCrypto from "node:crypto";
+import * as NodeCrypto2 from "node:crypto";
 
 // ../../packages/ycodium-acp-executor/src/approvals.ts
 function createApprovalGate(input2) {
@@ -397,7 +567,7 @@ var UnboundedEventStream = class {
 };
 
 // ../../packages/ycodium-acp-executor/src/config-options.ts
-function isRecord(value) {
+function isRecord2(value) {
   return typeof value === "object" && value !== null && !Array.isArray(value);
 }
 function asString(value) {
@@ -416,7 +586,7 @@ function flattenChoices(rawOptions, currentValue) {
   const out = [];
   const seen = /* @__PURE__ */ new Set();
   const push = (entry) => {
-    if (!isRecord(entry)) return;
+    if (!isRecord2(entry)) return;
     const value = asString(entry["value"]);
     if (value === void 0 || seen.has(value)) return;
     seen.add(value);
@@ -431,7 +601,7 @@ function flattenChoices(rawOptions, currentValue) {
     });
   };
   for (const entry of rawOptions) {
-    if (isRecord(entry) && Array.isArray(entry["options"])) {
+    if (isRecord2(entry) && Array.isArray(entry["options"])) {
       for (const nested of entry["options"]) push(nested);
       continue;
     }
@@ -440,7 +610,7 @@ function flattenChoices(rawOptions, currentValue) {
   return out;
 }
 function isConfigOption(entry, configId) {
-  return isRecord(entry) && asString(entry["id"])?.trim() === configId.trim();
+  return isRecord2(entry) && asString(entry["id"])?.trim() === configId.trim();
 }
 function findConfigOptionEntry(configOptions, configId) {
   return Array.isArray(configOptions) && configId.trim() !== "" ? configOptions.find(
@@ -455,7 +625,7 @@ function withConfigOptionValue(configOptions, configId, value) {
 }
 function pickEffortOption(configOptions) {
   if (!Array.isArray(configOptions)) return void 0;
-  const candidates = configOptions.filter(isRecord).filter((option) => normalizedField(option, "type") === "select").filter(looksLikeEffortOption);
+  const candidates = configOptions.filter(isRecord2).filter((option) => normalizedField(option, "type") === "select").filter(looksLikeEffortOption);
   return candidates.find((option) => normalizedField(option, "category") === "model_option") ?? candidates.find((option) => normalizedField(option, "id") === "effort") ?? candidates.find((option) => normalizedField(option, "category") === "thought_level") ?? candidates[0];
 }
 function findAcpEffortConfig(configOptions) {
@@ -475,7 +645,7 @@ function findAcpEffortConfig(configOptions) {
 }
 
 // ../../packages/ycodium-acp-executor/src/util.ts
-function isRecord2(value) {
+function isRecord3(value) {
   return typeof value === "object" && value !== null && !Array.isArray(value);
 }
 function asTrimmedString(value) {
@@ -530,11 +700,11 @@ function extractCommandFromTitle(title) {
   return backtickMatch?.[1]?.trim() || void 0;
 }
 function extractToolCommand(data, title) {
-  const item = isRecord2(data?.["item"]) ? data["item"] : void 0;
-  const itemInput = item && isRecord2(item["input"]) ? item["input"] : void 0;
-  const itemResult = item && isRecord2(item["result"]) ? item["result"] : void 0;
-  const rawInput = isRecord2(data?.["rawInput"]) ? data["rawInput"] : void 0;
-  const dataInput = isRecord2(data?.["input"]) ? data["input"] : void 0;
+  const item = isRecord3(data?.["item"]) ? data["item"] : void 0;
+  const itemInput = item && isRecord3(item["input"]) ? item["input"] : void 0;
+  const itemResult = item && isRecord3(item["result"]) ? item["result"] : void 0;
+  const rawInput = isRecord3(data?.["rawInput"]) ? data["rawInput"] : void 0;
+  const dataInput = isRecord3(data?.["input"]) ? data["input"] : void 0;
   const candidates = [
     normalizeCommandValue(item?.["command"]),
     normalizeCommandValue(itemInput?.["command"]),
@@ -579,7 +749,7 @@ function collectPaths(value, paths, seen, depth) {
     }
     return;
   }
-  if (!isRecord2(value)) {
+  if (!isRecord3(value)) {
     return;
   }
   for (const key of ["path", "filePath", "relativePath", "filename", "newPath", "oldPath"]) {
@@ -657,7 +827,7 @@ function deriveToolActivityPresentation(input2) {
   const title = asTrimmedString(input2.title);
   const detail = stripTrailingExitCode(asTrimmedString(input2.detail));
   const fallbackSummary = asTrimmedString(input2.fallbackSummary) ?? "Tool";
-  const data = isRecord2(input2.data) ? input2.data : void 0;
+  const data = isRecord3(input2.data) ? input2.data : void 0;
   const command = extractToolCommand(data, title);
   const primaryPath = extractPrimaryPath(data);
   const action = classifyToolAction({
@@ -689,7 +859,7 @@ function deriveToolActivityPresentation(input2) {
     };
   }
   if (action === "search") {
-    const rawInput = isRecord2(data?.["rawInput"]) ? data["rawInput"] : void 0;
+    const rawInput = isRecord3(data?.["rawInput"]) ? data["rawInput"] : void 0;
     const query = asTrimmedString(rawInput?.["query"]) ?? asTrimmedString(rawInput?.["pattern"]) ?? asTrimmedString(rawInput?.["searchTerm"]);
     return {
       summary: "Searched files",
@@ -749,7 +919,7 @@ function extractCommandFromTitle2(title) {
   return match?.[1]?.trim() || void 0;
 }
 function extractToolCallCommand(rawInput, title) {
-  if (isRecord2(rawInput)) {
+  if (isRecord3(rawInput)) {
     const directCommand = normalizeCommandValue2(rawInput["command"]);
     if (directCommand) {
       return directCommand;
@@ -777,7 +947,7 @@ function boundTailText(text4, limit = TOOL_CALL_CONTENT_MAX_CHARS) {
 var boundToolCallOutputText = (text4) => boundTailText(text4);
 var RAW_OUTPUT_TEXT_FIELDS = ["content", "stdout", "stderr", "output"];
 function boundToolCallRawOutput(rawOutput) {
-  if (!isRecord2(rawOutput)) {
+  if (!isRecord3(rawOutput)) {
     return rawOutput;
   }
   let changed = false;
@@ -969,11 +1139,11 @@ function collectSessionConfigOptionValues(configOption) {
   );
 }
 function collectSessionModelIds(models) {
-  if (!isRecord2(models) || !Array.isArray(models["availableModels"])) {
+  if (!isRecord3(models) || !Array.isArray(models["availableModels"])) {
     return [];
   }
   return models["availableModels"].flatMap(
-    (model) => isRecord2(model) && typeof model["modelId"] === "string" ? [model["modelId"]] : []
+    (model) => isRecord3(model) && typeof model["modelId"] === "string" ? [model["modelId"]] : []
   );
 }
 function catalogModelLastSegment(value) {
@@ -1045,7 +1215,7 @@ function parseAvailableCommandsUpdate(params) {
   }
   const commands = [];
   for (const command of availableCommands) {
-    if (!isRecord2(command)) {
+    if (!isRecord3(command)) {
       continue;
     }
     const name = typeof command["name"] === "string" ? command["name"].trim() : "";
@@ -1053,7 +1223,7 @@ function parseAvailableCommandsUpdate(params) {
       continue;
     }
     const description = typeof command["description"] === "string" ? command["description"].trim() || void 0 : void 0;
-    const input2 = isRecord2(command["input"]) ? command["input"] : void 0;
+    const input2 = isRecord3(command["input"]) ? command["input"] : void 0;
     const inputHint = typeof input2?.["hint"] === "string" ? input2["hint"].trim() || void 0 : void 0;
     commands.push({
       name,
@@ -1107,7 +1277,7 @@ function boundToolCallRawPayload(params, update, toolCall) {
 }
 function textFromContentBlocks(blocks) {
   const parts = blocks.flatMap(
-    (block) => isRecord2(block) && block["type"] === "text" && typeof block["text"] === "string" ? [block["text"]] : []
+    (block) => isRecord3(block) && block["type"] === "text" && typeof block["text"] === "string" ? [block["text"]] : []
   );
   const joined = parts.join("");
   return joined.trim().length > 0 ? joined : void 0;
@@ -1132,7 +1302,7 @@ function parseSessionUpdateEvent(params) {
       const entries = Array.isArray(upd["entries"]) ? upd["entries"] : [];
       const plan = entries.map((entry, index) => ({
         step: readAcpText(entry, "content") ?? `Step ${index + 1}`,
-        status: normalizePlanStepStatus(isRecord2(entry) ? entry["status"] : void 0)
+        status: normalizePlanStepStatus(isRecord3(entry) ? entry["status"] : void 0)
       }));
       if (plan.length > 0) {
         events.push({
@@ -1172,7 +1342,7 @@ function parseSessionUpdateEvent(params) {
     }
     case "agent_message_chunk":
     case "agent_thought_chunk": {
-      const content = isRecord2(upd["content"]) ? upd["content"] : void 0;
+      const content = isRecord3(upd["content"]) ? upd["content"] : void 0;
       const contentType = content?.["type"];
       const streamKind = kind === "agent_thought_chunk" ? "reasoning_text" : "assistant_text";
       if (contentType === "text") {
@@ -1212,7 +1382,7 @@ function parseSessionUpdateEvent(params) {
     }
     case "compaction_summary_chunk": {
       const compactionId = readAcpText(upd, "compactionId");
-      const content = isRecord2(upd["content"]) ? upd["content"] : void 0;
+      const content = isRecord3(upd["content"]) ? upd["content"] : void 0;
       const text4 = content?.["type"] === "text" ? content["text"] : void 0;
       if (compactionId === void 0 || typeof text4 !== "string" || text4.length === 0) break;
       events.push({ _tag: "CompactionSummaryChunk", compactionId, text: text4 });
@@ -22906,17 +23076,17 @@ function isResponseMessage(value) {
 function isNotificationMessage(value) {
   return isJsonRpcEnvelope(value) && !("id" in value) && typeof value["method"] === "string";
 }
-function isRecord3(value) {
+function isRecord4(value) {
   return typeof value === "object" && value !== null;
 }
 function isJsonRpcEnvelope(value) {
-  return isRecord3(value) && value["jsonrpc"] === "2.0";
+  return isRecord4(value) && value["jsonrpc"] === "2.0";
 }
 function isJsonRpcId(value) {
   return value === null || typeof value === "string" || typeof value === "number" && Number.isFinite(value);
 }
 function isResponseShapedMessage(value) {
-  return isRecord3(value) && !("method" in value) && ("id" in value || "result" in value || "error" in value);
+  return isRecord4(value) && !("method" in value) && ("id" in value || "result" in value || "error" in value);
 }
 function isResponseBatch(batch) {
   let hasValidCall = false;
@@ -22926,7 +23096,7 @@ function isResponseBatch(batch) {
   for (const entry of batch) {
     hasValidCall ||= isRequestMessage(entry) || isNotificationMessage(entry);
     hasValidResponse ||= isResponseMessage(entry);
-    if (!isRecord3(entry)) {
+    if (!isRecord4(entry)) {
       continue;
     }
     hasCallShape ||= "method" in entry;
@@ -22941,13 +23111,13 @@ function isResponseBatch(batch) {
   return hasResponseShape && !hasCallShape;
 }
 function cancelRequestId(params) {
-  if (!isRecord3(params) || !isJsonRpcId(params["requestId"])) {
+  if (!isRecord4(params) || !isJsonRpcId(params["requestId"])) {
     return void 0;
   }
   return params["requestId"];
 }
 function isErrorResponse(value) {
-  return isRecord3(value) && typeof value["code"] === "number" && Number.isInteger(value["code"]) && typeof value["message"] === "string";
+  return isRecord4(value) && typeof value["code"] === "number" && Number.isInteger(value["code"]) && typeof value["message"] === "string";
 }
 var Handled = {
   /**
@@ -23492,7 +23662,7 @@ var Connection = class {
     if (this.abortController.signal.aborted) {
       return Promise.resolve();
     }
-    if (!isRecord3(message)) {
+    if (!isRecord4(message)) {
       console.error("Invalid message", { message });
       return Promise.resolve();
     }
@@ -23895,7 +24065,7 @@ function ndJsonStream(output2, input2) {
           await writeJson(protocolErrorResponse(RequestError.parseError()));
           return;
         }
-        if (isRecord3(message) || Array.isArray(message)) {
+        if (isRecord4(message) || Array.isArray(message)) {
           controller.enqueue(message);
         } else {
           await writeJson(protocolErrorResponse(RequestError.invalidRequest(message)));
@@ -24882,14 +25052,14 @@ var legacyClientNotificationMethods = /* @__PURE__ */ new Set([
 import * as NodeStream from "node:stream";
 
 // ../../packages/ycodium-acp-executor/src/jsonrpc.ts
-function isRecord4(value) {
+function isRecord5(value) {
   return typeof value === "object" && value !== null;
 }
 function isJsonRpcId2(value) {
   return typeof value === "string" || typeof value === "number" && Number.isFinite(value);
 }
 function isJsonRpcEnvelope2(value) {
-  return isRecord4(value) && value["jsonrpc"] === "2.0";
+  return isRecord5(value) && value["jsonrpc"] === "2.0";
 }
 function isRequestMessage2(value) {
   return isJsonRpcEnvelope2(value) && "id" in value && typeof value["method"] === "string" && isJsonRpcId2(value["id"]);
@@ -24909,7 +25079,7 @@ function isNotificationMessage2(value) {
   return isJsonRpcEnvelope2(value) && !("id" in value) && typeof value["method"] === "string";
 }
 function readJsonRpcError(value) {
-  if (!isRecord4(value) || typeof value["code"] !== "number" || typeof value["message"] !== "string") {
+  if (!isRecord5(value) || typeof value["code"] !== "number" || typeof value["message"] !== "string") {
     return void 0;
   }
   return {
@@ -24982,11 +25152,11 @@ var KNOWN_SESSION_UPDATES = /* @__PURE__ */ new Set([
   "compaction_summary_chunk"
 ]);
 function isSessionUpdateEnvelope(payload) {
-  if (!isRecord4(payload) || typeof payload["sessionId"] !== "string") {
+  if (!isRecord5(payload) || typeof payload["sessionId"] !== "string") {
     return false;
   }
   const update = payload["update"];
-  return isRecord4(update) && typeof update["sessionUpdate"] === "string";
+  return isRecord5(update) && typeof update["sessionUpdate"] === "string";
 }
 function hasKnownVariantShape(update) {
   const kind = update["sessionUpdate"];
@@ -24994,7 +25164,7 @@ function hasKnownVariantShape(update) {
     return false;
   }
   if (kind === "user_message_chunk" || kind === "agent_message_chunk" || kind === "agent_thought_chunk") {
-    return isRecord4(update["content"]);
+    return isRecord5(update["content"]);
   }
   return true;
 }
@@ -25400,7 +25570,7 @@ function forgetConfigOptionValue(state, configId) {
   const forgetsModel = configId === void 0 || configId === state.modelConfigId;
   const { currentModelReported: _forgottenReport, ...withoutReport } = state;
   const configOptions = configId !== void 0 && Array.isArray(state.configOptions) ? state.configOptions.map((option) => {
-    if (!isRecord2(option) || option["id"] !== configId) return option;
+    if (!isRecord3(option) || option["id"] !== configId) return option;
     const { currentValue: _forgotten, ...rest } = option;
     return rest;
   }) : state.configOptions;
@@ -25411,7 +25581,7 @@ function forgetConfigOptionValue(state, configId) {
   };
 }
 function modelSelectionStateFromSetup(setup) {
-  const sessionModels = isRecord2(setup.models) ? setup.models : void 0;
+  const sessionModels = isRecord3(setup.models) ? setup.models : void 0;
   const modelConfigId = extractModelConfigId(setup);
   const strategy = modelConfigId !== void 0 ? "config-option" : "session/set_model";
   const modelConfigOption = modelConfigId === void 0 ? void 0 : findSessionConfigOption(setup.configOptions, modelConfigId);
@@ -26121,6 +26291,7 @@ function createExecutorPrompt({
   promptResults,
   settleToolSubagents
 }) {
+  const ownOutcomes = /* @__PURE__ */ new Map();
   const settleTurn = (input2) => {
     if (!isLive(input2.expectedGeneration) || input2.record.finished) {
       return false;
@@ -26137,14 +26308,22 @@ function createExecutorPrompt({
     }
     closeActiveAssistantSegment(input2.turnId);
     shared.promptsInFlight = Math.max(0, shared.promptsInFlight - 1);
-    if (shared.promptsInFlight !== 0 || shared.activeTurnId !== input2.turnId) return false;
+    if (shared.promptsInFlight !== 0 || shared.activeTurnId !== input2.turnId) {
+      if (input2.foldedIn !== true) ownOutcomes.set(input2.turnId, input2);
+      return false;
+    }
+    const outcome = (input2.foldedIn === true ? ownOutcomes.get(input2.turnId) : void 0) ?? input2;
+    ownOutcomes.delete(input2.turnId);
     shared.activeTurnId = void 0;
     if (shared.status !== "disposed") {
       shared.status = "ready";
     }
     const interrupted = promptResults.hasInterrupted(input2.turnId);
     settleToolSubagents(
-      toolSubagentSettlementOfTurn(interrupted ? "cancelled" : input2.state, input2.failureCategory),
+      toolSubagentSettlementOfTurn(
+        interrupted ? "cancelled" : outcome.state,
+        outcome.failureCategory
+      ),
       input2.turnId
     );
     emit({
@@ -26154,10 +26333,10 @@ function createExecutorPrompt({
       threadId: options.threadId,
       turnId: input2.turnId,
       payload: {
-        state: interrupted ? "cancelled" : input2.state,
-        stopReason: interrupted ? "cancelled" : input2.stopReason,
-        ...input2.errorMessage === void 0 ? {} : { errorMessage: input2.errorMessage },
-        ...input2.state === "failed" ? failureCategoryField(input2.failureCategory) : {}
+        state: interrupted ? "cancelled" : outcome.state,
+        stopReason: interrupted ? "cancelled" : outcome.stopReason,
+        ...outcome.errorMessage === void 0 ? {} : { errorMessage: outcome.errorMessage },
+        ...outcome.state === "failed" ? failureCategoryField(outcome.failureCategory) : {}
       }
     });
     interruptedTurnIds.delete(input2.turnId);
@@ -26182,7 +26361,7 @@ function createExecutorPrompt({
       return await promptRpc;
     } else {
       const { promise: early, resolve: settleEarly } = Promise.withResolvers();
-      shared.pendingSettlement = {
+      shared.pendingSettlements.set(promptKey, {
         promptKey,
         sessionId,
         settle: settleEarly,
@@ -26191,7 +26370,7 @@ function createExecutorPrompt({
           onError: () => promptResults.reject(record4.promptId),
           hasResult: () => record4.response !== void 0
         }
-      };
+      });
       try {
         const outcome = await Promise.race([
           promptRpc.then((value) => {
@@ -26204,7 +26383,7 @@ function createExecutorPrompt({
         if (outcome.error !== void 0) throw outcome.error;
         return outcome.response;
       } finally {
-        shared.pendingSettlement = void 0;
+        shared.pendingSettlements.delete(promptKey);
         void promptRpc.catch(() => void 0);
       }
     }
@@ -26354,7 +26533,9 @@ function createExecutorPrompt({
       settle2({
         turnId,
         stopReason,
-        state: response2.stopReason === "cancelled" ? "cancelled" : "completed"
+        state: response2.stopReason === "cancelled" ? "cancelled" : "completed",
+        // 立刻写出的插话没被打断却应答 cancelled：agent 把它并进了这一轮（grok 的 removedFromQueue）。
+        foldedIn: response2.stopReason === "cancelled" && input2.expectedActiveTurnId !== void 0 && hooks.queuesPromptsWhileRunning === true
       });
       return {
         threadId: options.threadId,
@@ -26363,7 +26544,8 @@ function createExecutorPrompt({
         ...response2.usage !== void 0 && response2.usage !== null ? { usage: response2.usage } : {}
       };
     };
-    await promptMutex.acquire();
+    const writesWhileRunning = input2.expectedActiveTurnId !== void 0 && hooks.queuesPromptsWhileRunning === true;
+    if (!writesWhileRunning) await promptMutex.acquire();
     let response;
     try {
       failIfDisposed();
@@ -26445,7 +26627,7 @@ function createExecutorPrompt({
         await options.beforeApplyResult();
       }
     } finally {
-      promptMutex.release();
+      if (!writesWhileRunning) promptMutex.release();
       notifyPromptSettled();
     }
     if (!isLive(started.generation)) {
@@ -26779,7 +26961,7 @@ function createExecutorRequests({
     pendingUserInputs.delete(requestId);
     pending.resolve({
       kind: "answered",
-      answers: isRecord2(answers) ? answers : {}
+      answers: isRecord3(answers) ? answers : {}
     });
   };
   return {
@@ -26793,7 +26975,7 @@ function createExecutorRequests({
 }
 
 // ../../packages/ycodium-acp-executor/src/artifacts.ts
-import * as NodePath from "node:path";
+import * as NodePath3 from "node:path";
 import * as NodeURL from "node:url";
 function resourceLinkArtifacts(content) {
   if (content["type"] !== "resource_link" || typeof content["uri"] !== "string") return [];
@@ -26804,7 +26986,7 @@ function resourceLinkArtifacts(content) {
   } catch {
     return [];
   }
-  if (!NodePath.isAbsolute(path)) return [];
+  if (!NodePath3.isAbsolute(path)) return [];
   const name = typeof content["name"] === "string" ? content["name"].trim() : "";
   const mimeType = typeof content["mimeType"] === "string" ? content["mimeType"].trim() : "";
   return [
@@ -27078,18 +27260,18 @@ function modelRefreshFailedError(requestedModelId, error62) {
 }
 
 // ../../packages/ycodium-acp-executor/src/runtime-mode.ts
-function isRecord5(value) {
+function isRecord6(value) {
   return typeof value === "object" && value !== null && !Array.isArray(value);
 }
 function asString2(value) {
   return typeof value === "string" ? value : void 0;
 }
 function acpModeConfigId(setup) {
-  if (!isRecord5(setup)) return void 0;
+  if (!isRecord6(setup)) return void 0;
   const configOptions = setup["configOptions"];
   if (!Array.isArray(configOptions)) return void 0;
   for (const option of configOptions) {
-    if (!isRecord5(option)) continue;
+    if (!isRecord6(option)) continue;
     if (asString2(option["category"])?.trim().toLowerCase() !== "mode") continue;
     const id = asString2(option["id"])?.trim();
     if (id) return id;
@@ -27488,28 +27670,29 @@ function createExecutorSettlement({
     if (settledPromptKeys.length > SETTLED_PROMPT_KEY_LIMIT) settledPromptKeys.shift();
   };
   const abortPendingSettlement = (reason, failureCategory) => {
-    const waiting = shared.pendingSettlement;
-    if (waiting === void 0) return;
-    if (waiting.hasResult?.()) return;
-    shared.pendingSettlement = void 0;
-    waiting.settle({
-      error: withFailureCategory(
-        new AcpExecutorRequestError("session/prompt", reason),
-        failureCategory
-      )
-    });
+    for (const [key, waiting] of shared.pendingSettlements) {
+      if (waiting.hasResult?.()) continue;
+      shared.pendingSettlements.delete(key);
+      waiting.settle({
+        error: withFailureCategory(
+          new AcpExecutorRequestError("session/prompt", reason),
+          failureCategory
+        )
+      });
+    }
   };
   const settleFromNotification = (method, params) => {
     const hook = hooks.promptSettlement;
-    if (hook === void 0 || shared.pendingSettlement === void 0) return false;
+    if (hook === void 0 || shared.pendingSettlements.size === 0) return false;
     const signal = hook.fromNotification(method, params);
     if (signal === void 0) return false;
-    const waiting = shared.pendingSettlement;
-    if (signal.sessionId !== waiting.sessionId) return false;
-    if (signal.promptKey !== void 0 && signal.promptKey !== waiting.promptKey) {
-      return settledPromptKeys.includes(signal.promptKey);
+    const waiting = signal.promptKey === void 0 ? [...shared.pendingSettlements.values()].find(
+      (candidate) => candidate.sessionId === signal.sessionId
+    ) : shared.pendingSettlements.get(signal.promptKey);
+    if (waiting === void 0 || waiting.sessionId !== signal.sessionId) {
+      return signal.promptKey !== void 0 && settledPromptKeys.includes(signal.promptKey);
     }
-    shared.pendingSettlement = void 0;
+    shared.pendingSettlements.delete(waiting.promptKey);
     rememberSettledPromptKey(waiting.promptKey);
     if (signal.outcome === "error") {
       waiting.onError?.();
@@ -27536,14 +27719,14 @@ function createExecutorSettlement({
 
 // ../../packages/ycodium-acp-executor/src/executor/subagent-sessions.ts
 function parseState(raw) {
-  if (!isRecord2(raw)) return { status: void 0, error: void 0 };
+  if (!isRecord3(raw)) return { status: void 0, error: void 0 };
   const state = raw["state"];
   if (state === "running") return { status: "running", error: void 0 };
   if (state === "requires_action") return { status: "waiting", error: void 0 };
   if (state !== "idle") return { status: void 0, error: void 0 };
   const stopReason = raw["stopReason"];
-  const error62 = isRecord2(raw["error"]) ? asTrimmedString(raw["error"]["message"]) : void 0;
-  if (stopReason === "error" || isRecord2(raw["error"])) return { status: "failed", error: error62 };
+  const error62 = isRecord3(raw["error"]) ? asTrimmedString(raw["error"]["message"]) : void 0;
+  if (stopReason === "error" || isRecord3(raw["error"])) return { status: "failed", error: error62 };
   if (stopReason === "cancelled") return { status: "cancelled", error: void 0 };
   return { status: "idle", error: void 0 };
 }
@@ -27559,7 +27742,7 @@ function childLinkage(childId, record4) {
 function createSubagentSessionTracker(registry2) {
   const observe = (notification, ctx) => {
     const update = notification.update;
-    if (!isRecord2(update) || update["sessionUpdate"] !== "subagent_update") return [];
+    if (!isRecord3(update) || update["sessionUpdate"] !== "subagent_update") return [];
     const childId = asTrimmedString(update["sessionId"]);
     if (childId === void 0 || ctx.ownSessionIds.has(childId)) return [];
     const outerId = notification.sessionId;
@@ -27984,9 +28167,9 @@ function readOpenToolCalls(toolCalls, turnId) {
 }
 
 // ../../packages/ycodium-acp-executor/src/protocol-log.ts
-import * as NodeFS from "node:fs";
-import * as NodeOS from "node:os";
-import * as NodePath2 from "node:path";
+import * as NodeFS2 from "node:fs";
+import * as NodeOS2 from "node:os";
+import * as NodePath4 from "node:path";
 var DEFAULT_MAX_BYTES = 8 * 1024 * 1024;
 var UNSAFE_FILE_CHARS = /[^A-Za-z0-9._-]+/gu;
 function safeFileName(value) {
@@ -27994,12 +28177,12 @@ function safeFileName(value) {
 }
 function createAcpProtocolLogFile(input2) {
   const maxBytes = input2.maxBytes ?? DEFAULT_MAX_BYTES;
-  NodeFS.mkdirSync(input2.directory, { recursive: true });
-  const filePath = NodePath2.join(
+  NodeFS2.mkdirSync(input2.directory, { recursive: true });
+  const filePath = NodePath4.join(
     input2.directory,
     `${safeFileName(input2.provider)}-${safeFileName(input2.threadId)}-${Date.now().toString(36)}.ndjson`
   );
-  const stream = (input2.openStream ?? ((path) => NodeFS.createWriteStream(path, { flags: "a" })))(
+  const stream = (input2.openStream ?? ((path) => NodeFS2.createWriteStream(path, { flags: "a" })))(
     filePath
   );
   let bytes = 0;
@@ -28051,7 +28234,7 @@ function createAcpProtocolLogFromEnv(input2) {
   const flag = process.env.YCODIUM_ACP_PROTOCOL_LOG;
   if (flag !== "1" && flag?.toLowerCase() !== "true") return void 0;
   const configured = process.env.YCODIUM_ACP_PROTOCOL_LOG_DIR?.trim();
-  const directory = configured && configured.length > 0 ? configured : NodePath2.join(NodeOS.tmpdir(), "ycodium-acp-protocol");
+  const directory = configured && configured.length > 0 ? configured : NodePath4.join(NodeOS2.tmpdir(), "ycodium-acp-protocol");
   try {
     const sink = createAcpProtocolLogFile({
       directory,
@@ -28075,7 +28258,7 @@ function defaultNowIso() {
   return (/* @__PURE__ */ new Date()).toISOString();
 }
 function defaultRandomId() {
-  return NodeCrypto.randomUUID();
+  return NodeCrypto2.randomUUID();
 }
 function createAcpExecutor(options) {
   const hooks = { ...defaultVendorHooks, ...options.hooks };
@@ -28103,7 +28286,7 @@ function createAcpExecutor(options) {
     startInFlight: void 0,
     activeTurnId: void 0,
     promptsInFlight: 0,
-    pendingSettlement: void 0,
+    pendingSettlements: /* @__PURE__ */ new Map(),
     manualCompaction: void 0,
     assistantSegment: { nextSegmentIndex: 0 },
     modeState: void 0,
@@ -28671,28 +28854,28 @@ var MAX_VERSION_OUTPUT_BYTES = 64 * 1024;
 
 // src/config.ts
 var GROK_DEFAULT_LAUNCH_ARGS = "agent stdio";
-function isRecord6(value) {
+function isRecord7(value) {
   return typeof value === "object" && value !== null && !Array.isArray(value);
 }
-function readString(value) {
+function readString2(value) {
   return typeof value === "string" ? value : "";
 }
 function readTrimmed(value) {
-  return readString(value).trim();
+  return readString2(value).trim();
 }
 function readEnvironment(value) {
   if (!Array.isArray(value)) return {};
   const env = {};
   for (const entry of value) {
-    if (!isRecord6(entry)) continue;
+    if (!isRecord7(entry)) continue;
     const name = readTrimmed(entry["name"]);
     if (name.length === 0) continue;
-    env[name] = readString(entry["value"]);
+    env[name] = readString2(entry["value"]);
   }
   return env;
 }
 function parseGrokInstanceConfig(config2) {
-  if (!isRecord6(config2)) {
+  if (!isRecord7(config2)) {
     return {
       binaryPath: "",
       launchArgs: GROK_DEFAULT_LAUNCH_ARGS,
@@ -28702,11 +28885,11 @@ function parseGrokInstanceConfig(config2) {
       envelopeDriver: void 0
     };
   }
-  const nested = isRecord6(config2["config"]) ? config2["config"] : void 0;
+  const nested = isRecord7(config2["config"]) ? config2["config"] : void 0;
   const settings = nested ?? config2;
   return {
     binaryPath: readTrimmed(settings["binaryPath"]),
-    launchArgs: readString(settings["launchArgs"]) || GROK_DEFAULT_LAUNCH_ARGS,
+    launchArgs: readString2(settings["launchArgs"]) || GROK_DEFAULT_LAUNCH_ARGS,
     homePath: readTrimmed(settings["homePath"]) || readTrimmed(config2["homePath"]),
     homeEnvVar: readTrimmed(settings["homeEnvVar"]) || readTrimmed(config2["homeEnvVar"]),
     environment: readEnvironment(config2["environment"]),
@@ -28830,166 +29013,6 @@ function readDeviceCodeOutput(stdout, onText) {
   return { text: text4, code };
 }
 
-// src/grokHome.ts
-import * as NodeCrypto2 from "node:crypto";
-import * as NodeOS2 from "node:os";
-import * as NodePath4 from "node:path";
-import { mergeLaunchEnv } from "@ycodium-ai/plugin-api/executor";
-
-// src/grokAccount.ts
-import * as NodeFS2 from "node:fs";
-import * as NodePath3 from "node:path";
-var AUTH_FILE_NAME = "auth.json";
-var isRecord7 = (value) => typeof value === "object" && value !== null && !Array.isArray(value);
-var readString2 = (record4, key) => {
-  const value = record4[key];
-  if (typeof value !== "string") return void 0;
-  const trimmed3 = value.trim();
-  return trimmed3.length > 0 ? trimmed3 : void 0;
-};
-var parseJsonRecord = (raw) => {
-  let parsed;
-  try {
-    parsed = JSON.parse(raw);
-  } catch {
-    return void 0;
-  }
-  return isRecord7(parsed) ? parsed : void 0;
-};
-var directoryExists = (homePath) => {
-  try {
-    return NodeFS2.statSync(homePath).isDirectory();
-  } catch {
-    return false;
-  }
-};
-var readCredentialFile = (path) => {
-  try {
-    return NodeFS2.readFileSync(path, "utf8");
-  } catch {
-    return void 0;
-  }
-};
-var signedOutProbe = (exists) => ({
-  state: "signed-out",
-  directoryExists: exists,
-  email: void 0,
-  name: void 0,
-  expiresAt: void 0
-});
-var unreadableProbe = (exists) => ({
-  state: "unreadable",
-  directoryExists: exists,
-  email: void 0,
-  name: void 0,
-  expiresAt: void 0
-});
-var joinName = (record4) => {
-  const first = readString2(record4, "first_name");
-  const last = readString2(record4, "last_name");
-  const joined = [first, last].filter((part) => part !== void 0).join(" ");
-  return joined.length > 0 ? joined : void 0;
-};
-var findIdentityEntry = (parsed) => {
-  for (const value of Object.values(parsed)) {
-    if (!isRecord7(value)) continue;
-    if (readString2(value, "email") !== void 0 || readString2(value, "user_id") !== void 0) {
-      return value;
-    }
-  }
-  return void 0;
-};
-var isExpired = (expiresAt, nowMs) => {
-  if (expiresAt === void 0) return false;
-  const parsed = Date.parse(expiresAt);
-  return Number.isNaN(parsed) ? false : parsed <= nowMs;
-};
-var readGrokAccount = (homePath) => {
-  const exists = directoryExists(homePath);
-  const raw = readCredentialFile(NodePath3.join(homePath, AUTH_FILE_NAME));
-  if (raw === void 0) return signedOutProbe(exists);
-  const parsed = parseJsonRecord(raw);
-  const identity = parsed === void 0 ? void 0 : findIdentityEntry(parsed);
-  if (identity === void 0) return unreadableProbe(exists);
-  const expiresAt = readString2(identity, "expires_at");
-  return {
-    state: isExpired(expiresAt, Date.now()) ? "expired" : "signed-in",
-    directoryExists: exists,
-    email: readString2(identity, "email"),
-    name: joinName(identity),
-    expiresAt
-  };
-};
-
-// src/grokHome.ts
-function expandHomePath(value) {
-  if (value === "~") return NodeOS2.homedir();
-  if (value.startsWith("~/") || value.startsWith("~\\")) {
-    return NodePath4.join(NodeOS2.homedir(), value.slice(2));
-  }
-  return value;
-}
-function resolveGrokHomePath(value) {
-  const trimmed3 = value.trim();
-  if (trimmed3.length === 0) return NodePath4.join(NodeOS2.homedir(), ".grok");
-  return NodePath4.resolve(expandHomePath(trimmed3));
-}
-function probeGrokAccount(accountPath) {
-  const resolved = resolveGrokHomePath(accountPath);
-  const account = readGrokAccount(resolved);
-  return {
-    accountPath: resolved,
-    state: account.state,
-    ...account.email === void 0 ? {} : { email: account.email },
-    ...account.name === void 0 ? {} : { name: account.name },
-    ...account.expiresAt === void 0 ? {} : { expiresAt: account.expiresAt }
-  };
-}
-function grokContinuationKey(recipe) {
-  return `grok:home:${resolveGrokHomePath(recipe.homePath)}`;
-}
-function resolveAccountHomePath(recipe, configuredHome) {
-  const fromEnvironment = recipe.environment["GROK_HOME"]?.trim();
-  if (fromEnvironment !== void 0 && fromEnvironment.length > 0) {
-    return NodePath4.resolve(expandHomePath(fromEnvironment));
-  }
-  return resolveGrokHomePath(configuredHome);
-}
-function absentPath() {
-  return NodePath4.join(
-    NodeOS2.tmpdir(),
-    `ycodium-grok-no-auth-${NodeCrypto2.randomUUID()}`,
-    "auth.json"
-  );
-}
-function ownEndpointAuthGuard(recipe) {
-  const connectivity = GROK_CARD.modelConnectivity;
-  const baseUrlKey = connectivity.baseUrlEnvKey;
-  if (baseUrlKey === void 0 || (recipe.environment[baseUrlKey]?.trim() ?? "") === "") return {};
-  const guard = {};
-  for (const entry of connectivity.extraEnv ?? []) {
-    if (entry.value === "$absentPath") guard[entry.name] = absentPath();
-  }
-  return guard;
-}
-function buildSignInEnv(recipe) {
-  const configuredHome = recipe.homePath;
-  const homeInjection = configuredHome.trim().length > 0 ? { [GROK_CARD.homeEnvVar]: resolveGrokHomePath(configuredHome) } : {};
-  return mergeLaunchEnv({
-    accountHome: homeInjection,
-    instanceTable: recipe.environment,
-    handOverrides: { GROK_OAUTH2_REFERRER: "ycodium" }
-  });
-}
-function buildSpawnEnv(recipe, resolvedHomePath, homeConfigured) {
-  const homeInjection = homeConfigured ? { [GROK_CARD.homeEnvVar]: resolvedHomePath } : {};
-  return mergeLaunchEnv({
-    accountHome: { ...homeInjection, ...ownEndpointAuthGuard(recipe) },
-    instanceTable: recipe.environment,
-    handOverrides: { GROK_OAUTH2_REFERRER: "ycodium" }
-  });
-}
-
 // src/grokSignIn.ts
 function makeGrokSignIn(input2) {
   const { host, recipe } = input2;
@@ -29231,30 +29254,38 @@ var grokTurnUsageReport = (promptResponse) => {
     ...sessionId === void 0 ? {} : { sessionId }
   };
 };
+var mergeReports = (left, right) => {
+  if (left === void 0 || right === void 0) return left ?? right;
+  const totals = {
+    uncachedInputTokens: left.totals.uncachedInputTokens + right.totals.uncachedInputTokens,
+    cachedInputTokens: left.totals.cachedInputTokens + right.totals.cachedInputTokens,
+    cacheCreationTokens: left.totals.cacheCreationTokens + right.totals.cacheCreationTokens,
+    outputTokens: left.totals.outputTokens + right.totals.outputTokens,
+    reasoningTokens: left.totals.reasoningTokens + right.totals.reasoningTokens
+  };
+  const larger = sumOf(left.totals) >= sumOf(right.totals) ? left : right;
+  return { ...larger, totals };
+};
 var createGrokTurnUsageCollector = (base) => {
   const pastKeys = [];
-  let promptKey;
-  let report;
-  let seen = false;
+  const turn = /* @__PURE__ */ new Map();
+  const answered = /* @__PURE__ */ new Set();
+  let latestKey;
   let wake;
-  const mark = () => {
-    seen = true;
-    wake?.();
-  };
+  const allAnswered = () => [...turn.keys()].every((key) => answered.has(key));
   const observe = (response) => {
-    const key = base.responseKey?.(response);
-    if (key !== void 0 && key !== promptKey && pastKeys.includes(key)) return;
-    report = grokTurnUsageReport(response) ?? report;
-    mark();
+    const key = base.responseKey?.(response) ?? latestKey;
+    if (key === void 0) return;
+    if (!turn.has(key) && pastKeys.includes(key)) return;
+    turn.set(key, grokTurnUsageReport(response) ?? turn.get(key));
+    answered.add(key);
+    if (allAnswered()) wake?.();
   };
   const settlement = {
     ...base,
     requestFields: (key) => {
-      if (promptKey !== void 0) pastKeys.push(promptKey);
-      if (pastKeys.length > 16) pastKeys.shift();
-      promptKey = key;
-      report = void 0;
-      seen = false;
+      turn.set(key, void 0);
+      latestKey = key;
       return base.requestFields(key);
     },
     responseKey: (response) => {
@@ -29264,7 +29295,7 @@ var createGrokTurnUsageCollector = (base) => {
   };
   const attach = async (event) => {
     if (event.type !== "turn.completed" || !isRecord8(event.payload)) return event;
-    if (event.payload["state"] === "completed" && !seen) {
+    if (event.payload["state"] === "completed" && !allAnswered()) {
       await new Promise((resolve2) => {
         const timer = setTimeout(resolve2, USAGE_GRACE_MS);
         wake = () => {
@@ -29274,8 +29305,12 @@ var createGrokTurnUsageCollector = (base) => {
       });
       wake = void 0;
     }
-    const taken = report;
-    report = void 0;
+    let taken;
+    for (const report of turn.values()) taken = mergeReports(taken, report);
+    for (const key of turn.keys()) pastKeys.push(key);
+    while (pastKeys.length > 16) pastKeys.shift();
+    turn.clear();
+    answered.clear();
     return taken === void 0 ? event : { ...event, payload: { ...event.payload, tokenUsage: taken } };
   };
   return { settlement, attach };
@@ -30482,6 +30517,55 @@ function createGrokModelCatalog(input2) {
   return { readCliVersion, refreshModelCatalog, refreshForSend };
 }
 
+// src/grokFollowUpSteer.ts
+import * as NodeFS5 from "node:fs";
+import * as NodePath8 from "node:path";
+var SETTING = 'follow_up_behavior = "steer"';
+function grokFollowUpSteerIsOn(text4) {
+  const lines = text4.split(/\r?\n/).map((line) => line.trim());
+  const headers = lines.flatMap((line, index) => line === "[ui]" ? [index] : []);
+  const header = headers[0];
+  if (headers.length !== 1 || header === void 0) return false;
+  for (const line of lines.slice(header + 1)) {
+    if (line.startsWith("[")) return false;
+    if (line === SETTING) return true;
+  }
+  return false;
+}
+function ensureGrokFollowUpSteer(homePath) {
+  const path = NodePath8.join(homePath, "config.toml");
+  try {
+    return grokFollowUpSteerIsOn(NodeFS5.readFileSync(path, "utf8")) ? "on" : "off";
+  } catch (error62) {
+    if (error62.code !== "ENOENT") throw error62;
+  }
+  NodeFS5.mkdirSync(homePath, { recursive: true });
+  try {
+    NodeFS5.writeFileSync(path, `[ui]
+${SETTING}
+`, { encoding: "utf8", flag: "wx" });
+    return "created";
+  } catch (error62) {
+    if (error62.code !== "EEXIST") throw error62;
+    return grokFollowUpSteerIsOn(NodeFS5.readFileSync(path, "utf8")) ? "on" : "off";
+  }
+}
+function prepareGrokFollowUpSteer(homePath, log, threadId) {
+  try {
+    if (ensureGrokFollowUpSteer(homePath) === "off" && threadId !== void 0) {
+      log.info(
+        "grok follow-up steering is off in config.toml; mid-turn messages run after the current request",
+        { threadId }
+      );
+    }
+  } catch (error62) {
+    log.warn("could not read or create the grok config", {
+      ...threadId === void 0 ? {} : { threadId },
+      cause: error62 instanceof Error ? error62.message : String(error62)
+    });
+  }
+}
+
 // src/grokInstance.ts
 var RESUME_SCHEMA_VERSION = 1;
 var yieldTick = () => new Promise((resolve2) => {
@@ -30596,6 +30680,7 @@ var createGrokInstance = (config2, host) => {
         detail: "Grok program path is not configured"
       };
     }
+    prepareGrokFollowUpSteer(resolveAccountHomePath(recipe, recipe.homePath), host.log);
     const env = spawnEnv();
     const version2 = await raceAbort3(modelCatalog.readCliVersion(signal), signal);
     if (signal?.aborted) throw new Error("aborted");
@@ -30684,6 +30769,11 @@ var createGrokInstance = (config2, host) => {
         if (disposed) throw new Error("instance disposed");
         throwIfStartAborted(signal);
       }
+      prepareGrokFollowUpSteer(
+        resolveAccountHomePath(recipe, recipe.homePath),
+        host.log,
+        input2.threadId
+      );
       const env = spawnEnv();
       const effort = modelSelectionStringOption(input2.modelSelection, GROK_REASONING_OPTION_ID);
       const baseArgs = tokenizeLaunchArgs(recipe.launchArgs);
@@ -30730,6 +30820,8 @@ var createGrokInstance = (config2, host) => {
         authMethodId: resolveGrokAuthMethodId,
         hooks: {
           promptSettlement: turnUsage.settlement,
+          // 运行中再收到的 prompt 由 grok 自己排队、在下一个工具调用结束时并进这一轮（配合上面写的配置）。
+          queuesPromptsWhileRunning: true,
           modelDefaultEffort: grokModelDefaultEffort,
           // 派发子 agent 的调用由子 agent 名单接管，不再画成普通工具。
           onToolCallUpdated: (update) => ({
@@ -30961,6 +31053,7 @@ var createGrokInstance = (config2, host) => {
 var executors = [
   {
     card: GROK_CARD,
+    lifecycle: [{ kind: "detect", reversible: true }],
     createInstance: async (config2, host) => {
       host.log.info("createInstance");
       return createGrokInstance(config2, host);
@@ -30970,9 +31063,26 @@ var executors = [
 ];
 var index_default = definePlugin({
   id: "agent-grok",
-  apiVersion: 53,
+  apiVersion: 60,
   executors,
   activate(ctx) {
+    ctx.command({
+      name: "effectiveConfig",
+      description: "Settings form: the account directory an empty path resolves to on this machine.",
+      scope: "read",
+      payloadSchema: EXECUTOR_EFFECTIVE_PAYLOAD_SCHEMA,
+      handle: async (payload) => {
+        const request = readExecutorEffectiveRequest(payload);
+        return {
+          homePath: executorHomeEffectiveValue(
+            "GROK_HOME",
+            request,
+            process.env,
+            (value) => resolveGrokHomePath(value ?? "")
+          )
+        };
+      }
+    });
     ctx.log.info("grok executor ready");
   }
 });

package/locales/en.json

@@ -1,4 +1,8 @@
 {
+  "presentation": {
+    "name": "Grok",
+    "description": "Use Grok in Ycodium and pick up earlier sessions where they left off."
+  },
   "form": {
     "binaryPath": {
       "title": "Program path",
@@ -9,6 +13,11 @@
       "title": "Account directory",
       "description": "Sessions and the `grok login` credentials live here, so providers sharing this directory can pick up each other's threads and providers with different directories cannot. Leave empty to use the CLI's default (~/.grok).",
       "placeholder": "e.g. ~/.grok-work"
+    },
+    "effective": {
+      "provider": "{{name}} in this provider",
+      "machine": "{{name}} on this machine",
+      "default": "default"
     }
   },
   "usage": {

package/locales/zh-CN.json

@@ -1,4 +1,8 @@
 {
+  "presentation": {
+    "name": "Grok",
+    "description": "在 Ycodium 里使用 Grok，之前的会话可以接着做。"
+  },
   "form": {
     "binaryPath": {
       "title": "程序路径",
@@ -9,6 +13,11 @@
       "title": "账号目录",
       "description": "会话和 `grok login` 的凭据都保存在这里，因此共用同一目录的 provider 可以接手彼此的会话，目录不同的则不能。留空则使用该命令行工具的默认目录（~/.grok）。",
       "placeholder": "例如 ~/.grok-work"
+    },
+    "effective": {
+      "provider": "本 provider 的 {{name}}",
+      "machine": "本机的 {{name}}",
+      "default": "默认"
     }
   },
   "usage": {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ycodium-ai/agent-grok",
-  "version": "0.2.3710",
+  "version": "0.2.3799",
   "description": "Grok executor: grok CLI over Agent Client Protocol stdio.",
   "keywords": [
     "ycodium",
@@ -21,14 +21,16 @@
     "@types/node": "24.12.4",
     "esbuild": "0.28.1",
     "vite-plus": "0.2.2",
-    "@ycodium-ai/plugin-api": "0.2.3710",
-    "ycodium-acp-executor": "0.2.3710",
+    "@ycodium-ai/plugin-api": "0.2.3799",
+    "ycodium-acp-executor": "0.2.3799",
     "ycodium-executor-testing": "0.0.0"
   },
   "ycodium": {
     "plugin": "./dist/index.js",
     "displayName": "Grok",
-    "description": "Run Grok (grok agent stdio) with its session/resume continuation, reasoning-effort spawn tiers, and device-code sign-in.",
+    "displayNameKey": "presentation.name",
+    "description": "Use Grok in Ycodium and pick up earlier sessions where they left off.",
+    "descriptionKey": "presentation.description",
     "icon": "./assets/icon.svg",
     "permissions": [
       {