opencode-antigravity-auth 1.0.7 → 1.1.1

package/README.md

@@ -6,33 +6,60 @@ Enable Opencode to authenticate against **Antigravity** (Google's IDE) via OAuth
 
 ## What you get
 
-- **Google OAuth sign-in** with automatic token refresh
+- **Google OAuth sign-in** (multi-account via `opencode auth login`) with automatic token refresh
+- **Multi-account load balancing** Automatically cycle through multiple Google accounts to maximize rate limits
+- **Automatic endpoint fallback** between Antigravity API endpoints (daily → autopush → prod)
 - **Antigravity API compatibility** for OpenAI-style requests
 - **Debug logging** for requests and responses
-- **Drop-in setup**—Opencode auto-installs the plugin from config
+- **Drop-in setup** Opencode auto-installs the plugin from config
 
 ## Quick start
 
-1) **Add the plugin to config** (`~/.config/opencode/opencode.json` or project `.opencode.json`):
+### Step 1: Create your config file
+
+If this is your first time using Opencode, create the config directory first:
+
+```bash
+mkdir -p ~/.config/opencode
+```
+
+Then create or edit the config file at `~/.config/opencode/opencode.json`:
 
 ```json
 {
-  "plugin": ["opencode-antigravity-auth@1.0.7"]
+  "plugin": ["opencode-antigravity-auth@1.1.1"]
 }
 ```
 
-2) **Authenticate**
+> **Note:** You can also use a project-local `.opencode.json` file in your project root instead. The global config at `~/.config/opencode/opencode.json` applies to all projects.
+
+### Step 2: Authenticate
+
+Run the authentication command:
+
+```bash
+opencode auth login
+```
+
+1. Select **Google** as the provider
+2. Select **OAuth with Google (Antigravity)**
+3. **Project ID prompt:** You'll see this prompt:
+   ```
+   Project ID (leave blank to use your default project):
+   ```
+   **Just press Enter to skip this** — it's optional and only needed if you want to use a specific Google Cloud project. Most users can leave it blank.
+4. Sign in via the browser and return to Opencode. If the browser doesn't open, copy the displayed URL manually.
+5. After signing in, you can add more Google accounts (up to 10) for load balancing, or press Enter to finish.
 
-- Run `opencode auth login`.
-- Choose Google → **OAuth with Google (Antigravity)**.
-- Sign in via the browser and return to Opencode. If the browser doesn’t open, use the printed link.
+> **Alternative:** For a quick single-account setup without project ID options, open `opencode` and use the `/connect` command instead.
 
-3) **Declare the models you want**
+### Step 3: Add the models you want to use
+
+Open the **same config file** you created in Step 1 (`~/.config/opencode/opencode.json`) and add the models under `provider.google.models`:
 
-Add Antigravity models under the `provider.google.models` section of your config:
 ```json
 {
-  "plugin": ["opencode-antigravity-auth"],
+  "plugin": ["opencode-antigravity-auth@1.1.1"],
   "provider": {
     "google": {
       "models": {
@@ -84,12 +111,64 @@ Add Antigravity models under the `provider.google.models` section of your config
 }
 ```
 
-4) **Use a model**
+> **Tip:** You only need to add the models you plan to use. The example above includes all available models, but you can remove any you don't need.
+
+### Step 4: Use a model
 
 ```bash
 opencode run "Hello world" --model=google/gemini-3-pro-high
 ```
 
