@ycodium-ai/agent-grok 0.2.3766 → 0.2.3799

package/dist/index.js

@@ -88,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: [
@@ -26288,6 +26291,7 @@ function createExecutorPrompt({
   promptResults,
   settleToolSubagents
 }) {
+  const ownOutcomes = /* @__PURE__ */ new Map();
   const settleTurn = (input2) => {
     if (!isLive(input2.expectedGeneration) || input2.record.finished) {
       return false;
@@ -26304,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({
@@ -26321,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);
@@ -26349,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,
@@ -26358,7 +26370,7 @@ function createExecutorPrompt({
           onError: () => promptResults.reject(record4.promptId),
           hasResult: () => record4.response !== void 0
         }
-      };
+      });
       try {
         const outcome = await Promise.race([
           promptRpc.then((value) => {
@@ -26371,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);
       }
     }
@@ -26521,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,
@@ -26530,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();
@@ -26612,7 +26627,7 @@ function createExecutorPrompt({
         await options.beforeApplyResult();
       }
     } finally {
-      promptMutex.release();
+      if (!writesWhileRunning) promptMutex.release();
       notifyPromptSettled();
     }
     if (!isLive(started.generation)) {
@@ -27655,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?.();
@@ -28270,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,
@@ -29238,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) => {
@@ -29271,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 = () => {
@@ -29281,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 };
@@ -30489,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) => {
@@ -30603,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");
@@ -30691,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);
@@ -30737,6 +30820,8 @@ var createGrokInstance = (config2, host) => {
         authMethodId: resolveGrokAuthMethodId,
         hooks: {
           promptSettlement: turnUsage.settlement,
+          // 运行中再收到的 prompt 由 grok 自己排队、在下一个工具调用结束时并进这一轮（配合上面写的配置）。
+          queuesPromptsWhileRunning: true,
           modelDefaultEffort: grokModelDefaultEffort,
           // 派发子 agent 的调用由子 agent 名单接管，不再画成普通工具。
           onToolCallUpdated: (update) => ({
@@ -30978,7 +31063,7 @@ var executors = [
 ];
 var index_default = definePlugin({
   id: "agent-grok",
-  apiVersion: 56,
+  apiVersion: 60,
   executors,
   activate(ctx) {
     ctx.command({

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ycodium-ai/agent-grok",
-  "version": "0.2.3766",
+  "version": "0.2.3799",
   "description": "Grok executor: grok CLI over Agent Client Protocol stdio.",
   "keywords": [
     "ycodium",
@@ -21,8 +21,8 @@
     "@types/node": "24.12.4",
     "esbuild": "0.28.1",
     "vite-plus": "0.2.2",
-    "@ycodium-ai/plugin-api": "0.2.3766",
-    "ycodium-acp-executor": "0.2.3766",
+    "@ycodium-ai/plugin-api": "0.2.3799",
+    "ycodium-acp-executor": "0.2.3799",
     "ycodium-executor-testing": "0.0.0"
   },
   "ycodium": {