@ycodium-ai/agent-kimi 0.2.3766 → 0.2.3851

package/dist/index.js

@@ -26065,6 +26065,7 @@ function createExecutorPrompt({
   promptResults,
   settleToolSubagents
 }) {
+  const ownOutcomes = /* @__PURE__ */ new Map();
   const settleTurn = (input2) => {
     if (!isLive(input2.expectedGeneration) || input2.record.finished) {
       return false;
@@ -26081,14 +26082,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({
@@ -26098,10 +26107,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);
@@ -26126,7 +26135,7 @@ function createExecutorPrompt({
       return await promptRpc;
     } else {
       const { promise: early, resolve: settleEarly } = Promise.withResolvers();
-      shared.pendingSettlement = {
+      shared.pendingSettlements.set(promptKey, {
         promptKey,
         sessionId,
         settle: settleEarly,
@@ -26135,7 +26144,7 @@ function createExecutorPrompt({
           onError: () => promptResults.reject(record2.promptId),
           hasResult: () => record2.response !== void 0
         }
-      };
+      });
       try {
         const outcome = await Promise.race([
           promptRpc.then((value) => {
@@ -26148,7 +26157,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);
       }
     }
@@ -26298,7 +26307,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,
@@ -26307,7 +26318,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();
@@ -26389,7 +26401,7 @@ function createExecutorPrompt({
         await options.beforeApplyResult();
       }
     } finally {
-      promptMutex.release();
+      if (!writesWhileRunning) promptMutex.release();
       notifyPromptSettled();
     }
     if (!isLive(started.generation)) {
@@ -27450,28 +27462,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?.();
@@ -28065,7 +28078,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,
@@ -29930,7 +29943,7 @@ var executors = [
 ];
 var index_default = definePlugin({
   id: "agent-kimi",
-  apiVersion: 56,
+  apiVersion: 63,
   executors,
   activate(ctx) {
     ctx.command({

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ycodium-ai/agent-kimi",
-  "version": "0.2.3766",
+  "version": "0.2.3851",
   "description": "Kimi Code executor: runs `kimi acp` 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.3766",
+    "ycodium-acp-executor": "0.2.3851",
     "ycodium-executor-testing": "0.0.0",
-    "@ycodium-ai/plugin-api": "0.2.3766"
+    "@ycodium-ai/plugin-api": "0.2.3851"
   },
   "ycodium": {
     "plugin": "./dist/index.js",