dsh-agy-link 0.4.22 → 0.4.25

package/CHANGELOG.md

@@ -1,5 +1,29 @@
 # Changelog
 
+## 0.4.25 (2026-09-04)
+
+- **Fixed: Plugin Startup Blocker on DSH >= 0.1.1-rc.x / 0.1.2-rc.1 (`missing export 'CallId'`, issue #4).**
+  - **Root cause**: Newer `@deepseek-ai/dsh-llm` versions (e.g. `0.1.2-alpha.1` ~ `0.1.2-rc.1`) renamed `CallId` to `ToolCallId`. A named import `import { CallId } from '@deepseek-ai/dsh-llm'` caused Node ESM static resolution to fail at startup with `The requested module '@deepseek-ai/dsh-llm' does not provide an export named 'CallId'`, surfacing as a plugin load failure on DSH Desktop 2.0.5 and CLI.
+  - **Fix**: Replaced named import with a namespace fallback resolution `toToolCallId = dshLlm.ToolCallId ?? dshLlm.CallId ?? identity`. This avoids missing named export evaluation errors and ensures seamless backwards and forwards compatibility across all DSH host versions.
+  - **Ecosystem & Test Hardening**: Upgraded development dependencies to `@deepseek-ai/dsh-*@0.1.2-rc.1`. Configured `--test-concurrency=1` in test runner to prevent mock environment variable collisions across concurrent subprocess tests, achieving 100% pass rate across all 151 unit tests. Verified live startup with DSH 0.1.2-rc.1 and `dsh-lark-link`.
+
+## 0.4.24 (2026-08-28)
+
+- **Fixed: Antigravity Models Missing From Picker When Logged In (已登录/显示余量但模型列表不显示 — issue #1).**
+  - **Decoupled Adapter Registration from Synchronous Binary Discovery**: `registerAdapter` now executes regardless of initial `bin()` probe results (using resilient fallback model catalog), ensuring the Antigravity provider is never dropped during startup even if CLI path resolution is deferred.
+  - **Expanded macOS / Linux GUI App Path Discovery**: extended `resolveAgyBin` search candidates to include `~/.bun/bin`, `~/.cargo/bin`, `~/.local/share/pnpm`, `~/Library/pnpm`, `~/.yarn/bin`, `~/.npm-global/bin`, NVM (`~/.nvm/versions/node/*/bin`), FNM, Volta, ASDF shims, Linuxbrew, etc., fixing GUI desktop apps starting with minimal default system PATH.
+  - **Account-Aware Model Discovery & Environment Isolation**: model discovery now inherits current active/primary account isolated environment and proxy settings, falling back across ready pool accounts if default system HOME is unauthenticated.
+  - **Defensive Model & Effort Sanitization**: defensive catalog cleaning against empty IDs, blank names, empty reasoning effort arrays, and out-of-bounds `defaultEffort` to strictly satisfy DSH host validation and prevent fail-all provider group drops (`INVALID_CATALOG` / `INVALID_MODEL_*`).
+  - **Cross-Platform & Unit Tests**: added defensive catalog normalization and explicit binary path resolution tests across test suites.
+
+## 0.4.23 (2026-08-27)
+
+- **Enhanced: Antigravity Tool Mirroring with Native Git +/- Diff Cards & Full Tool Vocabulary.**
+  - **Tool Vocabulary & Parameter Mapping**: mapped agy's official editing tool `replace_file_content` (`TargetFile`, `TargetContent`, `ReplacementContent`, `Description`, `Instruction`) and write tool `write_to_file` (`TargetFile`, `CodeContent`, `Overwrite`, `Description`) to DSH native `DiffCallView` / `DiffResultView` cards.
+  - **Git Head Base Line Diffing**: added cross-platform `getGitHeadContent` to retrieve committed file content for full-file writes (`write_to_file`), allowing DSH to render line-by-line git `+`/`-` additions and deletions rather than treating existing modified files as blank new files.
+  - **Expanded Tool Support**: mapped `view_file` (with `AbsolutePath`/`StartLine` line location navigation), `grep_search`, `find_by_name`, `ask_question`, `read_url_content`, and `generate_image` onto their respective native/generic tool cards with descriptive titles.
+  - **Cross-Platform Hardened**: path normalization with forward-slash compatibility across Windows/macOS/Linux, `windowsHide: true`, strict subprocess timeout, and safe error fallback.
+
 ## 0.4.22 (2026-08-27)
 
 - **Fixed: `registration.adapter.prepareCall is not a function` on new DSH hosts (本轮运行失败 UNKNOWN).**

package/dist/index.js

@@ -1,9 +1,10 @@
 import { createRequire } from "node:module";
 import { execFile, execFileSync, spawn } from "node:child_process";
-import { delimiter, dirname, isAbsolute, join, resolve } from "node:path";
+import path, { delimiter, dirname, isAbsolute, join, resolve } from "node:path";
 import { accessSync, chmodSync, constants, existsSync, mkdirSync, readFileSync, readdirSync, renameSync, rmSync, statSync, unlinkSync, writeFileSync } from "node:fs";
 import { homedir, tmpdir } from "node:os";
-import { CallId, LlmAdapter, LlmError } from "@deepseek-ai/dsh-llm";
+import * as dshLlm from "@deepseek-ai/dsh-llm";
+import { LlmAdapter, LlmError } from "@deepseek-ai/dsh-llm";
 import { createHash, randomBytes, randomUUID } from "node:crypto";
 import { defineTool } from "@deepseek-ai/dsh-tools";
 import { mkdir, mkdtemp, readFile, readdir, rm, stat, unlink, writeFile } from "node:fs/promises";
@@ -549,6 +550,48 @@ const MIRROR_TOOL_NAME = "agy_tool";
 /** The only tool this DSH deployment lets a model call directly. */
 const WRAPPER_TOOL_NAME = "run_code";
 /**
+* Retrieve the committed HEAD content of a file via git, for computing
+* line diffs on full-file writes. Pure & safe: catches all failures (not in git,
+* untracked, git missing, binary) and returns null in <=500ms.
+*/
+function getGitHeadContent(filePath, execFn = execFileSync) {
+	if (!filePath || typeof filePath !== "string" || filePath === "file") return null;
+	try {
+		const resolved = path.resolve(filePath);
+		const toplevel = execFn("git", ["rev-parse", "--show-toplevel"], {
+			cwd: path.dirname(resolved),
+			encoding: "utf-8",
+			stdio: [
+				"ignore",
+				"pipe",
+				"ignore"
+			],
+			timeout: 500,
+			windowsHide: true
+		});
+		const root = typeof toplevel === "string" ? toplevel.trim() : "";
+		if (!root) return null;
+		const relPath = path.relative(root, resolved).replace(/\\/g, "/");
+		if (relPath.startsWith("..")) return null;
+		const content = execFn("git", ["show", `HEAD:${relPath}`], {
+			cwd: root,
+			encoding: "utf-8",
+			stdio: [
+				"ignore",
+				"pipe",
+				"ignore"
+			],
+			timeout: 500,
+			windowsHide: true
+		});
+		const str = typeof content === "string" ? content : "";
+		if (str.includes("\0")) return null;
+		return str;
+	} catch {
+		return null;
+	}
+}
+/**
 * Build the run_code tool-call arguments that replay one recorded agy tool
 * step. The deployment's tool-dispatch policy only allows `run_code` as a
 * direct model call (everything else must be invoked from inside a
@@ -581,8 +624,9 @@ function toolInput(args) {
 }
 /**
 * agy serializes tool args with PascalCase keys (CommandLine, AbsolutePath,
-* SearchDirectory, …); pick() accepts both spellings so cards always read
-* the real field instead of falling back to raw JSON.
+* SearchDirectory, TargetFile, TargetContent, ReplacementContent, CodeContent…);
+* pick() accepts all casing spellings so cards always read the real field
+* instead of falling back to raw JSON.
 */
 function pick$1(input, ...keys) {
 	for (const k of keys) {
@@ -598,41 +642,50 @@ function presentMirrorCall(args) {
 	switch (name) {
 		case "run_command":
 		case "bash":
-		case "execute_command": return {
-			card: "terminal",
-			title: pick$1(input, "command", "cmd", "CommandLine", "Cmd") ?? JSON.stringify(input),
-			...pick$1(input, "description", "Description") !== void 0 ? { description: pick$1(input, "description", "Description") } : {},
-			...pick$1(input, "cwd", "Cwd", "WorkingDirectory") !== void 0 ? { cwd: pick$1(input, "cwd", "Cwd", "WorkingDirectory") } : {}
-		};
-		case "write_to_file":
-		case "write_file":
-		case "create_file": {
-			const path = pick$1(input, "path", "file_path", "filename", "Path", "FilePath", "FileName", "AbsolutePath") ?? "file";
-			const content = pick$1(input, "content", "Content", "FileContents", "contents") ?? "";
+		case "execute_command": {
+			const command = pick$1(input, "CommandLine", "command_line", "command", "cmd", "Cmd") ?? JSON.stringify(input);
+			const desc = pick$1(input, "Description", "description", "toolAction", "toolSummary");
+			const cwd = pick$1(input, "Cwd", "cwd", "WorkingDirectory", "working_directory");
+			return {
+				card: "terminal",
+				title: command,
+				...desc !== void 0 ? { description: desc } : {},
+				...cwd !== void 0 ? { cwd } : {}
+			};
+		}
+		case "replace_file_content":
+		case "edit_file":
+		case "replace_in_file":
+		case "edit": {
+			const path = pick$1(input, "TargetFile", "target_file", "path", "file_path", "Path", "FilePath", "AbsolutePath", "targetFile") ?? "file";
+			const oldText = pick$1(input, "TargetContent", "target_content", "old_string", "oldText", "OldString", "OldText", "targetContent") ?? null;
+			const newText = pick$1(input, "ReplacementContent", "replacement_content", "new_string", "newText", "content", "NewString", "NewText", "Content", "replacementContent") ?? "";
+			const desc = pick$1(input, "Description", "description", "Instruction", "instruction", "toolAction", "toolSummary");
 			return {
 				card: "diff",
-				title: "Write " + path,
+				title: desc ? `${desc} · ${path}` : "Edit " + path,
 				diffs: [{
 					path,
-					oldText: null,
-					newText: content
+					oldText,
+					newText
 				}],
 				locations: [{ path }]
 			};
 		}
-		case "edit_file":
-		case "replace_in_file":
-		case "edit": {
-			const path = pick$1(input, "path", "file_path", "Path", "FilePath", "AbsolutePath") ?? "file";
-			const newText = pick$1(input, "new_string", "newText", "content", "NewString", "NewText", "Content") ?? "";
-			const oldText = pick$1(input, "old_string", "oldText", "OldString", "OldText") ?? null;
+		case "write_to_file":
+		case "write_file":
+		case "create_file": {
+			const path = pick$1(input, "TargetFile", "target_file", "path", "file_path", "filename", "Path", "FilePath", "FileName", "AbsolutePath", "targetFile") ?? "file";
+			const content = pick$1(input, "CodeContent", "code_content", "content", "Content", "FileContents", "contents", "codeContent") ?? "";
+			const desc = pick$1(input, "Description", "description", "toolAction", "toolSummary");
+			const oldText = pick$1(input, "old_string", "oldText", "OldString", "OldText") ?? getGitHeadContent(path);
 			return {
 				card: "diff",
-				title: "Edit " + path,
+				title: desc ? `${desc} · ${path}` : "Write " + path,
 				diffs: [{
 					path,
 					oldText,
-					newText
+					newText: content
 				}],
 				locations: [{ path }]
 			};
@@ -641,11 +694,12 @@ function presentMirrorCall(args) {
 		case "view_file":
 		case "read":
 		case "open_file": {
-			const path = pick$1(input, "path", "file_path", "filename", "Path", "FilePath", "FileName", "AbsolutePath") ?? "";
-			const offset = typeof input.offset === "number" ? input.offset : typeof input.Offset === "number" ? input.Offset : void 0;
+			const path = pick$1(input, "AbsolutePath", "absolute_path", "TargetFile", "target_file", "path", "file_path", "filename", "Path", "FilePath", "FileName", "targetFile") ?? "";
+			const offset = typeof input.offset === "number" ? input.offset : typeof input.Offset === "number" ? input.Offset : typeof input.StartLine === "number" ? input.StartLine - 1 : typeof input.start_line === "number" ? input.start_line - 1 : void 0;
+			const desc = pick$1(input, "Description", "description", "toolAction", "toolSummary");
 			return {
 				card: "generic",
-				title: "Read " + path,
+				title: desc ? `${desc} · ${path}` : "Read " + path,
 				kind: "read",
 				...path !== "" ? { locations: [{
 					path,
@@ -655,35 +709,70 @@ function presentMirrorCall(args) {
 		}
 		case "find_by_name":
 		case "glob":
-		case "search_files":
+		case "search_files": {
+			const q = pick$1(input, "pattern", "Pattern", "query", "Query", "regex", "Regex", "QueryString") ?? "";
+			return {
+				card: "generic",
+				title: pick$1(input, "Description", "description", "toolAction", "toolSummary") ?? (q !== "" ? "Search " + q : "Search"),
+				kind: "search"
+			};
+		}
+		case "grep_search":
 		case "search":
 		case "search_file_content":
 		case "grep": {
-			const q = pick$1(input, "pattern", "query", "regex", "Pattern", "Query", "Regex", "QueryString") ?? "";
+			const q = pick$1(input, "query", "Query", "pattern", "Pattern", "regex", "Regex", "QueryString") ?? "";
 			return {
 				card: "generic",
-				title: q !== "" ? "Search " + q : "Search",
+				title: pick$1(input, "Description", "description", "toolAction", "toolSummary") ?? (q !== "" ? "Search " + q : "Search"),
 				kind: "search"
 			};
 		}
 		case "list_dir":
 		case "ls": {
-			const path = pick$1(input, "path", "directory", "Path", "Directory", "SearchDirectory", "AbsolutePath") ?? "";
+			const path = pick$1(input, "DirectoryPath", "directory_path", "path", "directory", "Path", "Directory", "SearchDirectory", "search_directory", "AbsolutePath") ?? "";
 			return {
 				card: "generic",
-				title: path !== "" ? "List " + path : "List directory"
+				title: pick$1(input, "Description", "description", "toolAction", "toolSummary") ?? (path !== "" ? "List " + path : "List directory")
 			};
 		}
 		case "delete_file":
 		case "remove_file":
-		case "rm": return {
-			card: "generic",
-			title: "Delete " + (pick$1(input, "path", "file_path", "Path", "FilePath", "AbsolutePath") ?? ""),
-			kind: "delete"
-		};
+		case "rm": {
+			const path = pick$1(input, "TargetFile", "target_file", "path", "file_path", "Path", "FilePath", "AbsolutePath") ?? "";
+			return {
+				card: "generic",
+				title: pick$1(input, "Description", "description", "toolAction", "toolSummary") ?? "Delete " + path,
+				kind: "delete"
+			};
+		}
+		case "ask_question": {
+			const questions = input.questions;
+			const firstQ = Array.isArray(questions) && questions.length > 0 && typeof questions[0].question === "string" ? questions[0].question : void 0;
+			return {
+				card: "generic",
+				title: firstQ ? `Ask Question: ${firstQ}` : "Ask Question",
+				rawInput: input
+			};
+		}
+		case "read_url_content": {
+			const url = pick$1(input, "Url", "url") ?? "";
+			return {
+				card: "generic",
+				title: pick$1(input, "Description", "description", "toolAction", "toolSummary") ?? (url ? `Fetch ${url}` : "Fetch URL"),
+				kind: "fetch"
+			};
+		}
+		case "generate_image": {
+			const prompt = pick$1(input, "Prompt", "prompt", "ImageName", "image_name") ?? "";
+			return {
+				card: "generic",
+				title: prompt ? `Generate Image: ${prompt}` : "Generate Image"
+			};
+		}
 		default: return {
 			card: "generic",
-			title: name !== "" ? name : "agy tool",
+			title: pick$1(input, "Description", "description", "toolAction", "toolSummary") ?? (name !== "" ? name : "agy tool"),
 			rawInput: input
 		};
 	}
@@ -700,6 +789,7 @@ function presentMirrorResult(args, result) {
 			card: "terminal",
 			output: text
 		};
+		case "replace_file_content":
 		case "write_to_file":
 		case "write_file":
 		case "create_file":
@@ -800,6 +890,7 @@ function defineAgyMirrorTool(deps) {
 }
 //#endregion
 //#region src/host/mapper.ts
+const toToolCallId = dshLlm.ToolCallId ?? dshLlm.CallId ?? ((id) => id);
 function usageFromRaw(raw) {
 	const usage = {
 		inputTokens: raw.input_tokens ?? 0,
@@ -969,7 +1060,7 @@ var EventMapper = class {
 					index: idx,
 					block: {
 						type: "tool-call",
-						id: CallId(mirrorCallId(this.opts.runId, absIndex)),
+						id: toToolCallId(mirrorCallId(this.opts.runId, absIndex)),
 						name: toolName,
 						arguments: argumentsJson
 					}
@@ -1079,7 +1170,7 @@ function parseModelsOutput(stdout) {
 	const out = [];
 	for (const line of text.split(/\n/)) {
 		const t = line.trim();
-		if (t === "" || t.startsWith("Fetching") || t.startsWith("Error")) continue;
+		if (t === "" || t.startsWith("Fetching") || t.startsWith("Error") || /^(please sign in|warning|tip:)/i.test(t)) continue;
 		const m = t.match(/^(\S+)(?:\t+|\s{2,})(.+)$/);
 		if (m && m[1] !== void 0 && m[2] !== void 0) out.push({
 			slug: m[1],
@@ -1097,9 +1188,14 @@ 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);
+		if (!r.slug || typeof r.slug !== "string") continue;
+		const slug = r.slug.trim();
+		if (slug === "" || seen.has(slug)) continue;
+		seen.add(slug);
+		out.push({
+			slug,
+			label: typeof r.label === "string" && r.label.trim() !== "" ? r.label.trim() : slug
+		});
 	}
 	return out;
 }
@@ -1207,10 +1303,10 @@ function stripEffortLabel(label, eff) {
 	return label.replace(re, "").trim();
 }
 function buildFallbackCatalog(defs) {
-	return defs.map((d) => ({
-		id: d.id,
-		name: d.name,
-		efforts: d.efforts ?? null
+	return defs.filter((d) => Boolean(d && typeof d.id === "string" && d.id.trim() !== "")).map((d) => ({
+		id: d.id.trim(),
+		name: typeof d.name === "string" && d.name.trim() !== "" ? d.name.trim() : d.id.trim(),
+		efforts: Array.isArray(d.efforts) && d.efforts.length > 0 ? d.efforts.filter((e) => typeof e === "string" && e.trim() !== "") : null
 	}));
 }
 var ModelCatalog = class {
@@ -1288,7 +1384,7 @@ function findEntry(catalog, id) {
 	if (resolved !== id) return catalog.models.find((m) => m.id === resolved);
 }
 function defaultEffortFor(entry, cfg) {
-	if (!entry.efforts) return void 0;
+	if (!entry.efforts || entry.efforts.length === 0) return void 0;
 	if (cfg.defaultEffort !== "" && entry.efforts.includes(cfg.defaultEffort)) return cfg.defaultEffort;
 	for (const pref of [
 		"high",
@@ -1790,15 +1886,47 @@ function resolveAgyBin(cfg) {
 	if (cfg.agyBin !== "") candidates.push(cfg.agyBin);
 	const pathEnv = process.env.PATH ?? "";
 	for (const dir of pathEnv.split(delimiter)) if (dir !== "") candidates.push(...binCandidates(dir));
+	const home = homedir();
 	if (IS_WIN) {
 		const local = process.env.LOCALAPPDATA ?? "";
-		if (local !== "") candidates.push(join(local, "Programs", "agy", "agy.exe"));
-		candidates.push(join(homedir(), ".local", "bin", "agy.exe"));
-		candidates.push(join(homedir(), "AppData", "Roaming", "npm", "agy.cmd"));
+		const appData = process.env.APPDATA ?? "";
+		if (local !== "") {
+			candidates.push(join(local, "Programs", "agy", "agy.exe"));
+			candidates.push(join(local, "pnpm", "agy.cmd"));
+			candidates.push(join(local, "pnpm", "agy.exe"));
+		}
+		if (appData !== "") {
+			candidates.push(join(appData, "npm", "agy.cmd"));
+			candidates.push(join(appData, "Roaming", "npm", "agy.cmd"));
+		}
+		candidates.push(join(home, ".local", "bin", "agy.exe"));
+		candidates.push(join(home, ".local", "bin", "agy.cmd"));
+		candidates.push(join(home, ".bun", "bin", "agy.exe"));
+		candidates.push(join(home, ".cargo", "bin", "agy.exe"));
+		candidates.push(join(home, "scoop", "shims", "agy.exe"));
 	} else {
-		candidates.push(join(homedir(), ".local", "bin", "agy"));
+		candidates.push(join(home, ".local", "bin", "agy"));
 		candidates.push("/usr/local/bin/agy");
 		candidates.push("/opt/homebrew/bin/agy");
+		candidates.push("/opt/homebrew/sbin/agy");
+		candidates.push("/home/linuxbrew/.linuxbrew/bin/agy");
+		candidates.push(join(home, ".bun", "bin", "agy"));
+		candidates.push(join(home, ".cargo", "bin", "agy"));
+		candidates.push(join(home, ".local", "share", "pnpm", "agy"));
+		candidates.push(join(home, "Library", "pnpm", "agy"));
+		candidates.push(join(home, ".yarn", "bin", "agy"));
+		candidates.push(join(home, ".npm-global", "bin", "agy"));
+		candidates.push(join(home, ".volta", "bin", "agy"));
+		candidates.push(join(home, ".asdf", "shims", "agy"));
+		candidates.push(join(home, ".nix-profile", "bin", "agy"));
+		candidates.push("/run/current-system/sw/bin/agy");
+		try {
+			const nvmNodeDir = join(home, ".nvm", "versions", "node");
+			if (existsSync(nvmNodeDir)) for (const v of readdirSync(nvmNodeDir)) candidates.push(join(nvmNodeDir, v, "bin", "agy"));
+		} catch {}
+		candidates.push(join(home, ".local", "share", "fnm", "current", "bin", "agy"));
+		candidates.push(join(home, ".fnm", "current", "bin", "agy"));
+		candidates.push(join(home, "Library", "Application Support", "fnm", "current", "bin", "agy"));
 	}
 	const hits = [];
 	for (const c of candidates) try {
@@ -2087,15 +2215,19 @@ var AgyAdapter = class extends LlmAdapter {
 		const models = [];
 		const dropped = [];
 		for (const m of cat.models) {
-			if (seen.has(m.id)) {
-				dropped.push(m.id);
+			if (!m || typeof m.id !== "string") continue;
+			const id = m.id.trim();
+			if (id === "") continue;
+			if (seen.has(id)) {
+				dropped.push(id);
 				continue;
 			}
-			seen.add(m.id);
+			seen.add(id);
+			const name = typeof m.name === "string" && m.name.trim() !== "" ? m.name.trim() : id;
 			models.push({
 				provider: PROVIDER_ID,
-				id: m.id,
-				name: m.name,
+				id,
+				name,
 				inputModalities: ["text", "image"]
 			});
 		}
@@ -2104,26 +2236,37 @@ var AgyAdapter = class extends LlmAdapter {
 	}
 	async resolveModel(_provider, model, _signal) {
 		const cfg = this.deps.getConfig();
-		const entry = findEntry(this.deps.catalog.get(), model);
-		const name = entry ? entry.name : model;
-		const contextWindow = cfg.contextWindowDefault;
+		const cat = this.deps.catalog.get();
+		const rawModel = typeof model === "string" ? model.trim() : "";
+		const cleanId = rawModel !== "" ? rawModel : cfg.defaultModel;
+		const entry = findEntry(cat, cleanId);
+		const rawName = entry ? entry.name : cleanId;
+		const name = typeof rawName === "string" && rawName.trim() !== "" ? rawName.trim() : cleanId;
+		const contextWindow = typeof cfg.contextWindowDefault === "number" && cfg.contextWindowDefault > 0 ? cfg.contextWindowDefault : 2e5;
 		const resolved = {
 			provider: PROVIDER_ID,
-			id: model,
+			id: cleanId,
 			name,
 			inputModalities: ["text", "image"],
 			context: { contextWindow },
-			defaultMaxTokens: cfg.maxTokensDefault
+			defaultMaxTokens: typeof cfg.maxTokensDefault === "number" && cfg.maxTokensDefault > 0 ? cfg.maxTokensDefault : 8192
 		};
-		if (entry && entry.efforts) {
-			const def = defaultEffortFor(entry, cfg);
-			resolved.reasoning = {
-				efforts: entry.efforts.map((e) => ({
-					id: e,
-					name: e
-				})),
-				...def ? { defaultEffort: def } : {}
-			};
+		if (entry && Array.isArray(entry.efforts) && entry.efforts.length > 0) {
+			const cleanEfforts = Array.from(new Set(entry.efforts.filter((e) => typeof e === "string" && e.trim() !== "")));
+			if (cleanEfforts.length > 0) {
+				const def = defaultEffortFor({
+					...entry,
+					efforts: cleanEfforts
+				}, cfg);
+				const validDef = def && cleanEfforts.includes(def) ? def : cleanEfforts[0];
+				resolved.reasoning = {
+					efforts: cleanEfforts.map((e) => ({
+						id: e,
+						name: e
+					})),
+					...validDef ? { defaultEffort: validDef } : {}
+				};
+			}
 		}
 		return resolved;
 	}
@@ -28346,7 +28489,7 @@ function apply(ctx, entryConfig = {}) {
 	let lastParser = new StreamJsonParser();
 	const getConfig = () => resolveConfig(entryConfig);
 	const bin = () => {
-		if (binCache === void 0) binCache = resolveAgyBin(getConfig());
+		if (binCache === void 0 || binCache === null) binCache = resolveAgyBin(getConfig());
 		return binCache;
 	};
 	const version = () => versionCache;
@@ -28354,10 +28497,41 @@ function apply(ctx, entryConfig = {}) {
 	const pool = new AccountPoolManager();
 	const quota = new QuotaService(pool);
 	const semaphore = new Semaphore(() => getConfig().maxConcurrent);
+	const getDiscoveryEnv = (account) => {
+		const cfg = getConfig();
+		return {
+			...process.env,
+			...cfg.disableTelemetry ? {
+				DO_NOT_TRACK: "1",
+				DISABLE_TELEMETRY: "1",
+				GOOGLE_CLOUD_DISABLE_TELEMETRY: "1",
+				ANTIGRAVITY_DISABLE_TELEMETRY: "1"
+			} : {},
+			...account && account.dir ? isolatedHomeEnv(account.dir) : {},
+			...account?.proxyUrl ? {
+				ALL_PROXY: account.proxyUrl,
+				HTTPS_PROXY: account.proxyUrl,
+				HTTP_PROXY: account.proxyUrl,
+				all_proxy: account.proxyUrl,
+				https_proxy: account.proxyUrl,
+				http_proxy: account.proxyUrl
+			} : {}
+		};
+	};
 	const catalog = new ModelCatalog(async (signal) => {
 		const b = bin();
 		if (!b) throw new Error("agy binary not found");
-		const out = await probeProcess(b, ["models"], 3e4, signal);
+		const poolData = pool.getPoolData();
+		const primaryAcc = poolData.primaryAccountId ? pool.getAccount(poolData.primaryAccountId) : void 0;
+		const candidateAccount = primaryAcc && primaryAcc.enabled && !primaryAcc.authRequired ? primaryAcc : pool.getAccounts().find((a) => a.enabled && !a.authRequired);
+		let out = await probeProcess(b, ["models"], 3e4, signal, getDiscoveryEnv(candidateAccount));
+		if ((out.code !== 0 || out.stdout.includes("Please sign in") || /sign in|auth|not logged in/i.test(out.stderrTail)) && (!candidateAccount || !candidateAccount.dir)) {
+			const secondary = pool.getAccounts().find((a) => a.enabled && !a.authRequired && a.dir);
+			if (secondary) {
+				const secondaryOut = await probeProcess(b, ["models"], 3e4, signal, getDiscoveryEnv(secondary));
+				if (secondaryOut.code === 0 && secondaryOut.stdout.trim() !== "") out = secondaryOut;
+			}
+		}
 		if (out.code !== 0 && out.stdout.trim() === "") throw new Error("agy models failed: " + (out.stderrTail.trim() !== "" ? out.stderrTail.trim().slice(-200) : "exit " + String(out.code)));
 		return {
 			stdout: out.stdout,
@@ -28411,6 +28585,7 @@ function apply(ctx, entryConfig = {}) {
 		const file = overridesPath();
 		const current = readOverrides(file);
 		current[key] = value;
+		binCache = void 0;
 		try {
 			mkdirSync(stateDir(), { recursive: true });
 			writeFileSync(file, JSON.stringify(current, null, 2), "utf8");
@@ -28424,25 +28599,27 @@ function apply(ctx, entryConfig = {}) {
 			log("dormant: disabled by config");
 			return;
 		}
-		if (!bin()) {
+		const currentBin = bin();
+		if (!currentBin) {
 			dormantReason = "agy binary not found — install via https://antigravity.google/docs/cli/install";
 			log("dormant: agy binary not found");
 			return;
 		}
 		try {
-			versionCache = parseVersion((await probeProcess(bin(), ["--version"], 1e4)).stdout);
+			versionCache = parseVersion((await probeProcess(currentBin, ["--version"], 1e4)).stdout);
 			if (versionCache && compareVersions(versionCache, "1.1.8") < 0) {
 				dormantReason = "agy " + versionCache + " is older than 1.1.8 — run: agy update";
 				log("dormant: " + dormantReason);
 				return;
 			}
+			dormantReason = null;
 			log("agy detected: " + (versionCache ?? "unknown version"));
 		} catch {
 			log("version probe failed — continuing with fallback catalog");
 		}
 		await catalog.refreshIfNeeded().catch(() => void 0);
 	})();
-	if (getConfig().enabled && bin()) try {
+	if (getConfig().enabled) try {
 		ctx.llm.registerAdapter([PROVIDER_ID], adapter);
 		log("registered provider route: antigravity");
 	} catch (e) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dsh-agy-link",
-  "version": "0.4.22",
+  "version": "0.4.25",
   "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",
@@ -52,9 +52,9 @@
   },
   "devDependencies": {
     "@deepseek-ai/cordis": "^4.0.1",
-    "@deepseek-ai/dsh-commands": "^0.1.0-rc.6",
-    "@deepseek-ai/dsh-llm": "^0.1.0-rc.6",
-    "@deepseek-ai/dsh-tools": "^0.1.0-rc.6",
+    "@deepseek-ai/dsh-commands": "0.1.2-rc.1",
+    "@deepseek-ai/dsh-llm": "0.1.2-rc.1",
+    "@deepseek-ai/dsh-tools": "0.1.2-rc.1",
     "@types/node": "^24.3.0",
     "@types/qrcode": "^1.5.5",
     "tsdown": "^0.22.14",
@@ -83,7 +83,7 @@
   "scripts": {
     "build": "tsdown",
     "check": "tsc --noEmit",
-    "test": "node --experimental-transform-types --test \"test/**/*.test.ts\"",
+    "test": "node --experimental-transform-types --test --test-concurrency=1 \"test/**/*.test.ts\"",
     "prepack": "npm run build"
   },
   "engines": {