@ycodium-ai/agent-grok 0.2.2984 → 0.2.2990

package/dist/index.js

@@ -158,10 +158,7 @@ var GROK_CARD = {
 };
 
 // src/grokInstance.ts
-import * as NodeCrypto2 from "node:crypto";
-import * as NodeOS2 from "node:os";
-import * as NodePath5 from "node:path";
-import { mergeLaunchEnv } from "@ycodium-ai/plugin-api/executor";
+import * as NodeCrypto3 from "node:crypto";
 import { nodeStreamsFromHandle as nodeStreamsFromHandle2 } from "@ycodium-ai/plugin-api/process-stdin";
 
 // ../../packages/ycodium-acp-executor/src/executor.ts
@@ -23570,6 +23567,12 @@ var AcpExecutorDisposedError = class extends AcpExecutorError {
     this.name = "AcpExecutorDisposedError";
   }
 };
+var AcpExecutorTurnEndedError = class extends AcpExecutorError {
+  constructor(message = "The target turn has ended. The message was not sent.") {
+    super("provider-rejected", message);
+    this.name = "AcpExecutorTurnEndedError";
+  }
+};
 var AcpExecutorNotStartedError = class extends AcpExecutorError {
   constructor(message = "ACP session has not been started") {
     super("not-started", message);
@@ -24335,6 +24338,12 @@ function asTrimmedString(value) {
   const trimmed3 = value.trim();
   return trimmed3.length > 0 ? trimmed3 : void 0;
 }
+var selectPromptTurnId = (input2, activeTurnId, freshTurnId) => {
+  const target = input2.expectedActiveTurnId;
+  if (target === void 0) return input2.turnId ?? activeTurnId ?? freshTurnId();
+  if (activeTurnId !== target) throw new AcpExecutorTurnEndedError();
+  return target;
+};
 
 // ../../packages/ycodium-acp-executor/src/tool-presentation.ts
 function normalizeCommandValue(value) {
@@ -26419,7 +26428,7 @@ function createAcpExecutor(options) {
     await threadMutex.acquire();
     try {
       failIfDisposed();
-      turnId = input2.turnId ?? (promptsInFlight > 0 ? activeTurnId : void 0) ?? randomId();
+      turnId = selectPromptTurnId(input2, promptsInFlight > 0 ? activeTurnId : void 0, randomId);
       promptsInFlight += 1;
       activeTurnId = turnId;
       status = "running";
@@ -26441,20 +26450,20 @@ function createAcpExecutor(options) {
     let response;
     try {
       failIfDisposed();
-      if (interruptedTurnIds.has(turnId)) {
+      const queuedTurnId = turnId;
+      const isStale = () => interruptedTurnIds.has(queuedTurnId) || input2.expectedActiveTurnId !== void 0 && activeTurnId !== queuedTurnId;
+      if (!isStale()) {
+        modelSelectionState = await applyRequestedModel({
+          state: modelSelectionState,
+          acpSessionId: started.sessionId,
+          requestedModelId: input2.requestedModelId,
+          expectedGeneration: started.generation
+        });
+      }
+      if (isStale()) {
         settle2({ turnId, stopReason: "cancelled", state: "cancelled" });
-        return {
-          threadId: options.threadId,
-          turnId,
-          stopReason: "cancelled"
-        };
+        return { threadId: options.threadId, turnId, stopReason: "cancelled" };
       }
-      modelSelectionState = await applyRequestedModel({
-        state: modelSelectionState,
-        acpSessionId: started.sessionId,
-        requestedModelId: input2.requestedModelId,
-        expectedGeneration: started.generation
-      });
       closeActiveAssistantSegment(turnId);
       let written = false;
       try {
@@ -26584,10 +26593,7 @@ function createAcpExecutor(options) {
               provider: options.provider,
               threadId: options.threadId,
               turnId: targetTurnId,
-              payload: {
-                state: "cancelled",
-                stopReason: "cancelled"
-              }
+              payload: { state: "cancelled", stopReason: "cancelled" }
             });
             interruptedTurnIds.delete(targetTurnId);
           }
@@ -28065,43 +28071,11 @@ async function probeGrokVersion(input2) {
   });
 }
 
-// src/grokInstance.ts
-var RESUME_SCHEMA_VERSION = 1;
-var yieldTick = () => new Promise((resolve2) => {
-  setImmediate(resolve2);
-});
-var EventBus = class {
-  #queued = [];
-  #waiters = [];
-  #closed = false;
-  push(event) {
-    const waiter = this.#waiters.shift();
-    if (waiter) {
-      waiter({ done: false, value: event });
-      return;
-    }
-    this.#queued.push(event);
-  }
-  close() {
-    if (this.#closed) return;
-    this.#closed = true;
-    while (this.#waiters.length > 0) {
-      this.#waiters.shift()?.({ done: true, value: void 0 });
-    }
-  }
-  [Symbol.asyncIterator]() {
-    return {
-      next: () => {
-        const queued = this.#queued.shift();
-        if (queued !== void 0) return Promise.resolve({ done: false, value: queued });
-        if (this.#closed) return Promise.resolve({ done: true, value: void 0 });
-        return new Promise((resolve2) => {
-          this.#waiters.push(resolve2);
-        });
-      }
-    };
-  }
-};
+// src/grokHome.ts
+import * as NodeCrypto2 from "node:crypto";
+import * as NodeOS2 from "node:os";
+import * as NodePath5 from "node:path";
+import { mergeLaunchEnv } from "@ycodium-ai/plugin-api/executor";
 function expandHomePath(value) {
   if (value === "~") return NodeOS2.homedir();
   if (value.startsWith("~/") || value.startsWith("~\\")) {
@@ -28169,6 +28143,44 @@ function buildSpawnEnv(recipe, resolvedHomePath, homeConfigured) {
     handOverrides: { GROK_OAUTH2_REFERRER: "ycodium" }
   });
 }
+
+// src/grokInstance.ts
+var RESUME_SCHEMA_VERSION = 1;
+var yieldTick = () => new Promise((resolve2) => {
+  setImmediate(resolve2);
+});
+var EventBus = class {
+  #queued = [];
+  #waiters = [];
+  #closed = false;
+  push(event) {
+    const waiter = this.#waiters.shift();
+    if (waiter) {
+      waiter({ done: false, value: event });
+      return;
+    }
+    this.#queued.push(event);
+  }
+  close() {
+    if (this.#closed) return;
+    this.#closed = true;
+    while (this.#waiters.length > 0) {
+      this.#waiters.shift()?.({ done: true, value: void 0 });
+    }
+  }
+  [Symbol.asyncIterator]() {
+    return {
+      next: () => {
+        const queued = this.#queued.shift();
+        if (queued !== void 0) return Promise.resolve({ done: false, value: queued });
+        if (this.#closed) return Promise.resolve({ done: true, value: void 0 });
+        return new Promise((resolve2) => {
+          this.#waiters.push(resolve2);
+        });
+      }
+    };
+  }
+};
 function nowIso() {
   return (/* @__PURE__ */ new Date()).toISOString();
 }
@@ -28436,7 +28448,7 @@ var createGrokInstance = (config2, host) => {
         if (caveat !== void 0) {
           events.push({
             type: "runtime.warning",
-            eventId: NodeCrypto2.randomUUID(),
+            eventId: NodeCrypto3.randomUUID(),
             provider: GROK_DRIVER_KIND,
             providerInstanceId: host.instanceId,
             threadId: input2.threadId,
@@ -28473,7 +28485,7 @@ var createGrokInstance = (config2, host) => {
         const requestedModelId = modelIdFromSelection(input2.modelSelection);
         const turn = await dispatchAcpPrompt(booked.executor, {
           text: input2.input ?? "",
-          ...input2.expectedTurnId === void 0 ? {} : { turnId: input2.expectedTurnId },
+          expectedActiveTurnId: input2.expectedTurnId,
           ...requestedModelId === void 0 ? {} : { requestedModelId }
         });
         booked.turns.push({ id: turn.turnId, items: [] });

package/package.json

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