@ycodium-ai/agent-dsh 0.2.2988 → 0.2.2990

package/dist/index.js

@@ -30890,6 +30890,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);
@@ -31655,6 +31661,12 @@ function asTrimmedString(value) {
   const trimmed = value.trim();
   return trimmed.length > 0 ? trimmed : 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) {
@@ -33749,7 +33761,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";
@@ -33771,20 +33783,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 {
@@ -33914,10 +33926,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);
           }
@@ -35131,7 +35140,7 @@ var createDshInstance = (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-dsh",
-  "version": "0.2.2988",
+  "version": "0.2.2990",
   "description": "DeepSeek Harness executor: dsh CLI over Agent Client Protocol stdio.",
   "keywords": [
     "ycodium",
@@ -22,9 +22,9 @@
     "esbuild": "0.28.1",
     "vite-plus": "0.2.2",
     "yaml": "^2.9.0",
-    "ycodium-acp-executor": "0.2.2988",
+    "@ycodium-ai/plugin-api": "0.2.2990",
     "ycodium-executor-testing": "0.0.0",
-    "@ycodium-ai/plugin-api": "0.2.2988"
+    "ycodium-acp-executor": "0.2.2990"
   },
   "ycodium": {
     "plugin": "./dist/index.js",