@ycodium-ai/agent-antigravity 0.2.3020 → 0.2.3028

package/dist/index.js

@@ -26873,6 +26873,62 @@ function acpModelChoicesFromSessionModels(models) {
   return out;
 }
 
+// ../../packages/ycodium-acp-executor/src/apply-effort.ts
+var applyRequestedEffort = async (input2) => {
+  const requested = input2.requestedEffort?.trim();
+  if (!requested) return;
+  const effort = findAcpEffortConfig(input2.configOptions);
+  if (effort === void 0) return;
+  const matched = effort.choices.find((choice) => choice.value === requested);
+  if (matched === void 0) {
+    input2.log?.info("requested effort is not in the agent catalog; keeping its own", {
+      requestedEffort: requested,
+      advertised: effort.choices.map((choice) => choice.value)
+    });
+    return;
+  }
+  if (matched.isDefault === true) return;
+  if (!input2.isLive(input2.expectedGeneration)) return;
+  try {
+    await input2.connection.request("session/set_config_option", {
+      sessionId: input2.acpSessionId,
+      configId: effort.configId,
+      value: requested
+    });
+  } catch (error62) {
+    input2.log?.info("setting the effort level failed; the session keeps its own", {
+      requestedEffort: requested,
+      configId: effort.configId,
+      error: error62 instanceof Error ? error62.message : String(error62)
+    });
+  }
+};
+
+// ../../packages/ycodium-acp-executor/src/failureCategory.ts
+var ACP_FAILURE_CATEGORIES = [
+  "quota",
+  "rate-limit",
+  "context-limit",
+  "auth",
+  "model-unavailable",
+  "transport",
+  "unknown"
+];
+var isAcpFailureCategory = (value) => ACP_FAILURE_CATEGORIES.some((category) => category === value);
+var readAcpFailureCategory = (error62) => {
+  if (typeof error62 !== "object" || error62 === null) return void 0;
+  const value = error62.failureCategory;
+  return isAcpFailureCategory(value) ? value : void 0;
+};
+var withFailureCategory = (error62, category) => category === void 0 ? error62 : Object.assign(error62, { failureCategory: category });
+var failureCategoryField = (category) => category === void 0 ? {} : { failureCategory: category };
+var acpTransportIfEstablished = (sessionEstablished, disposed) => sessionEstablished && !disposed ? "transport" : void 0;
+var acpPromptFailureCategory = (error62, input2) => {
+  const signaled = readAcpFailureCategory(error62);
+  if (signaled !== void 0) return signaled;
+  return error62 instanceof AcpConnectionClosedError ? acpTransportIfEstablished(input2.sessionEstablished, input2.disposed) : void 0;
+};
+
 // ../../packages/ycodium-acp-executor/src/runtime-mode.ts
 function isRecord5(value) {
   return typeof value === "object" && value !== null && !Array.isArray(value);
@@ -26975,7 +27031,7 @@ var ACP_CONFIG_CATEGORY_HANDLING = {
   },
   thought_level: {
     consumed: true,
-    via: "config-options.ts:findAcpEffortConfig \u2192 executor.ts:applyRequestedEffort"
+    via: "config-options.ts:findAcpEffortConfig \u2192 apply-effort.ts:applyRequestedEffort"
   },
   model_option: {
     consumed: true,
@@ -27463,11 +27519,16 @@ function createAcpExecutor(options2) {
       payload: { answers }
     });
   };
