@codexhost/cli-darwin-x64 0.14.0 → 0.15.0

package/app/plugins/antigravity/plugin.mjs

@@ -413,8 +413,8 @@ import { spawn } from "node:child_process";
 import { randomUUID as randomUUID6 } from "node:crypto";
 import { readFile as readFile2, unlink } from "node:fs/promises";
 import https3 from "node:https";
-import os5 from "node:os";
-import path10 from "node:path";
+import os6 from "node:os";
+import path11 from "node:path";
 import readline from "node:readline";
 
 // ../../../node_modules/zod/v4/classic/external.js
@@ -1183,10 +1183,10 @@ function mergeDefs(...defs) {
 function cloneDef(schema) {
   return mergeDefs(schema._zod.def);
 }
-function getElementAtPath(obj, path11) {
-  if (!path11)
+function getElementAtPath(obj, path12) {
+  if (!path12)
     return obj;
-  return path11.reduce((acc, key) => acc?.[key], obj);
+  return path12.reduce((acc, key) => acc?.[key], obj);
 }
 function promiseAllObject(promisesObj) {
   const keys = Object.keys(promisesObj);
@@ -1595,11 +1595,11 @@ function explicitlyAborted(x, startIndex = 0) {
   }
   return false;
 }
-function prefixIssues(path11, issues) {
+function prefixIssues(path12, issues) {
   return issues.map((iss) => {
     var _a3;
     (_a3 = iss).path ?? (_a3.path = []);
-    iss.path.unshift(path11);
+    iss.path.unshift(path12);
     return iss;
   });
 }
@@ -1746,16 +1746,16 @@ function flattenError(error51, mapper = (issue2) => issue2.message) {
 }
 function formatError(error51, mapper = (issue2) => issue2.message) {
   const fieldErrors = { _errors: [] };
-  const processError = (error52, path11 = []) => {
+  const processError = (error52, path12 = []) => {
     for (const issue2 of error52.issues) {
       if (issue2.code === "invalid_union" && issue2.errors.length) {
-        issue2.errors.map((issues) => processError({ issues }, [...path11, ...issue2.path]));
+        issue2.errors.map((issues) => processError({ issues }, [...path12, ...issue2.path]));
       } else if (issue2.code === "invalid_key") {
-        processError({ issues: issue2.issues }, [...path11, ...issue2.path]);
+        processError({ issues: issue2.issues }, [...path12, ...issue2.path]);
       } else if (issue2.code === "invalid_element") {
-        processError({ issues: issue2.issues }, [...path11, ...issue2.path]);
+        processError({ issues: issue2.issues }, [...path12, ...issue2.path]);
       } else {
-        const fullpath = [...path11, ...issue2.path];
+        const fullpath = [...path12, ...issue2.path];
         if (fullpath.length === 0) {
           fieldErrors._errors.push(mapper(issue2));
         } else {
@@ -1782,17 +1782,17 @@ function formatError(error51, mapper = (issue2) => issue2.message) {
 }
 function treeifyError(error51, mapper = (issue2) => issue2.message) {
   const result = { errors: [] };
-  const processError = (error52, path11 = []) => {
+  const processError = (error52, path12 = []) => {
     var _a3, _b;
     for (const issue2 of error52.issues) {
       if (issue2.code === "invalid_union" && issue2.errors.length) {
-        issue2.errors.map((issues) => processError({ issues }, [...path11, ...issue2.path]));
+        issue2.errors.map((issues) => processError({ issues }, [...path12, ...issue2.path]));
       } else if (issue2.code === "invalid_key") {
-        processError({ issues: issue2.issues }, [...path11, ...issue2.path]);
+        processError({ issues: issue2.issues }, [...path12, ...issue2.path]);
       } else if (issue2.code === "invalid_element") {
-        processError({ issues: issue2.issues }, [...path11, ...issue2.path]);
+        processError({ issues: issue2.issues }, [...path12, ...issue2.path]);
       } else {
-        const fullpath = [...path11, ...issue2.path];
+        const fullpath = [...path12, ...issue2.path];
         if (fullpath.length === 0) {
           result.errors.push(mapper(issue2));
           continue;
@@ -1824,8 +1824,8 @@ function treeifyError(error51, mapper = (issue2) => issue2.message) {
 }
 function toDotPath(_path) {
   const segs = [];
-  const path11 = _path.map((seg) => typeof seg === "object" ? seg.key : seg);
-  for (const seg of path11) {
+  const path12 = _path.map((seg) => typeof seg === "object" ? seg.key : seg);
+  for (const seg of path12) {
     if (typeof seg === "number")
       segs.push(`[${seg}]`);
     else if (typeof seg === "symbol")
@@ -3446,10 +3446,10 @@ var $ZodObject = /* @__PURE__ */ $constructor("$ZodObject", (inst, def) => {
     const shape = def.shape;
     const propValues = {};
     for (const key in shape) {
-      const field = shape[key]._zod;
-      if (field.values) {
+      const field2 = shape[key]._zod;
+      if (field2.values) {
         propValues[key] ?? (propValues[key] = /* @__PURE__ */ new Set());
-        for (const v of field.values)
+        for (const v of field2.values)
           propValues[key].add(v);
       }
     }
@@ -5053,8 +5053,8 @@ function az_default() {
 }
 
 // ../../../node_modules/zod/v4/locales/be.js
-function getBelarusianPlural(count2, one, few, many) {
-  const absCount = Math.abs(count2);
+function getBelarusianPlural(count3, one, few, many) {
+  const absCount = Math.abs(count3);
   const lastDigit = absCount % 10;
   const lastTwoDigits = absCount % 100;
   if (lastTwoDigits >= 11 && lastTwoDigits <= 19) {
@@ -7132,8 +7132,8 @@ function hu_default() {
 }
 
 // ../../../node_modules/zod/v4/locales/hy.js
-function getArmenianPlural(count2, one, many) {
-  return Math.abs(count2) === 1 ? one : many;
+function getArmenianPlural(count3, one, many) {
+  return Math.abs(count3) === 1 ? one : many;
 }
 function withDefiniteArticle(word) {
   if (!word)
@@ -9261,8 +9261,8 @@ function ro_default() {
 }
 
 // ../../../node_modules/zod/v4/locales/ru.js
-function getRussianPlural(count2, one, few, many) {
-  const absCount = Math.abs(count2);
+function getRussianPlural(count3, one, few, many) {
+  const absCount = Math.abs(count3);
   const lastDigit = absCount % 10;
   const lastTwoDigits = absCount % 100;
   if (lastTwoDigits >= 11 && lastTwoDigits <= 19) {
@@ -14517,13 +14517,13 @@ function resolveRef(ref, ctx) {
   if (!ref.startsWith("#")) {
     throw new Error("External $ref is not supported, only local refs (#/...) are allowed");
   }
-  const path11 = ref.slice(1).split("/").filter(Boolean);
-  if (path11.length === 0) {
+  const path12 = ref.slice(1).split("/").filter(Boolean);
+  if (path12.length === 0) {
     return ctx.rootSchema;
   }
   const defsKey = ctx.version === "draft-2020-12" ? "$defs" : "definitions";
-  if (path11[0] === defsKey) {
-    const key = path11[1];
+  if (path12[0] === defsKey) {
+    const key = path12[1];
     if (!key || !ctx.defs[key]) {
       throw new Error(`Reference not found: ${ref}`);
     }
@@ -15196,6 +15196,51 @@ var hostInteractionIdSchema = opaqueIdSchema.brand();
 var threadPrewarmDiscardParamsSchema = external_exports.object({ threadId: hostThreadIdSchema });
 var threadPrewarmDiscardResultSchema = external_exports.object({ discarded: external_exports.boolean() });
 
+// ../../shared-contracts/dist/thread-questions.js
+var field = external_exports.discriminatedUnion("type", [
+  external_exports.object({
+    id: external_exports.string().min(1),
+    type: external_exports.literal("choice"),
+    prompt: external_exports.string(),
+    options: external_exports.array(external_exports.object({
+      value: external_exports.string().min(1),
+      label: external_exports.string(),
+      description: external_exports.string().optional()
+    })).min(1),
+    multiple: external_exports.boolean(),
+    allowOther: external_exports.boolean(),
+    optional: external_exports.boolean()
+  }),
+  external_exports.object({
+    id: external_exports.string().min(1),
+    type: external_exports.literal("text"),
+    prompt: external_exports.string(),
+    multiline: external_exports.boolean(),
+    secret: external_exports.literal(false),
+    optional: external_exports.boolean(),
+    placeholder: external_exports.string().optional(),
+    prefill: external_exports.string().optional()
+  })
+]);
+var threadQuestionSchema = external_exports.object({
+  interactionId: external_exports.string().min(1),
+  turnId: external_exports.string().min(1),
+  title: external_exports.string().optional(),
+  questions: external_exports.array(field).min(1)
+}).refine(({ questions }) => questions.some((q) => q.type === "choice" && q.multiple), {
+  message: "Shared cards require at least one multi-select question"
+});
+var threadQuestionsListParamsSchema = external_exports.strictObject({ threadId: external_exports.string().min(1) });
+var threadQuestionsResultSchema = external_exports.object({ questions: external_exports.array(threadQuestionSchema) });
+var threadQuestionRespondParamsSchema = external_exports.strictObject({
+  threadId: external_exports.string().min(1),
+  turnId: external_exports.string().min(1),
+  interactionId: external_exports.string().min(1),
+  answers: external_exports.record(external_exports.string(), external_exports.array(external_exports.string())),
+  cancelled: external_exports.boolean().default(false)
+});
+var threadQuestionRespondResultSchema = external_exports.object({ accepted: external_exports.literal(true) });
+
 // ../../shared-contracts/dist/console.js
 var consoleAnnouncementSchema = external_exports.strictObject({
   title: external_exports.string().trim().min(1).max(200),
@@ -16665,6 +16710,12 @@ function historyPath(environment) {
   const threadId = safeThreadId(environment);
   return threadId ? path5.join(historyRoot(environment), `${threadId}.json`) : null;
 }
+function antigravityHookDirectory(environment) {
+  const threadId = safeThreadId(environment);
+  if (!threadId || threadId === "." || threadId === "..")
+    return null;
+  return path5.join(historyRoot(environment), "hooks", threadId);
+}
 function jsonTurn(turn) {
   return JSON.parse(JSON.stringify(turn));
 }
@@ -16853,8 +16904,11 @@ var AntigravityHistory = class _AntigravityHistory {
 function nativeConversationDbPath(nativeSessionId, homedir2 = os3.homedir()) {
   return path6.join(homedir2, ".gemini", "antigravity-cli", "conversations", `${nativeSessionId}.db`);
 }
+function nativeBrainRoot(homedir2 = os3.homedir()) {
+  return path6.join(homedir2, ".gemini", "antigravity-cli", "brain");
+}
 function nativeBrainDirPath(nativeSessionId, homedir2 = os3.homedir()) {
-  return path6.join(homedir2, ".gemini", "antigravity-cli", "brain", nativeSessionId);
+  return path6.join(nativeBrainRoot(homedir2), nativeSessionId);
 }
 async function cloneNativeConversationDb(sourceSessionId, derivedSessionId, retainedTurnsCountOrHomedir, homedirOption = os3.homedir()) {
   let retainedTurnsCount;
@@ -18107,7 +18161,7 @@ var AntigravityQuestionBridge = class _AntigravityQuestionBridge {
     this.#server.on("request", (request, response) => this.#receive(request, response));
   }
   static async create(options) {
-    const directory = await mkdtemp2(path8.join(os4.tmpdir(), "codexhost-agy-question-"));
+    const directory = options.directory ?? await mkdtemp2(path8.join(os4.tmpdir(), "codexhost-agy-question-"));
     const bridge = new _AntigravityQuestionBridge(directory, options);
     try {
       await new Promise((resolve, reject) => {
@@ -18123,7 +18177,7 @@ var AntigravityQuestionBridge = class _AntigravityQuestionBridge {
         throw new Error("Question bridge did not bind");
       bridge.environment.CODEXHOST_AGY_QUESTION_URL = `http://127.0.0.1:${address.port}/question`;
       const client = path8.join(directory, "question-hook.cjs");
-      await mkdir3(path8.join(directory, ".agents"));
+      await mkdir3(path8.join(directory, ".agents"), { recursive: true, mode: 448 });
       await writeFile3(client, ANTIGRAVITY_QUESTION_HOOK_CLIENT, "utf8");
       const quote = (value) => `'${value.replaceAll("'", "'\\''")}'`;
       bridge.environment.CODEXHOST_AGY_QUESTION_NODE = `"${process.execPath.replaceAll("\\", "/")}"`;
@@ -18352,7 +18406,9 @@ var AntigravityQuestionBridge = class _AntigravityQuestionBridge {
         this.#server.close(() => resolve());
         this.#server.closeAllConnections();
       });
-      await rm3(this.directory, { recursive: true, force: true, maxRetries: 5, retryDelay: 50 });
+      if (this.#options.directory === void 0) {
+        await rm3(this.directory, { recursive: true, force: true, maxRetries: 5, retryDelay: 50 });
+      }
     })();
     return this.#disposal;
   }
@@ -18846,12 +18902,195 @@ var AntigravitySubagents = class {
   }
 };
 
+// dist/usage-statistics.js
+import { lstat, opendir } from "node:fs/promises";
+import os5 from "node:os";
+import path10 from "node:path";
+
+// ../../harness-adapter/dist/usage-statistics.js
+import { createReadStream } from "node:fs";
+import { createInterface } from "node:readline";
+var HarnessUsageSourceChangedError = class extends Error {
+  code = "HARNESS_USAGE_SOURCE_CHANGED";
+  /** Plugins may bundle their own copy of this contract, so instanceof is insufficient. */
+  static is(error51) {
+    return typeof error51 === "object" && error51 !== null && "code" in error51 && error51.code === "HARNESS_USAGE_SOURCE_CHANGED";
+  }
+};
+var MAX_SESSION_ID_LENGTH = 512;
+var MAX_CWD_LENGTH = 4096;
+var MAX_SESSION_TITLE_LENGTH = 200;
+function usageSessionTitle(value) {
+  if (typeof value !== "string")
+    return void 0;
+  const normalized = value.replaceAll("\0", "").replaceAll(/\s+/gu, " ").trim();
+  if (!normalized)
+    return void 0;
+  if (normalized.length <= MAX_SESSION_TITLE_LENGTH)
+    return normalized;
+  let title = "";
+  for (const character of normalized) {
+    if (title.length + character.length >= MAX_SESSION_TITLE_LENGTH)
+      break;
+    title += character;
+  }
+  return `${title.trimEnd()}…`;
+}
+function sessionIdOk(value) {
+  return typeof value === "string" && value.length > 0 && value.length <= MAX_SESSION_ID_LENGTH;
+}
+function cwdOk(value) {
+  return typeof value === "string" && value.length > 0 && value.length <= MAX_CWD_LENGTH && !value.includes("\0") && (value.startsWith("/") || /^[A-Za-z]:[\\/]/u.test(value) || value.startsWith("\\\\"));
+}
+function withUsageSession(entry, session) {
+  const sessionId = sessionIdOk(session.sessionId) ? session.sessionId : void 0;
+  const cwd = cwdOk(session.cwd) ? session.cwd : void 0;
+  const sessionTitle = sessionId !== void 0 ? usageSessionTitle(session.title) : void 0;
+  if (sessionId === void 0 && cwd === void 0)
+    return entry;
+  return {
+    ...entry,
+    ...sessionId !== void 0 ? { sessionId } : {},
+    ...cwd !== void 0 ? { cwd } : {},
+    ...sessionTitle !== void 0 ? { sessionTitle } : {}
+  };
+}
+async function* jsonlRecords(file2, marker, signal) {
+  const lines = createInterface({
+    input: createReadStream(file2, { encoding: "utf8", signal }),
+    crlfDelay: Infinity
+  });
+  for await (const line of lines) {
+    if (!line.includes(marker))
+      continue;
+    let value;
+    try {
+      value = JSON.parse(line);
+    } catch {
+      continue;
+    }
+    if (typeof value === "object" && value !== null && !Array.isArray(value)) {
+      yield value;
+    }
+  }
+}
+function nativeTimeMs(value) {
+  const time3 = typeof value === "number" ? value : typeof value === "string" ? Date.parse(value) : Number.NaN;
+  return Number.isFinite(time3) && time3 > 0 ? Math.floor(time3) : null;
+}
+
+// dist/usage-statistics.js
+function count2(value) {
+  return typeof value === "number" && Number.isSafeInteger(value) && value >= 0 ? value : null;
+}
+function antigravityHome(environment) {
+  return (process.platform === "win32" ? environment.USERPROFILE : environment.HOME) || os5.homedir();
+}
+function transcriptPath(brainRoot, conversationId) {
+  return path10.join(brainRoot, conversationId, ".system_generated", "logs", "transcript.jsonl");
+}
+function isMissing(error51) {
+  const code = error51?.code;
+  return code === "ENOENT" || code === "ENOTDIR";
+}
+async function lstatIfPresent(target) {
+  try {
+    return await lstat(target);
+  } catch (error51) {
+    if (isMissing(error51))
+      return null;
+    throw error51;
+  }
+}
+async function transcriptFingerprint(file2) {
+  const logs = path10.dirname(file2);
+  for (const directory of [path10.dirname(logs), logs]) {
+    if (!(await lstatIfPresent(directory))?.isDirectory())
+      return null;
+  }
+  const info = await lstatIfPresent(file2);
+  return info?.isFile() && info.size > 0 ? `${info.ino}:${info.size}:${info.mtimeMs}` : null;
+}
+async function listTranscripts(brainRoot, signal) {
+  signal.throwIfAborted();
+  const conversations = await opendir(brainRoot).catch((error51) => {
+    if (error51.code === "ENOENT")
+      return null;
+    throw error51;
+  });
+  if (!conversations)
+    return [];
+  const sources = [];
+  for await (const entry of conversations) {
+    signal.throwIfAborted();
+    if (!entry.isDirectory())
+      continue;
+    const file2 = transcriptPath(brainRoot, entry.name);
+    const fingerprint = await transcriptFingerprint(file2);
+    if (fingerprint)
+      sources.push({ id: file2, fingerprint });
+  }
+  return sources;
+}
+async function readAntigravityUsage(file2, signal) {
+  const sessionId = path10.basename(path10.resolve(file2, "..", "..", ".."));
+  const requests = /* @__PURE__ */ new Map();
+  for await (const record2 of jsonlRecords(file2, '"input_tokens"', signal)) {
+    if (record2.type !== "PLANNER_RESPONSE")
+      continue;
+    const step = count2(record2.step_index);
+    const input = count2(record2.input_tokens);
+    const output = count2(record2.output_tokens);
+    const cached2 = count2(record2.cache_read_tokens);
+    const at = nativeTimeMs(record2.created_at);
+    if (step === null || input === null || output === null || at === null)
+      continue;
+    requests.set(step, withUsageSession({
+      id: `${String(record2.created_at)}:${step}:${input}:${cached2 ?? "-"}:${output}`,
+      occurredAtMs: at,
+      inputTokens: input + (cached2 ?? 0),
+      ...cached2 !== null ? { cachedInputTokens: cached2 } : {},
+      outputTokens: output
+    }, { sessionId }));
+  }
+  return [...requests.values()];
+}
+function createAntigravityUsageStatistics(environment) {
+  const brainRoot = nativeBrainRoot(antigravityHome(environment));
+  let listed = /* @__PURE__ */ new Map();
+  return Object.freeze({
+    async listSources(signal) {
+      const sources = await listTranscripts(brainRoot, signal);
+      listed = new Map(sources.map(({ id, fingerprint }) => [id, fingerprint]));
+      return sources;
+    },
+    async readSource(id, signal) {
+      const expected = listed.get(id);
+      let entries;
+      try {
+        entries = await readAntigravityUsage(id, signal);
+      } catch (error51) {
+        if (expected !== void 0 && isMissing(error51)) {
+          throw new HarnessUsageSourceChangedError("Antigravity transcript disappeared before reading; refresh to retry");
+        }
+        throw error51;
+      }
+      if (expected !== void 0 && await transcriptFingerprint(id) !== expected) {
+        throw new HarnessUsageSourceChangedError("Antigravity transcript changed while reading; refresh to retry");
+      }
+      return entries;
+    }
+  });
+}
+
 // dist/antigravity-adapter.js
 var antigravityHarnessId = harnessIdSchema.parse("antigravity");
 var DEFAULT_INSPECT_TIMEOUT_MS = 2e4;
 var DEFAULT_PRINT_TIMEOUT = "30m";
 var DEFAULT_TOOL_OUTPUT_LIMIT = 64e3;
 var DEFAULT_SUBAGENT_OBSERVATION_TIMEOUT_MS = 3e4;
+var NATIVE_EXIT_GRACE_MS = 2e3;
+var DEFAULT_TURN_CLEANUP_WAIT_MS = 5e3;
 var CONTEXT_USAGE_TIMEOUT_MS = 8e3;
 var CONTEXT_USAGE_RETRY_MS = 100;
 var TRAJECTORY_TIMEOUT_MS = 2e3;
@@ -18880,8 +19119,8 @@ function mergePendingStep(pending, step) {
   };
 }
 function sameFile(left, right) {
-  const a = path10.resolve(left);
-  const b = path10.resolve(right);
+  const a = path11.resolve(left);
+  const b = path11.resolve(right);
   return process.platform === "win32" ? a.toLowerCase() === b.toLowerCase() : a === b;
 }
 function resolveAntigravityContextWindow(modelId, reportedWindow) {
@@ -18909,12 +19148,28 @@ function errorMessage(error51) {
 function invalidState(message) {
   return { code: "invalidState", message, retryable: false };
 }
+function settledWithin(promise2, timeoutMs) {
+  return new Promise((resolve) => {
+    const timer = setTimeout(resolve, timeoutMs);
+    const settle = () => {
+      clearTimeout(timer);
+      resolve();
+    };
+    void promise2.then(settle, settle);
+  });
+}
 var ANTIGRAVITY_WORKSPACE_FILE_INSTRUCTION = "[System Instruction: When creating new files in the workspace, you MUST use the write_to_file tool. When modifying existing files, use the replace_file_content tool. CRITICAL: NEVER include ArtifactMetadata when calling write_to_file for workspace files (ArtifactMetadata is strictly reserved for artifacts in the brain directory, and providing it for workspace files causes a path validation rejection). Do NOT use terminal commands (such as Set-Content, Out-File, echo, or cat) to create or write code files. For clarification, ask_question is connected to the codexhost Desktop through a Hook. Use single-choice or text questions. The Hook returns the actual user response in its reason while blocking the native auto-skip behavior; do not retry merely because the native tool reports it was blocked.]\n\n";
-function formatAntigravityTurnPrompt(text) {
+function antigravityWorkingDirectoryInstruction(cwd) {
+  return `[System Instruction: The project working directory is ${JSON.stringify(cwd)}. Run terminal commands and resolve relative file paths in this directory unless the task requires another one.]
+
+`;
+}
+function formatAntigravityTurnPrompt(text, cwd) {
   if (text.startsWith("/") || text.includes("ArtifactMetadata")) {
     return text;
   }
-  return `${ANTIGRAVITY_WORKSPACE_FILE_INSTRUCTION}${text}`;
+  const workingDirectory = cwd ? antigravityWorkingDirectoryInstruction(cwd) : "";
+  return `${ANTIGRAVITY_WORKSPACE_FILE_INSTRUCTION}${workingDirectory}${text}`;
 }
 function permissionDeniedTurnError(nativeMode, denial) {
   const mode = nativeMode ? ` '${nativeMode}'` : "";
@@ -19016,14 +19271,15 @@ async function pollAntigravityContextUsage(logPath, conversationId, modelId, isD
   }
   return null;
 }
-function hostUsage(value, modelId) {
+function hostUsage(value, modelId, scope) {
   if (!value)
     return null;
   const inputTokens = safeToken(value.input_tokens);
   const outputTokens = safeToken(value.output_tokens);
   const reasoningOutputTokens = safeToken(value.thinking_tokens);
   const totalTokens = safeToken(value.total_tokens);
-  const contextUsedTokens = safeToken(value.context_used_tokens ?? value.estimated_tokens_used ?? value.input_tokens);
+  const requestPromptTokens = scope === "request" && inputTokens !== void 0 ? inputTokens + (safeToken(value.cache_read_tokens) ?? 0) : void 0;
+  const contextUsedTokens = safeToken(value.context_used_tokens ?? value.estimated_tokens_used) ?? requestPromptTokens;
   const rawWindow = safeToken(value.context_window_tokens ?? value.max_context_tokens);
   const contextWindowTokens = contextUsedTokens !== void 0 || rawWindow !== void 0 ? resolveAntigravityContextWindow(modelId, rawWindow) : void 0;
   const usage = {
@@ -19100,6 +19356,7 @@ var AntigravitySession = class {
   #printTimeout;
   #toolOutputLimit;
   #subagentObservationTimeoutMs;
+  #turnCleanupWaitMs;
   #history;
   #subagentObservers = /* @__PURE__ */ new Set();
   #active = null;
@@ -19126,6 +19383,7 @@ var AntigravitySession = class {
     this.#thinkingOptionId = input.thinkingOptionId ?? input.history.thinkingOptionId;
     this.#toolOutputLimit = input.toolOutputLimit;
     this.#subagentObservationTimeoutMs = input.subagentObservationTimeoutMs;
+    this.#turnCleanupWaitMs = input.turnCleanupWaitMs;
     this.#onClosed = input.onClosed;
     this.initialState = this.#state();
     this.outputs = this.#channel.outputs;
@@ -19203,7 +19461,10 @@ var AntigravitySession = class {
       };
     }
     let questions;
-    this.#preparingQuestions = AntigravityQuestionBridge.create({
+    const hookDirectory = antigravityHookDirectory(this.#environment);
+    const previousTurn = hookDirectory ? this.#questionCleanup : Promise.resolve();
+    this.#preparingQuestions = previousTurn.then(() => AntigravityQuestionBridge.create({
+      ...hookDirectory ? { directory: hookDirectory } : {},
       turnId: command.turnId,
       nativeSessionId: () => this.#active?.command === command && !this.#active.cancellationRequested ? this.#nativeRef?.nativeSessionId : void 0,
       schedule: (action) => {
@@ -19226,7 +19487,7 @@ var AntigravitySession = class {
         }
         this.#channel.emit(output);
       }
-    });
+    }));
     try {
       questions = await this.#preparingQuestions;
     } catch (error51) {
@@ -19246,7 +19507,7 @@ var AntigravitySession = class {
       return { ok: false, error: invalidState("Antigravity Session is closed") };
     }
     const environment = { ...this.#environment, ...questions.environment };
-    const logPath = path10.join(os5.tmpdir(), `codexhost-antigravity-${randomUUID6()}.log`);
+    const logPath = path11.join(os6.tmpdir(), `codexhost-antigravity-${randomUUID6()}.log`);
     const arguments_ = [
       "--input-format",
       "stream-json",
@@ -19367,7 +19628,7 @@ ${line}`).slice(-8e3);
       });
     });
     try {
-      const turnPrompt = formatAntigravityTurnPrompt(text);
+      const turnPrompt = formatAntigravityTurnPrompt(text, this.#cwd);
       if (child.stdin.writable) {
         child.stdin.write(`${JSON.stringify({ event: "user", message: { content: turnPrompt } })}
 `, () => void 0);
@@ -19451,7 +19712,7 @@ ${line}`).slice(-8e3);
       if (event.step_update.conversation_id !== this.#nativeRef?.nativeSessionId)
         return;
       await this.#handleStep(active, event.step_update);
-      const usage = hostUsage(event.step_update.usage, active.model?.id);
+      const usage = hostUsage(event.step_update.usage, active.model?.id, "request");
       if (usage)
         this.#publishUsage(active, usage);
       this.#ensureContextUsage(active, event.step_update.conversation_id);
@@ -19477,7 +19738,7 @@ ${line}`).slice(-8e3);
       });
       return;
     }
-    const usage = hostUsage(event.result.usage, active.model?.id);
+    const usage = hostUsage(event.result.usage, active.model?.id, "conversation");
     if (usage)
       this.#publishUsage(active, usage);
     this.#ensureContextUsage(active, event.result.conversation_id);
@@ -19714,8 +19975,9 @@ ${line}`).slice(-8e3);
       await active.subagents.settled;
       if (active.process.stdin.writable)
         active.process.stdin.end();
-      const timer = setTimeout(() => active.process.kill(), 2e3);
-      await active.exited.finally(() => clearTimeout(timer));
+      const timer = setTimeout(() => active.process.kill(), NATIVE_EXIT_GRACE_MS);
+      await settledWithin(active.exited, NATIVE_EXIT_GRACE_MS + this.#turnCleanupWaitMs);
+      clearTimeout(timer);
       await active.questions.dispose();
       this.#subagentObservers.delete(active.subagents);
     }).catch(() => void 0);
@@ -19892,6 +20154,7 @@ function historySubagentState(history, id) {
 var AntigravityAdapter = class {
   commandCatalog = ANTIGRAVITY_COMMAND_CATALOG;
   harnessId = antigravityHarnessId;
+  usageStatistics;
   subagents = {
     readSnapshot: async (input) => {
       if (this.#closed || input.parent.harnessId !== this.harnessId || !nativeSubagentIdSchema.safeParse(input.nativeSubagentId).success) {
@@ -19924,6 +20187,7 @@ var AntigravityAdapter = class {
   #sessions = /* @__PURE__ */ new Set();
   #toolOutputLimit;
   #subagentObservationTimeoutMs;
+  #turnCleanupWaitMs;
   #closed = false;
   #quota = null;
   #quotaCwd = null;
@@ -19932,6 +20196,7 @@ var AntigravityAdapter = class {
   constructor(options = {}) {
     this.#command = options.command;
     this.#environment = options.environment ?? process.env;
+    this.usageStatistics = createAntigravityUsageStatistics(this.#environment);
     this.#inspectTimeoutMs = options.inspectTimeoutMs ?? DEFAULT_INSPECT_TIMEOUT_MS;
     this.#printTimeout = options.printTimeout ?? DEFAULT_PRINT_TIMEOUT;
     this.#toolOutputLimit = options.toolOutputLimit ?? DEFAULT_TOOL_OUTPUT_LIMIT;
@@ -19940,12 +20205,17 @@ var AntigravityAdapter = class {
       throw new RangeError("subagentObservationTimeoutMs must be a finite positive number");
     }
     this.#subagentObservationTimeoutMs = subagentObservationTimeoutMs;
+    const turnCleanupWaitMs = options.turnCleanupWaitMs ?? DEFAULT_TURN_CLEANUP_WAIT_MS;
+    if (!Number.isFinite(turnCleanupWaitMs) || turnCleanupWaitMs < 0) {
+      throw new RangeError("turnCleanupWaitMs must be a finite non-negative number");
+    }
+    this.#turnCleanupWaitMs = turnCleanupWaitMs;
   }
   async inspect(input = {}) {
     if (this.#closed) {
       return { status: "unavailable", error: invalidState("Antigravity Adapter is closed") };
     }
-    const cwd = path10.resolve(input.cwd ?? process.cwd());
+    const cwd = path11.resolve(input.cwd ?? process.cwd());
     const inFlight = this.#inspectionInFlight.get(cwd);
     if (inFlight)
       return inFlight;
@@ -20088,7 +20358,7 @@ var AntigravityAdapter = class {
         }
       };
     }
-    const cwd = path10.resolve(input.cwd);
+    const cwd = path11.resolve(input.cwd);
     let catalog = this.#inspectionCache.get(cwd)?.catalog;
     if (!catalog) {
       const inspection = await this.inspect({ cwd: input.cwd });
@@ -20124,6 +20394,7 @@ var AntigravityAdapter = class {
             ...params.thinkingOptionId ? { thinkingOptionId: params.thinkingOptionId } : {},
             toolOutputLimit: this.#toolOutputLimit,
             subagentObservationTimeoutMs: this.#subagentObservationTimeoutMs,
+            turnCleanupWaitMs: this.#turnCleanupWaitMs,
             onClosed: () => this.#sessions.delete(session2)
           });
           this.#sessions.add(session2);
@@ -20160,6 +20431,7 @@ var AntigravityAdapter = class {
             ...params.thinkingOptionId ? { thinkingOptionId: params.thinkingOptionId } : {},
             toolOutputLimit: this.#toolOutputLimit,
             subagentObservationTimeoutMs: this.#subagentObservationTimeoutMs,
+            turnCleanupWaitMs: this.#turnCleanupWaitMs,
             onClosed: () => this.#sessions.delete(session2)
           });
           this.#sessions.add(session2);
@@ -20217,6 +20489,7 @@ var AntigravityAdapter = class {
       ...thinkingOptionId ? { thinkingOptionId } : {},
       toolOutputLimit: this.#toolOutputLimit,
       subagentObservationTimeoutMs: this.#subagentObservationTimeoutMs,
+      turnCleanupWaitMs: this.#turnCleanupWaitMs,
       onClosed: () => this.#sessions.delete(session)
     });
     this.#sessions.add(session);
@@ -20276,11 +20549,23 @@ function createAntigravityInstallation(environment, command, dependencies = {})
 
 // dist/plugin.js
 var ANTIGRAVITY_COMMAND_ENV = "CODEXHOST_ANTIGRAVITY_COMMAND";
+var ANTIGRAVITY_DISABLE_AUTO_UPDATE_ENV = "AGY_CLI_DISABLE_AUTO_UPDATE";
+function antigravityProcessEnvironment(environment, platform) {
+  if (platform !== "win32" && platform !== "darwin")
+    return environment;
+  const isWindows = platform === "win32";
+  const matchesSwitch = (name) => isWindows ? name.toUpperCase() === ANTIGRAVITY_DISABLE_AUTO_UPDATE_ENV : name === ANTIGRAVITY_DISABLE_AUTO_UPDATE_ENV;
+  const entries = Object.entries(environment);
+  const configured = entries.some(([name, value]) => matchesSwitch(name) && value !== void 0);
+  const hasUndefinedSwitch = entries.some(([name, value]) => matchesSwitch(name) && value === void 0);
+  const cleanEnvironment = hasUndefinedSwitch ? Object.fromEntries(entries.filter(([name, value]) => !matchesSwitch(name) || value !== void 0)) : environment;
+  return configured ? cleanEnvironment : { ...cleanEnvironment, [ANTIGRAVITY_DISABLE_AUTO_UPDATE_ENV]: "true" };
+}
 function createHarnessAdapter(context) {
   const environment = { ...context.environment };
   return Object.assign(new AntigravityAdapter({
     ...environment[ANTIGRAVITY_COMMAND_ENV] ? { command: environment[ANTIGRAVITY_COMMAND_ENV] } : {},
-    environment
+    environment: antigravityProcessEnvironment(environment, context.platform)
   }), {
     install: createHarnessInstaller(environment, {
       posix: "https://antigravity.google/cli/install.sh",
@@ -20297,6 +20582,8 @@ async function warmup(adapter) {
 }
 export {
   ANTIGRAVITY_COMMAND_ENV,
+  ANTIGRAVITY_DISABLE_AUTO_UPDATE_ENV,
+  antigravityProcessEnvironment,
   createHarnessAdapter,
   warmup
 };