nolo-cli 0.1.52 → 0.1.54

package/index.js

@@ -9229,6 +9229,377 @@ var init_agentRecordHelpers = __esm({
   }
 });
 
+// packages/agent-runtime/antigravityOAuth.ts
+function getAntigravityUserAgent() {
+  const version = process.env.NOLO_ANTIGRAVITY_VERSION || "2.1.4";
+  const os2 = process.platform === "win32" ? "windows" : process.platform;
+  const arch3 = process.arch === "x64" ? "amd64" : process.arch === "ia32" ? "386" : process.arch;
+  return `antigravity/hub/${version} ${os2}/${arch3}`;
+}
+function resolveAntigravityCloudCodeBaseUrl(customProviderUrl) {
+  const raw = (customProviderUrl ?? "").trim();
+  if (!raw) return ANTIGRAVITY_CLOUD_CODE_BASE_URL;
+  const trimmed = trimTrailingSlash(raw);
+  if (trimmed.includes(ANTIGRAVITY_CLOUD_CODE_HOST)) {
+    const base = trimmed.replace(/\/v1internal:.*$/i, "").replace(/\/$/, "");
+    if (ANTIGRAVITY_LEGACY_GENERIC_BASE_RE.test(base)) {
+      return ANTIGRAVITY_CLOUD_CODE_BASE_URL;
+    }
+    return base;
+  }
+  return ANTIGRAVITY_CLOUD_CODE_BASE_URL;
+}
+function isAntigravityOAuthAgent(agentConfig) {
+  if (!agentConfig) return false;
+  const apiKeyRef = (agentConfig.apiKeyRef ?? "").trim().toLowerCase();
+  const provider = String(agentConfig.provider ?? "").trim().toLowerCase();
+  const url = (agentConfig.customProviderUrl ?? "").trim().toLowerCase();
+  return apiKeyRef === "antigravity" || provider === "google-antigravity" || url.includes(ANTIGRAVITY_CLOUD_CODE_HOST);
+}
+function readAntigravityProjectId(metadata) {
+  const value = metadata?.projectId;
+  return typeof value === "string" && value.trim() ? value.trim() : void 0;
+}
+var ANTIGRAVITY_CLOUD_CODE_BASE_URL, ANTIGRAVITY_CLOUD_CODE_HOST, ANTIGRAVITY_LEGACY_GENERIC_BASE_RE;
+var init_antigravityOAuth = __esm({
+  "packages/agent-runtime/antigravityOAuth.ts"() {
+    "use strict";
+    init_providerResolution();
+    ANTIGRAVITY_CLOUD_CODE_BASE_URL = "https://daily-cloudcode-pa.googleapis.com";
+    ANTIGRAVITY_CLOUD_CODE_HOST = "cloudcode-pa.googleapis.com";
+    ANTIGRAVITY_LEGACY_GENERIC_BASE_RE = /^https?:\/\/cloudcode-pa\.googleapis\.com$/i;
+  }
+});
+
+// packages/agent-runtime/antigravityWireModel.ts
+function resolveAntigravityWireModel(logicalModelId) {
+  const id = logicalModelId.trim();
+  const lower = id.toLowerCase();
+  if (lower === "gemini-3.1-pro" || lower === "gemini-3.1-pro-preview") {
+    const wireModelId = "gemini-3.1-pro-low";
+    return { wireModelId, profile: WIRE_PROFILES[wireModelId] };
+  }
+  if (WIRE_PROFILES[id]) {
+    return { wireModelId: id, profile: WIRE_PROFILES[id] };
+  }
+  return { wireModelId: id };
+}
+var WIRE_PROFILES;
+var init_antigravityWireModel = __esm({
+  "packages/agent-runtime/antigravityWireModel.ts"() {
+    "use strict";
+    WIRE_PROFILES = {
+      "gemini-3.5-flash-extra-low": { modelEnum: "MODEL_PLACEHOLDER_M187", maxOutputTokens: 65536 },
+      "gemini-3.5-flash-low": { modelEnum: "MODEL_PLACEHOLDER_M20", maxOutputTokens: 65536 },
+      "gemini-3-flash-agent": { modelEnum: "MODEL_PLACEHOLDER_M132", maxOutputTokens: 65536 },
+      "gemini-3.1-pro-low": { modelEnum: "MODEL_PLACEHOLDER_M36", maxOutputTokens: 65535 },
+      "gemini-pro-agent": { modelEnum: "MODEL_PLACEHOLDER_M16", maxOutputTokens: 65535 },
+      "claude-sonnet-4-6": { maxOutputTokens: 64e3 },
+      "claude-opus-4-6-thinking": { maxOutputTokens: 64e3 },
+      "gemini-2.5-flash": { maxOutputTokens: 65536 }
+    };
+  }
+});
+
+// packages/agent-runtime/antigravityCloudCodeProvider.ts
+import { randomUUID } from "node:crypto";
+function isGemini3WireModel(modelId) {
+  return modelId.includes("gemini-3");
+}
+function messageText(content) {
+  if (typeof content === "string") return content;
+  if (!Array.isArray(content)) return "";
+  return content.filter((part) => part?.type === "text").map((part) => part.text).join("\n").trim();
+}
+function parseToolArguments2(raw) {
+  if (!raw?.trim()) return {};
+  try {
+    const parsed = JSON.parse(raw);
+    return parsed && typeof parsed === "object" && !Array.isArray(parsed) ? parsed : {};
+  } catch {
+    return {};
+  }
+}
+function convertOpenAiMessagesToCca(messages, options) {
+  const contents = [];
+  const systemTexts = [];
+  const toolNamesById = /* @__PURE__ */ new Map();
+  for (const raw of messages) {
+    if (!raw || typeof raw !== "object" || !("role" in raw)) continue;
+    const role = String(raw.role);
+    const content = "content" in raw ? raw.content : null;
+    if (role === "system") {
+      const text = messageText(content);
+      if (text) systemTexts.push(text);
+      continue;
+    }
+    if (role === "user") {
+      const text = messageText(content);
+      if (!text) continue;
+      contents.push({ role: "user", parts: [{ text }] });
+      continue;
+    }
+    if (role === "assistant") {
+      const parts = [];
+      const text = messageText(content);
+      if (text) parts.push({ text });
+      const toolCalls = "tool_calls" in raw && Array.isArray(raw.tool_calls) ? raw.tool_calls ?? [] : [];
+      for (const call of toolCalls) {
+        const name = call?.function?.name?.trim();
+        if (!name) continue;
+        const id = call.id?.trim() || `${name}_${toolNamesById.size}`;
+        toolNamesById.set(id, name);
+        parts.push({
+          functionCall: {
+            name,
+            args: parseToolArguments2(call.function?.arguments),
+            id
+          },
+          ...options.attachSkipThoughtSignature ? { thoughtSignature: SKIP_THOUGHT_SIGNATURE } : {}
+        });
+      }
+      if (parts.length === 0) continue;
+      contents.push({ role: "model", parts });
+      continue;
+    }
+    if (role === "tool") {
+      const toolCallId = "tool_call_id" in raw && typeof raw.tool_call_id === "string" ? raw.tool_call_id : "";
+      const name = toolNamesById.get(toolCallId) ?? "tool";
+      const output2 = messageText(content) || "{}";
+      contents.push({
+        role: "user",
+        parts: [{ functionResponse: { name, response: { output: output2 } } }]
+      });
+    }
+  }
+  return { contents, systemTexts };
+}
+function convertOpenAiTools(tools) {
+  if (!Array.isArray(tools) || tools.length === 0) return void 0;
+  const declarations = [];
+  for (const tool of tools) {
+    if (!tool || typeof tool !== "object" || !("function" in tool)) continue;
+    const fn = tool.function;
+    const name = typeof fn.name === "string" ? fn.name : "";
+    if (!name) continue;
+    declarations.push({
+      name,
+      description: typeof fn.description === "string" ? fn.description : "",
+      parameters: fn.parameters ?? { type: "object", properties: {} }
+    });
+  }
+  if (declarations.length === 0) return void 0;
+  return [{ functionDeclarations: declarations }];
+}
+function buildCloudCodeAssistPayload(args2) {
+  const projectId = readAntigravityProjectId(args2.metadata);
+  if (!projectId) {
+    throw new Error(
+      "Antigravity OAuth credential is missing metadata.projectId. Re-run `nolo auth antigravity`."
+    );
+  }
+  const logicalModel = typeof args2.openAiBody.model === "string" && args2.openAiBody.model.trim() || args2.agentConfig.model?.trim() || "gemini-3.1-pro";
+  const { wireModelId: model, profile } = resolveAntigravityWireModel(logicalModel);
+  const rawMessages = Array.isArray(args2.openAiBody.messages) ? args2.openAiBody.messages : [];
+  const { contents, systemTexts } = convertOpenAiMessagesToCca(rawMessages, {
+    attachSkipThoughtSignature: isGemini3WireModel(model)
+  });
+  if (contents.length === 0) {
+    throw new Error("Antigravity Cloud Code Assist request has no user/model contents.");
+  }
+  const prompt = args2.agentConfig.prompt?.trim();
+  if (prompt) systemTexts.unshift(prompt);
+  const request = { contents };
+  if (systemTexts.length > 0) {
+    request.systemInstruction = {
+      role: "user",
+      parts: systemTexts.map((text) => ({ text }))
+    };
+  }
+  const tools = convertOpenAiTools(
+    Array.isArray(args2.openAiBody.tools) ? args2.openAiBody.tools : void 0
+  );
+  if (tools) {
+    request.tools = tools;
+    request.toolConfig = { functionCallingConfig: { mode: "VALIDATED" } };
+  }
+  const generationConfig = {};
+  if (profile?.maxOutputTokens) {
+    generationConfig.maxOutputTokens = profile.maxOutputTokens;
+  } else if (typeof args2.agentConfig.max_tokens === "number" && args2.agentConfig.max_tokens > 0) {
+    generationConfig.maxOutputTokens = args2.agentConfig.max_tokens;
+  }
+  if (typeof args2.agentConfig.temperature === "number") {
+    generationConfig.temperature = args2.agentConfig.temperature;
+  }
+  if (Object.keys(generationConfig).length > 0) {
+    request.generationConfig = generationConfig;
+  }
+  const agentId = randomUUID();
+  const trajectoryId = randomUUID();
+  const step = 2;
+  const requestId = `agent/${agentId}/${Date.now()}/${trajectoryId}/${step}`;
+  const isClaude = model.toLowerCase().includes("claude");
+  const labels = {
+    trajectory_id: trajectoryId,
+    last_step_index: String(step - 1),
+    used_claude: String(isClaude),
+    used_claude_conservative: String(isClaude)
+  };
+  if (profile?.modelEnum) {
+    labels.model_enum = profile.modelEnum;
+  }
+  request.labels = labels;
+  request.sessionId = `-${Math.floor(Math.random() * 9e15)}`;
+  return {
+    url: `${resolveAntigravityCloudCodeBaseUrl(args2.agentConfig.customProviderUrl)}${STREAM_PATH}`,
+    envelope: {
+      project: projectId,
+      model,
+      request,
+      requestId,
+      requestType: "agent",
+      userAgent: "antigravity"
+    }
+  };
+}
+function extractJsonFromSseLine(line) {
+  const trimmed = line.trim();
+  if (!trimmed.startsWith("data:")) return null;
+  const payload = trimmed.slice(5).trim();
+  if (!payload || payload === "[DONE]") return null;
+  try {
+    return JSON.parse(payload);
+  } catch {
+    return null;
+  }
+}
+function accumulateCcaChunks(chunks) {
+  let text = "";
+  const toolCalls = [];
+  let usage2;
+  for (const chunk of chunks) {
+    if (!chunk || typeof chunk !== "object") continue;
+    const response = "response" in chunk && chunk.response && typeof chunk.response === "object" ? chunk.response : chunk;
+    if ("usageMetadata" in response && response.usageMetadata && typeof response.usageMetadata === "object") {
+      const meta = response.usageMetadata;
+      const prompt = typeof meta.promptTokenCount === "number" ? meta.promptTokenCount : 0;
+      const candidates2 = typeof meta.candidatesTokenCount === "number" ? meta.candidatesTokenCount : 0;
+      const total = typeof meta.totalTokenCount === "number" ? meta.totalTokenCount : prompt + candidates2;
+      usage2 = {
+        prompt_tokens: prompt,
+        completion_tokens: candidates2,
+        total_tokens: total
+      };
+    }
+    const candidates = Array.isArray(response.candidates) ? response.candidates : [];
+    for (const candidate of candidates) {
+      if (!candidate || typeof candidate !== "object" || !("content" in candidate)) continue;
+      const content = candidate.content;
+      if (!content || typeof content !== "object" || !("parts" in content)) continue;
+      const parts = content.parts;
+      if (!Array.isArray(parts)) continue;
+      for (const part of parts) {
+        if (!part || typeof part !== "object") continue;
+        if ("text" in part && typeof part.text === "string") {
+          const piece = part.text;
+          if (!part.thought) {
+            text += piece;
+          }
+        }
+        if ("functionCall" in part && part.functionCall) {
+          const call = part.functionCall;
+          const name = typeof call.name === "string" ? call.name : "tool";
+          const id = typeof call.id === "string" ? call.id : `${name}_${toolCalls.length}`;
+          const argsObj = call.args && typeof call.args === "object" && !Array.isArray(call.args) ? call.args : {};
+          toolCalls.push({
+            id,
+            type: "function",
+            function: { name, arguments: JSON.stringify(argsObj) }
+          });
+        }
+      }
+    }
+  }
+  return { text, toolCalls, usage: usage2 };
+}
+async function readSseJsonChunks(response) {
+  const reader = response.body?.getReader();
+  if (!reader) return [];
+  const decoder = new TextDecoder();
+  let buffer = "";
+  const chunks = [];
+  while (true) {
+    const { done, value } = await reader.read();
+    if (done) break;
+    buffer += decoder.decode(value, { stream: true });
+    const lines = buffer.split("\n");
+    buffer = lines.pop() ?? "";
+    for (const line of lines) {
+      const parsed = extractJsonFromSseLine(line);
+      if (parsed) chunks.push(parsed);
+    }
+  }
+  if (buffer.trim()) {
+    const parsed = extractJsonFromSseLine(buffer);
+    if (parsed) chunks.push(parsed);
+  }
+  return chunks;
+}
+async function fetchAntigravityCloudCodeCompletion(args2) {
+  const fetchImpl = args2.fetchImpl ?? fetch;
+  const { url, envelope } = buildCloudCodeAssistPayload(args2);
+  const response = await fetchImpl(url, {
+    method: "POST",
+    headers: {
+      Authorization: `Bearer ${args2.accessToken}`,
+      "Content-Type": "application/json",
+      "User-Agent": getAntigravityUserAgent()
+    },
+    body: JSON.stringify(envelope),
+    signal: args2.signal
+  });
+  if (!response.ok) {
+    const errorText = await response.text();
+    return {
+      status: response.status,
+      body: { error: { message: errorText || response.statusText } }
+    };
+  }
+  const chunks = await readSseJsonChunks(response);
+  const { text, toolCalls, usage: usage2 } = accumulateCcaChunks(chunks);
+  const message = {
+    role: "assistant",
+    content: text || null
+  };
+  if (toolCalls.length > 0) {
+    message.tool_calls = toolCalls;
+  }
+  return {
+    status: 200,
+    body: {
+      choices: [
+        {
+          index: 0,
+          message,
+          finish_reason: toolCalls.length > 0 ? "tool_calls" : "stop"
+        }
+      ],
+      ...usage2 ? { usage: usage2 } : {}
+    }
+  };
+}
+var STREAM_PATH, SKIP_THOUGHT_SIGNATURE;
+var init_antigravityCloudCodeProvider = __esm({
+  "packages/agent-runtime/antigravityCloudCodeProvider.ts"() {
+    "use strict";
+    init_antigravityOAuth();
+    init_antigravityWireModel();
+    STREAM_PATH = "/v1internal:streamGenerateContent?alt=sse";
+    SKIP_THOUGHT_SIGNATURE = "skip_thought_signature_validator";
+  }
+});
+
 // packages/cli/client/agentConfigResolver.ts
 var init_agentConfigResolver = __esm({
   "packages/cli/client/agentConfigResolver.ts"() {
@@ -9245,6 +9616,278 @@ var init_localProviderResolver = __esm({
   }
 });
 
+// packages/cli/oauth/flows/antigravity.ts
+function readProjectId(value) {
+  if (typeof value === "string" && value.length > 0) {
+    return value;
+  }
+  if (value && typeof value === "object" && typeof value.id === "string" && value.id.length > 0) {
+    return value.id;
+  }
+  return void 0;
+}
+function getDefaultTierId(allowedTiers) {
+  if (!allowedTiers || allowedTiers.length === 0) {
+    return TIER_LEGACY;
+  }
+  const defaultTier = allowedTiers.find(
+    (tier) => tier.isDefault && typeof tier.id === "string" && tier.id.length > 0
+  );
+  if (defaultTier?.id) {
+    return defaultTier.id;
+  }
+  return TIER_LEGACY;
+}
+async function sleep2(ms) {
+  const { promise, resolve: resolve8 } = Promise.withResolvers();
+  setTimeout(resolve8, ms);
+  return promise;
+}
+async function onboardProjectWithRetries(fetchImpl, endpoint, headers, onboardBody, onProgress) {
+  for (let attempt = 1; attempt <= PROJECT_ONBOARD_MAX_ATTEMPTS; attempt += 1) {
+    if (attempt > 1) {
+      onProgress?.(
+        `Waiting for project provisioning (attempt ${attempt}/${PROJECT_ONBOARD_MAX_ATTEMPTS})...`
+      );
+      await sleep2(PROJECT_ONBOARD_INTERVAL_MS);
+    }
+    const onboardResponse = await fetchImpl(
+      `${endpoint}/v1internal:onboardUser`,
+      {
+        method: "POST",
+        headers,
+        body: JSON.stringify(onboardBody)
+      }
+    );
+    if (!onboardResponse.ok) {
+      const errorText = await onboardResponse.text();
+      throw new Error(
+        `onboardUser failed: ${onboardResponse.status} ${onboardResponse.statusText}: ${errorText}`
+      );
+    }
+    const operation = await onboardResponse.json();
+    if (!operation.done) {
+      continue;
+    }
+    const projectId = readProjectId(operation.response?.cloudaicompanionProject);
+    if (projectId) {
+      return projectId;
+    }
+  }
+  throw new Error(
+    `onboardUser did not return a provisioned project id after ${PROJECT_ONBOARD_MAX_ATTEMPTS} attempts`
+  );
+}
+async function discoverProject(fetchImpl, accessToken, onProgress) {
+  const headers = {
+    Authorization: `Bearer ${accessToken}`,
+    "Content-Type": "application/json"
+  };
+  onProgress?.("Checking for existing project...");
+  const endpoint = CLOUD_CODE_ENDPOINT;
+  const loadResponse = await fetchImpl(`${endpoint}/v1internal:loadCodeAssist`, {
+    method: "POST",
+    headers,
+    body: JSON.stringify({
+      metadata: ANTIGRAVITY_LOAD_CODE_ASSIST_METADATA
+    })
+  });
+  if (!loadResponse.ok) {
+    const errorText = await loadResponse.text();
+    throw new Error(
+      `loadCodeAssist failed: ${loadResponse.status} ${loadResponse.statusText}: ${errorText}`
+    );
+  }
+  const loadPayload = await loadResponse.json();
+  const existingProject = readProjectId(loadPayload.cloudaicompanionProject);
+  if (existingProject) {
+    return existingProject;
+  }
+  const tierId = getDefaultTierId(loadPayload.allowedTiers);
+  onProgress?.("Provisioning project...");
+  const onboardBody = {
+    tierId,
+    metadata: ANTIGRAVITY_LOAD_CODE_ASSIST_METADATA
+  };
+  return onboardProjectWithRetries(
+    fetchImpl,
+    endpoint,
+    headers,
+    onboardBody,
+    onProgress
+  );
+}
+async function getUserEmail(fetchImpl, accessToken) {
+  try {
+    const response = await fetchImpl(USERINFO_URL, {
+      headers: { Authorization: `Bearer ${accessToken}` }
+    });
+    if (!response.ok) return void 0;
+    const data = await response.json();
+    return typeof data.email === "string" ? data.email : void 0;
+  } catch {
+    return void 0;
+  }
+}
+function generateState2() {
+  const bytes = new Uint8Array(16);
+  crypto.getRandomValues(bytes);
+  return Array.from(bytes).map((value) => value.toString(16).padStart(2, "0")).join("");
+}
+async function runAntigravityOAuthLogin(deps = {}) {
+  const fetchImpl = deps.fetchImpl ?? fetch;
+  const output2 = deps.output ?? console;
+  const error = deps.error ?? console;
+  const redirectUri = `http://127.0.0.1:${CALLBACK_PORT}${CALLBACK_PATH}`;
+  let handle;
+  try {
+    handle = await startCallbackServer({
+      port: CALLBACK_PORT,
+      hostname: "127.0.0.1",
+      timeoutMs: 5 * 6e4
+    });
+  } catch (err) {
+    throw new Error(
+      `Failed to start Antigravity OAuth callback server on ${CALLBACK_PORT}: ${err instanceof Error ? err.message : String(err)}`
+    );
+  }
+  try {
+    const state = generateState2();
+    const pkce = await generatePkcePair();
+    const authParams = new URLSearchParams({
+      client_id: CLIENT_ID,
+      response_type: "code",
+      redirect_uri: redirectUri,
+      scope: SCOPES.join(" "),
+      state,
+      access_type: "offline",
+      prompt: "consent"
+    });
+    const authUrl = `${AUTH_URL}?${authParams.toString()}`;
+    output2.log(
+      `Open the following URL in your browser to log in to Antigravity:
+  ${authUrl}`
+    );
+    if (deps.openBrowser) {
+      try {
+        await deps.openBrowser(authUrl);
+      } catch (err) {
+        error.error(
+          `Failed to open browser automatically: ${err instanceof Error ? err.message : String(err)}`
+        );
+      }
+    }
+    const callback = await handle.waitForCode();
+    const tokenResponse = await fetchImpl(TOKEN_URL, {
+      method: "POST",
+      headers: { "Content-Type": "application/x-www-form-urlencoded" },
+      body: new URLSearchParams({
+        client_id: CLIENT_ID,
+        client_secret: CLIENT_SECRET,
+        code: callback.code,
+        grant_type: "authorization_code",
+        redirect_uri: redirectUri
+      })
+    });
+    if (!tokenResponse.ok) {
+      const body = await tokenResponse.text();
+      throw new Error(`Antigravity token exchange failed: ${body}`);
+    }
+    const tokenData = await tokenResponse.json();
+    if (!tokenData.refresh_token) {
+      throw new Error("No refresh token received. Please try again.");
+    }
+    const email = await getUserEmail(fetchImpl, tokenData.access_token);
+    const projectId = await discoverProject(
+      fetchImpl,
+      tokenData.access_token,
+      (message) => output2.log(message)
+    );
+    const now = (deps.now ?? Date.now)();
+    return {
+      provider: "antigravity",
+      accessToken: tokenData.access_token,
+      refreshToken: tokenData.refresh_token,
+      expiresAt: now + tokenData.expires_in * 1e3 - ACCESS_TOKEN_CLIENT_SKEW_MS2,
+      scope: tokenData.scope,
+      obtainedAt: now,
+      metadata: {
+        projectId,
+        email
+      }
+    };
+  } finally {
+    await handle.close();
+  }
+}
+async function refreshAntigravityOAuthToken(credential) {
+  if (!credential.refreshToken) {
+    throw new Error("Antigravity credential has no refresh_token");
+  }
+  const fetchImpl = fetch;
+  const projectId = credential.metadata?.projectId ?? void 0;
+  const response = await fetchImpl(TOKEN_URL, {
+    method: "POST",
+    headers: { "Content-Type": "application/x-www-form-urlencoded" },
+    body: new URLSearchParams({
+      client_id: CLIENT_ID,
+      client_secret: CLIENT_SECRET,
+      refresh_token: credential.refreshToken,
+      grant_type: "refresh_token"
+    })
+  });
+  if (!response.ok) {
+    const body = await response.text();
+    throw new Error(`Antigravity token refresh failed: ${body}`);
+  }
+  const data = await response.json();
+  const now = Date.now();
+  return {
+    ...credential,
+    accessToken: data.access_token,
+    refreshToken: data.refresh_token || credential.refreshToken,
+    expiresAt: now + data.expires_in * 1e3 - ACCESS_TOKEN_CLIENT_SKEW_MS2,
+    scope: data.scope ?? credential.scope,
+    obtainedAt: now
+  };
+}
+var decode, CLIENT_ID, CLIENT_SECRET, CALLBACK_PORT, CALLBACK_PATH, SCOPES, AUTH_URL, TOKEN_URL, USERINFO_URL, CLOUD_CODE_ENDPOINT, TIER_LEGACY, PROJECT_ONBOARD_MAX_ATTEMPTS, PROJECT_ONBOARD_INTERVAL_MS, ACCESS_TOKEN_CLIENT_SKEW_MS2, ANTIGRAVITY_LOAD_CODE_ASSIST_METADATA;
+var init_antigravity = __esm({
+  "packages/cli/oauth/flows/antigravity.ts"() {
+    "use strict";
+    init_callback_server();
+    init_pkce();
+    init_token_store();
+    decode = (s) => Buffer.from(s, "base64").toString("utf8");
+    CLIENT_ID = decode(
+      "MTA3MTAwNjA2MDU5MS10bWhzc2luMmgyMWxjcmUyMzV2dG9sb2poNGc0MDNlcC5hcHBzLmdvb2dsZXVzZXJjb250ZW50LmNvbQ=="
+    );
+    CLIENT_SECRET = decode("R09DU1BYLUs1OEZXUjQ4NkxkTEoxbUxCOHNYQzR6NnFEQWY=");
+    CALLBACK_PORT = 51121;
+    CALLBACK_PATH = "/oauth-callback";
+    SCOPES = [
+      "https://www.googleapis.com/auth/cloud-platform",
+      "https://www.googleapis.com/auth/userinfo.email",
+      "https://www.googleapis.com/auth/userinfo.profile",
+      "https://www.googleapis.com/auth/cclog",
+      "https://www.googleapis.com/auth/experimentsandconfigs"
+    ];
+    AUTH_URL = "https://accounts.google.com/o/oauth2/v2/auth";
+    TOKEN_URL = "https://oauth2.googleapis.com/token";
+    USERINFO_URL = "https://www.googleapis.com/oauth2/v1/userinfo?alt=json";
+    CLOUD_CODE_ENDPOINT = "https://cloudcode-pa.googleapis.com";
+    TIER_LEGACY = "legacy-tier";
+    PROJECT_ONBOARD_MAX_ATTEMPTS = 5;
+    PROJECT_ONBOARD_INTERVAL_MS = 2e3;
+    ACCESS_TOKEN_CLIENT_SKEW_MS2 = 5 * 60 * 1e3;
+    ANTIGRAVITY_LOAD_CODE_ASSIST_METADATA = Object.freeze({
+      ideType: "ANTIGRAVITY",
+      platform: "PLATFORM_UNSPECIFIED",
+      pluginType: "GEMINI"
+    });
+  }
+});
+
 // packages/cli/oauth/flows/openai-codex.ts
 import { createHash as createHash2 } from "node:crypto";
 async function postJson(fetchImpl, url, body, deps) {
@@ -9597,6 +10240,265 @@ var init_openai_codex = __esm({
   }
 });
 
+// packages/cli/oauth/flows/xai.ts
+function validateXAIEndpoint(url, field) {
+  let parsed;
+  try {
+    parsed = new URL(url);
+  } catch {
+    throw new Error(`Invalid xAI ${field}: ${url}`);
+  }
+  if (parsed.protocol !== "https:") {
+    throw new Error(`Invalid xAI ${field}: ${url}`);
+  }
+  const host = parsed.hostname.toLowerCase();
+  if (!host || host !== "x.ai" && !host.endsWith(".x.ai")) {
+    throw new Error(`Invalid xAI ${field}: ${url}`);
+  }
+  return url;
+}
+async function xaiOAuthDiscovery(fetchImpl, timeoutMs = DISCOVERY_TIMEOUT_MS) {
+  let response;
+  try {
+    response = await fetchImpl(XAI_OAUTH_DISCOVERY_URL, {
+      method: "GET",
+      headers: { Accept: "application/json" },
+      signal: AbortSignal.timeout(timeoutMs)
+    });
+  } catch (error) {
+    throw new Error(
+      `xAI OIDC discovery failed: ${error instanceof Error ? error.message : String(error)}`
+    );
+  }
+  if (response.status !== 200) {
+    throw new Error(`xAI OIDC discovery returned status ${response.status}.`);
+  }
+  let payload;
+  try {
+    payload = await response.json();
+  } catch (error) {
+    throw new Error(
+      `xAI OIDC discovery returned invalid JSON: ${error instanceof Error ? error.message : String(error)}`
+    );
+  }
+  if (!payload || typeof payload !== "object") {
+    throw new Error("xAI OIDC discovery response was not a JSON object.");
+  }
+  const obj = payload;
+  const authorizationEndpoint = typeof obj.authorization_endpoint === "string" ? obj.authorization_endpoint.trim() : "";
+  const tokenEndpoint = typeof obj.token_endpoint === "string" ? obj.token_endpoint.trim() : "";
+  if (!authorizationEndpoint || !tokenEndpoint) {
+    throw new Error("xAI OIDC discovery response was missing required endpoints.");
+  }
+  validateXAIEndpoint(authorizationEndpoint, "authorization_endpoint");
+  validateXAIEndpoint(tokenEndpoint, "token_endpoint");
+  return {
+    authorization_endpoint: authorizationEndpoint,
+    token_endpoint: tokenEndpoint
+  };
+}
+function buildXAIAuthorizeUrl(opts) {
+  const params = new URLSearchParams({
+    response_type: "code",
+    client_id: XAI_OAUTH_CLIENT_ID,
+    redirect_uri: opts.redirectUri,
+    scope: XAI_OAUTH_SCOPE,
+    code_challenge: opts.codeChallenge,
+    code_challenge_method: "S256",
+    state: opts.state,
+    nonce: opts.nonce,
+    plan: "generic",
+    referrer: "nolo-cli"
+  });
+  return `${opts.authorizationEndpoint}?${params.toString()}`;
+}
+function generateState3() {
+  const bytes = new Uint8Array(16);
+  crypto.getRandomValues(bytes);
+  return Array.from(bytes).map((value) => value.toString(16).padStart(2, "0")).join("");
+}
+async function exchangeXAIToken(fetchImpl, code, redirectUri, verifier) {
+  const discovery = await xaiOAuthDiscovery(fetchImpl);
+  const tokenEndpoint = validateXAIEndpoint(discovery.token_endpoint, "token_endpoint");
+  const body = new URLSearchParams({
+    grant_type: "authorization_code",
+    client_id: XAI_OAUTH_CLIENT_ID,
+    code,
+    redirect_uri: redirectUri,
+    code_verifier: verifier
+  });
+  const response = await fetchImpl(tokenEndpoint, {
+    method: "POST",
+    headers: {
+      "Content-Type": "application/x-www-form-urlencoded",
+      Accept: "application/json"
+    },
+    body,
+    signal: AbortSignal.timeout(TOKEN_REQUEST_TIMEOUT_MS2)
+  });
+  if (!response.ok) {
+    let detail = "";
+    try {
+      detail = (await response.text()).trim();
+    } catch {
+    }
+    throw new Error(
+      `xAI token exchange failed: ${response.status}${detail ? ` ${detail}` : ""}`
+    );
+  }
+  const data = await response.json();
+  if (typeof data.access_token !== "string" || !data.access_token) {
+    throw new Error("xAI token exchange response missing access_token");
+  }
+  if (typeof data.refresh_token !== "string" || !data.refresh_token) {
+    throw new Error("xAI token exchange response missing refresh_token");
+  }
+  if (typeof data.expires_in !== "number" || !Number.isFinite(data.expires_in)) {
+    throw new Error("xAI token exchange response missing expires_in");
+  }
+  return {
+    accessToken: data.access_token,
+    refreshToken: data.refresh_token,
+    expiresIn: data.expires_in,
+    scope: typeof data.scope === "string" ? data.scope : void 0,
+    idToken: typeof data.id_token === "string" ? data.id_token : void 0
+  };
+}
+async function runXaiOAuthLogin(deps = {}) {
+  const fetchImpl = deps.fetchImpl ?? fetch;
+  const output2 = deps.output ?? console;
+  const error = deps.error ?? console;
+  const redirectUri = `http://${XAI_OAUTH_REDIRECT_HOST}:${XAI_OAUTH_REDIRECT_PORT}${XAI_OAUTH_REDIRECT_PATH}`;
+  let handle;
+  try {
+    handle = await startCallbackServer({
+      port: XAI_OAUTH_REDIRECT_PORT,
+      hostname: XAI_OAUTH_REDIRECT_HOST,
+      timeoutMs: 5 * 6e4
+    });
+  } catch (err) {
+    throw new Error(
+      `Failed to start xAI OAuth callback server on ${XAI_OAUTH_REDIRECT_PORT}: ${err instanceof Error ? err.message : String(err)}`
+    );
+  }
+  try {
+    const state = generateState3();
+    const pkce = await generatePkcePair();
+    const nonce = crypto.randomUUID().replace(/-/g, "");
+    const discovery = await xaiOAuthDiscovery(fetchImpl);
+    const authUrl = buildXAIAuthorizeUrl({
+      authorizationEndpoint: discovery.authorization_endpoint,
+      redirectUri,
+      codeChallenge: pkce.challenge,
+      state,
+      nonce
+    });
+    output2.log(
+      `Open the following URL in your browser to log in to xAI Grok (SuperGrok):
+  ${authUrl}
+
+Docs: ${XAI_OAUTH_DOCS_URL}`
+    );
+    if (deps.openBrowser) {
+      try {
+        await deps.openBrowser(authUrl);
+      } catch (err) {
+        error.error(
+          `Failed to open browser automatically: ${err instanceof Error ? err.message : String(err)}`
+        );
+      }
+    }
+    const callback = await handle.waitForCode();
+    const token = await exchangeXAIToken(
+      fetchImpl,
+      callback.code,
+      redirectUri,
+      pkce.verifier
+    );
+    const now = (deps.now ?? Date.now)();
+    const expiresIn = token.expiresIn;
+    return {
+      provider: "xai",
+      accessToken: token.accessToken,
+      refreshToken: token.refreshToken,
+      expiresAt: now + expiresIn * 1e3 - ACCESS_TOKEN_CLIENT_SKEW_MS3,
+      scope: token.scope,
+      idToken: token.idToken,
+      obtainedAt: now
+    };
+  } finally {
+    await handle.close();
+  }
+}
+async function refreshXaiOAuthToken(credential) {
+  if (!credential.refreshToken) {
+    throw new Error("xAI credential has no refresh_token");
+  }
+  const fetchImpl = fetch;
+  const discovery = await xaiOAuthDiscovery(fetchImpl);
+  const tokenEndpoint = validateXAIEndpoint(discovery.token_endpoint, "token_endpoint");
+  const body = new URLSearchParams({
+    grant_type: "refresh_token",
+    client_id: XAI_OAUTH_CLIENT_ID,
+    refresh_token: credential.refreshToken
+  });
+  const response = await fetchImpl(tokenEndpoint, {
+    method: "POST",
+    headers: {
+      "Content-Type": "application/x-www-form-urlencoded",
+      Accept: "application/json"
+    },
+    body,
+    signal: AbortSignal.timeout(TOKEN_REQUEST_TIMEOUT_MS2)
+  });
+  if (!response.ok) {
+    let detail = "";
+    try {
+      detail = (await response.text()).trim();
+    } catch {
+    }
+    throw new Error(
+      `xAI token refresh failed: ${response.status}${detail ? ` ${detail}` : ""}`
+    );
+  }
+  const data = await response.json();
+  if (typeof data.access_token !== "string" || !data.access_token) {
+    throw new Error("xAI token refresh response missing access_token");
+  }
+  if (typeof data.expires_in !== "number" || !Number.isFinite(data.expires_in)) {
+    throw new Error("xAI token refresh response missing expires_in");
+  }
+  const newRefresh = typeof data.refresh_token === "string" && data.refresh_token ? data.refresh_token : credential.refreshToken;
+  const now = Date.now();
+  return {
+    ...credential,
+    accessToken: data.access_token,
+    refreshToken: newRefresh,
+    expiresAt: now + data.expires_in * 1e3 - ACCESS_TOKEN_CLIENT_SKEW_MS3,
+    obtainedAt: now
+  };
+}
+var XAI_OAUTH_ISSUER, XAI_OAUTH_DISCOVERY_URL, XAI_OAUTH_CLIENT_ID, XAI_OAUTH_SCOPE, XAI_OAUTH_REDIRECT_HOST, XAI_OAUTH_REDIRECT_PORT, XAI_OAUTH_REDIRECT_PATH, XAI_OAUTH_DOCS_URL, ACCESS_TOKEN_CLIENT_SKEW_MS3, DISCOVERY_TIMEOUT_MS, TOKEN_REQUEST_TIMEOUT_MS2;
+var init_xai = __esm({
+  "packages/cli/oauth/flows/xai.ts"() {
+    "use strict";
+    init_callback_server();
+    init_pkce();
+    init_token_store();
+    XAI_OAUTH_ISSUER = "https://auth.x.ai";
+    XAI_OAUTH_DISCOVERY_URL = `${XAI_OAUTH_ISSUER}/.well-known/openid-configuration`;
+    XAI_OAUTH_CLIENT_ID = "b1a00492-073a-47ea-816f-4c329264a828";
+    XAI_OAUTH_SCOPE = "openid profile email offline_access grok-cli:access api:access";
+    XAI_OAUTH_REDIRECT_HOST = "127.0.0.1";
+    XAI_OAUTH_REDIRECT_PORT = 56121;
+    XAI_OAUTH_REDIRECT_PATH = "/callback";
+    XAI_OAUTH_DOCS_URL = "https://hermes-agent.nousresearch.com/docs/guides/xai-grok-oauth";
+    ACCESS_TOKEN_CLIENT_SKEW_MS3 = 5 * 60 * 1e3;
+    DISCOVERY_TIMEOUT_MS = 15e3;
+    TOKEN_REQUEST_TIMEOUT_MS2 = 2e4;
+  }
+});
+
 // packages/cli/oauth/apiKeyRefResolver.ts
 function isOAuthProvider(value) {
   return value === "chatgpt" || value === "xai" || value === "antigravity";
@@ -9606,11 +10508,20 @@ function createOAuthApiKeyRefResolver(options = {}) {
     const provider = ref.trim();
     if (!isOAuthProvider(provider)) return null;
     const refresh = REFRESH_BY_PROVIDER[provider];
-    return resolveFreshAccessToken({
+    const token = await resolveFreshAccessToken({
       provider,
       ...options.homeDir ? { homeDir: options.homeDir } : {},
       ...refresh ? { refresh } : {}
     });
+    if (token) return token;
+    const store = createOAuthTokenStore(options.homeDir);
+    const credential = store.read(provider);
+    if (credential && isTokenExpired(credential)) {
+      throw new Error(
+        `OAuth credential for "${provider}" is expired and could not be refreshed. Run \`nolo auth ${provider}\` (or \`nolo auth ${provider} --sync-to-server\` for server-side runs).`
+      );
+    }
+    return null;
   };
 }
 var REFRESH_BY_PROVIDER;
@@ -9618,9 +10529,16 @@ var init_apiKeyRefResolver = __esm({
   "packages/cli/oauth/apiKeyRefResolver.ts"() {
     "use strict";
     init_token_store();
+    init_antigravity();
     init_openai_codex();
+    init_xai();
     REFRESH_BY_PROVIDER = {
-      chatgpt: refreshOpenAiCodexToken
+      chatgpt: refreshOpenAiCodexToken,
+      // Previously only chatgpt was wired; expired antigravity/xai tokens then
+      // surfaced as "OAuth credential not found" even when ~/.nolo/credentials
+      // still held a valid refresh_token.
+      antigravity: refreshAntigravityOAuthToken,
+      xai: refreshXaiOAuthToken
     };
   }
 });
@@ -19152,13 +20070,13 @@ var init_env = __esm({
 });
 
 // packages/app/utils/retryFetch.ts
-var TRANSIENT_READ_RETRY_STATUSES, DEFAULT_RETRY_DELAYS_MS, sleep2, getRequestMethod, isRetryableReadMethod, isAbortError, fetchWithTransientReadRetry;
+var TRANSIENT_READ_RETRY_STATUSES, DEFAULT_RETRY_DELAYS_MS, sleep3, getRequestMethod, isRetryableReadMethod, isAbortError, fetchWithTransientReadRetry;
 var init_retryFetch = __esm({
   "packages/app/utils/retryFetch.ts"() {
     "use strict";
     TRANSIENT_READ_RETRY_STATUSES = /* @__PURE__ */ new Set([502, 503, 504]);
     DEFAULT_RETRY_DELAYS_MS = [300, 1e3];
-    sleep2 = (ms) => new Promise((resolve8) => {
+    sleep3 = (ms) => new Promise((resolve8) => {
       setTimeout(resolve8, ms);
     });
     getRequestMethod = (input2, init) => {
@@ -19176,7 +20094,7 @@ var init_retryFetch = __esm({
       const delaysMs = options.delaysMs ?? DEFAULT_RETRY_DELAYS_MS;
       const retryStatuses = options.retryStatuses ?? TRANSIENT_READ_RETRY_STATUSES;
       const fetchImpl = options.fetchImpl ?? fetch;
-      const wait = options.sleep ?? sleep2;
+      const wait = options.sleep ?? sleep3;
       for (let attempt = 0; ; attempt += 1) {
         try {
           const response = await fetchImpl(input2, init);
@@ -25122,12 +26040,12 @@ function dataURLtoFile(dataUrl, filename) {
     return null;
   }
 }
-var BYTES_PER_MB, sleep3, parseDataUrl, appendNoCacheQuery, tryLoadImage, waitForFileReady;
+var BYTES_PER_MB, sleep4, parseDataUrl, appendNoCacheQuery, tryLoadImage, waitForFileReady;
 var init_imageUtils = __esm({
   "packages/app/utils/imageUtils.ts"() {
     "use strict";
     BYTES_PER_MB = 1024 * 1024;
-    sleep3 = (ms) => new Promise((resolve8) => setTimeout(resolve8, ms));
+    sleep4 = (ms) => new Promise((resolve8) => setTimeout(resolve8, ms));
     parseDataUrl = (dataUrl) => {
       const trimmed = dataUrl.trim();
       const parts = trimmed.split(",");
@@ -25180,7 +26098,7 @@ var init_imageUtils = __esm({
           console.debug("[imageUtils] waitForFileReady: image loaded for", url);
           return true;
         }
-        await sleep3(intervalMs);
+        await sleep4(intervalMs);
       }
       console.warn("[imageUtils] waitForFileReady: timeout for", url);
       return false;
@@ -40795,24 +41713,6 @@ var init_generateResponseRequestBody = __esm({
   }
 });
 
-// packages/agent-runtime/antigravityOAuth.ts
-function isAntigravityOAuthAgent(agentConfig) {
-  if (!agentConfig) return false;
-  const apiKeyRef = (agentConfig.apiKeyRef ?? "").trim().toLowerCase();
-  const provider = String(agentConfig.provider ?? "").trim().toLowerCase();
-  const url = (agentConfig.customProviderUrl ?? "").trim().toLowerCase();
-  return apiKeyRef === "antigravity" || provider === "google-antigravity" || url.includes(ANTIGRAVITY_CLOUD_CODE_HOST);
-}
-var ANTIGRAVITY_CLOUD_CODE_BASE_URL, ANTIGRAVITY_CLOUD_CODE_HOST;
-var init_antigravityOAuth = __esm({
-  "packages/agent-runtime/antigravityOAuth.ts"() {
-    "use strict";
-    init_providerResolution();
-    ANTIGRAVITY_CLOUD_CODE_BASE_URL = "https://daily-cloudcode-pa.googleapis.com";
-    ANTIGRAVITY_CLOUD_CODE_HOST = "cloudcode-pa.googleapis.com";
-  }
-});
-
 // packages/agent-runtime/agentCallPlan.ts
 function resolveClientWire(plan) {
   if (plan.upstreamWire === "gemini-cca") return "chat.completions";
@@ -51769,7 +52669,7 @@ ${emailPreview(match)}
 ${emailText(match).slice(0, 4e3)}`
       };
     }
-    await sleep4(pollIntervalMs);
+    await sleep5(pollIntervalMs);
   }
   throw new Error(`\u7B49\u5F85\u90AE\u4EF6\u8D85\u65F6\uFF1A${Math.ceil(timeoutMs / 1e3)} \u79D2\u5185\u6CA1\u6709\u5339\u914D\u90AE\u4EF6`);
 }
@@ -51828,7 +52728,7 @@ async function emailArchiveFunc(args2, thunkApi) {
     displayData: `\u5DF2\u5F52\u6863\u90AE\u4EF6\uFF1A${email?.subject || email?.dbKey}`
   };
 }
-var emailPreview, sleep4, normalizeContains, clampNumber, participantList, emailText, matchesWaitFilters, stripHtml, cleanUrl, extractEmailVerificationArtifacts, emailSearchFunctionSchema, emailReadFunctionSchema, emailUpdateTagsFunctionSchema, emailArchiveFunctionSchema, emailProvisionIdentityFunctionSchema, emailSendFunctionSchema, emailWaitForFunctionSchema, emailExtractVerificationFunctionSchema;
+var emailPreview, sleep5, normalizeContains, clampNumber, participantList, emailText, matchesWaitFilters, stripHtml, cleanUrl, extractEmailVerificationArtifacts, emailSearchFunctionSchema, emailReadFunctionSchema, emailUpdateTagsFunctionSchema, emailArchiveFunctionSchema, emailProvisionIdentityFunctionSchema, emailSendFunctionSchema, emailWaitForFunctionSchema, emailExtractVerificationFunctionSchema;
 var init_emailTools = __esm({
   "packages/ai/tools/emailTools.ts"() {
     "use strict";
@@ -51839,7 +52739,7 @@ var init_emailTools = __esm({
       const tags = Array.isArray(email?.tags) && email.tags.length > 0 ? ` #${email.tags.join(" #")}` : "";
       return `- ${subject} | from: ${from} | ${email?.mailbox ?? "mailbox?"}${tags} | ${email?.dbKey ?? ""}`;
     };
-    sleep4 = (ms) => new Promise((resolve8) => setTimeout(resolve8, ms));
+    sleep5 = (ms) => new Promise((resolve8) => setTimeout(resolve8, ms));
     normalizeContains = (value) => typeof value === "string" ? value.trim().toLowerCase() : "";
     clampNumber = (value, fallback, min, max) => {
       const parsed = Number(value);
@@ -61131,7 +62031,7 @@ async function pollAppDeployJob(thunkApi, args2, toolRunId, jobId, options) {
         );
         throw repairError;
       }
-      await sleep5(Math.min(400 + attempt * 50, 2e3));
+      await sleep6(Math.min(400 + attempt * 50, 2e3));
     }
     throw new Error("\u90E8\u7F72\u4EFB\u52A1\u4ECD\u5728\u670D\u52A1\u7AEF\u6267\u884C\uFF0C\u8BF7\u7A0D\u540E\u91CD\u8BD5\u67E5\u770B\u7ED3\u679C\u3002");
   } finally {
@@ -61727,7 +62627,7 @@ async function appFileReplaceFunc(args2, thunkApi) {
 \u4E0B\u4E00\u6B65\uFF1A\u5148 appPreflight\uFF0C\u518D appDeploy\u3002`
   };
 }
-var normalizeOptionalString, TOOL_STEP_STATUS_RANK, APP_DEPLOY_STEP_LABELS, sleep5, appDeployFunctionSchema, appPreflightFunctionSchema, appListFunctionSchema, appDeleteFunctionSchema, appReadFunctionSchema, appFileListFunctionSchema, appFileReadFunctionSchema, appFileSearchFunctionSchema, appFileWriteFunctionSchema, appFileReplaceFunctionSchema;
+var normalizeOptionalString, TOOL_STEP_STATUS_RANK, APP_DEPLOY_STEP_LABELS, sleep6, appDeployFunctionSchema, appPreflightFunctionSchema, appListFunctionSchema, appDeleteFunctionSchema, appReadFunctionSchema, appFileListFunctionSchema, appFileReadFunctionSchema, appFileSearchFunctionSchema, appFileWriteFunctionSchema, appFileReplaceFunctionSchema;
 var init_appTools = __esm({
   "packages/ai/tools/appTools.ts"() {
     "use strict";
@@ -61757,7 +62657,7 @@ var init_appTools = __esm({
       deploy: "\u53D1\u5E03\u7AD9\u70B9",
       verify: "\u9A8C\u8BC1\u8BBF\u95EE"
     };
-    sleep5 = (ms) => new Promise((resolve8) => setTimeout(resolve8, ms));
+    sleep6 = (ms) => new Promise((resolve8) => setTimeout(resolve8, ms));
     appDeployFunctionSchema = {
       name: "appDeploy",
       description: "\u5C06 JavaScript/TypeScript \u4EE3\u7801\u90E8\u7F72\u4E3A Web \u5E94\u7528\u3002\u9ED8\u8BA4\u90E8\u7F72\u5230\u5E73\u53F0\u670D\u52A1\u5668\uFF08nolo.chat/apps/{appId}/\uFF09\uFF0C\u65E0\u9700\u7528\u6237\u914D\u7F6E\u4EFB\u4F55\u989D\u5916\u8D26\u53F7\uFF0C\u7ACB\u5373\u53EF\u8BBF\u95EE\u3002\u4EE3\u7801\u5FC5\u987B\u662F ES Module \u683C\u5F0F\uFF08export default { fetch(req) {} }\uFF09\u3002\u652F\u6301\u591A\u6587\u4EF6\u9879\u76EE\uFF1A\u901A\u8FC7 files \u6570\u7EC4\u4F20\u5165\uFF0C\u670D\u52A1\u7AEF\u81EA\u52A8\u6253\u5305\u3002\u65B0\u5EFA\u5E94\u7528\u65F6\u4F7F\u7528 name\uFF1B\u66F4\u65B0\u5DF2\u6709\u5E94\u7528\u65F6\u5FC5\u987B\u4F18\u5148\u4F20 appId\uFF0C\u907F\u514D\u56E0\u4E3A\u540D\u79F0\u91CD\u590D\u800C\u8BEF\u5EFA\u65B0\u5E94\u7528\u3002",
@@ -65380,7 +66280,7 @@ __export(cliExecutor_exports, {
   startCliSession: () => startCliSession
 });
 import { exec, execSync, spawn as spawn3 } from "child_process";
-import { randomUUID } from "node:crypto";
+import { randomUUID as randomUUID2 } from "node:crypto";
 import { mkdtempSync, readFileSync as readFileSync5, rmSync, writeFileSync as writeFileSync3 } from "node:fs";
 import { isAbsolute, join as join5, resolve as resolve3 } from "node:path";
 import { tmpdir } from "node:os";
@@ -66530,7 +67430,7 @@ function startCliSession(provider, options = {}) {
   if (!EXECUTORS[provider]) {
     throw new Error(`Unknown CLI provider: "${provider}". Supported: ${Object.keys(EXECUTORS).join(", ")}`);
   }
-  const sessionId = randomUUID();
+  const sessionId = randomUUID2();
   cliSessions.set(sessionId, {
     sessionId,
     provider,
@@ -67846,6 +68746,92 @@ function createCliLocalRuntimeAdapter(deps) {
         };
       }
       const apiKeyRefResolver = createOAuthApiKeyRefResolver();
+      if (isAntigravityOAuthAgent(agentConfig)) {
+        const accessToken = await apiKeyRefResolver("antigravity");
+        if (!accessToken) {
+          throw new Error(
+            'OAuth credential for "antigravity" not found locally. Run `nolo auth antigravity`.'
+          );
+        }
+        const credential = readOAuthCredential("antigravity");
+        const { requestedToolNames: requestedToolNames2, tools: tools2 } = resolveProviderOpenAiToolBundle(
+          agentConfig,
+          deps.env,
+          buildProviderOpenAiTools
+        );
+        logLocalRuntimeDiagnostic("provider.selected", {
+          agentKey: agentConfig.key,
+          transport: "antigravity-cloud-code",
+          apiSource: agentConfig.apiSource ?? null,
+          provider: agentConfig.provider ?? "google-antigravity",
+          model: agentConfig.model ?? null,
+          customProviderEndpoint: summarizeEndpoint(agentConfig.customProviderUrl) ?? null,
+          hasApiKey: true,
+          hasProjectId: Boolean(credential?.metadata?.projectId)
+        });
+        return {
+          model: agentConfig.model || "gemini-3.1-pro",
+          complete: async (messages, options) => {
+            const timeoutSignal = buildRequestTimeoutSignal(options?.timeoutMs);
+            const openAiBody = {
+              model: agentConfig.model || "gemini-3.1-pro",
+              messages,
+              stream: false,
+              ...tools2.length > 0 ? { tools: tools2 } : {}
+            };
+            logLocalRuntimeDiagnostic("provider.request.start", {
+              agentKey: agentConfig.key,
+              transport: "antigravity-cloud-code",
+              model: openAiBody.model,
+              messageCount: messages.length,
+              toolCount: tools2.length,
+              requestedToolNames: requestedToolNames2,
+              openAiToolNames: summarizeOpenAiToolNames(tools2),
+              timeoutMs: options?.timeoutMs ?? null
+            });
+            try {
+              const result = await fetchAntigravityCloudCodeCompletion({
+                agentConfig,
+                accessToken,
+                metadata: credential?.metadata ?? null,
+                openAiBody,
+                signal: timeoutSignal?.signal,
+                fetchImpl: (url, init) => fetchWithTransientRetry(fetchImpl, url, init, {
+                  sleep: deps.sleep,
+                  loopbackRequest
+                })
+              });
+              if (result.status < 200 || result.status >= 300) {
+                const errMsg = result.body && typeof result.body === "object" && result.body.error && typeof result.body.error.message === "string" ? result.body.error.message : JSON.stringify(result.body);
+                throw new Error(`local antigravity provider failed: HTTP ${result.status} ${errMsg}`);
+              }
+              const choice = Array.isArray(result.body.choices) ? result.body.choices[0] : void 0;
+              const message = choice?.message ?? {};
+              const content = typeof message.content === "string" ? message.content : message.content == null ? "" : String(message.content);
+              const tool_calls = Array.isArray(message.tool_calls) ? message.tool_calls : void 0;
+              if (content && options?.onTextDelta) {
+                options.onTextDelta(content);
+              }
+              logLocalRuntimeDiagnostic("provider.request.result", {
+                agentKey: agentConfig.key,
+                transport: "antigravity-cloud-code",
+                ok: true,
+                contentChars: content.length,
+                toolCallCount: tool_calls?.length ?? 0
+              });
+              return {
+                content,
+                model: agentConfig.model || "gemini-3.1-pro",
+                provider: agentConfig.provider || "google-antigravity",
+                ...tool_calls ? { tool_calls } : {},
+                trace: messages
+              };
+            } finally {
+              timeoutSignal?.clear();
+            }
+          }
+        };
+      }
       if (shouldUsePlatformChatProvider(deps.env, agentConfig)) {
         const providerConfig2 = await resolvePlatformChatProviderConfig({
           agentConfig,
@@ -68075,6 +69061,9 @@ var init_localRuntimeAdapter = __esm({
   "packages/cli/client/localRuntimeAdapter.ts"() {
     "use strict";
     init_agentRuntimeLocal();
+    init_antigravityCloudCodeProvider();
+    init_antigravityOAuth();
+    init_oauthTokenStore();
     init_localRuntimeDb();
     init_agentConfigResolver();
     init_localProviderResolver();
@@ -69170,7 +70159,7 @@ __export(machineInfo_exports, {
 import { existsSync as existsSync7, readFileSync as readFileSync7, writeFileSync as writeFileSync4, mkdirSync as mkdirSync3 } from "node:fs";
 import { dirname as dirname4, join as join8 } from "node:path";
 import { arch as arch2, hostname as hostname2, homedir as homedir5, platform } from "node:os";
-import { randomUUID as randomUUID2 } from "node:crypto";
+import { randomUUID as randomUUID3 } from "node:crypto";
 function defaultMachineIdPath() {
   return join8(homedir5(), ".nolo", "machine-id");
 }
@@ -69180,7 +70169,7 @@ function resolveMachineId(path8 = defaultMachineIdPath()) {
       const existing = readFileSync7(path8, "utf8").trim();
       if (existing) return existing;
     }
-    const next = `machine-${randomUUID2()}`;
+    const next = `machine-${randomUUID3()}`;
     mkdirSync3(dirname4(path8), { recursive: true });
     writeFileSync4(path8, `${next}
 `, "utf8");
@@ -69576,22 +70565,22 @@ async function runHttpAgentTurn(options, authToken) {
     options.output.write(`[nolo] Agent request failed: HTTP ${res.status}
 `);
     const errorText = typeof data?.error === "string" ? data.error.trim() : "";
-    const messageText = typeof data?.message === "string" ? data.message.trim() : "";
+    const messageText2 = typeof data?.message === "string" ? data.message.trim() : "";
     const reasonText = typeof data?.reason === "string" ? data.reason.trim() : "";
     const codeText = typeof data?.code === "string" ? data.code.trim() : "";
     const dialogIdText = typeof data?.dialogId === "string" ? data.dialogId.trim() : "";
-    if (errorText || messageText) {
-      options.output.write(`${errorText || messageText}
+    if (errorText || messageText2) {
+      options.output.write(`${errorText || messageText2}
 `);
-      if (messageText && messageText !== errorText) {
-        options.output.write(`${messageText}
+      if (messageText2 && messageText2 !== errorText) {
+        options.output.write(`${messageText2}
 `);
       }
-      if (codeText && codeText !== errorText && codeText !== messageText) {
+      if (codeText && codeText !== errorText && codeText !== messageText2) {
         options.output.write(`code=${codeText}
 `);
       }
-      if (reasonText && reasonText !== errorText && reasonText !== messageText) {
+      if (reasonText && reasonText !== errorText && reasonText !== messageText2) {
         options.output.write(`reason=${reasonText}
 `);
       }
@@ -70008,10 +70997,12 @@ ${this.text}
 // packages/cli/agentRunControl.ts
 var agentRunControl_exports = {};
 __export(agentRunControl_exports, {
+  checkStaleRun: () => checkStaleRun,
   defaultGenerateRunId: () => defaultGenerateRunId,
   finalizeRunRecord: () => finalizeRunRecord,
   findRunRecord: () => findRunRecord,
   findRunRecordByPid: () => findRunRecordByPid,
+  isPidGone: () => isPidGone,
   listRunRecords: () => listRunRecords,
   readRunRecord: () => readRunRecord,
   resolveNoloHome: () => resolveNoloHome2,
@@ -70054,7 +71045,7 @@ function defaultGenerateRunId() {
 function writeRunRecord(record, deps = {}) {
   const fs5 = deps.fs ?? nodeFs;
   const path8 = resolveRunRecordPath(record.runId, deps.env, deps.homedir);
-  fs5.mkdirSync(join9(path8, ".."), { recursive: true });
+  fs5.mkdirSync(resolveRunsDir(deps.env, deps.homedir), { recursive: true });
   fs5.writeFileSync(path8, JSON.stringify(record, null, 2));
 }
 function readRunRecord(runId, deps = {}) {
@@ -70172,6 +71163,29 @@ function finalizeRunRecord(runId, update, deps = {}) {
   record.endedAt = now().toISOString();
   writeRunRecord(record, deps);
 }
+function isPidGone(pid, deps = {}) {
+  const kill = deps.kill ?? ((p, s) => process.kill(p, s));
+  try {
+    kill(pid, "0");
+    return false;
+  } catch (error) {
+    const code = error.code;
+    return code === "ESRCH";
+  }
+}
+function checkStaleRun(runId, deps = {}) {
+  const record = readRunRecord(runId, deps);
+  if (!record) return null;
+  if (record.status !== "running") return record;
+  if (typeof record.pid !== "number") return record;
+  if (!isPidGone(record.pid, deps)) return record;
+  const now = deps.now ?? (() => /* @__PURE__ */ new Date());
+  record.status = "failed";
+  record.note = "process gone: pid no longer exists";
+  record.endedAt = now().toISOString();
+  writeRunRecord(record, deps);
+  return record;
+}
 function formatDuration(startedAt, endedAt) {
   const start = new Date(startedAt).getTime();
   const end = endedAt ? new Date(endedAt).getTime() : Date.now();
@@ -70213,14 +71227,48 @@ function readLogContent(logPath, tailCount, deps) {
     return "";
   }
 }
-async function runAgentPsCommand(_args, deps) {
+function isRunningStatus(status) {
+  return RUNNING_STATUSES.has(status);
+}
+function parseJsonFlag(args2) {
+  let json = false;
+  const rest = [];
+  for (const arg of args2) {
+    if (arg === "--json") {
+      json = true;
+      continue;
+    }
+    if (arg.startsWith("--json=")) {
+      const value = arg.slice("--json=".length);
+      json = value === "" || value === "true" || value === "1";
+      continue;
+    }
+    rest.push(arg);
+  }
+  return { json, rest };
+}
+function defaultSleep2(ms) {
+  return new Promise((resolve8) => setTimeout(resolve8, ms));
+}
+async function runAgentPsCommand(args2, deps) {
+  const { json } = parseJsonFlag(args2);
   const records = listRunRecords(deps);
-  if (records.length === 0) {
+  for (const record of records) {
+    if (record.status === "running" && typeof record.pid === "number") {
+      checkStaleRun(record.runId, deps);
+    }
+  }
+  const refreshed = records.map((r) => readRunRecord(r.runId, deps)).filter(Boolean);
+  if (json) {
+    deps.output.write(JSON.stringify(refreshed) + "\n");
+    return 0;
+  }
+  if (refreshed.length === 0) {
     deps.output.write("No local runs found.\n");
     return 0;
   }
   deps.output.write("RUN ID                          STATUS   PID      AGENT\n");
-  for (const record of records) {
+  for (const record of refreshed) {
     const pid = record.pid?.toString() ?? "-";
     deps.output.write(
       `${record.runId.padEnd(32)} ${record.status.padEnd(8)} ${pid.padEnd(8)} ${record.agentKey}
@@ -70229,18 +71277,83 @@ async function runAgentPsCommand(_args, deps) {
   }
   return 0;
 }
+function parseStatusArgs(args2) {
+  let target = "";
+  let json = false;
+  let watch = false;
+  let intervalMs = 2e3;
+  for (let i = 0; i < args2.length; i++) {
+    const arg = args2[i];
+    if (arg === "--json") {
+      json = true;
+      continue;
+    }
+    if (arg.startsWith("--json=")) {
+      const value = arg.slice("--json=".length);
+      json = value === "" || value === "true" || value === "1";
+      continue;
+    }
+    if (arg === "--watch") {
+      watch = true;
+      continue;
+    }
+    if (arg.startsWith("--watch=")) {
+      const value = arg.slice("--watch=".length);
+      watch = value === "" || value === "true" || value === "1";
+      continue;
+    }
+    if (arg === "--interval-ms") {
+      const next = args2[i + 1];
+      if (next && /^\d+$/.test(next)) {
+        intervalMs = Number(next);
+        i += 1;
+      }
+      continue;
+    }
+    if (arg.startsWith("--interval-ms=")) {
+      const value = arg.slice("--interval-ms=".length);
+      if (/^\d+$/.test(value)) intervalMs = Number(value);
+      continue;
+    }
+    if (!arg.startsWith("-") && !target) {
+      target = arg;
+    }
+  }
+  return { target, json, watch, intervalMs };
+}
+function printStatusTick(record, deps) {
+  const elapsed = formatDuration(record.startedAt, record.endedAt);
+  const note = record.note ? ` (${record.note})` : "";
+  deps.output.write(
+    `[${(/* @__PURE__ */ new Date()).toISOString()}] ${record.runId} status=${record.status} elapsed=${elapsed}${note}
+`
+  );
+}
 async function runAgentStatusCommand(args2, deps) {
-  const target = args2[0];
+  const { target, json, watch, intervalMs } = parseStatusArgs(args2);
   if (!target) {
-    deps.output.write("Usage: nolo agent status <runId|pid>\n");
+    deps.output.write("Usage: nolo agent status <runId|pid> [--json] [--watch] [--interval-ms N]\n");
     return 1;
   }
-  const record = findRunRecord(target, deps);
-  if (!record) {
+  const initial = findRunRecord(target, deps);
+  if (!initial) {
     deps.output.write(`Run not found: ${target}
 `);
     return 1;
   }
+  const reconciled = checkStaleRun(initial.runId, deps) ?? initial;
+  if (json) {
+    const record = readRunRecord(reconciled.runId, deps) ?? reconciled;
+    deps.output.write(JSON.stringify(record) + "\n");
+    return 0;
+  }
+  if (!watch) {
+    const record = readRunRecord(reconciled.runId, deps) ?? reconciled;
+    return printStatusOnce(record, deps);
+  }
+  return runStatusWatch(reconciled.runId, intervalMs, deps);
+}
+function printStatusOnce(record, deps) {
   deps.output.write(`runId:    ${record.runId}
 `);
   deps.output.write(`status:   ${record.status}
@@ -70260,6 +71373,8 @@ async function runAgentStatusCommand(args2, deps) {
   if (typeof record.exitCode === "number") deps.output.write(`exitCode: ${record.exitCode}
 `);
   if (record.dialogId) deps.output.write(`dialog:   ${record.dialogId}
+`);
+  if (record.note) deps.output.write(`note:     ${record.note}
 `);
   deps.output.write(`log:      ${record.logPath}
 `);
@@ -70273,6 +71388,47 @@ async function runAgentStatusCommand(args2, deps) {
   }
   return 0;
 }
+async function runStatusWatch(runId, intervalMs, deps) {
+  const sleep7 = deps.sleep ?? defaultSleep2;
+  const now = deps.now ?? (() => /* @__PURE__ */ new Date());
+  let stopped = false;
+  const setSignalHandler = deps.setSignalHandler ?? ((handler) => {
+    process.once("SIGINT", handler);
+  });
+  const clearSignalHandler = deps.clearSignalHandler ?? (() => {
+    process.removeAllListeners("SIGINT");
+  });
+  setSignalHandler(() => {
+    stopped = true;
+  });
+  try {
+    let record = readRunRecord(runId, deps);
+    if (!record) {
+      deps.output.write(`Run not found: ${runId}
+`);
+      return 1;
+    }
+    printStatusTick(record, deps);
+    while (!stopped && isRunningStatus(record.status)) {
+      await sleep7(intervalMs);
+      if (stopped) break;
+      record = checkStaleRun(runId, deps);
+      if (!record) {
+        deps.output.write(`Run not found: ${runId}
+`);
+        return 1;
+      }
+      printStatusTick(record, deps);
+    }
+    if (stopped) {
+      deps.output.write(`watch stopped by signal
+`);
+    }
+    return 0;
+  } finally {
+    clearSignalHandler();
+  }
+}
 function parseLogsArgs(args2, onTail) {
   let runId = "";
   for (let i = 0; i < args2.length; i++) {
@@ -70364,10 +71520,12 @@ async function runAgentStopCommand(args2, deps) {
 async function runAgentKillCommand(args2, deps) {
   return runSignalCommand(args2, "SIGKILL", "kill", deps);
 }
+var RUNNING_STATUSES;
 var init_agentRunControl = __esm({
   "packages/cli/agentRunControl.ts"() {
     "use strict";
     init_cliEnvHelpers();
+    RUNNING_STATUSES = /* @__PURE__ */ new Set(["running"]);
   }
 });
 
@@ -76502,458 +77660,6 @@ var init_spaceCommands = __esm({
   }
 });
 
-// packages/cli/oauth/flows/antigravity.ts
-function readProjectId(value) {
-  if (typeof value === "string" && value.length > 0) {
-    return value;
-  }
-  if (value && typeof value === "object" && typeof value.id === "string" && value.id.length > 0) {
-    return value.id;
-  }
-  return void 0;
-}
-function getDefaultTierId(allowedTiers) {
-  if (!allowedTiers || allowedTiers.length === 0) {
-    return TIER_LEGACY;
-  }
-  const defaultTier = allowedTiers.find(
-    (tier) => tier.isDefault && typeof tier.id === "string" && tier.id.length > 0
-  );
-  if (defaultTier?.id) {
-    return defaultTier.id;
-  }
-  return TIER_LEGACY;
-}
-async function sleep6(ms) {
-  const { promise, resolve: resolve8 } = Promise.withResolvers();
-  setTimeout(resolve8, ms);
-  return promise;
-}
-async function onboardProjectWithRetries(fetchImpl, endpoint, headers, onboardBody, onProgress) {
-  for (let attempt = 1; attempt <= PROJECT_ONBOARD_MAX_ATTEMPTS; attempt += 1) {
-    if (attempt > 1) {
-      onProgress?.(
-        `Waiting for project provisioning (attempt ${attempt}/${PROJECT_ONBOARD_MAX_ATTEMPTS})...`
-      );
-      await sleep6(PROJECT_ONBOARD_INTERVAL_MS);
-    }
-    const onboardResponse = await fetchImpl(
-      `${endpoint}/v1internal:onboardUser`,
-      {
-        method: "POST",
-        headers,
-        body: JSON.stringify(onboardBody)
-      }
-    );
-    if (!onboardResponse.ok) {
-      const errorText = await onboardResponse.text();
-      throw new Error(
-        `onboardUser failed: ${onboardResponse.status} ${onboardResponse.statusText}: ${errorText}`
-      );
-    }
-    const operation = await onboardResponse.json();
-    if (!operation.done) {
-      continue;
-    }
-    const projectId = readProjectId(operation.response?.cloudaicompanionProject);
-    if (projectId) {
-      return projectId;
-    }
-  }
-  throw new Error(
-    `onboardUser did not return a provisioned project id after ${PROJECT_ONBOARD_MAX_ATTEMPTS} attempts`
-  );
-}
-async function discoverProject(fetchImpl, accessToken, onProgress) {
-  const headers = {
-    Authorization: `Bearer ${accessToken}`,
-    "Content-Type": "application/json"
-  };
-  onProgress?.("Checking for existing project...");
-  const endpoint = CLOUD_CODE_ENDPOINT;
-  const loadResponse = await fetchImpl(`${endpoint}/v1internal:loadCodeAssist`, {
-    method: "POST",
-    headers,
-    body: JSON.stringify({
-      metadata: ANTIGRAVITY_LOAD_CODE_ASSIST_METADATA
-    })
-  });
-  if (!loadResponse.ok) {
-    const errorText = await loadResponse.text();
-    throw new Error(
-      `loadCodeAssist failed: ${loadResponse.status} ${loadResponse.statusText}: ${errorText}`
-    );
-  }
-  const loadPayload = await loadResponse.json();
-  const existingProject = readProjectId(loadPayload.cloudaicompanionProject);
-  if (existingProject) {
-    return existingProject;
-  }
-  const tierId = getDefaultTierId(loadPayload.allowedTiers);
-  onProgress?.("Provisioning project...");
-  const onboardBody = {
-    tierId,
-    metadata: ANTIGRAVITY_LOAD_CODE_ASSIST_METADATA
-  };
-  return onboardProjectWithRetries(
-    fetchImpl,
-    endpoint,
-    headers,
-    onboardBody,
-    onProgress
-  );
-}
-async function getUserEmail(fetchImpl, accessToken) {
-  try {
-    const response = await fetchImpl(USERINFO_URL, {
-      headers: { Authorization: `Bearer ${accessToken}` }
-    });
-    if (!response.ok) return void 0;
-    const data = await response.json();
-    return typeof data.email === "string" ? data.email : void 0;
-  } catch {
-    return void 0;
-  }
-}
-function generateState2() {
-  const bytes = new Uint8Array(16);
-  crypto.getRandomValues(bytes);
-  return Array.from(bytes).map((value) => value.toString(16).padStart(2, "0")).join("");
-}
-async function runAntigravityOAuthLogin(deps = {}) {
-  const fetchImpl = deps.fetchImpl ?? fetch;
-  const output2 = deps.output ?? console;
-  const error = deps.error ?? console;
-  const redirectUri = `http://127.0.0.1:${CALLBACK_PORT}${CALLBACK_PATH}`;
-  let handle;
-  try {
-    handle = await startCallbackServer({
-      port: CALLBACK_PORT,
-      hostname: "127.0.0.1",
-      timeoutMs: 5 * 6e4
-    });
-  } catch (err) {
-    throw new Error(
-      `Failed to start Antigravity OAuth callback server on ${CALLBACK_PORT}: ${err instanceof Error ? err.message : String(err)}`
-    );
-  }
-  try {
-    const state = generateState2();
-    const pkce = await generatePkcePair();
-    const authParams = new URLSearchParams({
-      client_id: CLIENT_ID,
-      response_type: "code",
-      redirect_uri: redirectUri,
-      scope: SCOPES.join(" "),
-      state,
-      access_type: "offline",
-      prompt: "consent"
-    });
-    const authUrl = `${AUTH_URL}?${authParams.toString()}`;
-    output2.log(
-      `Open the following URL in your browser to log in to Antigravity:
-  ${authUrl}`
-    );
-    if (deps.openBrowser) {
-      try {
-        await deps.openBrowser(authUrl);
-      } catch (err) {
-        error.error(
-          `Failed to open browser automatically: ${err instanceof Error ? err.message : String(err)}`
-        );
-      }
-    }
-    const callback = await handle.waitForCode();
-    const tokenResponse = await fetchImpl(TOKEN_URL, {
-      method: "POST",
-      headers: { "Content-Type": "application/x-www-form-urlencoded" },
-      body: new URLSearchParams({
-        client_id: CLIENT_ID,
-        client_secret: CLIENT_SECRET,
-        code: callback.code,
-        grant_type: "authorization_code",
-        redirect_uri: redirectUri
-      })
-    });
-    if (!tokenResponse.ok) {
-      const body = await tokenResponse.text();
-      throw new Error(`Antigravity token exchange failed: ${body}`);
-    }
-    const tokenData = await tokenResponse.json();
-    if (!tokenData.refresh_token) {
-      throw new Error("No refresh token received. Please try again.");
-    }
-    const email = await getUserEmail(fetchImpl, tokenData.access_token);
-    const projectId = await discoverProject(
-      fetchImpl,
-      tokenData.access_token,
-      (message) => output2.log(message)
-    );
-    const now = (deps.now ?? Date.now)();
-    return {
-      provider: "antigravity",
-      accessToken: tokenData.access_token,
-      refreshToken: tokenData.refresh_token,
-      expiresAt: now + tokenData.expires_in * 1e3 - ACCESS_TOKEN_CLIENT_SKEW_MS2,
-      scope: tokenData.scope,
-      obtainedAt: now,
-      metadata: {
-        projectId,
-        email
-      }
-    };
-  } finally {
-    await handle.close();
-  }
-}
-var decode, CLIENT_ID, CLIENT_SECRET, CALLBACK_PORT, CALLBACK_PATH, SCOPES, AUTH_URL, TOKEN_URL, USERINFO_URL, CLOUD_CODE_ENDPOINT, TIER_LEGACY, PROJECT_ONBOARD_MAX_ATTEMPTS, PROJECT_ONBOARD_INTERVAL_MS, ACCESS_TOKEN_CLIENT_SKEW_MS2, ANTIGRAVITY_LOAD_CODE_ASSIST_METADATA;
-var init_antigravity = __esm({
-  "packages/cli/oauth/flows/antigravity.ts"() {
-    "use strict";
-    init_callback_server();
-    init_pkce();
-    init_token_store();
-    decode = (s) => Buffer.from(s, "base64").toString("utf8");
-    CLIENT_ID = decode(
-      "MTA3MTAwNjA2MDU5MS10bWhzc2luMmgyMWxjcmUyMzV2dG9sb2poNGc0MDNlcC5hcHBzLmdvb2dsZXVzZXJjb250ZW50LmNvbQ=="
-    );
-    CLIENT_SECRET = decode("R09DU1BYLUs1OEZXUjQ4NkxkTEoxbUxCOHNYQzR6NnFEQWY=");
-    CALLBACK_PORT = 51121;
-    CALLBACK_PATH = "/oauth-callback";
-    SCOPES = [
-      "https://www.googleapis.com/auth/cloud-platform",
-      "https://www.googleapis.com/auth/userinfo.email",
-      "https://www.googleapis.com/auth/userinfo.profile",
-      "https://www.googleapis.com/auth/cclog",
-      "https://www.googleapis.com/auth/experimentsandconfigs"
-    ];
-    AUTH_URL = "https://accounts.google.com/o/oauth2/v2/auth";
-    TOKEN_URL = "https://oauth2.googleapis.com/token";
-    USERINFO_URL = "https://www.googleapis.com/oauth2/v1/userinfo?alt=json";
-    CLOUD_CODE_ENDPOINT = "https://cloudcode-pa.googleapis.com";
-    TIER_LEGACY = "legacy-tier";
-    PROJECT_ONBOARD_MAX_ATTEMPTS = 5;
-    PROJECT_ONBOARD_INTERVAL_MS = 2e3;
-    ACCESS_TOKEN_CLIENT_SKEW_MS2 = 5 * 60 * 1e3;
-    ANTIGRAVITY_LOAD_CODE_ASSIST_METADATA = Object.freeze({
-      ideType: "ANTIGRAVITY",
-      platform: "PLATFORM_UNSPECIFIED",
-      pluginType: "GEMINI"
-    });
-  }
-});
-
-// packages/cli/oauth/flows/xai.ts
-function validateXAIEndpoint(url, field) {
-  let parsed;
-  try {
-    parsed = new URL(url);
-  } catch {
-    throw new Error(`Invalid xAI ${field}: ${url}`);
-  }
-  if (parsed.protocol !== "https:") {
-    throw new Error(`Invalid xAI ${field}: ${url}`);
-  }
-  const host = parsed.hostname.toLowerCase();
-  if (!host || host !== "x.ai" && !host.endsWith(".x.ai")) {
-    throw new Error(`Invalid xAI ${field}: ${url}`);
-  }
-  return url;
-}
-async function xaiOAuthDiscovery(fetchImpl, timeoutMs = DISCOVERY_TIMEOUT_MS) {
-  let response;
-  try {
-    response = await fetchImpl(XAI_OAUTH_DISCOVERY_URL, {
-      method: "GET",
-      headers: { Accept: "application/json" },
-      signal: AbortSignal.timeout(timeoutMs)
-    });
-  } catch (error) {
-    throw new Error(
-      `xAI OIDC discovery failed: ${error instanceof Error ? error.message : String(error)}`
-    );
-  }
-  if (response.status !== 200) {
-    throw new Error(`xAI OIDC discovery returned status ${response.status}.`);
-  }
-  let payload;
-  try {
-    payload = await response.json();
-  } catch (error) {
-    throw new Error(
-      `xAI OIDC discovery returned invalid JSON: ${error instanceof Error ? error.message : String(error)}`
-    );
-  }
-  if (!payload || typeof payload !== "object") {
-    throw new Error("xAI OIDC discovery response was not a JSON object.");
-  }
-  const obj = payload;
-  const authorizationEndpoint = typeof obj.authorization_endpoint === "string" ? obj.authorization_endpoint.trim() : "";
-  const tokenEndpoint = typeof obj.token_endpoint === "string" ? obj.token_endpoint.trim() : "";
-  if (!authorizationEndpoint || !tokenEndpoint) {
-    throw new Error("xAI OIDC discovery response was missing required endpoints.");
-  }
-  validateXAIEndpoint(authorizationEndpoint, "authorization_endpoint");
-  validateXAIEndpoint(tokenEndpoint, "token_endpoint");
-  return {
-    authorization_endpoint: authorizationEndpoint,
-    token_endpoint: tokenEndpoint
-  };
-}
-function buildXAIAuthorizeUrl(opts) {
-  const params = new URLSearchParams({
-    response_type: "code",
-    client_id: XAI_OAUTH_CLIENT_ID,
-    redirect_uri: opts.redirectUri,
-    scope: XAI_OAUTH_SCOPE,
-    code_challenge: opts.codeChallenge,
-    code_challenge_method: "S256",
-    state: opts.state,
-    nonce: opts.nonce,
-    plan: "generic",
-    referrer: "nolo-cli"
-  });
-  return `${opts.authorizationEndpoint}?${params.toString()}`;
-}
-function generateState3() {
-  const bytes = new Uint8Array(16);
-  crypto.getRandomValues(bytes);
-  return Array.from(bytes).map((value) => value.toString(16).padStart(2, "0")).join("");
-}
-async function exchangeXAIToken(fetchImpl, code, redirectUri, verifier) {
-  const discovery = await xaiOAuthDiscovery(fetchImpl);
-  const tokenEndpoint = validateXAIEndpoint(discovery.token_endpoint, "token_endpoint");
-  const body = new URLSearchParams({
-    grant_type: "authorization_code",
-    client_id: XAI_OAUTH_CLIENT_ID,
-    code,
-    redirect_uri: redirectUri,
-    code_verifier: verifier
-  });
-  const response = await fetchImpl(tokenEndpoint, {
-    method: "POST",
-    headers: {
-      "Content-Type": "application/x-www-form-urlencoded",
-      Accept: "application/json"
-    },
-    body,
-    signal: AbortSignal.timeout(TOKEN_REQUEST_TIMEOUT_MS2)
-  });
-  if (!response.ok) {
-    let detail = "";
-    try {
-      detail = (await response.text()).trim();
-    } catch {
-    }
-    throw new Error(
-      `xAI token exchange failed: ${response.status}${detail ? ` ${detail}` : ""}`
-    );
-  }
-  const data = await response.json();
-  if (typeof data.access_token !== "string" || !data.access_token) {
-    throw new Error("xAI token exchange response missing access_token");
-  }
-  if (typeof data.refresh_token !== "string" || !data.refresh_token) {
-    throw new Error("xAI token exchange response missing refresh_token");
-  }
-  if (typeof data.expires_in !== "number" || !Number.isFinite(data.expires_in)) {
-    throw new Error("xAI token exchange response missing expires_in");
-  }
-  return {
-    accessToken: data.access_token,
-    refreshToken: data.refresh_token,
-    expiresIn: data.expires_in,
-    scope: typeof data.scope === "string" ? data.scope : void 0,
-    idToken: typeof data.id_token === "string" ? data.id_token : void 0
-  };
-}
-async function runXaiOAuthLogin(deps = {}) {
-  const fetchImpl = deps.fetchImpl ?? fetch;
-  const output2 = deps.output ?? console;
-  const error = deps.error ?? console;
-  const redirectUri = `http://${XAI_OAUTH_REDIRECT_HOST}:${XAI_OAUTH_REDIRECT_PORT}${XAI_OAUTH_REDIRECT_PATH}`;
-  let handle;
-  try {
-    handle = await startCallbackServer({
-      port: XAI_OAUTH_REDIRECT_PORT,
-      hostname: XAI_OAUTH_REDIRECT_HOST,
-      timeoutMs: 5 * 6e4
-    });
-  } catch (err) {
-    throw new Error(
-      `Failed to start xAI OAuth callback server on ${XAI_OAUTH_REDIRECT_PORT}: ${err instanceof Error ? err.message : String(err)}`
-    );
-  }
-  try {
-    const state = generateState3();
-    const pkce = await generatePkcePair();
-    const nonce = crypto.randomUUID().replace(/-/g, "");
-    const discovery = await xaiOAuthDiscovery(fetchImpl);
-    const authUrl = buildXAIAuthorizeUrl({
-      authorizationEndpoint: discovery.authorization_endpoint,
-      redirectUri,
-      codeChallenge: pkce.challenge,
-      state,
-      nonce
-    });
-    output2.log(
-      `Open the following URL in your browser to log in to xAI Grok (SuperGrok):
-  ${authUrl}
-
-Docs: ${XAI_OAUTH_DOCS_URL}`
-    );
-    if (deps.openBrowser) {
-      try {
-        await deps.openBrowser(authUrl);
-      } catch (err) {
-        error.error(
-          `Failed to open browser automatically: ${err instanceof Error ? err.message : String(err)}`
-        );
-      }
-    }
-    const callback = await handle.waitForCode();
-    const token = await exchangeXAIToken(
-      fetchImpl,
-      callback.code,
-      redirectUri,
-      pkce.verifier
-    );
-    const now = (deps.now ?? Date.now)();
-    const expiresIn = token.expiresIn;
-    return {
-      provider: "xai",
-      accessToken: token.accessToken,
-      refreshToken: token.refreshToken,
-      expiresAt: now + expiresIn * 1e3 - ACCESS_TOKEN_CLIENT_SKEW_MS3,
-      scope: token.scope,
-      idToken: token.idToken,
-      obtainedAt: now
-    };
-  } finally {
-    await handle.close();
-  }
-}
-var XAI_OAUTH_ISSUER, XAI_OAUTH_DISCOVERY_URL, XAI_OAUTH_CLIENT_ID, XAI_OAUTH_SCOPE, XAI_OAUTH_REDIRECT_HOST, XAI_OAUTH_REDIRECT_PORT, XAI_OAUTH_REDIRECT_PATH, XAI_OAUTH_DOCS_URL, ACCESS_TOKEN_CLIENT_SKEW_MS3, DISCOVERY_TIMEOUT_MS, TOKEN_REQUEST_TIMEOUT_MS2;
-var init_xai = __esm({
-  "packages/cli/oauth/flows/xai.ts"() {
-    "use strict";
-    init_callback_server();
-    init_pkce();
-    init_token_store();
-    XAI_OAUTH_ISSUER = "https://auth.x.ai";
-    XAI_OAUTH_DISCOVERY_URL = `${XAI_OAUTH_ISSUER}/.well-known/openid-configuration`;
-    XAI_OAUTH_CLIENT_ID = "b1a00492-073a-47ea-816f-4c329264a828";
-    XAI_OAUTH_SCOPE = "openid profile email offline_access grok-cli:access api:access";
-    XAI_OAUTH_REDIRECT_HOST = "127.0.0.1";
-    XAI_OAUTH_REDIRECT_PORT = 56121;
-    XAI_OAUTH_REDIRECT_PATH = "/callback";
-    XAI_OAUTH_DOCS_URL = "https://hermes-agent.nousresearch.com/docs/guides/xai-grok-oauth";
-    ACCESS_TOKEN_CLIENT_SKEW_MS3 = 5 * 60 * 1e3;
-    DISCOVERY_TIMEOUT_MS = 15e3;
-    TOKEN_REQUEST_TIMEOUT_MS2 = 2e4;
-  }
-});
-
 // packages/cli/client/profileConfig.ts
 import { existsSync as existsSync10, mkdirSync as mkdirSync5, readFileSync as readFileSync11, writeFileSync as writeFileSync6 } from "node:fs";
 import { dirname as dirname5, join as join11 } from "node:path";
@@ -77218,7 +77924,7 @@ async function runLoginCommand(args2, deps = {}) {
     serverUrl,
     fetchImpl: deps.fetchImpl ?? fetch,
     openBrowser: deps.openBrowser ?? defaultOpenBrowser,
-    sleep: deps.sleep ?? defaultSleep2,
+    sleep: deps.sleep ?? defaultSleep3,
     now: deps.now ?? Date.now,
     output: outputTarget,
     error: errorTarget,
@@ -77286,7 +77992,7 @@ function runLogoutCommand(deps = {}) {
   }
   return 0;
 }
-var LOGIN_HELP_TEXT, LOGOUT_HELP_TEXT, WHOAMI_HELP_TEXT, postJson2, defaultSleep2, defaultOpenBrowser;
+var LOGIN_HELP_TEXT, LOGOUT_HELP_TEXT, WHOAMI_HELP_TEXT, postJson2, defaultSleep3, defaultOpenBrowser;
 var init_authCommands = __esm({
   "packages/cli/authCommands.ts"() {
     "use strict";
@@ -77326,7 +78032,7 @@ Usage:
       headers: { "Content-Type": "application/json" },
       body: JSON.stringify(body)
     });
-    defaultSleep2 = (ms) => new Promise((resolve8) => setTimeout(resolve8, ms));
+    defaultSleep3 = (ms) => new Promise((resolve8) => setTimeout(resolve8, ms));
     defaultOpenBrowser = async (url) => {
       const command2 = process.platform === "darwin" ? "open" : process.platform === "win32" ? "cmd" : "xdg-open";
       const args2 = process.platform === "win32" ? ["/c", "start", "", url] : [url];
@@ -77654,7 +78360,7 @@ ${SYNC_HELP_LINE}
 
 // packages/connector-experimental/heartbeatLoop.ts
 async function runHeartbeatLoop(options) {
-  const sleep7 = options.sleep ?? defaultSleep3;
+  const sleep7 = options.sleep ?? defaultSleep4;
   let beats = 0;
   while (!options.signal?.aborted) {
     await options.sendHeartbeat();
@@ -77664,11 +78370,11 @@ async function runHeartbeatLoop(options) {
     await sleep7(options.intervalMs);
   }
 }
-var defaultSleep3;
+var defaultSleep4;
 var init_heartbeatLoop = __esm({
   "packages/connector-experimental/heartbeatLoop.ts"() {
     "use strict";
-    defaultSleep3 = (ms) => new Promise((resolve8) => setTimeout(resolve8, ms));
+    defaultSleep4 = (ms) => new Promise((resolve8) => setTimeout(resolve8, ms));
   }
 });
 
@@ -78281,7 +78987,7 @@ ${text}`);
       return 1;
     }
     const maxAttempts = deps.maxConnectorAttempts ?? Infinity;
-    const sleep7 = deps.sleep ?? defaultSleep4;
+    const sleep7 = deps.sleep ?? defaultSleep5;
     const reconnectDelayMs = resolveConnectorReconnectDelayMs(env);
     for (let attempt = 1; attempt <= maxAttempts; attempt += 1) {
       if (deps.signal?.aborted) {
@@ -78351,7 +79057,7 @@ ${text}`);
     sendHeartbeat
   });
 }
-var defaultSleep4;
+var defaultSleep5;
 var init_machineCommands = __esm({
   "packages/cli/machineCommands.ts"() {
     "use strict";
@@ -78366,7 +79072,7 @@ var init_machineCommands = __esm({
     init_machineWsRunDispatch();
     init_machineWsSession();
     init_machineStatusCommands();
-    defaultSleep4 = (ms) => new Promise((resolve8) => setTimeout(resolve8, ms));
+    defaultSleep5 = (ms) => new Promise((resolve8) => setTimeout(resolve8, ms));
   }
 });
 
@@ -80283,11 +80989,11 @@ function getAgentInternalCommandEntries() {
       return runAgentReadCommand2(args2, deps);
     }),
     createAgentRunCommand(["agent", "run"], "Run an agent"),
-    createEnvCommand(["agent", "ps"], "List active and recent local agent runs", async (_args, deps) => {
+    createEnvCommand(["agent", "ps"], "List active and recent local agent runs (--json for machine-readable output)", async (_args, deps) => {
       const { runAgentPsCommand: runAgentPsCommand2 } = await Promise.resolve().then(() => (init_agentRunControl(), agentRunControl_exports));
       return runAgentPsCommand2(_args, { ...deps, output: process.stdout });
     }),
-    createEnvCommand(["agent", "status"], "Show status of a local agent run", async (args2, deps) => {
+    createEnvCommand(["agent", "status"], "Show status of a local agent run (--json, --watch, --interval-ms N)", async (args2, deps) => {
       const { runAgentStatusCommand: runAgentStatusCommand2 } = await Promise.resolve().then(() => (init_agentRunControl(), agentRunControl_exports));
       return runAgentStatusCommand2(args2, { ...deps, output: process.stdout });
     }),