-  const abortPendingSettlement = (reason) => {
+  const abortPendingSettlement = (reason, failureCategory) => {
     const waiting = pendingSettlement;
     if (waiting === void 0) return;
     pendingSettlement = void 0;
-    waiting.settle({ error: new AcpExecutorRequestError("session/prompt", reason) });
+    waiting.settle({
+      error: withFailureCategory(
+        new AcpExecutorRequestError("session/prompt", reason),
+        failureCategory
+      )
+    });
   };
   const settleAllUserInputs = () => {
     for (const pending of pendingUserInputs.values()) {
@@ -27491,9 +27552,12 @@ function createAcpExecutor(options2) {
     rememberSettledPromptKey(waiting.promptKey);
     if (signal.outcome === "error") {
       waiting.settle({
-        error: new AcpExecutorRequestError(
-          "session/prompt",
-          signal.detail ?? "prompt failed without an error detail"
+        error: withFailureCategory(
+          new AcpExecutorRequestError(
+            "session/prompt",
+            signal.detail ?? "prompt failed without an error detail"
+          ),
+          signal.failureCategory
         )
       });
     } else {
@@ -27648,7 +27712,10 @@ function createAcpExecutor(options2) {
       }
       settleAllApprovals("cancel");
       settleAllUserInputs();
-      abortPendingSettlement("connection closed");
+      abortPendingSettlement(
+        "connection closed",
+        acpTransportIfEstablished(startResult !== void 0, disposed)
+      );
       promptWaiters.splice(0).forEach((wake) => wake());
     },
     () => {
@@ -27703,35 +27770,6 @@ function createAcpExecutor(options2) {
     }
     return { ...input2.state, currentModelId: value, configOptions };
   };
-  const applyRequestedEffort = async (input2) => {
-    const requested = input2.requestedEffort?.trim();
-    if (!requested) return;
-    const effort = findAcpEffortConfig(input2.configOptions);
-    if (effort === void 0) return;
-    const matched = effort.choices.find((choice) => choice.value === requested);
-    if (matched === void 0) {
-      options2.log?.info("requested effort is not in the agent catalog; keeping its own", {
-        requestedEffort: requested,
-        advertised: effort.choices.map((choice) => choice.value)
-      });
-      return;
-    }
-    if (matched.isDefault === true) return;
-    if (!isLive(input2.expectedGeneration)) return;
-    try {
-      await connection.request("session/set_config_option", {
-        sessionId: input2.acpSessionId,
-        configId: effort.configId,
-        value: requested
-      });
-    } catch (error62) {
-      options2.log?.info("setting the effort level failed; the session keeps its own", {
-        requestedEffort: requested,
-        configId: effort.configId,
-        error: error62 instanceof Error ? error62.message : String(error62)
-      });
-    }
-  };
   const startOnce = async (expectedGeneration) => {
     const initializePayload = acpInitializePayload(options2.clientInfo, options2.clientCapabilities);
     const initialized = await connection.request(
@@ -27806,6 +27844,9 @@ function createAcpExecutor(options2) {
       expectedGeneration
     });
     await applyRequestedEffort({
+      connection,
+      log: options2.log,
+      isLive,
       configOptions: nextModelSelectionState.configOptions,
       acpSessionId: nextSessionId,
       requestedEffort: options2.requestedEffort,
@@ -27928,7 +27969,8 @@ function createAcpExecutor(options2) {
       payload: {
         state: input2.state,
         stopReason: input2.stopReason,
-        ...input2.errorMessage === void 0 ? {} : { errorMessage: input2.errorMessage }
+        ...input2.errorMessage === void 0 ? {} : { errorMessage: input2.errorMessage },
+        ...input2.state === "failed" ? failureCategoryField(input2.failureCategory) : {}
       }
     });
     interruptedTurnIds.delete(input2.turnId);
@@ -28025,15 +28067,25 @@ function createAcpExecutor(options2) {
         if (disposed) {
           throw new AcpExecutorDisposedError();
         }
+        const failureCategory = acpPromptFailureCategory(error62, {
+          sessionEstablished: startResult !== void 0,
+          disposed
+        });
         if (written && input2.onDispatched !== void 0 && !interruptedTurnIds.has(turnId)) {
           const errorMessage2 = error62 instanceof Error && error62.message.trim() || "ACP prompt failed";
-          if (settle2({ turnId, stopReason: "error", state: "failed", errorMessage: errorMessage2 }))
+          if (settle2({
+            turnId,
+            stopReason: "error",
+            state: "failed",
+            errorMessage: errorMessage2,
+            ...failureCategory === void 0 ? {} : { failureCategory }
+          }))
             options2.log?.warn?.("turn failed after dispatch", {
               threadId: options2.threadId,
               failure: errorMessage2
             });
         }
-        throw error62;
+        throw error62 instanceof Error ? withFailureCategory(error62, failureCategory) : error62;
       }
       await connection.awaitInboundIdle();
       if (options2.beforeApplyResult) {
@@ -28677,17 +28729,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 +28825,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 +30923,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 +31532,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 +31775,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 +31917,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 +32592,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 +32646,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);

package/package.json

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