@ycodium-ai/agent-grok 0.2.3202 → 0.2.3210

package/dist/index.js

@@ -27262,6 +27262,9 @@ function createAcpSessionRegistry(threads, stopBooked2) {
     if (!booked) return Promise.resolve();
     booked.closing ??= Promise.resolve().then(() => stopBooked2(booked)).then(() => {
       if (threads.get(threadId) === booked) threads.delete(threadId);
+    }).catch((cause) => {
+      if (threads.get(threadId) === booked) delete booked.closing;
+      throw cause;
     });
     return booked.closing;
   };
@@ -27271,6 +27274,61 @@ function createAcpSessionRegistry(threads, stopBooked2) {
   return { requireThread, stopSession, stopAll };
 }
 
+// ../../packages/ycodium-acp-executor/src/session-cleanup.ts
+var reportedForwardingFailures = /* @__PURE__ */ new WeakSet();
+async function cleanupAcpSession(input2) {
+  const failures = [];
+  const forwarding = input2.forwarding.catch((cause) => {
+    if (reportedForwardingFailures.has(input2.forwarding)) return;
+    reportedForwardingFailures.add(input2.forwarding);
+    failures.push(new Error(`forwarding failed: ${String(cause)}`, { cause }));
+  });
+  for (const [step, cleanup] of [
+    ["executor.dispose", () => input2.executor.dispose()],
+    ["stopProcess", input2.stopProcess],
+    ["forwarding", () => forwarding]
+  ]) {
+    try {
+      await cleanup();
+    } catch (cause) {
+      failures.push(new Error(`${step} failed: ${String(cause)}`, { cause }));
+    }
+  }
+  if (failures.length > 0) {
+    throw new AggregateError(failures, failures.map((error62) => error62.message).join("; "));
+  }
+}
+async function cleanupAcpStartup(input2) {
+  try {
+    await cleanupAcpSession(input2);
+    return true;
+  } catch (cleanupError) {
+    input2.log.warn("ACP session startup cleanup failed", {
+      threadId: input2.threadId,
+      error: String(cleanupError)
+    });
+    return false;
+  }
+}
+function createRetryableClose(run) {
+  let task;
+  return () => {
+    if (task) return task;
+    const done = Promise.withResolvers();
+    const current = done.promise;
+    task = current;
+    void current.catch(() => {
+      if (task === current) task = void 0;
+    });
+    try {
+      run().then(done.resolve, done.reject);
+    } catch (cause) {
+      done.reject(cause);
+    }
+    return current;
+  };
+}
+
 // ../../packages/ycodium-acp-executor/src/sessionProcess.ts
 var fileName = (path) => path.slice(path.lastIndexOf("/") + 1);
 var withoutExe = (name) => name.replace(/\.exe$/, "");
@@ -28753,9 +28811,11 @@ function nowIso() {
   return (/* @__PURE__ */ new Date()).toISOString();
 }
 async function stopBooked(booked) {
-  await booked.executor.dispose().catch(() => void 0);
-  await booked.handle.kill("SIGTERM").catch(() => void 0);
-  await booked.forwarding.catch(() => void 0);
+  await cleanupAcpSession({
+    executor: booked.executor,
+    stopProcess: () => booked.handle.kill("SIGTERM"),
+    forwarding: booked.forwarding
+  });
 }
 function modelIdFromSelection(selection) {
   if (typeof selection !== "object" || selection === null || Array.isArray(selection)) {
@@ -28770,8 +28830,16 @@ var createGrokInstance = (config2, host) => {
   const threads = /* @__PURE__ */ new Map();
   const signInOperations = /* @__PURE__ */ new Map();
   let disposed = false;
-  let disposeTask;
   const { requireThread, stopSession, stopAll } = createAcpSessionRegistry(threads, stopBooked);
+  const disposeOnce = createRetryableClose(async () => {
+    const operations = [...signInOperations.values()];
+    signInOperations.clear();
+    for (const operation of operations) {
+      await operation.handle.kill("SIGTERM").catch(() => void 0);
+    }
+    await stopAll();
+    events.close();
+  });
   const probeAuth = () => {
     if ((recipe.environment["XAI_API_KEY"] ?? "").trim().length > 0) {
       return { status: "authenticated", type: "api-key", label: "XAI_API_KEY" };
@@ -29036,9 +29104,13 @@ var createGrokInstance = (config2, host) => {
         }
         return session;
       } catch (error62) {
-        await executor.dispose().catch(() => void 0);
-        await handle.kill("SIGTERM").catch(() => void 0);
-        await forwarding.catch(() => void 0);
+        await cleanupAcpStartup({
+          executor,
+          stopProcess: () => handle.kill("SIGTERM"),
+          forwarding,
+          log: host.log,
+          threadId: input2.threadId
+        });
         throw error62;
       }
     },
@@ -29118,18 +29190,8 @@ var createGrokInstance = (config2, host) => {
     }),
     continuationKey: grokContinuationKey(recipe),
     dispose: () => {
-      if (disposeTask) return disposeTask;
       disposed = true;
-      disposeTask = (async () => {
-        const operations = [...signInOperations.values()];
-        signInOperations.clear();
-        for (const operation of operations) {
-          await operation.handle.kill("SIGTERM").catch(() => void 0);
-        }
-        await stopAll();
-        events.close();
-      })();
-      return disposeTask;
+      return disposeOnce();
     },
     /**
      * 设备码登录：`grok login --device-auth` 是 RFC 8628 流程，CLI 自己打印网址和
@@ -29186,7 +29248,7 @@ var executors = [
 ];
 var index_default = definePlugin({
   id: "agent-grok",
-  apiVersion: 18,
+  apiVersion: 20,
   executors,
   activate(ctx) {
     ctx.log.info("grok executor ready");

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ycodium-ai/agent-grok",
-  "version": "0.2.3202",
+  "version": "0.2.3210",
   "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.3202",
-    "@ycodium-ai/plugin-api": "0.2.3202",
-    "ycodium-executor-testing": "0.0.0"
+    "@ycodium-ai/plugin-api": "0.2.3210",
+    "ycodium-executor-testing": "0.0.0",
+    "ycodium-acp-executor": "0.2.3210"
   },
   "ycodium": {
     "plugin": "./dist/index.js",