@ycodium-ai/agent-antigravity 0.2.3018 → 0.2.3024

package/dist/index.js

@@ -28677,17 +28677,38 @@ async function* watchAgentStderr(source, onLoginPrompt, onBrowserHelperLine) {
 // src/agentProcess.ts
 async function waitForExit(handle, timeoutMs) {
   let timer;
-  await Promise.race([
+  const exited = await Promise.race([
     handle.exited.then(
-      () => void 0,
-      () => void 0
+      () => true,
+      () => true
     ),
     new Promise((resolve6) => {
-      timer = setTimeout(resolve6, timeoutMs);
+      timer = setTimeout(() => resolve6(false), timeoutMs);
       timer.unref?.();
     })
   ]);
   clearTimeout(timer);
+  return exited;
+}
+function stopAgentProcess(handle, exitWaitMs, log) {
+  let stopping = stoppingByHandle.get(handle);
+  if (stopping === void 0) {
+    stopping = terminate(handle, exitWaitMs, log);
+    stoppingByHandle.set(handle, stopping);
+  }
+  return stopping;
+}
+var stoppingByHandle = /* @__PURE__ */ new WeakMap();
+async function terminate(handle, exitWaitMs, log) {
+  await handle.kill("SIGTERM").catch(() => void 0);
+  if (await waitForExit(handle, exitWaitMs)) return;
+  log.warn("the agent process ignored SIGTERM; killing it", { pid: handle.pid, exitWaitMs });
+  await handle.kill("SIGKILL").catch(() => void 0);
+  if (await waitForExit(handle, exitWaitMs)) return;
+  log.error("the agent process is still running after SIGKILL; leaving it behind", {
+    pid: handle.pid,
+    exitWaitMs
+  });
 }
 async function openAgentProcess(input2) {
   await prepareAntigravityProfile(input2.profile);
@@ -28752,8 +28773,7 @@ async function openAgentProcess(input2) {
   const close = () => {
     closing ??= (async () => {
       await connection.close().catch(() => void 0);
-      await handle.kill("SIGTERM").catch(() => void 0);
-      await waitForExit(handle, input2.exitWaitMs);
+      await stopAgentProcess(handle, input2.exitWaitMs, input2.host.log);
       await removeRuntimeTempDir(directory);
     })();
     return closing;
@@ -30851,9 +30871,8 @@ function createAntigravityTextGeneration(deps) {
     const closeAll = async () => {
       stopped = true;
       await executor?.dispose().catch(() => void 0);
-      await handle?.kill("SIGTERM").catch(() => void 0);
+      if (handle !== void 0) await stopAgentProcess(handle, deps.exitWaitMs, deps.host.log);
       await pump?.catch(() => void 0);
-      if (handle !== void 0) await waitForExit(handle, deps.exitWaitMs);
       if (runtimeTemp !== void 0) await removeRuntimeTempDir(runtimeTemp);
       if (workspace !== void 0) {
         await removeTemporarySessionFiles({ profile: deps.profile, sessionId, workspace });
@@ -31461,9 +31480,8 @@ async function createAntigravityInstance(config2, host, deps) {
   const stopBooked = async (booked) => {
     for (const stopped of booked.background.finish()) events.push(stopped);
     await booked.executor.dispose().catch(() => void 0);
-    await booked.handle.kill("SIGTERM").catch(() => void 0);
+    await stopAgentProcess(booked.handle, exitWaitMs, host.log);
     await booked.forwarding.catch(() => void 0);
-    await waitForExit(booked.handle, exitWaitMs);
     if (!await removeRuntimeTempDir(booked.runtimeTemp)) {
       host.log.warn("could not remove a runtime temp directory; it is swept on the next start", {
         directory: booked.runtimeTemp
@@ -31705,7 +31723,7 @@ async function createAntigravityInstance(config2, host, deps) {
         if (sessionReady) {
           void noteSession(() => login.noteSessionSignedOut());
           host.log.warn("antigravity asked to sign in during a session; stopping the process");
-          void handle.kill("SIGTERM").catch(() => void 0);
+          void stopAgentProcess(handle, exitWaitMs, host.log);
         }
       };
       const aborted2 = new Promise((_, reject) => {
@@ -31847,9 +31865,8 @@ async function createAntigravityInstance(config2, host, deps) {
         return session;
       } catch (error62) {
         await executor.dispose().catch(() => void 0);
-        await handle.kill("SIGTERM").catch(() => void 0);
+        await stopAgentProcess(handle, exitWaitMs, host.log);
         await forwarding.catch(() => void 0);
-        await waitForExit(handle, exitWaitMs);
         await removeRuntimeTempDir(runtimeTemp);
         if (live.signInRequired || isSignInRequiredError(error62)) {
           await noteSession(() => login.noteSessionSignedOut());
@@ -32523,20 +32540,6 @@ function matchesExpectedRuntime(initializeResult, expectedVersion) {
   const auth = capabilities["auth"];
   return agentInfo["name"] === EXPECTED_AGENT_NAME && runtimeVersionNumber(acpAgentVersion(initializeResult) ?? "") === runtimeVersionNumber(expectedVersion) && initializeResult["protocolVersion"] === 1 && capabilities["loadSession"] === true && isRecord18(sessionCapabilities) && Boolean(sessionCapabilities["resume"]) && isRecord18(auth) && Boolean(auth["logout"]) && authMethods.some((method) => isRecord18(method) && method["id"] === "oauth-personal");
 }
-async function waitForExit2(handle) {
-  let timer;
-  await Promise.race([
-    handle.exited.then(
-      () => void 0,
-      () => void 0
-    ),
-    new Promise((resolve6) => {
-      timer = setTimeout(resolve6, EXIT_WAIT_MS);
-      timer.unref?.();
-    })
-  ]);
-  clearTimeout(timer);
-}
 async function validateInstalledRuntime(input2) {
   const platform2 = input2.platform ?? HOST_PLATFORM;
   const profileRoot = NodePath12.join(input2.dataDir, "tmp", "validate-profile");
@@ -32591,8 +32594,7 @@ async function validateInstalledRuntime(input2) {
   } finally {
     await closeHandshake?.().catch(() => void 0);
     if (handle !== void 0) {
-      await handle.kill("SIGTERM").catch(() => void 0);
-      await waitForExit2(handle);
+      await stopAgentProcess(handle, EXIT_WAIT_MS, input2.host.log);
     }
     await removeRuntimeTempDir(runtimeTemp);
     await removeRuntimeTempDir(profile);
@@ -33062,7 +33064,7 @@ var executors = [
 ];
 var index_default = definePlugin({
   id: "agent-antigravity",
-  apiVersion: 8,
+  apiVersion: 9,
   executors,
   activate(ctx) {
     const runtime = createRuntimeManager({

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ycodium-ai/agent-antigravity",
-  "version": "0.2.3018",
+  "version": "0.2.3024",
   "description": "Google Antigravity executor: runs the Antigravity agent over Agent Client Protocol stdio.",
   "keywords": [
     "ycodium",
@@ -31,9 +31,9 @@
     "typescript": "~6.0.3",
     "vite-plus": "0.2.2",
     "yauzl": "^3.4.0",
-    "@ycodium-ai/plugin-api": "0.2.3018",
-    "ycodium-acp-executor": "0.2.3018",
-    "ycodium-executor-testing": "0.0.0"
+    "@ycodium-ai/plugin-api": "0.2.3024",
+    "ycodium-executor-testing": "0.0.0",
+    "ycodium-acp-executor": "0.2.0"
   },
   "ycodium": {
     "plugin": "./dist/index.js",