dsh-agy-link 0.4.18 → 0.4.20

package/CHANGELOG.md

@@ -1,5 +1,22 @@
 # Changelog
 
+## 0.4.20 (2026-08-27)
+
+- **Fixed: Primary Account Quota Fetched With a STALE Token (主账号刷新/同步拿的值不对).**
+  - **Root cause (verified live)**: on macOS, agy >= 1.1.15 keeps its CURRENT credential in the Keychain; the on-disk `antigravity-oauth-token` was a stale leftover from a PREVIOUS account's login. `getStoredToken` read the disk file FIRST and only fell back to the Keychain — so every 刷新/同步 used the old account's (still-valid) token and displayed ITS quota under the current login's name (observed: agy authenticated as q98… while the disk file still held elegantmanco's token; UI showed the wrong account's 5h/weekly numbers).
+  - **Keychain-first token resolution**: for the primary / system-HOME account the Keychain credential now WINS over the on-disk file (disk remains the fallback for older agy builds and non-mac systems). Isolated pool accounts are pinned by test to never touch the shared Keychain. Verified end-to-end against live Google endpoints: the primary's token identity and quota now match the actual agy login (5h 91% / weekly 31% instead of the stale account's numbers).
+  - **Token-anchored identity on manual refresh**: `refreshAccountQuota(force=true)` additionally calls the OAuth userinfo endpoint once per explicit user click and re-labels the slot to the token's TRUE owner (`resetAccountIdentity`), so an external `agy logout` + re-login self-heals in one click even when logs disagree.
+  - **Log detection hardened**: `detectEmailFromAgyLogs` returns the LAST match per file (append-ordered logs → newest login wins), fixing first-match returning a superseded account.
+  - **Risk posture preserved**: background polls (force=false) still NEVER call userinfo — zero extra network on the automatic path (pinned by a regression test).
+
+## 0.4.19 (2026-08-26)
+
+- **Fixed: Antigravity Models Missing From the Model Picker (登录成功、额度正常但模型列表为空 — issue #1).**
+  - **Root cause**: when `agy models` lists a bare Gemini base alongside its effort variants (the agy 1.1.13 output shape, e.g. `gemini-3.7-flash` + `gemini-3.7-flash-medium`), `foldEfforts` emitted the base id TWICE — once as the folded base entry and once as a verbatim row. DSH's `llm.listModels` contract throws `INVALID_CATALOG` on any duplicate model id, and the host's model-catalog builder then drops the ENTIRE Antigravity provider group from the picker — so login and quota panels looked perfectly healthy while no Antigravity model could be selected.
+  - **Fix (three layers)**: (1) `foldEfforts` now absorbs the bare base into its folded entry instead of duplicating it; (2) `parseModelsOutput` dedupes repeated raw slugs (first occurrence wins); (3) `AgyAdapter.listModels` dedupes ids as a final guard, so even a user-configured `fallbackModels` list containing repeats can never nuke the whole group.
+  - Regression tests pin both bare-base-plus-variants shapes and the duplicate-slug parse, plus an adapter-level uniqueness guard test.
+  - **Observability**: when the adapter-level guard drops duplicate ids it now logs which ids were removed (`model catalog contained duplicate ids [...]`) so field instances surface in DSH server logs instead of being silently masked. When reporting picker issues, attach the `/agy doctor` report (`~/.dsh/agy-link/diagnostics/doctor-*.md`) and the raw `agy models` output.
+
 ## 0.4.18 (2026-08-25)
 
 - **Quota Fallback Never Clobbers Good Data (5h=100%/weekly-missing 根因).**

package/dist/index.js

@@ -1074,7 +1074,7 @@ function parseModelsOutput(stdout) {
 	if (text === "") return [];
 	try {
 		const list = extractModelList(JSON.parse(text));
-		if (list) return list;
+		if (list) return dedupeBySlug(list);
 	} catch {}
 	const out = [];
 	for (const line of text.split(/\n/)) {
@@ -1090,6 +1090,17 @@ function parseModelsOutput(stdout) {
 			label: t
 		});
 	}
+	return dedupeBySlug(out);
+}
+/** First occurrence wins: duplicate raw slugs would become duplicate catalog ids. */
+function dedupeBySlug(raw) {
+	const seen = /* @__PURE__ */ new Set();
+	const out = [];
+	for (const r of raw) {
+		if (seen.has(r.slug)) continue;
+		seen.add(r.slug);
+		out.push(r);
+	}
 	return out;
 }
 function extractModelList(parsed) {
@@ -1189,7 +1200,7 @@ function foldEfforts(raw) {
 	};
 	folded.sort((a, b) => rank(a) - rank(b));
 	verbatim.sort((a, b) => rank(a) - rank(b));
-	return [...folded, ...verbatim];
+	return [...folded, ...verbatim.filter((e) => !bases.has(e.id))];
 }
 function stripEffortLabel(label, eff) {
 	const re = new RegExp("\\s*\\(?" + eff + "\\)?\\s*$", "i");
@@ -2071,12 +2082,25 @@ var AgyAdapter = class extends LlmAdapter {
 	}
 	async listModels(_provider) {
 		this.deps.catalog.refreshIfNeeded();
-		return this.deps.catalog.get().models.map((m) => ({
-			provider: PROVIDER_ID,
-			id: m.id,
-			name: m.name,
-			inputModalities: ["text", "image"]
-		}));
+		const cat = this.deps.catalog.get();
+		const seen = /* @__PURE__ */ new Set();
+		const models = [];
+		const dropped = [];
+		for (const m of cat.models) {
+			if (seen.has(m.id)) {
+				dropped.push(m.id);
+				continue;
+			}
+			seen.add(m.id);
+			models.push({
+				provider: PROVIDER_ID,
+				id: m.id,
+				name: m.name,
+				inputModalities: ["text", "image"]
+			});
+		}
+		if (dropped.length > 0) this.warnOnce("catalog-dupes", "model catalog contained duplicate ids [" + dropped.join(", ") + "] — kept first occurrence so DSH does not drop the whole provider group (INVALID_CATALOG)");
+		return models;
 	}
 	async resolveModel(_provider, model, _signal) {
 		const cfg = this.deps.getConfig();
@@ -27702,8 +27726,11 @@ function detectEmailFromAgyLogs(homeDir) {
 			time: statSync(join(logDir, f)).mtimeMs
 		})).sort((a, b) => b.time - a.time).slice(0, 5);
 		for (const file of files) try {
-			const m = readFileSync(join(logDir, file.name), "utf8").match(/(?:authenticated successfully as|applyAuthResult:\s*email=|"email"\s*:\s*"|User:\s*)\s*([a-zA-Z0-9._%+-]+@[a-zA-Z0-9.-]+\.[a-zA-Z]{2,})/i);
-			if (m && m[1]) return m[1];
+			const content = readFileSync(join(logDir, file.name), "utf8");
+			const re = /(?:authenticated successfully as|applyAuthResult:\s*email=|"email"\s*:\s*"|User:\s*)\s*([a-zA-Z0-9._%+-]+@[a-zA-Z0-9.-]+\.[a-zA-Z]{2,})/gi;
+			let last;
+			for (let m = re.exec(content); m !== null; m = re.exec(content)) if (m[1]) last = m[1];
+			if (last) return last;
 		} catch {}
 	} catch {}
 }
@@ -27790,21 +27817,39 @@ var QuotaService = class {
 		return join(home, ".gemini", "antigravity-cli", "antigravity-oauth-token");
 	}
 	/**
+	* Read the system-HOME Keychain credential. Protected so tests (and future
+	* platforms) can substitute the reader without touching the real Keychain.
+	*/
+	readSystemKeychainToken() {
+		return readMacKeychainToken();
+	}
+	/**
 	* Read the active token document and normalize it to a flat StoredToken.
-	* Reads from the on-disk token file first (0ms, silent, avoids macOS Keychain popups).
-	* Falls back to macOS Keychain only if the disk file is absent.
+	*
+	* Precedence for the primary / system-HOME account: the macOS Keychain
+	* WINS over the on-disk token file. agy >= 1.1.15 keeps its CURRENT
+	* credential in the Keychain; the on-disk antigravity-oauth-token can be a
+	* stale leftover from a PREVIOUS account's login (verified live: disk
+	* held an old account's token while agy itself was authenticated as
+	* someone else — disk-first precedence made every quota refresh fetch the
+	* WRONG account's numbers). Isolated pool accounts only ever read their
+	* own directory's file; the Keychain is one shared slot they must not see.
 	*/
 	getStoredToken(account) {
-		const file = this.getTokenFilePath(account);
-		if (existsSync(file)) try {
-			const tok = normalizeStoredToken(JSON.parse(readFileSync(file, "utf8")));
-			if (tok && (tok.accessToken || tok.refreshToken)) return tok;
-		} catch {}
+		const disk = (() => {
+			const file = this.getTokenFilePath(account);
+			if (!existsSync(file)) return null;
+			try {
+				const tok = normalizeStoredToken(JSON.parse(readFileSync(file, "utf8")));
+				if (tok && (tok.accessToken || tok.refreshToken)) return tok;
+			} catch {}
+			return null;
+		})();
 		if (account.systemHome || !account.dir) {
-			const keychainToken = readMacKeychainToken();
-			if (keychainToken) return keychainToken;
+			const keychainToken = this.readSystemKeychainToken();
+			if (keychainToken && (keychainToken.accessToken || keychainToken.refreshToken)) return keychainToken;
 		}
-		return null;
+		return disk;
 	}
 	/** Persist refreshed tokens back in the SAME on-disk shape agy wrote. */
 	persistRefreshedToken(account, tokens) {
@@ -27943,9 +27988,13 @@ var QuotaService = class {
 			const detected = detectEmailFromAgyLogs(home);
 			if (detected) email = detected;
 		}
-		if (email && email !== account.email) this.pool.resetAccountIdentity(account.id, email);
 		const accessToken = await this.getValidAccessToken(account);
 		if (!accessToken) return null;
+		if (force) {
+			const info = await this.fetchUserInfo(accessToken, account.proxyUrl);
+			if (info?.email) email = info.email;
+		}
+		if (email && email !== account.email) this.pool.resetAccountIdentity(account.id, email);
 		const [summary, discovered] = await Promise.all([this.fetchQuotaSummary(accessToken, account.proxyUrl), this.fetchAvailableModels(accessToken, account.proxyUrl)]);
 		if (!email) {
 			const info = await this.fetchUserInfo(accessToken, account.proxyUrl);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dsh-agy-link",
-  "version": "0.4.18",
+  "version": "0.4.20",
   "description": "Google Antigravity (agy CLI) models for DeepSeek Harness — stream Gemini/Claude/GPT-OSS subscriptions into DSH with thinking, tool activity, token usage and in-GUI Google OAuth login.",
   "type": "module",
   "license": "MIT",