dsh-agy-link 0.2.4 → 0.2.6

package/dist/index.js

@@ -10,10 +10,18 @@ import { randomBytes } from "node:crypto";
 import { fileURLToPath } from "node:url";
 //#region src/common/types.ts
 const PROVIDER_ID = "antigravity";
-const PLUGIN_ID = "agy-link";
 const DEFAULT_FALLBACK_MODELS = [
 	{
-		id: "gemini-3-6-flash",
+		id: "gemini-3.7-flash",
+		name: "Gemini 3.7 Flash",
+		efforts: [
+			"low",
+			"medium",
+			"high"
+		]
+	},
+	{
+		id: "gemini-3.6-flash",
 		name: "Gemini 3.6 Flash",
 		efforts: [
 			"low",
@@ -22,13 +30,80 @@ const DEFAULT_FALLBACK_MODELS = [
 		]
 	},
 	{
-		id: "gemini-3-1-pro",
+		id: "gemini-3.5-flash",
+		name: "Gemini 3.5 Flash",
+		efforts: [
+			"low",
+			"medium",
+			"high"
+		]
+	},
+	{
+		id: "gemini-3.1-pro",
 		name: "Gemini 3.1 Pro",
 		efforts: ["low", "high"]
 	},
+	{
+		id: "gemini-3.1-flash-lite",
+		name: "Gemini 3.1 Flash Lite"
+	},
+	{
+		id: "gemini-2.5-pro",
+		name: "Gemini 2.5 Pro",
+		efforts: ["low", "high"]
+	},
+	{
+		id: "gemini-2.5-flash",
+		name: "Gemini 2.5 Flash",
+		efforts: [
+			"low",
+			"medium",
+			"high"
+		]
+	},
+	{
+		id: "gemini-2.5-flash-lite",
+		name: "Gemini 2.5 Flash Lite"
+	},
+	{
+		id: "claude-opus-4-8",
+		name: "Claude Opus 4.8 (Thinking)"
+	},
+	{
+		id: "claude-opus-4-6",
+		name: "Claude Opus 4.6 (Thinking)"
+	},
+	{
+		id: "claude-opus-4-5",
+		name: "Claude Opus 4.5 (Thinking)"
+	},
+	{
+		id: "claude-opus-4",
+		name: "Claude Opus 4 (Thinking)"
+	},
 	{
 		id: "claude-sonnet-4-6",
 		name: "Claude Sonnet 4.6 (Thinking)"
+	},
+	{
+		id: "claude-sonnet-4-5",
+		name: "Claude Sonnet 4.5 (Thinking)"
+	},
+	{
+		id: "claude-sonnet-4",
+		name: "Claude Sonnet 4 (Thinking)"
+	},
+	{
+		id: "claude-haiku-4-5",
+		name: "Claude Haiku 4.5"
+	},
+	{
+		id: "gpt-oss-120b",
+		name: "GPT-OSS 120B"
+	},
+	{
+		id: "gpt-oss-20b",
+		name: "GPT-OSS 20B"
 	}
 ];
 function defaultConfig() {
@@ -250,13 +325,14 @@ function defaultOutput(output) {
 	return "-> " + (s.length > 2048 ? s.slice(0, 2048) + "... (+" + (s.length - 2048) + " chars)" : s) + "\n";
 }
 function usageFromRaw(raw) {
-	return {
+	const usage = {
 		inputTokens: raw.input_tokens ?? 0,
-		outputTokens: raw.output_tokens ?? 0,
-		cacheReadTokens: raw.cache_read_tokens ?? void 0,
-		cacheWriteTokens: raw.cache_write_tokens ?? void 0,
-		reasoningTokens: raw.thinking_tokens ?? void 0
+		outputTokens: raw.output_tokens ?? 0
 	};
+	if (raw.cache_read_tokens !== void 0) usage.cacheReadTokens = raw.cache_read_tokens;
+	if (raw.cache_write_tokens !== void 0) usage.cacheWriteTokens = raw.cache_write_tokens;
+	if (raw.thinking_tokens !== void 0) usage.reasoningTokens = raw.thinking_tokens;
+	return usage;
 }
 /** Suffix-delta: emit only what grew; fall back to a newline + full text. */
 function suffixDelta(prev, next) {
@@ -386,7 +462,7 @@ var EventMapper = class {
 		yield {
 			type: "finish",
 			reason: { kind: "stop" },
-			replayState: ev.conversationId !== "" ? { response: { conversationId: ev.conversationId } } : void 0
+			...ev.conversationId !== "" ? { replayState: { response: { conversationId: ev.conversationId } } } : {}
 		};
 		this.finished = true;
 	}
@@ -624,7 +700,12 @@ function findEntry(catalog, id) {
 function defaultEffortFor(entry, cfg) {
 	if (!entry.efforts) return void 0;
 	if (cfg.defaultEffort !== "" && entry.efforts.includes(cfg.defaultEffort)) return cfg.defaultEffort;
-	return entry.efforts.includes("medium") ? "medium" : entry.efforts[entry.efforts.length - 1];
+	for (const pref of [
+		"high",
+		"medium",
+		"low"
+	]) if (entry.efforts.includes(pref)) return pref;
+	return entry.efforts[entry.efforts.length - 1];
 }
 //#endregion
 //#region src/host/parser.ts
@@ -757,14 +838,20 @@ function parseUsage(v) {
 	if (!v || typeof v !== "object") return {};
 	const o = v;
 	const num = (x) => typeof x === "number" && Number.isFinite(x) ? x : void 0;
-	return {
-		input_tokens: num(o.input_tokens),
-		output_tokens: num(o.output_tokens),
-		thinking_tokens: num(o.thinking_tokens),
-		cache_read_tokens: num(o.cache_read_tokens),
-		cache_write_tokens: num(o.cache_write_tokens),
-		total_tokens: num(o.total_tokens)
-	};
+	const out = {};
+	const inT = num(o.input_tokens);
+	const outT = num(o.output_tokens);
+	if (inT !== void 0) out.input_tokens = inT;
+	if (outT !== void 0) out.output_tokens = outT;
+	const t = num(o.thinking_tokens);
+	if (t !== void 0) out.thinking_tokens = t;
+	const cr = num(o.cache_read_tokens);
+	if (cr !== void 0) out.cache_read_tokens = cr;
+	const cw = num(o.cache_write_tokens);
+	if (cw !== void 0) out.cache_write_tokens = cw;
+	const tot = num(o.total_tokens);
+	if (tot !== void 0) out.total_tokens = tot;
+	return out;
 }
 /** Parse one decoded JSON object into a typed event; undefined = ignore. */
 function classifyEvent(obj, seq) {
@@ -785,8 +872,8 @@ function classifyEvent(obj, seq) {
 		]);
 		return {
 			kind: "init",
-			conversationId: typeof cid === "string" && cid !== "" ? cid : void 0,
-			model: typeof model === "string" ? model : void 0,
+			...typeof cid === "string" && cid !== "" ? { conversationId: cid } : {},
+			...typeof model === "string" ? { model } : {},
 			raw: o
 		};
 	}
@@ -806,12 +893,13 @@ function classifyEvent(obj, seq) {
 			"stepType",
 			"type"
 		]));
+		const toolInfo = stepKind === "tool" ? extractTool(o) : void 0;
 		return {
 			kind: "step",
 			stepKey,
 			stepKind,
 			text: extractText(o),
-			tool: stepKind === "tool" ? extractTool(o) : void 0,
+			...toolInfo !== void 0 ? { tool: toolInfo } : {},
 			raw: o
 		};
 	}
@@ -836,7 +924,7 @@ function classifyEvent(obj, seq) {
 			conversationId: typeof cid === "string" ? cid : "",
 			ok,
 			response: typeof response === "string" ? response : "",
-			error: typeof error === "string" ? error : void 0,
+			...typeof error === "string" ? { error } : {},
 			usage: parseUsage(inner.usage),
 			raw: o
 		};
@@ -1787,10 +1875,12 @@ function defineAgyAskTool(deps) {
 				throw new Error("agy_ask: schema is not valid JSON: " + String(e));
 			}
 			const readPaths = typeof args.readPaths === "string" && args.readPaths.trim() !== "" ? args.readPaths.split(/[ ,]+/).filter(Boolean) : [];
+			const entry = findEntry(deps.catalog(), model);
+			const effort = args.effort ?? (entry?.efforts ? defaultEffortFor(entry, cfg) : void 0);
 			const res = await runAgyOnce(deps, {
 				prompt: args.prompt,
 				model: model === "" ? void 0 : model,
-				effort: args.effort,
+				effort,
 				mode: args.mode,
 				timeoutMs: args.timeoutMinutes ? args.timeoutMinutes * 6e4 : void 0,
 				signal: exec.signal,
@@ -2486,11 +2576,7 @@ function apply(ctx, entryConfig = {}) {
 	const catalog = new ModelCatalog(async (signal) => {
 		const b = bin();
 		if (!b) throw new Error("agy binary not found");
-		const out = await probeProcess(b, [
-			"models",
-			"--output-format",
-			"json"
-		], 3e4, signal);
+		const out = await probeProcess(b, ["models"], 3e4, signal);
 		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,
@@ -2566,15 +2652,6 @@ function apply(ctx, entryConfig = {}) {
 	} catch (e) {
 		log("adapter registration failed: " + String(e));
 	}
-	try {
-		ctx.llm.registerConfigurableProviders([{
-			provider: PROVIDER_ID,
-			displayName: "Antigravity (agy CLI)",
-			settingsNs: PLUGIN_ID,
-			settingsPath: [],
-			declared: false
-		}]);
-	} catch {}
 	ctx.commands.register(agyCommandDefinition({
 		cfg: getConfig,
 		bin,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dsh-agy-link",
-  "version": "0.2.4",
+  "version": "0.2.6",
   "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",