@khalilgharbaoui/opencode-claude-code-plugin 0.26.0 → 0.26.1

package/dist/index.js

@@ -4088,6 +4088,39 @@ async function fetchSessionParentId(sessionID) {
     return void 0;
   }
 }
+async function fetchSessionRunState(sessionID) {
+  if (!sessionID || sessionID === "default") return "unknown";
+  const status = opencodeClient?.session?.status;
+  if (!status) return "unknown";
+  try {
+    const res = await status.call(opencodeClient.session);
+    const data = res.data;
+    if (!data || typeof data !== "object") return "unknown";
+    const entry = data[sessionID];
+    if (!entry || typeof entry !== "object") return "idle";
+    const type = entry.type;
+    return type === "idle" ? "idle" : "busy";
+  } catch (err) {
+    log.debug("failed to read opencode session status", {
+      sessionID,
+      error: err instanceof Error ? err.message : String(err)
+    });
+    return "unknown";
+  }
+}
+async function settleSessionRunState(sessionID, options = {}) {
+  const pollMs = options.pollMs ?? 150;
+  const windowMs = options.windowMs ?? 1500;
+  const started = Date.now();
+  let last = "unknown";
+  for (; ; ) {
+    const state = await fetchSessionRunState(sessionID);
+    if (state === "busy") return "busy";
+    if (state !== "unknown") last = state;
+    if (Date.now() - started >= windowMs) return last;
+    await new Promise((resolve5) => setTimeout(resolve5, pollMs));
+  }
+}
 async function getRuntimeMcpStatus() {
   const client = opencodeClient;
   if (!client?.mcp?.status) return void 0;
@@ -6205,6 +6238,16 @@ function resolveOpencodeAgent(headers, providerOptions, providerKey) {
   }
   return void 0;
 }
+function describeAbortReason(reason) {
+  if (reason === void 0) return "undefined";
+  if (reason instanceof Error) return `${reason.name}: ${reason.message}`;
+  if (typeof reason === "string") return reason;
+  try {
+    return JSON.stringify(reason) ?? typeof reason;
+  } catch {
+    return typeof reason;
+  }
+}
 var KNOWN_DELTA_TYPES = /* @__PURE__ */ new Set([
   "thinking_delta",
   "text_delta",
@@ -9578,14 +9621,28 @@ ${plan}
             options.abortSignal.addEventListener("abort", () => {
               autoContinueState.aborted = true;
               if (turnCompleted || controllerClosed) {
-                if (activeProcess && activeProcess.lineEmitter.listenerCount("line") === 0 && getPendingProxyCalls(sk).length > 0) {
-                  log.info("abort between proxy tool boundaries; releasing pending calls", { sk });
-                  void interruptTurn(activeProcess).then((idle) => {
-                    log.info("interrupt sent for aborted turn", { sk, idle });
+                const stoppedProcess = activeProcess;
+                if (stoppedProcess && stoppedProcess.lineEmitter.listenerCount("line") === 0 && getPendingProxyCalls(sk).length > 0) {
+                  const reason = describeAbortReason(options.abortSignal?.reason);
+                  void settleSessionRunState(affinity).then((stopped) => {
+                    const stillParked = stoppedProcess.lineEmitter.listenerCount("line") === 0 && getPendingProxyCalls(sk).length > 0;
+                    if (stopped === "busy" || !stillParked) {
+                      log.debug("abort at a tool boundary while opencode is still running the turn; keeping pending calls", {
+                        sk,
+                        session: stopped,
+                        stillParked,
+                        reason
+                      });
+                      return;
+                    }
+                    log.info("abort between proxy tool boundaries; releasing pending calls", { sk, reason });
+                    void interruptTurn(stoppedProcess).then((idle) => {
+                      log.info("interrupt sent for aborted turn", { sk, idle });
+                    });
+                    releaseAbandonedProxyCalls(
+                      "Provider stream was aborted while opencode was running its proxy tool calls"
+                    );
                   });
-                  releaseAbandonedProxyCalls(
-                    "Provider stream was aborted while opencode was running its proxy tool calls"
-                  );
                 }
                 return;
               }