clawmoney 0.13.2 → 0.13.4

package/dist/index.js

@@ -395,8 +395,8 @@ relay
     .option('--mode <mode>', 'Safety mode: chat, search, code, full', 'chat')
     .option('--concurrency <n>', 'Max concurrent requests', '5')
     .option('--daily-limit <usd>', 'Max daily spend in USD', '20')
-    .option('--price-input <usd>', 'Price per 1M input tokens', '5')
-    .option('--price-output <usd>', 'Price per 1M output tokens', '25')
+    .option('--price-input <usd>', 'Override input price per 1M (auto-populated from pricing.ts)')
+    .option('--price-output <usd>', 'Override output price per 1M (auto-populated from pricing.ts)')
     .action(async (options) => {
     try {
         await relayRegisterCommand(options);

package/dist/relay/upstream/antigravity-api.d.ts

@@ -72,14 +72,6 @@ export declare function configureAntigravityDispatcher(): void;
 export declare function ensureClawmoneyDir(): void;
 export declare function loadAccounts(): AntigravityAccountsFile;
 export declare function saveAccounts(file: AntigravityAccountsFile): void;
-/**
- * Discover the Google Cloud project ID associated with this Antigravity
- * account via `loadCodeAssist`. Required for every v1internal request.
- *
- * Some workspace / business accounts return an empty string here — we fall
- * back to `ANTIGRAVITY_DEFAULT_PROJECT_ID` in that case, matching the
- * sub2api and opencode-antigravity-auth behavior.
- */
 export declare function resolveAntigravityProjectId(accessToken: string): Promise<string>;
 export declare function configureAntigravityRateGuard(config?: RelayRateGuardConfig): void;
 export declare function getAntigravityRateGuardSnapshot(): ReturnType<RateGuard["currentLoad"]> | null;

package/dist/relay/upstream/antigravity-api.js

@@ -69,6 +69,16 @@ const ANTIGRAVITY_ENDPOINTS = [
     ANTIGRAVITY_ENDPOINT_AUTOPUSH,
     ANTIGRAVITY_ENDPOINT_PROD,
 ];
+// For project discovery (loadCodeAssist / onboardUser) we hit PROD first.
+// sub2api and opencode-antigravity-auth both found that the sandbox daily/
+// autopush endpoints often 404 on these setup calls even though they handle
+// the generate path fine. Mirroring their order avoids the "no project →
+// fallback to hardcoded rising-fact-p41fc → 403 API not enabled" trap.
+const ANTIGRAVITY_LOAD_ENDPOINTS = [
+    ANTIGRAVITY_ENDPOINT_PROD,
+    ANTIGRAVITY_ENDPOINT_DAILY,
+    ANTIGRAVITY_ENDPOINT_AUTOPUSH,
+];
 const GENERATE_PATH = "/v1internal:generateContent";
 // Hardcoded fallback project ID used for workspace/business accounts that
 // don't return their own `cloudaicompanionProject` from `loadCodeAssist`. Same
@@ -271,8 +281,27 @@ async function getFreshAccount() {
  * back to `ANTIGRAVITY_DEFAULT_PROJECT_ID` in that case, matching the
  * sub2api and opencode-antigravity-auth behavior.
  */
-export async function resolveAntigravityProjectId(accessToken) {
-    configureDispatcher();
+function extractProjectId(raw) {
+    if (!raw)
+        return undefined;
+    const project = raw.cloudaicompanionProject;
+    if (typeof project === "string" && project)
+        return project;
+    if (project && typeof project === "object" && project.id)
+        return project.id;
+    return undefined;
+}
+function extractTierId(data) {
+    const pick = (t) => {
+        if (!t)
+            return undefined;
+        if (typeof t === "string")
+            return t || undefined;
+        return t.id || undefined;
+    };
+    return pick(data.paidTier) ?? pick(data.currentTier);
+}
+async function callLoadCodeAssist(accessToken) {
     const body = JSON.stringify({
         metadata: {
             ideType: "ANTIGRAVITY",
@@ -281,24 +310,82 @@ export async function resolveAntigravityProjectId(accessToken) {
         },
     });
     const headers = antigravityHeaders(accessToken);
-    for (const baseEndpoint of ANTIGRAVITY_ENDPOINTS) {
+    for (const baseEndpoint of ANTIGRAVITY_LOAD_ENDPOINTS) {
         try {
             const resp = await fetchWithProxy(`${baseEndpoint}/v1internal:loadCodeAssist`, { method: "POST", headers, body });
-            if (!resp.ok)
+            if (!resp.ok) {
+                logger.warn(`[antigravity-api] loadCodeAssist ${resp.status} at ${baseEndpoint}`);
                 continue;
+            }
             const data = (await resp.json());
-            const project = data.cloudaicompanionProject;
-            if (typeof project === "string" && project)
-                return project;
-            if (project && typeof project === "object" && project.id) {
-                return project.id;
+            return {
+                project: extractProjectId(data),
+                tier: extractTierId(data),
+            };
+        }
+        catch (err) {
+            logger.warn(`[antigravity-api] loadCodeAssist error at ${baseEndpoint}: ${err.message}`);
+        }
+    }
+    return null;
+}
+/**
+ * Trigger Google's onboarding flow so a fresh account gets a real project
+ * ID back. Some accounts (especially first-time Antigravity users) return
+ * an empty `cloudaicompanionProject` from loadCodeAssist; they have to be
+ * onboarded first. Mirrors sub2api's Client.OnboardUser retry/poll logic.
+ */
+async function callOnboardUser(accessToken, tierId) {
+    const body = JSON.stringify({
+        tierId,
+        metadata: {
+            ideType: "ANTIGRAVITY",
+            platform: "PLATFORM_UNSPECIFIED",
+            pluginType: "GEMINI",
+        },
+    });
+    const headers = antigravityHeaders(accessToken);
+    for (const baseEndpoint of ANTIGRAVITY_LOAD_ENDPOINTS) {
+        for (let attempt = 1; attempt <= 5; attempt++) {
+            try {
+                const resp = await fetchWithProxy(`${baseEndpoint}/v1internal:onboardUser`, { method: "POST", headers, body });
+                if (!resp.ok) {
+                    if (resp.status >= 500 || resp.status === 404)
+                        break; // try next endpoint
+                    logger.warn(`[antigravity-api] onboardUser ${resp.status} at ${baseEndpoint}`);
+                    return undefined;
+                }
+                const data = (await resp.json());
+                const project = extractProjectId(data.response);
+                if (data.done && project)
+                    return project;
+                // done=false → wait a couple seconds and poll again
+                await new Promise((r) => setTimeout(r, 2000));
+            }
+            catch (err) {
+                logger.warn(`[antigravity-api] onboardUser error at ${baseEndpoint}: ${err.message}`);
+                break;
             }
         }
-        catch {
-            // try next endpoint
+    }
+    return undefined;
+}
+export async function resolveAntigravityProjectId(accessToken) {
+    configureDispatcher();
+    const loaded = await callLoadCodeAssist(accessToken);
+    if (loaded?.project)
+        return loaded.project;
+    if (loaded?.tier) {
+        logger.info(`[antigravity-api] loadCodeAssist returned no project (tier=${loaded.tier}) — running onboardUser...`);
+        const onboarded = await callOnboardUser(accessToken, loaded.tier);
+        if (onboarded) {
+            logger.info(`[antigravity-api] onboardUser succeeded, project=${onboarded}`);
+            return onboarded;
         }
     }
-    logger.warn(`[antigravity-api] loadCodeAssist did not return a project — using default ${ANTIGRAVITY_DEFAULT_PROJECT_ID}`);
+    logger.warn(`[antigravity-api] could not resolve a real project — falling back to ${ANTIGRAVITY_DEFAULT_PROJECT_ID}. ` +
+        `This shared project needs staging-cloudaicompanion API enabled in Google Cloud Console; ` +
+        `expect 403 errors until a real project is resolved.`);
     return ANTIGRAVITY_DEFAULT_PROJECT_ID;
 }
 function antigravityHeaders(accessToken) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "clawmoney",
-  "version": "0.13.2",
+  "version": "0.13.4",
   "description": "ClawMoney CLI -- Earn rewards with your AI agent",
   "type": "module",
   "bin": {