+Or start the interactive TUI and select a model from the model picker:
+
+```bash
+opencode
+```
+
+## Multi-account load balancing
+
+The plugin supports multiple Google accounts to maximize rate limits and provide automatic failover.
+
+### How it works
+
+- **Round-robin selection:** Each request uses the next account in the pool
+- **Automatic failover:** On HTTP `429` (rate limit), the plugin automatically switches to the next available account
+- **Smart cooldown:** Rate-limited accounts are temporarily cooled down and automatically become available again after the cooldown expires
+- **Single-account retry:** If you only have one account, the plugin waits for the rate limit to reset and retries automatically
+- **Toast notifications:** The TUI shows which account is being used and when switching occurs
+
+### Adding accounts
+
+**CLI flow (`opencode auth login`):**
+
+When you run `opencode auth login` and already have accounts saved, you'll be prompted:
+
+```
+2 account(s) saved:
+  1. user1@gmail.com
+  2. user2@gmail.com
+
+(a)dd new account(s) or (f)resh start? [a/f]:
+```
+
+- Press `a` to add more accounts to your existing pool
+- Press `f` to clear all existing accounts and start fresh
+
+**TUI flow (`/connect`):**
+
+The `/connect` command in the TUI adds accounts non-destructively — it will never clear your existing accounts. To start fresh via TUI, run `opencode auth logout` first, then `/connect`.
+
+### Account storage
+
+- Account pool is stored in `~/.config/opencode/antigravity-accounts.json` (or `%APPDATA%\opencode\antigravity-accounts.json` on Windows)
+- This file contains OAuth refresh tokens; **treat it like a password** and don't share or commit it
+- The plugin automatically syncs with OpenCode's auth state — if you log out via OpenCode, stale account storage is cleared automatically
+
+### Automatic account recovery
+
+- If Google revokes a refresh token (`invalid_grant`), that account is automatically removed from the pool
+- Rerun `opencode auth login` to re-add the account
+
 ## Debugging
 
 Enable verbose logging:
@@ -139,5 +218,15 @@ Use at your own risk. Proceed only if you understand and accept these risks.
 
 ## Credits
 
