@ycodium-ai/agent-antigravity 0.2.3122 → 0.2.3158

package/dist/index.js

@@ -1626,9 +1626,6 @@ function registerAntigravityAuthCommands(ctx) {
 // src/antigravityInstance.ts
 import * as NodeCrypto6 from "node:crypto";
 
-// src/agentProcess.ts
-import { nodeStreamsFromHandle } from "@ycodium-ai/plugin-api/process-stdin";
-
 // ../../packages/ycodium-acp-executor/src/executor.ts
 import * as NodeCrypto from "node:crypto";
 
@@ -26478,7 +26475,10 @@ function createAcpConnection(options2) {
     }
     pending.delete(key);
     try {
-      options2.onResponse?.(waiter.method);
+      options2.onResponse?.(
+        waiter,
+        Object.hasOwn(message, "error") ? { error: message["error"] } : { result: message["result"] }
+      );
     } catch {
     }
     if (Object.hasOwn(message, "error")) {
@@ -26611,12 +26611,17 @@ function createAcpConnection(options2) {
   options2.readable.on("end", onEnd);
   options2.readable.on("error", onError);
   options2.writable.once("error", onWritableError);
-  const begin = (method, params) => {
+  const begin = (method, params, promptId) => {
     failIfClosed();
     const id = nextRequestId;
     nextRequestId += 1;
     const { promise: promise2, resolve: resolve6, reject } = Promise.withResolvers();
-    pending.set(String(id), { method, resolve: resolve6, reject });
+    pending.set(String(id), {
+      method,
+      ...promptId === void 0 ? {} : { promptId },
+      resolve: resolve6,
+      reject
+    });
     const message = params === void 0 ? { jsonrpc: "2.0", id, method } : { jsonrpc: "2.0", id, method, params };
     const written = Promise.race([writeMessage(message), promise2]).then(
       () => void 0,
@@ -26686,12 +26691,14 @@ function createExecutorLifecycle({
   notifyPromptSettled,
   eventStream,
   onInputDead,
-  shared
+  shared,
+  promptResults
 }) {
   const cancel = async (turnId) => {
     failIfDisposed();
     const started = requireStarted();
     const targetTurnId = turnId ?? shared.activeTurnId;
+    promptResults.stop(targetTurnId);
     if (targetTurnId !== void 0) {
       interruptedTurnIds.add(targetTurnId);
     }
@@ -26702,6 +26709,9 @@ function createExecutorLifecycle({
       if (shared.sessionId) {
         await connection.notify("session/cancel", { sessionId: shared.sessionId });
       }
+      await promptResults.wait(targetTurnId);
+      if (targetTurnId !== void 0 && shared.activeTurnId !== targetTurnId && !interruptedTurnIds.has(targetTurnId))
+        return;
       const settled = await waitForPromptIdle(cancelGraceMs);
       if (!settled) {
         throw new AcpExecutorCancelTimeoutError();
@@ -26722,6 +26732,7 @@ function createExecutorLifecycle({
               payload: { state: "cancelled", stopReason: "cancelled" }
             });
             interruptedTurnIds.delete(targetTurnId);
+            promptResults.forget(targetTurnId);
           }
         }
       }
@@ -26796,33 +26807,39 @@ function createExecutorLifecycle({
       if (!shared.disposed) emitSessionState("ready");
     }
   };
-  const dispose = async () => {
-    if (shared.disposed) {
-      return;
-    }
+  let disposing;
+  const dispose = () => {
+    if (disposing) return disposing;
+    shared.disposing = true;
+    promptResults.stop();
     settleAllApprovals("cancel");
     settleAllUserInputs();
     abortPendingSettlement("executor disposed");
     notifyPromptSettled();
     shared.abortLocalPrompt?.();
-    emit({
-      type: "session.exited",
-      ...stamp(),
-      provider: options2.provider,
-      threadId: options2.threadId,
-      payload: { reason: "disposed" }
-    });
-    shared.disposed = true;
-    shared.generation += 1;
-    shared.status = "disposed";
-    eventStream.close();
-    options2.readable.off("end", onInputDead);
-    options2.readable.off("error", onInputDead);
-    options2.readable.pause();
-    if (!shared.connectionClosed) {
-      await connection.awaitInboundIdle().catch(() => void 0);
-      await connection.close().catch(() => void 0);
-    }
+    disposing = (async () => {
+      promptResults.finishUnreceived();
+      await promptResults.wait();
+      emit({
+        type: "session.exited",
+        ...stamp(),
+        provider: options2.provider,
+        threadId: options2.threadId,
+        payload: { reason: "disposed" }
+      });
+      shared.disposed = true;
+      shared.generation += 1;
+      shared.status = "disposed";
+      eventStream.close();
+      options2.readable.off("end", onInputDead);
+      options2.readable.off("error", onInputDead);
+      options2.readable.pause();
+      if (!shared.connectionClosed) {
+        await connection.awaitInboundIdle().catch(() => void 0);
+        await connection.close().catch(() => void 0);
+      }
+    })();
+    return disposing;
   };
   return { cancel, compact, dispose };
 }
@@ -26926,12 +26943,14 @@ function createExecutorPrompt({
   promptMutex,
   applyRequestedModel,
   notifyPromptSettled,
-  shared
+  shared,
+  promptResults
 }) {
   const settleTurn = (input2) => {
-    if (!isLive(input2.expectedGeneration)) {
+    if (!isLive(input2.expectedGeneration) || input2.record.finished) {
       return false;
     }
+    promptResults.complete(input2.record);
     if (!acpPromptSettlementBelongsToContext({
       liveAcpSessionId: shared.sessionId ?? "",
       expectedAcpSessionId: input2.expectedSessionId,
@@ -26948,6 +26967,7 @@ function createExecutorPrompt({
     if (shared.status !== "disposed") {
       shared.status = "ready";
     }
+    const interrupted = promptResults.hasInterrupted(input2.turnId);
     emit({
       type: "turn.completed",
       ...stamp(),
@@ -26955,30 +26975,44 @@ function createExecutorPrompt({
       threadId: options2.threadId,
       turnId: input2.turnId,
       payload: {
-        state: input2.state,
-        stopReason: input2.stopReason,
+        state: interrupted ? "cancelled" : input2.state,
+        stopReason: interrupted ? "cancelled" : input2.stopReason,
         ...input2.errorMessage === void 0 ? {} : { errorMessage: input2.errorMessage },
         ...input2.state === "failed" ? failureCategoryField(input2.failureCategory) : {}
       }
     });
     interruptedTurnIds.delete(input2.turnId);
+    promptResults.forget(input2.turnId);
     return true;
   };
-  const sendPromptRpc = async (sessionId, promptParts, onWritten) => {
+  const sendPromptRpc = async (sessionId, promptParts, onWritten, record2) => {
     const settlementHooks = hooks.promptSettlement;
     const promptKey = settlementHooks === void 0 ? void 0 : randomId();
-    const pending = connection.begin("session/prompt", {
-      sessionId,
-      prompt: promptParts,
-      ...settlementHooks !== void 0 && promptKey !== void 0 ? settlementHooks.requestFields(promptKey) : {}
-    });
+    const pending = connection.begin(
+      "session/prompt",
+      {
+        sessionId,
+        prompt: promptParts,
+        ...settlementHooks !== void 0 && promptKey !== void 0 ? settlementHooks.requestFields(promptKey) : {}
+      },
+      record2?.promptId
+    );
     void pending.written.then(onWritten, () => void 0);
     const promptRpc = pending.response;
     if (settlementHooks === void 0 || promptKey === void 0) {
       return await promptRpc;
     } else {
       const { promise: early, resolve: settleEarly } = Promise.withResolvers();
-      shared.pendingSettlement = { promptKey, sessionId, settle: settleEarly };
+      shared.pendingSettlement = {
+        promptKey,
+        sessionId,
+        settle: settleEarly,
+        ...record2 === void 0 ? {} : {
+          onResponse: (response) => promptResults.receive(record2.promptId, response),
+          onError: () => promptResults.reject(record2.promptId),
+          hasResult: () => record2.response !== void 0
+        }
+      };
       try {
         const outcome = await Promise.race([
           promptRpc.then((value) => {
@@ -26999,9 +27033,11 @@ function createExecutorPrompt({
   const prompt = async (input2) => {
     failIfDisposed();
     const started = requireStarted();
+    let record2;
     const settle2 = (rest) => settleTurn({
       expectedGeneration: started.generation,
       expectedSessionId: started.sessionId,
+      record: record2,
       ...rest
     });
     let turnId;
@@ -27014,6 +27050,17 @@ function createExecutorPrompt({
         randomId
       );
       shared.promptsInFlight += 1;
+      record2 = promptResults.add(
+        {
+          promptId: randomId(),
+          sessionId: started.sessionId,
+          generation: started.generation,
+          turnId
+        },
+        () => {
+          finishPrompt();
+        }
+      );
       shared.activeTurnId = turnId;
       shared.status = "running";
       if (shared.promptsInFlight === 1) {
@@ -27030,6 +27077,42 @@ function createExecutorPrompt({
       threadMutex.release();
     }
     const promptParts = input2.prompt ?? (input2.text !== void 0 ? [{ type: "text", text: input2.text }] : [{ type: "text", text: "" }]);
+    let contextWindow;
+    const finishPrompt = () => {
+      if (!isLive(started.generation) || record2.finished) throw new AcpExecutorDisposedError();
+      const response2 = record2.response;
+      if (record2.interrupted || response2 === void 0) {
+        settle2({ turnId, stopReason: "cancelled", state: "cancelled" });
+        return { threadId: options2.threadId, turnId, stopReason: "cancelled" };
+      }
+      const stopReason = hooks.completedStopReason?.(response2) ?? response2.stopReason;
+      if (contextWindow !== void 0) {
+        emit({
+          type: "thread.token-usage.updated",
+          ...stamp(),
+          provider: options2.provider,
+          threadId: options2.threadId,
+          turnId,
+          payload: {
+            usage: {
+              usedTokens: contextWindow.usedTokens,
+              ...contextWindow.maxTokens === void 0 ? {} : { maxTokens: contextWindow.maxTokens }
+            }
+          }
+        });
+      }
+      settle2({
+        turnId,
+        stopReason,
+        state: response2.stopReason === "cancelled" ? "cancelled" : "completed"
+      });
+      return {
+        threadId: options2.threadId,
+        turnId,
+        stopReason,
+        ...response2.usage !== void 0 && response2.usage !== null ? { usage: response2.usage } : {}
+      };
+    };
     await promptMutex.acquire();
     let response;
     try {
@@ -27044,6 +27127,7 @@ function createExecutorPrompt({
           expectedGeneration: started.generation
         });
       }
+      failIfDisposed();
       if (isStale()) {
         settle2({ turnId, stopReason: "cancelled", state: "cancelled" });
         return { threadId: options2.threadId, turnId, stopReason: "cancelled" };
@@ -27051,10 +27135,15 @@ function createExecutorPrompt({
       closeActiveAssistantSegment(turnId);
       let written = false;
       try {
-        response = await sendPromptRpc(started.sessionId, promptParts, () => {
-          written = true;
-          input2.onDispatched?.(turnId);
-        });
+        response = await sendPromptRpc(
+          started.sessionId,
+          promptParts,
+          () => {
+            written = true;
+            input2.onDispatched?.(turnId);
+          },
+          record2
+        );
       } catch (error62) {
         if (shared.disposed) {
           throw new AcpExecutorDisposedError();
@@ -27093,8 +27182,7 @@ function createExecutorPrompt({
     if (turnId === void 0) {
       throw new AcpExecutorError("internal", "ACP prompt settled without a turn id");
     }
-    const settledTurnId = turnId;
-    let contextWindow;
+    if (record2.finished) throw new AcpExecutorDisposedError();
     if (hooks.readContextWindow !== void 0) {
       try {
         contextWindow = await hooks.readContextWindow({
@@ -27105,43 +27193,6 @@ function createExecutorPrompt({
         contextWindow = void 0;
       }
     }
-    const finishPrompt = () => {
-      if (interruptedTurnIds.has(settledTurnId)) {
-        settle2({ turnId: settledTurnId, stopReason: "cancelled", state: "cancelled" });
-        return {
-          threadId: options2.threadId,
-          turnId: settledTurnId,
-          stopReason: "cancelled"
-        };
-      }
-      const stopReason = hooks.completedStopReason?.(response) ?? response.stopReason;
-      if (contextWindow !== void 0) {
-        emit({
-          type: "thread.token-usage.updated",
-          ...stamp(),
-          provider: options2.provider,
-          threadId: options2.threadId,
-          turnId: settledTurnId,
-          payload: {
-            usage: {
-              usedTokens: contextWindow.usedTokens,
-              ...contextWindow.maxTokens === void 0 ? {} : { maxTokens: contextWindow.maxTokens }
-            }
-          }
-        });
-      }
-      settle2({
-        turnId: settledTurnId,
-        stopReason,
-        state: response.stopReason === "cancelled" ? "cancelled" : "completed"
-      });
-      return {
-        threadId: options2.threadId,
-        turnId: settledTurnId,
-        stopReason,
-        ...response.usage !== void 0 && response.usage !== null ? { usage: response.usage } : {}
-      };
-    };
     if (threadMutex.tryAcquire()) {
       try {
         return finishPrompt();
@@ -27159,6 +27210,91 @@ function createExecutorPrompt({
   return { sendPromptRpc, prompt };
 }
 
+// ../../packages/ycodium-acp-executor/src/executor/prompt-results.ts
+function createPromptResults({
+  options: options2,
+  shared
+}) {
+  const prompts = /* @__PURE__ */ new Map();
+  const add = (identity, finish) => {
+    const { promise: done, resolve: resolve6 } = Promise.withResolvers();
+    const record2 = {
+      ...identity,
+      finish,
+      done,
+      resolve: resolve6,
+      rejected: false,
+      interrupted: false,
+      finished: false
+    };
+    prompts.set(record2.promptId, record2);
+    return record2;
+  };
+  const receive = (promptId, response) => {
+    const record2 = prompts.get(promptId);
+    if (!record2 || record2.finished || record2.rejected || record2.response !== void 0) return;
+    if (shared.disposed || shared.generation !== record2.generation || shared.sessionId !== record2.sessionId)
+      return;
+    record2.response = response;
+  };
+  const reject = (promptId) => {
+    const record2 = prompts.get(promptId);
+    if (record2 && record2.response === void 0) record2.rejected = true;
+  };
+  const stop = (turnId) => {
+    for (const record2 of prompts.values()) {
+      if (!record2.finished && (turnId === void 0 || record2.turnId === turnId) && record2.response === void 0) {
+        record2.interrupted = true;
+      }
+    }
+  };
+  const complete = (record2) => {
+    record2.finished = true;
+    record2.resolve();
+  };
+  const hasInterrupted = (turnId) => [...prompts.values()].some((record2) => record2.turnId === turnId && record2.interrupted);
+  const forget = (turnId) => {
+    for (const [id, record2] of prompts) {
+      if (record2.turnId === turnId) {
+        complete(record2);
+        prompts.delete(id);
+      }
+    }
+  };
+  const wait = async (turnId) => {
+    const claimed = [...prompts.values()].filter(
+      (record2) => !record2.finished && record2.response !== void 0 && (turnId === void 0 || record2.turnId === turnId)
+    );
+    if (claimed.length === 0) return;
+    let timer;
+    try {
+      const drained = await Promise.race([
+        Promise.all(claimed.map((record2) => record2.done)).then(() => true),
+        new Promise((resolve6) => {
+          timer = setTimeout(() => resolve6(false), options2.resultDrainTimeoutMs ?? 2e3);
+        })
+      ]);
+      if (drained) return;
+      options2.log?.warn?.("ACP result settlement timed out", { threadId: options2.threadId });
+      for (const record2 of claimed) if (!record2.finished) record2.finish();
+    } finally {
+      clearTimeout(timer);
+    }
+  };
+  const finishUnreceived = () => {
+    const claimedTurns = new Set(
+      [...prompts.values()].filter((record2) => !record2.finished && record2.response !== void 0).map((record2) => record2.turnId)
+    );
+    for (const record2 of prompts.values()) {
+      if (!record2.finished && record2.response === void 0) {
+        if (claimedTurns.has(record2.turnId)) record2.finish();
+        else complete(record2);
+      }
+    }
+  };
+  return { add, receive, reject, stop, complete, hasInterrupted, forget, wait, finishUnreceived };
+}
+
 // ../../packages/ycodium-acp-executor/src/user-input-pending.ts
 var userInputAnswerOptionId = (question, answers) => {
   const answer = answers[question.id];
@@ -27465,7 +27601,7 @@ function createExecutorRuntime({
     turnId: () => shared.activeTurnId
   });
   const failIfDisposed = () => {
-    if (shared.disposed) {
+    if (shared.disposed || shared.disposing) {
       throw new AcpExecutorDisposedError();
     }
   };
@@ -28057,6 +28193,7 @@ function createExecutorSettlement({
   const abortPendingSettlement = (reason, failureCategory) => {
     const waiting = shared.pendingSettlement;
     if (waiting === void 0) return;
+    if (waiting.hasResult?.()) return;
     shared.pendingSettlement = void 0;
     waiting.settle({
       error: withFailureCategory(
@@ -28078,6 +28215,7 @@ function createExecutorSettlement({
     shared.pendingSettlement = void 0;
     rememberSettledPromptKey(waiting.promptKey);
     if (signal.outcome === "error") {
+      waiting.onError?.();
       waiting.settle({
         error: withFailureCategory(
           new AcpExecutorRequestError(
@@ -28088,8 +28226,10 @@ function createExecutorSettlement({
         )
       });
     } else {
+      const response = { stopReason: signal.stopReason ?? "end_turn" };
+      waiting.onResponse?.(response);
       waiting.settle({
-        response: { stopReason: signal.stopReason ?? "end_turn" }
+        response
       });
     }
     return true;
@@ -28419,6 +28559,7 @@ function createAcpExecutor(options2) {
   const shared = {
     generation: 0,
     disposed: false,
+    disposing: false,
     status: "idle",
     sessionId: void 0,
     modelSelectionState: {
@@ -28506,6 +28647,7 @@ function createAcpExecutor(options2) {
     shared
   });
   const { rememberSettledPromptKey, abortPendingSettlement, settleFromNotification } = createExecutorSettlement({ hooks, shared });
+  const promptResults = createPromptResults({ options: options2, shared });
   const connection = createAcpConnection({
     readable: options2.readable,
     writable: options2.writable,
@@ -28516,8 +28658,12 @@ function createAcpExecutor(options2) {
       });
     },
     // 窗口在应答帧到达的那一刻同步收掉：应答之后的通知是真输出，不能再丢。
-    onResponse: (method) => {
+    onResponse: ({ method, promptId }, outcome) => {
       if (method === "session/load") shared.sessionLoadInFlight = false;
+      if (promptId !== void 0) {
+        if ("result" in outcome) promptResults.receive(promptId, outcome.result);
+        else promptResults.reject(promptId);
+      }
     },
     onNotification: (notification) => {
       if (notification.method === "session/update") {
@@ -28582,6 +28728,7 @@ function createAcpExecutor(options2) {
     shared
   });
   const { sendPromptRpc, prompt } = createExecutorPrompt({
+    promptResults,
     isLive,
     closeActiveAssistantSegment,
     emit,
@@ -28601,6 +28748,7 @@ function createAcpExecutor(options2) {
     shared
   });
   const { cancel, compact, dispose } = createExecutorLifecycle({
+    promptResults,
     failIfDisposed,
     requireStarted,
     interruptedTurnIds,
@@ -28652,6 +28800,27 @@ function createAcpExecutor(options2) {
   };
 }
 
+// ../../packages/ycodium-acp-executor/src/session-registry.ts
+function createAcpSessionRegistry(threads, stopBooked) {
+  const requireThread = (threadId) => {
+    const booked = threads.get(threadId);
+    if (!booked) throw new Error(`unknown thread ${threadId}`);
+    if (booked.closing) throw new Error(`thread ${threadId} is closing`);
+    return booked;
+  };
+  const stopSession = (threadId, booked = threads.get(threadId)) => {
+    if (!booked) return Promise.resolve();
+    booked.closing ??= Promise.resolve().then(() => stopBooked(booked)).then(() => {
+      if (threads.get(threadId) === booked) threads.delete(threadId);
+    });
+    return booked.closing;
+  };
+  const stopAll = () => Promise.all([...threads].map(([threadId, booked]) => stopSession(threadId, booked))).then(
+    () => void 0
+  );
+  return { requireThread, stopSession, stopAll };
+}
+
 // ../../packages/ycodium-acp-executor/src/start-abort.ts
 function throwIfStartAborted(signal) {
   if (signal?.aborted) throw new Error("aborted");
@@ -28742,6 +28911,21 @@ function acpAgentVersion(initializeResult) {
 }
 var MAX_VERSION_OUTPUT_BYTES = 64 * 1024;
 
+// src/agentProcess.ts
+import { nodeStreamsFromHandle } from "@ycodium-ai/plugin-api/process-stdin";
+
+// src/clock.ts
+var realAgentClock = {
+  now: () => Date.now(),
+  delay(ms, callback) {
+    const timer = setTimeout(callback, ms);
+    timer.unref?.();
+    return () => {
+      clearTimeout(timer);
+    };
+  }
+};
+
 // src/profile.ts
 import * as NodeCrypto2 from "node:crypto";
 import * as NodeFSP from "node:fs/promises";
@@ -29000,36 +29184,36 @@ async function* watchAgentStderr(source, onLoginPrompt, onBrowserHelperLine) {
 }
 
 // src/agentProcess.ts
-async function waitForExit(handle, timeoutMs) {
-  let timer;
+async function waitForExit(handle, timeoutMs, clock) {
+  let cancel = () => {
+  };
   const exited = await Promise.race([
     handle.exited.then(
       () => true,
       () => true
     ),
     new Promise((resolve6) => {
-      timer = setTimeout(() => resolve6(false), timeoutMs);
-      timer.unref?.();
+      cancel = clock.delay(timeoutMs, () => resolve6(false));
     })
   ]);
-  clearTimeout(timer);
+  cancel();
   return exited;
 }
-function stopAgentProcess(handle, exitWaitMs, log) {
+function stopAgentProcess(handle, exitWaitMs, log, clock = realAgentClock) {
   let stopping = stoppingByHandle.get(handle);
   if (stopping === void 0) {
-    stopping = terminate(handle, exitWaitMs, log);
+    stopping = terminate(handle, exitWaitMs, log, clock);
     stoppingByHandle.set(handle, stopping);
   }
   return stopping;
 }
 var stoppingByHandle = /* @__PURE__ */ new WeakMap();
-async function terminate(handle, exitWaitMs, log) {
+async function terminate(handle, exitWaitMs, log, clock) {
   await handle.kill("SIGTERM").catch(() => void 0);
-  if (await waitForExit(handle, exitWaitMs)) return;
+  if (await waitForExit(handle, exitWaitMs, clock)) 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;
+  if (await waitForExit(handle, exitWaitMs, clock)) return;
   log.error("the agent process is still running after SIGKILL; leaving it behind", {
     pid: handle.pid,
     exitWaitMs
@@ -29062,6 +29246,7 @@ async function openAgentProcess(input2) {
     await removeRuntimeTempDir(directory);
     throw error62;
   }
+  const clock = input2.clock ?? realAgentClock;
   const { readable, writable } = nodeStreamsFromHandle({
     stdout: filterAgentStdout(handle.stdout, { onLoginPrompt: input2.onLoginPrompt }),
     stderr: watchAgentStderr(handle.stderr, input2.onLoginPrompt, input2.onBrowserHelperLine),
@@ -29073,22 +29258,21 @@ async function openAgentProcess(input2) {
     const pending = connection.request(method, params);
     if (timeoutMs === void 0) return pending;
     return new Promise((resolve6, reject) => {
-      const timer = setTimeout(() => {
+      const cancel = clock.delay(timeoutMs, () => {
         reject(
           new AntigravityAuthError(
             "agent-timeout",
             `Antigravity did not answer '${method}' in time. It may still be starting up; try again.`
           )
         );
-      }, timeoutMs);
-      timer.unref?.();
+      });
       pending.then(
         (value) => {
-          clearTimeout(timer);
+          cancel();
           resolve6(value);
         },
         (error62) => {
-          clearTimeout(timer);
+          cancel();
           reject(error62);
         }
       );
@@ -29098,7 +29282,7 @@ async function openAgentProcess(input2) {
   const close = () => {
     closing ??= (async () => {
       await connection.close().catch(() => void 0);
-      await stopAgentProcess(handle, input2.exitWaitMs, input2.host.log);
+      await stopAgentProcess(handle, input2.exitWaitMs, input2.host.log, clock);
       await removeRuntimeTempDir(directory);
     })();
     return closing;
@@ -30054,13 +30238,14 @@ function createAntigravitySession({
   platform: platform2,
   processEnv,
   exitWaitMs,
+  clock,
   userHome,
   dirs,
   events,
   threads,
   mutable,
   resolveInput,
-  stopBooked,
+  stopSession,
   login,
   noteSession,
   recordCatalog,
@@ -30075,8 +30260,8 @@ function createAntigravitySession({
       if (cwd.trim() === "") throw new Error("workspace path missing");
       const existing = threads.get(input2.threadId);
       if (existing !== void 0) {
-        threads.delete(input2.threadId);
-        await stopBooked(existing);
+        await stopSession(input2.threadId, existing);
+        if (mutable.disposed) throw new Error("instance disposed");
         throwIfStartAborted(signal);
       }
       const lease = await deps.runtime.acquire(resolveInput);
@@ -30135,7 +30320,7 @@ function createAntigravitySession({
         if (sessionReady) {
           void noteSession(() => login.noteSessionSignedOut());
           host.log.warn("antigravity asked to sign in during a session; stopping the process");
-          void stopAgentProcess(handle, exitWaitMs, host.log);
+          void stopAgentProcess(handle, exitWaitMs, host.log, clock);
         }
       };
       const { readable, writable, stderrTail } = nodeStreamsFromHandle2({
@@ -30282,7 +30467,7 @@ function createAntigravitySession({
         return session;
       } catch (error62) {
         await executor.dispose().catch(() => void 0);
-        await stopAgentProcess(handle, exitWaitMs, host.log);
+        await stopAgentProcess(handle, exitWaitMs, host.log, clock);
         await forwarding.catch(() => void 0);
         await removeRuntimeTempDir(runtimeTemp);
         if (live.signInRequired || isSignInRequiredError(error62)) {
@@ -30300,10 +30485,9 @@ import * as NodeCrypto4 from "node:crypto";
 function createAntigravityTurn({
   deps,
   events,
-  threads,
   mutable,
   requireThread,
-  stopBooked,
+  stopSession,
   login,
   pushTaskEvents
 }) {
@@ -30340,8 +30524,7 @@ function createAntigravityTurn({
       ...base,
       payload: { state: "completed", stopReason: "end_turn" }
     });
-    threads.delete(input2.threadId);
-    await stopBooked(booked);
+    await stopSession(input2.threadId, booked);
     return { threadId: input2.threadId, turnId };
   };
   return {
@@ -30876,6 +31059,7 @@ function createLoginController(deps) {
   const { host } = deps;
   const authDeadlineMs = deps.authDeadlineMs ?? AUTH_DEADLINE_MS;
   const startupMs = deps.startupTimeoutMs ?? AGENT_STARTUP_TIMEOUT_MS;
+  const clock = deps.clock ?? realAgentClock;
   const forward = deps.forward ?? forwardCallback;
   const markerFile = signedInMarkerFile(deps.dirs.profile);
   const browserCommand = buildBrowserCommand({ nodePath: deps.nodePath, platform: deps.platform });
@@ -30944,6 +31128,7 @@ function createLoginController(deps) {
         platform: deps.platform,
         processEnv: deps.processEnv,
         exitWaitMs: deps.exitWaitMs,
+        clock,
         clientInfo: deps.clientInfo,
         browserCommand: hooks.browser ? browserCommand : void 0,
         onLoginPrompt: hooks.onLoginPrompt,
@@ -31039,13 +31224,12 @@ function createLoginController(deps) {
   };
   const runSignIn = async (target) => {
     const guard = (promise2) => Promise.race([promise2, target.interrupted]);
-    const deadline = setTimeout(() => {
+    const cancelDeadline = clock.delay(authDeadlineMs, () => {
       abortFlow(target, {
         kind: "failed",
         failure: failure2("expired", "Google sign-in expired. Start sign-in again.")
       });
-    }, authDeadlineMs);
-    deadline.unref?.();
+    });
     const opening = open4({
       browser: true,
       onLoginPrompt: (detail) => receiveAuthorizationUrl(target, detail),
@@ -31089,7 +31273,7 @@ function createLoginController(deps) {
         });
       }
     } finally {
-      clearTimeout(deadline);
+      cancelDeadline();
       const agent = await opening.catch(() => void 0);
       if (agent !== void 0) await release(agent);
       if (refreshAfter) requestRefresh();
@@ -31116,7 +31300,7 @@ function createLoginController(deps) {
     phase = "starting";
     authorizationUrl = null;
     error62 = null;
-    expiresAt = new Date(Date.now() + authDeadlineMs).toISOString();
+    expiresAt = new Date(clock.now() + authDeadlineMs).toISOString();
     publish();
     target.done = track(runSignIn(target));
     return snapshot();
@@ -31812,6 +31996,7 @@ var TextGenerationRejection = class extends Error {
 };
 function createAntigravityTextGeneration(deps) {
   const timeoutMs = deps.timeoutMs ?? DEFAULT_TIMEOUT_MS;
+  const clock = deps.clock ?? realAgentClock;
   const running = /* @__PURE__ */ new Set();
   const runJson = async (request2) => {
     const { operation, signal } = request2;
@@ -31839,7 +32024,8 @@ function createAntigravityTextGeneration(deps) {
     const closeAll = async () => {
       stopped = true;
       await executor?.dispose().catch(() => void 0);
-      if (handle !== void 0) await stopAgentProcess(handle, deps.exitWaitMs, deps.host.log);
+      if (handle !== void 0)
+        await stopAgentProcess(handle, deps.exitWaitMs, deps.host.log, clock);
       await pump?.catch(() => void 0);
       if (runtimeTemp !== void 0) await removeRuntimeTempDir(runtimeTemp);
       if (workspace !== void 0) {
@@ -32133,6 +32319,7 @@ async function createAntigravityInstance(config2, host, deps) {
   const platform2 = deps.platform ?? HOST_PLATFORM;
   const processEnv = deps.processEnv ?? process.env;
   const exitWaitMs = deps.exitWaitMs ?? DEFAULT_EXIT_WAIT_MS;
+  const clock = deps.clock ?? realAgentClock;
   const userHome = deps.userHome ?? resolveAntigravityUserHome(platform2, { ...processEnv, ...recipe.environment });
   const dirs = resolveAntigravityDirectories({
     dataDir: deps.dataDir,
@@ -32145,6 +32332,7 @@ async function createAntigravityInstance(config2, host, deps) {
   const events = new EventBus();
   const threads = /* @__PURE__ */ new Map();
   const mutable = { disposed: false };
+  let disposeTask;
   const unregister = deps.runtime.registerInstance({
     instanceId: host.instanceId,
     host,
@@ -32157,15 +32345,10 @@ async function createAntigravityInstance(config2, host, deps) {
     processEnv
   };
   const resolveExecutable = () => deps.runtime.resolve(resolveInput);
-  const requireThread = (threadId) => {
-    const booked = threads.get(threadId);
-    if (!booked) throw new Error(`unknown thread ${threadId}`);
-    return booked;
-  };
   const stopBooked = async (booked) => {
     for (const stopped of booked.background.finish()) events.push(stopped);
     await booked.executor.dispose().catch(() => void 0);
-    await stopAgentProcess(booked.handle, exitWaitMs, host.log);
+    await stopAgentProcess(booked.handle, exitWaitMs, host.log, clock);
     await booked.forwarding.catch(() => void 0);
     if (!await removeRuntimeTempDir(booked.runtimeTemp)) {
       host.log.warn("could not remove a runtime temp directory; it is swept on the next start", {
@@ -32173,6 +32356,7 @@ async function createAntigravityInstance(config2, host, deps) {
       });
     }
   };
+  const { requireThread, stopSession, stopAll } = createAcpSessionRegistry(threads, stopBooked);
   const helpers = createAntigravityTextGeneration({
     host,
     profile: dirs.profile,
@@ -32181,14 +32365,17 @@ async function createAntigravityInstance(config2, host, deps) {
     platform: platform2,
     processEnv,
     exitWaitMs,
+    clock,
     clientInfo: CLIENT_INFO,
     acquireExecutable: () => deps.runtime.acquire(resolveInput),
     ...deps.textGenerationTimeoutMs === void 0 ? {} : { timeoutMs: deps.textGenerationTimeoutMs }
   });
   const stopAllSessions = async (keepThreadId) => {
     const targets = [...threads].filter(([threadId]) => threadId !== keepThreadId);
-    for (const [threadId] of targets) threads.delete(threadId);
-    await Promise.all([...targets.map(([, booked]) => stopBooked(booked)), helpers.stopRunning()]);
+    await Promise.all([
+      ...targets.map(([threadId, booked]) => stopSession(threadId, booked)),
+      helpers.stopRunning()
+    ]);
   };
   const login = createLoginController({
     host,
@@ -32200,6 +32387,7 @@ async function createAntigravityInstance(config2, host, deps) {
     acquireExecutable: () => deps.runtime.acquire(resolveInput),
     stopSessions: stopAllSessions,
     exitWaitMs,
+    clock,
     clientInfo: CLIENT_INFO,
     nodePath: deps.nodePath ?? process.execPath,
     ...deps.authDeadlineMs === void 0 ? {} : { authDeadlineMs: deps.authDeadlineMs },
@@ -32278,13 +32466,14 @@ async function createAntigravityInstance(config2, host, deps) {
     platform: platform2,
     processEnv,
     exitWaitMs,
+    clock,
     userHome,
     dirs,
     events,
     threads,
     mutable,
     resolveInput,
-    stopBooked,
+    stopSession,
     login,
     noteSession,
     recordCatalog,
@@ -32294,10 +32483,9 @@ async function createAntigravityInstance(config2, host, deps) {
   const turn = createAntigravityTurn({
     deps,
     events,
-    threads,
     mutable,
     requireThread,
-    stopBooked,
+    stopSession,
     login,
     pushTaskEvents
   });
@@ -32344,11 +32532,10 @@ async function createAntigravityInstance(config2, host, deps) {
     sendTurn: turn.sendTurn,
     interruptTurn: async (threadId, turnId) => {
       const booked = threads.get(threadId);
-      if (booked === void 0) return;
+      if (booked === void 0 || booked.closing) return;
       host.log.info("interrupt turn", { threadId, turnId });
       if (booked.session.status !== "running" && booked.background.hasPromoted()) {
-        threads.delete(threadId);
-        await stopBooked(booked);
+        await stopSession(threadId, booked);
         return;
       }
       await booked.executor.cancel(turnId);
@@ -32380,12 +32567,7 @@ async function createAntigravityInstance(config2, host, deps) {
       };
       if (applied !== void 0) booked.appliedModeId = applied;
     },
-    stopSession: async (threadId) => {
-      const booked = threads.get(threadId);
-      if (booked === void 0) return;
-      threads.delete(threadId);
-      await stopBooked(booked);
-    },
+    stopSession: (threadId) => stopSession(threadId),
     readThread: async (threadId) => {
       const booked = requireThread(threadId);
       return { threadId, turns: booked.turns };
@@ -32393,17 +32575,18 @@ async function createAntigravityInstance(config2, host, deps) {
     events,
     textGeneration: helpers.textGeneration,
     continuationKey: dirs.continuationKey,
-    dispose: async () => {
-      if (mutable.disposed) return;
+    dispose: () => {
+      if (disposeTask) return disposeTask;
       mutable.disposed = true;
-      unregisterLogin();
-      unsubscribeRuntime();
-      await login.dispose();
-      unregister();
-      const booked = [...threads.values()];
-      threads.clear();
-      await Promise.all([...booked.map((entry) => stopBooked(entry)), helpers.stopRunning()]);
-      events.close();
+      disposeTask = (async () => {
+        unregisterLogin();
+        unsubscribeRuntime();
+        await login.dispose();
+        unregister();
+        await Promise.all([stopAll(), helpers.stopRunning()]);
+        events.close();
+      })();
+      return disposeTask;
     }
   };
   return instance;
@@ -33478,7 +33661,7 @@ var executors = [
 ];
 var index_default = definePlugin({
   id: "agent-antigravity",
-  apiVersion: 13,
+  apiVersion: 15,
   executors,
   activate(ctx) {
     const runtime = createRuntimeManager({

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ycodium-ai/agent-antigravity",
-  "version": "0.2.3122",
+  "version": "0.2.3158",
   "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-acp-executor": "0.2.3122",
-    "@ycodium-ai/plugin-api": "0.2.3122",
+    "@ycodium-ai/plugin-api": "0.2.3158",
+    "ycodium-acp-executor": "0.2.3158",
     "ycodium-executor-testing": "0.0.0"
   },
   "ycodium": {