@ycodium-ai/agent-claude 0.2.3202 → 0.2.3210

package/dist/index.js

@@ -22417,16 +22417,27 @@ var makeSdkStream = (deps) => {
       }
     }
   };
+  const claimTurnResult = (context, message) => {
+    const turnState = context.turnState;
+    if (message.type !== "result" || turnState === void 0) return () => {
+    };
+    const claim = Promise.withResolvers();
+    turnState.resultClaim = claim.promise;
+    return claim.resolve;
+  };
   const runSdkStream = async (context) => {
     let handlerThrew = false;
     try {
       for await (const message of context.query) {
         if (context.stopped) break;
+        const releaseClaim = claimTurnResult(context, message);
         try {
           await handleSdkMessage(context, message);
         } catch (cause) {
           handlerThrew = true;
           throw cause;
+        } finally {
+          releaseClaim();
         }
       }
       await handleStreamExit(context, null, false);
@@ -23505,10 +23516,30 @@ var makeSessionControls = (deps) => {
 };
 
 // src/adapter/sessionLifecycle.ts
+var RESULT_CLAIM_WAIT_MS = 1e3;
 var makeSessionLifecycle = (deps) => {
   const { emitter, log, completeTurn } = deps;
   const { nowIso, makeEventStamp, eventHeader, offerRuntimeEvent } = emitter;
   const sessions = /* @__PURE__ */ new Map();
+  const awaitClaimedResult = async (context) => {
+    const claim = context.turnState?.resultClaim;
+    if (claim === void 0) return;
+    let timer;
+    const timeout = new Promise((resolve4) => {
+      timer = setTimeout(() => resolve4("timeout"), RESULT_CLAIM_WAIT_MS);
+    });
+    try {
+      const outcome = await Promise.race([claim.then(() => "settled"), timeout]);
+      if (outcome === "timeout") {
+        log.warn("claude.session.stop-result-claim-timeout", {
+          threadId: context.session.threadId,
+          waitedMs: RESULT_CLAIM_WAIT_MS
+        });
+      }
+    } finally {
+      clearTimeout(timer);
+    }
+  };
   const stopSessionInternal = async (context, stopOptions) => {
     if (context.stopWork) {
       await context.stopWork;
@@ -23561,7 +23592,10 @@ var makeSessionLifecycle = (deps) => {
         pending.cancel();
       }
       if (context.turnState) {
-        await completeTurn(context, "interrupted", "Session stopped.");
+        await awaitClaimedResult(context);
+        if (context.turnState) {
+          await completeTurn(context, "interrupted", "Session stopped.");
+        }
       }
       if (closeFailure) throw closeFailure;
       await context.cliProcess.clear();
@@ -25179,7 +25213,7 @@ var makeTurnLifecycle = (deps) => {
       }
     });
   };
-  const completeTurn = async (context, status, errorMessage, result, failureCategory) => {
+  const publishTurnCompletion = async (context, status, errorMessage, result, failureCategory) => {
     const resultContextWindow = maxClaudeContextWindowFromModelUsage(result?.modelUsage);
     if (resultContextWindow !== void 0) {
       context.lastKnownContextWindow = resultContextWindow;
@@ -25304,6 +25338,23 @@ var makeTurnLifecycle = (deps) => {
       context.interruptSettled.resolve(void 0);
     }
   };
+  const completeTurn = (context, status, errorMessage, result, failureCategory) => {
+    const turnState = context.turnState;
+    if (!turnState)
+      return publishTurnCompletion(context, status, errorMessage, result, failureCategory);
+    if (turnState.completion) return turnState.completion;
+    const completion = Promise.withResolvers();
+    const work = completion.promise;
+    turnState.completion = work;
+    void work.catch(() => {
+      if (turnState.completion === work) delete turnState.completion;
+    });
+    publishTurnCompletion(context, status, errorMessage, result, failureCategory).then(
+      completion.resolve,
+      completion.reject
+    );
+    return work;
+  };
   return { ensureSyntheticTurn, completeTurn };
 };
 
@@ -28001,7 +28052,7 @@ function createClaudeAdapter(recipe, host, options) {
     events: runtimeEventQueue,
     dispose: async () => {
       const results = await Promise.allSettled(
-        [...sessions.values()].map((ctx) => stopSessionInternal(ctx, { emitExitEvent: false }))
+        [...sessions.values()].map((ctx) => stopSessionInternal(ctx))
       );
       runtimeEventQueue.close();
       const failures = results.flatMap(
@@ -28116,7 +28167,7 @@ var executors = [
 ];
 var index_default = definePlugin({
   id: "agent-claude",
-  apiVersion: 18,
+  apiVersion: 20,
   executors,
   activate(ctx) {
     capturedAttachments = ctx.attachments;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ycodium-ai/agent-claude",
-  "version": "0.2.3202",
+  "version": "0.2.3210",
   "description": "Claude executor: Claude Code CLI via @anthropic-ai/claude-agent-sdk.",
   "keywords": [
     "ycodium",
@@ -24,7 +24,7 @@
     "@types/node": "24.12.4",
     "esbuild": "0.28.1",
     "vite-plus": "0.2.2",
-    "@ycodium-ai/plugin-api": "0.2.3202",
+    "@ycodium-ai/plugin-api": "0.2.3210",
     "ycodium-composer-tokens": "0.0.0",
     "ycodium-executor-testing": "0.0.0",
     "ycodium-jsonl-stream": "0.0.0"