-- Inspired by and different from [opencode-gemini-auth](https://github.com/jenslys/opencode-gemini-auth) by [jenslys](https://github.com/jenslys). Thanks for the groundwork! 🚀
-- Thanks to [CLIProxyAPI](https://github.com/router-for-me/CLIProxyAPI) for the inspiration.
+Built with help and inspiration from:
+
+- [opencode-gemini-auth](https://github.com/jenslys/opencode-gemini-auth) — Gemini OAuth groundwork by [@jenslys](https://github.com/jenslys)
+- [CLIProxyAPI](https://github.com/router-for-me/CLIProxyAPI) — Helpful reference for Antigravity API
+
+## Support
+
+If this plugin helps you, consider supporting its continued maintenance:
+
+[![ko-fi](https://ko-fi.com/img/githubbutton_sm.svg)](https://ko-fi.com/S6S81QBOIR)
+
+

package/dist/src/plugin/accounts.d.ts

@@ -0,0 +1,37 @@
+import { type AccountStorage } from "./storage";
+import type { OAuthAuthDetails, RefreshParts } from "./types";
+export interface ManagedAccount {
+    index: number;
+    email?: string;
+    addedAt: number;
+    lastUsed: number;
+    parts: RefreshParts;
+    access?: string;
+    expires?: number;
+    isRateLimited: boolean;
+    rateLimitResetTime: number;
+}
+/**
+ * In-memory multi-account manager for round-robin routing.
+ *
+ * Source of truth for the pool is `antigravity-accounts.json`.
+ */
+export declare class AccountManager {
+    private accounts;
+    private cursor;
+    static loadFromDisk(authFallback?: OAuthAuthDetails): Promise<AccountManager>;
+    constructor(authFallback?: OAuthAuthDetails, stored?: AccountStorage | null);
+    getAccountCount(): number;
+    getAccountsSnapshot(): ManagedAccount[];
+    /**
+     * Picks the next available account (round-robin), skipping accounts in cooldown.
+     */
+    pickNext(): ManagedAccount | null;
+    markRateLimited(account: ManagedAccount, retryAfterMs: number): void;
+    removeAccount(account: ManagedAccount): boolean;
+    updateFromAuth(account: ManagedAccount, auth: OAuthAuthDetails): void;
+    toAuthDetails(account: ManagedAccount): OAuthAuthDetails;
+    getMinWaitTimeMs(): number;
+    saveToDisk(): Promise<void>;
+}
+//# sourceMappingURL=accounts.d.ts.map

package/dist/src/plugin/accounts.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"accounts.d.ts","sourceRoot":"","sources":["../../../src/plugin/accounts.ts"],"names":[],"mappings":"AACA,OAAO,EAA8B,KAAK,cAAc,EAAE,MAAM,WAAW,CAAC;AAC5E,OAAO,KAAK,EAAE,gBAAgB,EAAE,YAAY,EAAE,MAAM,SAAS,CAAC;AAE9D,MAAM,WAAW,cAAc;IAC7B,KAAK,EAAE,MAAM,CAAC;IACd,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,OAAO,EAAE,MAAM,CAAC;IAChB,QAAQ,EAAE,MAAM,CAAC;IACjB,KAAK,EAAE,YAAY,CAAC;IACpB,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,aAAa,EAAE,OAAO,CAAC;IACvB,kBAAkB,EAAE,MAAM,CAAC;CAC5B;AAaD;;;;GAIG;AACH,qBAAa,cAAc;IACzB,OAAO,CAAC,QAAQ,CAAwB;IACxC,OAAO,CAAC,MAAM,CAAK;WAEN,YAAY,CAAC,YAAY,CAAC,EAAE,gBAAgB,GAAG,OAAO,CAAC,cAAc,CAAC;gBAKvE,YAAY,CAAC,EAAE,gBAAgB,EAAE,MAAM,CAAC,EAAE,cAAc,GAAG,IAAI;IAuE3E,eAAe,IAAI,MAAM;IAIzB,mBAAmB,IAAI,cAAc,EAAE;IAIvC;;OAEG;IACH,QAAQ,IAAI,cAAc,GAAG,IAAI;IAiCjC,eAAe,CAAC,OAAO,EAAE,cAAc,EAAE,YAAY,EAAE,MAAM,GAAG,IAAI;IAMpE,aAAa,CAAC,OAAO,EAAE,cAAc,GAAG,OAAO;IAwB/C,cAAc,CAAC,OAAO,EAAE,cAAc,EAAE,IAAI,EAAE,gBAAgB,GAAG,IAAI;IAOrE,aAAa,CAAC,OAAO,EAAE,cAAc,GAAG,gBAAgB;IASxD,gBAAgB,IAAI,MAAM;IAuBpB,UAAU,IAAI,OAAO,CAAC,IAAI,CAAC;CAkBlC"}

package/dist/src/plugin/accounts.js

@@ -0,0 +1,197 @@
+import { formatRefreshParts, parseRefreshParts } from "./auth";
+import { loadAccounts, saveAccounts } from "./storage";
+function nowMs() {
+    return Date.now();
+}
+function clampNonNegativeInt(value, fallback) {
+    if (typeof value !== "number" || !Number.isFinite(value)) {
+        return fallback;
+    }
+    return value < 0 ? 0 : Math.floor(value);
+}
+/**
+ * In-memory multi-account manager for round-robin routing.
+ *
+ * Source of truth for the pool is `antigravity-accounts.json`.
+ */
+export class AccountManager {
+    accounts = [];
+    cursor = 0;
+    static async loadFromDisk(authFallback) {
+        const stored = await loadAccounts();
+        return new AccountManager(authFallback, stored);
+    }
+    constructor(authFallback, stored) {
+        const authParts = authFallback ? parseRefreshParts(authFallback.refresh) : null;
+        if (stored && stored.accounts.length === 0) {
+            this.accounts = [];
+            this.cursor = 0;
+            return;
+        }
+        if (stored && stored.accounts.length > 0) {
+            const baseNow = nowMs();
+            this.accounts = stored.accounts
+                .map((acc, index) => {
+                if (!acc.refreshToken || typeof acc.refreshToken !== "string") {
+                    return null;
+                }
+                const matchesFallback = !!(authFallback &&
+                    authParts &&
+                    authParts.refreshToken &&
+                    acc.refreshToken === authParts.refreshToken);
+                return {
+                    index,
+                    email: acc.email,
+                    addedAt: clampNonNegativeInt(acc.addedAt, baseNow),
+                    lastUsed: clampNonNegativeInt(acc.lastUsed, 0),
+                    parts: {
+                        refreshToken: acc.refreshToken,
+                        projectId: acc.projectId,
+                        managedProjectId: acc.managedProjectId,
+                    },
+                    access: matchesFallback ? authFallback?.access : undefined,
+                    expires: matchesFallback ? authFallback?.expires : undefined,
+                    isRateLimited: !!acc.isRateLimited,
+                    rateLimitResetTime: clampNonNegativeInt(acc.rateLimitResetTime, 0),
+                };
+            })
+                .filter((a) => a !== null);
+            this.cursor = clampNonNegativeInt(stored.activeIndex, 0);
+            if (this.accounts.length > 0) {
+                this.cursor = this.cursor % this.accounts.length;
+            }
+            return;
+        }
+        if (authFallback) {
+            const parts = parseRefreshParts(authFallback.refresh);
+            if (parts.refreshToken) {
+                const now = nowMs();
+                this.accounts = [
+                    {
+                        index: 0,
+                        email: undefined,
+                        addedAt: now,
+                        lastUsed: 0,
+                        parts,
+                        access: authFallback.access,
+                        expires: authFallback.expires,
+                        isRateLimited: false,
+                        rateLimitResetTime: 0,
+                    },
+                ];
+                this.cursor = 0;
+            }
+        }
+    }
+    getAccountCount() {
+        return this.accounts.length;
+    }
+    getAccountsSnapshot() {
+        return this.accounts.map((a) => ({ ...a, parts: { ...a.parts } }));
+    }
+    /**
+     * Picks the next available account (round-robin), skipping accounts in cooldown.
+     */
+    pickNext() {
+        const total = this.accounts.length;
+        if (total === 0) {
+            return null;
+        }
+        const now = nowMs();
+        // Clear expired cooldowns.
+        for (const acc of this.accounts) {
+            if (acc.isRateLimited && acc.rateLimitResetTime > 0 && now > acc.rateLimitResetTime) {
+                acc.isRateLimited = false;
+                acc.rateLimitResetTime = 0;
+            }
+        }
+        for (let i = 0; i < total; i++) {
+            const idx = (this.cursor + i) % total;
+            const candidate = this.accounts[idx];
+            if (!candidate) {
+                continue;
+            }
+            if (candidate.isRateLimited) {
+                continue;
+            }
+            this.cursor = (idx + 1) % total;
+            candidate.lastUsed = now;
+            return candidate;
+        }
+        return null;
+    }
+    markRateLimited(account, retryAfterMs) {
+        const duration = clampNonNegativeInt(retryAfterMs, 0);
+        account.isRateLimited = true;
+        account.rateLimitResetTime = nowMs() + duration;
+    }
+    removeAccount(account) {
+        const idx = this.accounts.indexOf(account);
+        if (idx < 0) {
+            return false;
+        }
+        this.accounts.splice(idx, 1);
+        this.accounts.forEach((acc, index) => {
+            acc.index = index;
+        });
+        if (this.accounts.length === 0) {
+            this.cursor = 0;
+            return true;
+        }
+        if (this.cursor > idx) {
+            this.cursor -= 1;
+        }
+        this.cursor = this.cursor % this.accounts.length;
+        return true;
+    }
+    updateFromAuth(account, auth) {
+        const parts = parseRefreshParts(auth.refresh);
+        account.parts = parts;
+        account.access = auth.access;
+        account.expires = auth.expires;
+    }
+    toAuthDetails(account) {
+        return {
+            type: "oauth",
+            refresh: formatRefreshParts(account.parts),
+            access: account.access,
+            expires: account.expires,
+        };
+    }
+    getMinWaitTimeMs() {
+        const now = nowMs();
+        // Clear expired cooldowns first (same logic as pickNext)
+        for (const acc of this.accounts) {
+            if (acc.isRateLimited && acc.rateLimitResetTime > 0 && now > acc.rateLimitResetTime) {
+                acc.isRateLimited = false;
+                acc.rateLimitResetTime = 0;
+            }
+        }
+        const available = this.accounts.some((a) => !a.isRateLimited);
+        if (available) {
+            return 0;
+        }
+        const waits = this.accounts
+            .filter((a) => a.isRateLimited && a.rateLimitResetTime > 0)
+            .map((a) => Math.max(0, a.rateLimitResetTime - now));
+        return waits.length > 0 ? Math.min(...waits) : 0;
+    }
+    async saveToDisk() {
+        const storage = {
+            version: 1,
+            accounts: this.accounts.map((a) => ({
+                email: a.email,
+                refreshToken: a.parts.refreshToken,
+                projectId: a.parts.projectId,
+                managedProjectId: a.parts.managedProjectId,
+                addedAt: a.addedAt,
+                lastUsed: a.lastUsed,
+                isRateLimited: a.isRateLimited,
+                rateLimitResetTime: a.rateLimitResetTime,
+            })),
+            activeIndex: this.cursor,
+        };
+        await saveAccounts(storage);
+    }
+}
+//# sourceMappingURL=accounts.js.map

package/dist/src/plugin/accounts.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"accounts.js","sourceRoot":"","sources":["../../../src/plugin/accounts.ts"],"names":[],"mappings":"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"}

package/dist/src/plugin/accounts.test.d.ts

@@ -0,0 +1,2 @@
+export {};
+//# sourceMappingURL=accounts.test.d.ts.map

package/dist/src/plugin/accounts.test.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"accounts.test.d.ts","sourceRoot":"","sources":["../../../src/plugin/accounts.test.ts"],"names":[],"mappings":""}

package/dist/src/plugin/accounts.test.js

@@ -0,0 +1,139 @@
+import { beforeEach, describe, expect, it, vi } from "vitest";
+import { AccountManager } from "./accounts";
+describe("AccountManager", () => {
+    beforeEach(() => {
+        vi.useRealTimers();
+    });
+    it("treats on-disk storage as source of truth, even when empty", () => {
+        const fallback = {
+            type: "oauth",
+            refresh: "r1|p1",
+            access: "access",
+            expires: 123,
+        };
+        const stored = {
+            version: 1,
+            accounts: [],
+            activeIndex: 0,
+        };
+        const manager = new AccountManager(fallback, stored);
+        expect(manager.getAccountCount()).toBe(0);
+    });
+    it("rotates accounts round-robin", () => {
+        const stored = {
+            version: 1,
+            accounts: [
+                { refreshToken: "r1", projectId: "p1", addedAt: 1, lastUsed: 0 },
+                { refreshToken: "r2", projectId: "p2", addedAt: 1, lastUsed: 0 },
+            ],
+            activeIndex: 0,
+        };
+        const manager = new AccountManager(undefined, stored);
+        expect(manager.pickNext()?.parts.refreshToken).toBe("r1");
+        expect(manager.pickNext()?.parts.refreshToken).toBe("r2");
+        expect(manager.pickNext()?.parts.refreshToken).toBe("r1");
+    });
+    it("attaches fallback access tokens only to the matching stored account", () => {
+        const fallback = {
+            type: "oauth",
+            refresh: "r2|p2",
+            access: "access-2",
+            expires: 123,
+        };
+        const stored = {
+            version: 1,
+            accounts: [
+                { refreshToken: "r1", projectId: "p1", addedAt: 1, lastUsed: 0 },
+                { refreshToken: "r2", projectId: "p2", addedAt: 1, lastUsed: 0 },
+            ],
+            activeIndex: 0,
+        };
+        const manager = new AccountManager(fallback, stored);
+        const snapshot = manager.getAccountsSnapshot();
+        expect(snapshot[0]?.access).toBeUndefined();
+        expect(snapshot[0]?.expires).toBeUndefined();
+        expect(snapshot[1]?.access).toBe("access-2");
+        expect(snapshot[1]?.expires).toBe(123);
+    });
+    it("does not attach fallback access tokens to an unrelated account", () => {
+        const fallback = {
+            type: "oauth",
+            refresh: "r3|p3",
+            access: "access-3",
+            expires: 456,
+        };
+        const stored = {
+            version: 1,
+            accounts: [
+                { refreshToken: "r1", projectId: "p1", addedAt: 1, lastUsed: 0 },
+                { refreshToken: "r2", projectId: "p2", addedAt: 1, lastUsed: 0 },
+            ],
+            activeIndex: 0,
+        };
+        const manager = new AccountManager(fallback, stored);
+        const snapshot = manager.getAccountsSnapshot();
+        expect(snapshot.some((account) => !!account.access)).toBe(false);
+        expect(snapshot.some((account) => typeof account.expires === "number")).toBe(false);
+    });
+    it("skips rate-limited accounts", () => {
+        vi.useFakeTimers();
+        vi.setSystemTime(new Date(0));
+        const stored = {
+            version: 1,
+            accounts: [
+                { refreshToken: "r1", projectId: "p1", addedAt: 1, lastUsed: 0 },
+                { refreshToken: "r2", projectId: "p2", addedAt: 1, lastUsed: 0 },
+            ],
+            activeIndex: 0,
+        };
+        const manager = new AccountManager(undefined, stored);
+        const first = manager.pickNext();
+        expect(first?.parts.refreshToken).toBe("r1");
+        manager.markRateLimited(first, 60_000);
+        const next = manager.pickNext();
+        expect(next?.parts.refreshToken).toBe("r2");
+    });
+    it("returns minimum wait time and re-enables after cooldown", () => {
+        vi.useFakeTimers();
+        vi.setSystemTime(new Date(0));
+        const stored = {
+            version: 1,
+            accounts: [
+                { refreshToken: "r1", projectId: "p1", addedAt: 1, lastUsed: 0 },
+                { refreshToken: "r2", projectId: "p2", addedAt: 1, lastUsed: 0 },
+            ],
+            activeIndex: 0,
+        };
+        const manager = new AccountManager(undefined, stored);
+        const acc1 = manager.pickNext();
+        const acc2 = manager.pickNext();
+        manager.markRateLimited(acc1, 10_000);
+        manager.markRateLimited(acc2, 5_000);
+        expect(manager.pickNext()).toBeNull();
+        expect(manager.getMinWaitTimeMs()).toBe(5_000);
+        vi.setSystemTime(new Date(6_000));
+        const available = manager.pickNext();
+        expect(available?.parts.refreshToken).toBe("r2");
+    });
+    it("removes an account and keeps cursor consistent", () => {
+        vi.useFakeTimers();
+        vi.setSystemTime(new Date(0));
+        const stored = {
+            version: 1,
+            accounts: [
+                { refreshToken: "r1", projectId: "p1", addedAt: 1, lastUsed: 0 },
+                { refreshToken: "r2", projectId: "p2", addedAt: 1, lastUsed: 0 },
+                { refreshToken: "r3", projectId: "p3", addedAt: 1, lastUsed: 0 },
+            ],
+            activeIndex: 1,
+        };
+        const manager = new AccountManager(undefined, stored);
+        const picked = manager.pickNext();
+        expect(picked?.parts.refreshToken).toBe("r2");
+        manager.removeAccount(picked);
+        expect(manager.getAccountCount()).toBe(2);
+        const next = manager.pickNext();
+        expect(next?.parts.refreshToken).toBe("r3");
+    });
+});
+//# sourceMappingURL=accounts.test.js.map

package/dist/src/plugin/accounts.test.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"accounts.test.js","sourceRoot":"","sources":["../../../src/plugin/accounts.test.ts"],"names":[],"mappings":"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"}

package/dist/src/plugin/cli.d.ts

@@ -2,4 +2,18 @@
  * Prompts the user for a project ID via stdin/stdout.
  */
 export declare function promptProjectId(): Promise<string>;
+/**
+ * Prompts user whether they want to add another OAuth account.
+ */
+export declare function promptAddAnotherAccount(currentCount: number): Promise<boolean>;
+export type LoginMode = "add" | "fresh";
+export interface ExistingAccountInfo {
+    email?: string;
+    index: number;
+}
+/**
+ * Prompts user to choose login mode when accounts already exist.
+ * Returns "add" to append new accounts, "fresh" to clear and start over.
+ */
+export declare function promptLoginMode(existingAccounts: ExistingAccountInfo[]): Promise<LoginMode>;
 //# sourceMappingURL=cli.d.ts.map

package/dist/src/plugin/cli.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"cli.d.ts","sourceRoot":"","sources":["../../../src/plugin/cli.ts"],"names":[],"mappings":"AAGA;;GAEG;AACH,wBAAsB,eAAe,IAAI,OAAO,CAAC,MAAM,CAAC,CAQvD"}
+{"version":3,"file":"cli.d.ts","sourceRoot":"","sources":["../../../src/plugin/cli.ts"],"names":[],"mappings":"AAGA;;GAEG;AACH,wBAAsB,eAAe,IAAI,OAAO,CAAC,MAAM,CAAC,CAQvD;AAED;;GAEG;AACH,wBAAsB,uBAAuB,CAAC,YAAY,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC,CASpF;AAED,MAAM,MAAM,SAAS,GAAG,KAAK,GAAG,OAAO,CAAC;AAExC,MAAM,WAAW,mBAAmB;IAClC,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,KAAK,EAAE,MAAM,CAAC;CACf;AAED;;;GAGG;AACH,wBAAsB,eAAe,CAAC,gBAAgB,EAAE,mBAAmB,EAAE,GAAG,OAAO,CAAC,SAAS,CAAC,CA0BjG"}

package/dist/src/plugin/cli.js

@@ -13,4 +13,47 @@ export async function promptProjectId() {
         rl.close();
     }
 }
+/**
+ * Prompts user whether they want to add another OAuth account.
+ */
+export async function promptAddAnotherAccount(currentCount) {
+    const rl = createInterface({ input, output });
+    try {
+        const answer = await rl.question(`Add another account? (${currentCount} added) (y/n): `);
+        const normalized = answer.trim().toLowerCase();
+        return normalized === "y" || normalized === "yes";
+    }
+    finally {
+        rl.close();
+    }
+}
+/**
+ * Prompts user to choose login mode when accounts already exist.
+ * Returns "add" to append new accounts, "fresh" to clear and start over.
+ */
+export async function promptLoginMode(existingAccounts) {
+    const rl = createInterface({ input, output });
+    try {
+        console.log(`\n${existingAccounts.length} account(s) saved:`);
+        for (const acc of existingAccounts) {
+            const label = acc.email || `Account ${acc.index + 1}`;
+            console.log(`  ${acc.index + 1}. ${label}`);
+        }
+        console.log("");
+        while (true) {
+            const answer = await rl.question("(a)dd new account(s) or (f)resh start? [a/f]: ");
+            const normalized = answer.trim().toLowerCase();
+            if (normalized === "a" || normalized === "add") {
+                return "add";
+            }
+            if (normalized === "f" || normalized === "fresh") {
+                return "fresh";
+            }
+            console.log("Please enter 'a' to add accounts or 'f' to start fresh.");
+        }
+    }
+    finally {
+        rl.close();
+    }
+}
 //# sourceMappingURL=cli.js.map

package/dist/src/plugin/cli.js.map

@@ -1 +1 @@
-{"version":3,"file":"cli.js","sourceRoot":"","sources":["../../../src/plugin/cli.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,eAAe,EAAE,MAAM,wBAAwB,CAAC;AACzD,OAAO,EAAE,KAAK,IAAI,KAAK,EAAE,MAAM,IAAI,MAAM,EAAE,MAAM,cAAc,CAAC;AAEhE;;GAEG;AACH,MAAM,CAAC,KAAK,UAAU,eAAe;IACnC,MAAM,EAAE,GAAG,eAAe,CAAC,EAAE,KAAK,EAAE,MAAM,EAAE,CAAC,CAAC;IAC9C,IAAI,CAAC;QACH,MAAM,MAAM,GAAG,MAAM,EAAE,CAAC,QAAQ,CAAC,wDAAwD,CAAC,CAAC;QAC3F,OAAO,MAAM,CAAC,IAAI,EAAE,CAAC;IACvB,CAAC;YAAS,CAAC;QACT,EAAE,CAAC,KAAK,EAAE,CAAC;IACb,CAAC;AACH,CAAC"}
+{"version":3,"file":"cli.js","sourceRoot":"","sources":["../../../src/plugin/cli.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,eAAe,EAAE,MAAM,wBAAwB,CAAC;AACzD,OAAO,EAAE,KAAK,IAAI,KAAK,EAAE,MAAM,IAAI,MAAM,EAAE,MAAM,cAAc,CAAC;AAEhE;;GAEG;AACH,MAAM,CAAC,KAAK,UAAU,eAAe;IACnC,MAAM,EAAE,GAAG,eAAe,CAAC,EAAE,KAAK,EAAE,MAAM,EAAE,CAAC,CAAC;IAC9C,IAAI,CAAC;QACH,MAAM,MAAM,GAAG,MAAM,EAAE,CAAC,QAAQ,CAAC,wDAAwD,CAAC,CAAC;QAC3F,OAAO,MAAM,CAAC,IAAI,EAAE,CAAC;IACvB,CAAC;YAAS,CAAC;QACT,EAAE,CAAC,KAAK,EAAE,CAAC;IACb,CAAC;AACH,CAAC;AAED;;GAEG;AACH,MAAM,CAAC,KAAK,UAAU,uBAAuB,CAAC,YAAoB;IAChE,MAAM,EAAE,GAAG,eAAe,CAAC,EAAE,KAAK,EAAE,MAAM,EAAE,CAAC,CAAC;IAC9C,IAAI,CAAC;QACH,MAAM,MAAM,GAAG,MAAM,EAAE,CAAC,QAAQ,CAAC,yBAAyB,YAAY,iBAAiB,CAAC,CAAC;QACzF,MAAM,UAAU,GAAG,MAAM,CAAC,IAAI,EAAE,CAAC,WAAW,EAAE,CAAC;QAC/C,OAAO,UAAU,KAAK,GAAG,IAAI,UAAU,KAAK,KAAK,CAAC;IACpD,CAAC;YAAS,CAAC;QACT,EAAE,CAAC,KAAK,EAAE,CAAC;IACb,CAAC;AACH,CAAC;AASD;;;GAGG;AACH,MAAM,CAAC,KAAK,UAAU,eAAe,CAAC,gBAAuC;IAC3E,MAAM,EAAE,GAAG,eAAe,CAAC,EAAE,KAAK,EAAE,MAAM,EAAE,CAAC,CAAC;IAC9C,IAAI,CAAC;QACH,OAAO,CAAC,GAAG,CAAC,KAAK,gBAAgB,CAAC,MAAM,oBAAoB,CAAC,CAAC;QAC9D,KAAK,MAAM,GAAG,IAAI,gBAAgB,EAAE,CAAC;YACnC,MAAM,KAAK,GAAG,GAAG,CAAC,KAAK,IAAI,WAAW,GAAG,CAAC,KAAK,GAAG,CAAC,EAAE,CAAC;YACtD,OAAO,CAAC,GAAG,CAAC,KAAK,GAAG,CAAC,KAAK,GAAG,CAAC,KAAK,KAAK,EAAE,CAAC,CAAC;QAC9C,CAAC;QACD,OAAO,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC;QAEhB,OAAO,IAAI,EAAE,CAAC;YACZ,MAAM,MAAM,GAAG,MAAM,EAAE,CAAC,QAAQ,CAAC,gDAAgD,CAAC,CAAC;YACnF,MAAM,UAAU,GAAG,MAAM,CAAC,IAAI,EAAE,CAAC,WAAW,EAAE,CAAC;YAE/C,IAAI,UAAU,KAAK,GAAG,IAAI,UAAU,KAAK,KAAK,EAAE,CAAC;gBAC/C,OAAO,KAAK,CAAC;YACf,CAAC;YACD,IAAI,UAAU,KAAK,GAAG,IAAI,UAAU,KAAK,OAAO,EAAE,CAAC;gBACjD,OAAO,OAAO,CAAC;YACjB,CAAC;YAED,OAAO,CAAC,GAAG,CAAC,yDAAyD,CAAC,CAAC;QACzE,CAAC;IACH,CAAC;YAAS,CAAC;QACT,EAAE,CAAC,KAAK,EAAE,CAAC;IACb,CAAC;AACH,CAAC"}

package/dist/src/plugin/project.d.ts

@@ -1,4 +1,4 @@
-import type { OAuthAuthDetails, PluginClient, ProjectContextResult } from "./types";
+import type { OAuthAuthDetails, ProjectContextResult } from "./types";
 interface AntigravityUserTier {
     id?: string;
     isDefault?: boolean;
@@ -28,6 +28,6 @@ export declare function onboardManagedProject(accessToken: string, tierId: strin
 /**
  * Resolves an effective project ID for the current auth state, caching results per refresh token.
  */
-export declare function ensureProjectContext(auth: OAuthAuthDetails, client: PluginClient, providerId: string): Promise<ProjectContextResult>;
+export declare function ensureProjectContext(auth: OAuthAuthDetails): Promise<ProjectContextResult>;
 export {};
 //# sourceMappingURL=project.d.ts.map