@estebanforge/pi-ask-antigravity 1.2.1 → 1.2.4

package/extensions/index.ts

@@ -34,11 +34,15 @@ import * as os from "node:os";
 import * as path from "node:path";
 import {
 	type AgentToolResult,
+	buildSessionContext,
+	getAgentDir,
 	getSettingsListTheme,
+	keyHint,
 	type ExtensionAPI,
 } from "@earendil-works/pi-coding-agent";
 
 import { Container, SettingsList, Text, type SettingItem } from "@earendil-works/pi-tui";
+import { contentText } from "@earendil-works/pi-ai";
 import { Type } from "typebox";
 
 // --- Constants -------------------------------------------------------------
@@ -52,6 +56,10 @@ const DISCOVERY_POLL_ATTEMPTS = 5;
 const DISCOVERY_POLL_MS = 100;
 const GLOBAL_CONFIG_PATH = path.join(os.homedir(), ".pi", "agent", "ask-antigravity.json");
 
+// renderCall / renderResult preview limits (match pi-claude-bridge).
+const PREVIEW_MAX_CHARS = 1000;
+const PREVIEW_MAX_LINES = 6;
+
 const DEFAULT_MODEL = "flash";
 const DEFAULT_THINKING = "medium";
 // Default on: without --dangerously-skip-permissions, any run_command hangs in
@@ -83,13 +91,13 @@ type Mode = "plan" | "accept-edits";
 // whose full string equals the overlay target, the live entry wins. When it
 // does not (older agy, missing model, plan gate), the overlay entry resolves
 // the alias so the user can still type "sonnet" and get a working answer.
-//   "sonnet"   -> Claude Sonnet 4.6 (Thinking)
-//   "opus"     -> Claude Opus 4.6 (Thinking)
-//   "gpt-oss"  -> GPT-OSS 120B (Medium)
+//   "sonnet"   -> claude-sonnet-4-6
+//   "opus"     -> claude-opus-4-6-thinking
+//   "gpt-oss"  -> gpt-oss-120b-medium
 const STATIC_ALIAS_OVERLAY: ReadonlyArray<ModelEntry> = [
-	{ full: "Claude Sonnet 4.6 (Thinking)", family: "other", version: null, tier: null },
-	{ full: "Claude Opus 4.6 (Thinking)", family: "other", version: null, tier: null },
-	{ full: "GPT-OSS 120B (Medium)", family: "other", version: null, tier: null },
+	{ full: "claude-sonnet-4-6", family: "other", version: null, tier: null },
+	{ full: "claude-opus-4-6-thinking", family: "other", version: null, tier: null },
+	{ full: "gpt-oss-120b-medium", family: "other", version: null, tier: null },
 ];
 
 // Short alias → overlay full string. Used by resolveModel to recognize
@@ -97,15 +105,15 @@ const STATIC_ALIAS_OVERLAY: ReadonlyArray<ModelEntry> = [
 // not match. The overlay entries are also merged into the live catalog for
 // exact-string passthrough, so this map only needs to cover the short names.
 const STATIC_SHORT_ALIAS: ReadonlyMap<string, string> = new Map([
-	["sonnet", "Claude Sonnet 4.6 (Thinking)"],
-	["opus", "Claude Opus 4.6 (Thinking)"],
-	["gpt-oss", "GPT-OSS 120B (Medium)"],
+	["sonnet", "claude-sonnet-4-6"],
+	["opus", "claude-opus-4-6-thinking"],
+	["gpt-oss", "gpt-oss-120b-medium"],
 ]);
 
 /** Merge the live catalog with the static alias overlay. Live entries win on
  *  case-insensitive full-string equality so an updated `agy models` listing
  *  always takes precedence over the hardcoded fallback. */
-function mergeCatalog(live: ModelEntry[]): ModelEntry[] {
+export function mergeCatalog(live: ModelEntry[]): ModelEntry[] {
 	const seen = new Set(live.map((e) => e.full.toLowerCase()));
 	const merged = [...live];
 	for (const entry of STATIC_ALIAS_OVERLAY) {
@@ -139,13 +147,22 @@ COMPACT OUTPUT (param: digest): when true, the prompt is prefixed to request com
 type ThinkingTier = "low" | "medium" | "high";
 type Family = "flash" | "pro" | "other";
 
-interface ModelEntry {
-	full: string; // exact agy string, e.g. "Gemini 3.5 Flash (Medium)"
+export interface ModelEntry {
+	full: string; // exact agy slug, e.g. "gemini-3.6-flash-medium"
 	family: Family;
-	version: string | null; // "3.5"
+	version: string | null; // "3.6"
 	tier: ThinkingTier | null;
 }
 
+/** Argv-facing model resolution: the exact --model slug plus an optional
+ *  --effort tier. Gemini bases split the tier out (the base slug alone is
+ *  invalid without --effort); fixed-thinking families keep agy's exact slug
+ *  and carry no effort. */
+export interface ResolvedModel {
+	model: string;
+	effort?: ThinkingTier;
+}
+
 interface Config {
 	defaultModel: string;
 	defaultThinking: ThinkingTier;
@@ -243,8 +260,11 @@ function saveConfig(patch: Partial<Config>): SaveResult {
 // --- Model parsing + alias resolution --------------------------------------
 
 /** Parse one `agy models` line into a structured entry. */
-function parseModelLine(line: string): ModelEntry | null {
-	const full = line.trim();
+export function parseModelLine(line: string): ModelEntry | null {
+	// agy prints TWO columns: "<slug>  <display label>". --model takes only the
+	// slug (col 1), so split it off; the label is display-only. A bare-slug line
+	// (no whitespace) splits to itself.
+	const full = line.trim().split(/\s+/)[0] ?? "";
 	if (!full) return null;
 
 	const lower = full.toLowerCase();
@@ -257,7 +277,7 @@ function parseModelLine(line: string): ModelEntry | null {
 	const versionMatch = lower.match(/(\d+\.\d+)/);
 	const version = versionMatch ? versionMatch[1] : null;
 
-	const tierMatch = lower.match(/\((low|medium|high)\)/);
+	const tierMatch = lower.match(/-(low|medium|high)$/);
 	const tier = tierMatch ? (tierMatch[1] as ThinkingTier) : null;
 
 	return { full, family, version, tier };
@@ -276,21 +296,34 @@ function nearestTier(available: ThinkingTier[], preferred: ThinkingTier): Thinki
 	return sorted[0] ?? preferred;
 }
 
+/** Build the argv-facing resolution from a picked catalog entry. Gemini bases
+ *  (slugs starting "gemini-") accept a separate --effort, so split the tier
+ *  suffix out of the slug: the base alone (gemini-3.6-flash) is what --model
+ *  wants, and the tier goes to --effort. Fixed-thinking families keep agy's
+ *  exact slug even when it carries a -medium suffix (gpt-oss-120b-medium):
+ *  agy rejects --effort for them, so the suffix stays part of the slug. */
+function toResolved(full: string, tier: ThinkingTier | null): ResolvedModel {
+	if (tier && full.toLowerCase().startsWith("gemini-")) {
+		return { model: full.replace(/-(low|medium|high)$/, ""), effort: tier };
+	}
+	return { model: full };
+}
+
 /**
- * Resolve a friendly alias / partial name to an exact agy model string.
- * Returns null if resolution is not possible (caller passes input through
- * to agy, which may resolve or fail on its own).
+ * Resolve a friendly alias / partial name to an argv-facing {model, effort?}.
+ * Returns null only when the family is unrecognized; the caller then passes
+ * the raw input straight to agy.
  */
-function resolveModel(
+export function resolveModel(
 	input: string,
 	entries: ModelEntry[],
 	defaultThinking: ThinkingTier,
-): string | null {
+): ResolvedModel | null {
 	const lower = input.toLowerCase().trim();
 
 	// 1. Exact full-string match (case-insensitive).
 	const exact = entries.find((e) => e.full.toLowerCase() === lower);
-	if (exact) return exact.full;
+	if (exact) return toResolved(exact.full, exact.tier);
 
 	// 1b. Static short alias ("sonnet" / "opus" / "gpt-oss"). Checked
 	//     before the family parser because none of these names contain
@@ -303,9 +336,8 @@ function resolveModel(
 	//     the model under different casing than the overlay.
 	if (STATIC_SHORT_ALIAS.has(lower)) {
 		const target = STATIC_SHORT_ALIAS.get(lower) as string;
-		const targetLower = target.toLowerCase();
-		const fromCatalog = entries.find((e) => e.full.toLowerCase() === targetLower);
-		return fromCatalog ? fromCatalog.full : target;
+		const fromCatalog = entries.find((e) => e.full.toLowerCase() === target.toLowerCase());
+		return toResolved(fromCatalog?.full ?? target, fromCatalog?.tier ?? null);
 	}
 
 	// 2. Parse the alias.
@@ -365,13 +397,14 @@ function resolveModel(
 	const familyTiers = new Set(
 		candidates.map((e) => e.tier).filter((t): t is ThinkingTier => t !== null),
 	);
-	if (familyTiers.size === 0) return candidates[0].full; // no tiers on any entry
+	if (familyTiers.size === 0) return toResolved(candidates[0].full, null); // no tiers on any entry
 
 	const preferred =
 		tier ??
 		(familyTiers.has(defaultThinking) ? defaultThinking : FAMILY_DEFAULT_TIER[family]);
 	const chosenTier = nearestTier([...familyTiers], preferred);
-	return (candidates.find((e) => e.tier === chosenTier) ?? candidates[0]).full;
+	const picked = candidates.find((e) => e.tier === chosenTier) ?? candidates[0];
+	return toResolved(picked.full, picked.tier);
 }
 
 // --- agy process helpers ---------------------------------------------------
@@ -620,14 +653,82 @@ function newConversationId(
 	return null;
 }
 
+// --- Full-context export (opt-in includeContext) --------------------------
+// NOTE: duplicated per pi-ask-* package (each is self-contained). Duck-typed
+// over role/content to tolerate AgentMessage's union + custom message types.
+
+// Tool-call inputs and tool-result bodies are clamped so the exported
+// transcript stays reviewable; the agent can re-read any source file by path.
+// User/assistant prose is kept in full (that IS the conversation).
+const CONTEXT_BLOCK_MAX_CHARS = 2000;
+
+function clampBlock(text: unknown, limit = CONTEXT_BLOCK_MAX_CHARS): string {
+	const t = String(text ?? "");
+	return t.length > limit ? `${t.slice(0, limit)}\n…[truncated, ${t.length - limit} more chars]` : t;
+}
+
+/** Render resolved pi AgentMessages to a readable markdown transcript.
+ *  Pure: no IO. Caller writes the returned string to a temp file. */
+export function renderAgentMessagesMarkdown(messages: readonly unknown[]): string {
+	const lines: string[] = [
+		"# Pi conversation context",
+		"",
+		`_Exported for full-context delegation. ${messages.length} message(s)._`,
+		"",
+	];
+	for (const raw of messages) {
+		const m = raw as { role?: string; content?: unknown };
+		const role = m.role ?? "message";
+		const content = m.content;
+		if (role === "assistant") {
+			const blocks = (Array.isArray(content) ? content : []) as ReadonlyArray<{
+				type: string;
+				text?: string;
+				name?: string;
+				input?: unknown;
+			}>;
+			const text = blocks
+				.filter((b) => b.type === "text")
+				.map((b) => b.text ?? "")
+				.join("\n");
+			if (text.trim()) lines.push("## Assistant", "", text, "");
+			for (const b of blocks) {
+				if (b.type === "toolCall" || b.type === "tool_use") {
+					const input = clampBlock(
+						typeof b.input === "string" ? b.input : JSON.stringify(b.input ?? ""),
+						500,
+					);
+					lines.push(`> tool call: ${b.name ?? "(unknown)"}(${input})`, "");
+				}
+			}
+		} else if (role === "toolResult" || role === "tool_result" || role === "tool") {
+			const text = contentText(content as any);
+			if (text.trim()) lines.push("## Tool result", "", clampBlock(text), "");
+		} else {
+			const text = contentText(content as any);
+			if (text.trim()) lines.push(`## ${role}`, "", clampBlock(text), "");
+		}
+	}
+	return lines.join("\n");
+}
+
+/** Centralized scratch dir for full-context exports, following the
+ *  ~/.pi/extensions-data/<author>/<extension>/ convention (see pi-token-cost-ledger).
+ *  Derived from getAgentDir() so rebranded distros resolve correctly. */
+function askContextDir(): string {
+	return path.join(path.dirname(getAgentDir()), "extensions-data", "estebanforge", "pi-ask-antigravity");
+}
+
 // --- Extension -------------------------------------------------------------
 
 interface AgyDetails {
 	model: string | null;
 	resolvedModel: string | null;
+	thinking: ThinkingTier | null;
 	mode: Mode;
 	digest: boolean;
 	conversationId: string | null;
+	includeContext: boolean;
 	exitCode: number;
 	aborted: boolean;
 	timedOut: boolean;
@@ -671,7 +772,7 @@ export default async function (pi: ExtensionAPI) {
 						`  defaultModel:    ${config.defaultModel}`,
 						`  defaultThinking: ${config.defaultThinking}`,
 						`  permissions:     ${config.skipPermissions ? "auto-approved" : "prompt"}`,
-						`  resolved:        ${resolveModel(config.defaultModel, discovered, config.defaultThinking) ?? "(agy default)"}`,
+						`  resolved:        ${resolveModel(config.defaultModel, discovered, config.defaultThinking)?.model ?? "(agy default)"}`,
 						``,
 						`Edit: ~/.pi/agent/ask-antigravity.json`,
 					].join("\n"),
@@ -682,7 +783,7 @@ export default async function (pi: ExtensionAPI) {
 
 			// Resolve the display string for the current default model.
 			const currentResolved =
-				resolveModel(config.defaultModel, discovered, config.defaultThinking) ?? config.defaultModel;
+				resolveModel(config.defaultModel, discovered, config.defaultThinking)?.model ?? config.defaultModel;
 
 			const items: SettingItem[] = [
 				{
@@ -692,7 +793,7 @@ export default async function (pi: ExtensionAPI) {
 						"Friendly alias resolved to the latest matching agy model. 'flash' = latest Flash, 'pro' = latest Pro, 'gemini' = latest Flash.",
 					currentValue: `${config.defaultModel} → ${currentResolved}`,
 					values: MODEL_OPTIONS.map((m) => {
-						const r = resolveModel(m, discovered, config.defaultThinking) ?? m;
+						const r = resolveModel(m, discovered, config.defaultThinking)?.model ?? m;
 						return `${m} → ${r}`;
 					}),
 				},
@@ -830,7 +931,80 @@ export default async function (pi: ExtensionAPI) {
 					description: `Hard cap on the agy run in minutes. Default ${DEFAULT_TIMEOUT_MIN}.`,
 				}),
 			),
+			includeContext: Type.Optional(
+				Type.Boolean({
+					description:
+						"When true, export the current pi conversation (resolved, as markdown) to a temp file inside the workspace and tell agy to read it first. Default false (isolated one-shot). Opt in only when the user explicitly wants agy to see the full conversation; it costs agy tokens to read.",
+				}),
+			),
 		}),
+		renderCall(args, theme, _context) {
+			// Show RESOLVED model/thinking/mode (config defaults applied) so the
+			// row identifies what will actually run, not just explicit args.
+			// agy folds the thinking tier into the model alias or --effort; we
+			// surface the resolved tier separately for identification.
+			const cfg = loadConfig();
+			const requestedModel = (args.model as string | undefined)?.trim() || cfg.defaultModel;
+			const resolved =
+				resolveModel(requestedModel, discovered, cfg.defaultThinking) ?? { model: requestedModel };
+			const thinking: ThinkingTier = resolved.effort ?? cfg.defaultThinking;
+			const mode: Mode = (args.mode as Mode | undefined) ?? "accept-edits";
+			const useDigest = typeof args.digest === "boolean" ? args.digest : mode === "plan";
+			const isContinue =
+				typeof args.conversationId === "string" && CONV_ID_RE.test(args.conversationId);
+
+			const tags: string[] = [`model=${resolved.model}`, `thinking=${thinking}`];
+			if (mode !== "accept-edits") tags.push(`mode=${mode}`);
+			if (useDigest) tags.push("digest");
+			if (isContinue) tags.push("continue");
+			if (args.includeContext) tags.push("context=full");
+
+			let text = theme.fg("mdLink", theme.bold("AskAntigravity "));
+			text += `${theme.fg("accent", `[${tags.join(", ")}]`)} `;
+
+			const prompt = String(args.prompt ?? "");
+			const truncated = prompt.length > PREVIEW_MAX_CHARS ? prompt.slice(0, PREVIEW_MAX_CHARS) : prompt;
+			const lines = truncated.split("\n").slice(0, PREVIEW_MAX_LINES);
+			text += theme.fg("muted", `"${lines.join("\n")}"`);
+			if (prompt.length > PREVIEW_MAX_CHARS || prompt.split("\n").length > PREVIEW_MAX_LINES) {
+				text += theme.fg("dim", " …");
+			}
+			return new Text(text, 0, 0);
+		},
+		renderResult(result, { expanded, isPartial }, theme) {
+			const d = result.details as AgyDetails | undefined;
+			if (isPartial) {
+				const status = result.content[0]?.type === "text" ? result.content[0].text : "working...";
+				return new Text(theme.fg("mdLink", "◉ AskAntigravity ") + theme.fg("muted", status), 0, 0);
+			}
+
+			const body = result.content[0]?.type === "text" ? result.content[0].text : "";
+			const errored = d?.exitCode !== 0 || !!d?.aborted || !!d?.timedOut;
+
+			let text = errored
+				? theme.fg("error", "✗ AskAntigravity error")
+				: theme.fg("mdLink", "✓ AskAntigravity");
+
+			const rTags: string[] = [];
+			if (d?.resolvedModel || d?.model) rTags.push(`model=${d?.resolvedModel ?? d?.model}`);
+			if (d?.thinking) rTags.push(`thinking=${d.thinking}`);
+			if (d?.mode && d.mode !== "accept-edits") rTags.push(`mode=${d.mode}`);
+			if (d?.includeContext) rTags.push("context=full");
+			if (rTags.length) text += ` ${theme.fg("accent", `[${rTags.join(", ")}]`)}`;
+			if (d?.durationMs) text += ` ${theme.fg("dim", `${(d.durationMs / 1000).toFixed(1)}s`)}`;
+
+			if (expanded) {
+				if (body) text += `\n${theme.fg("toolOutput", body)}`;
+			} else {
+				const truncated = body.length > PREVIEW_MAX_CHARS ? body.slice(0, PREVIEW_MAX_CHARS) : body;
+				const lines = truncated.split("\n").slice(0, PREVIEW_MAX_LINES);
+				if (lines.length) text += `\n${theme.fg("toolOutput", lines.join("\n"))}`;
+				if (body.length > PREVIEW_MAX_CHARS || body.split("\n").length > PREVIEW_MAX_LINES) {
+					text += `\n${theme.fg("dim", `… (${keyHint("app.tools.expand", "to expand")})`)}`;
+				}
+			}
+			return new Text(text, 0, 0);
+		},
 		async execute(toolCallId, params, signal, onUpdate, ctx) {
 			// Circular-delegation guard (best-effort). This extension registers
 			// NO provider, so the check only fires if a future agy-as-provider
@@ -877,7 +1051,9 @@ export default async function (pi: ExtensionAPI) {
 				};
 			}
 			const resolved =
-				resolveModel(requestedModel, discovered, config.defaultThinking) ?? requestedModel;
+				resolveModel(requestedModel, discovered, config.defaultThinking) ?? {
+					model: requestedModel,
+				};
 
 			const start = Date.now();
 			const cwd = params.cwd || ctx.cwd || process.cwd();
@@ -888,13 +1064,13 @@ export default async function (pi: ExtensionAPI) {
 				if (!stat.isDirectory()) {
 					return {
 						content: [{ type: "text", text: `cwd is not a directory: ${cwd}` }],
-						details: emptyDetails(requestedModel, resolved),
+						details: emptyDetails(requestedModel, resolved.model),
 					};
 				}
 			} catch {
 				return {
 					content: [{ type: "text", text: `cwd does not exist: ${cwd}` }],
-					details: emptyDetails(requestedModel, resolved),
+					details: emptyDetails(requestedModel, resolved.model),
 				};
 			}
 
@@ -924,10 +1100,34 @@ export default async function (pi: ExtensionAPI) {
 				? `(Use compact digests, not full file contents.)\n${params.prompt}`
 				: params.prompt;
 
+			// Opt-in full-context export (isolated stays the default).
+			let contextFile: string | null = null;
+			if (params.includeContext) {
+				try {
+					const { messages } = buildSessionContext(ctx.sessionManager.getBranch());
+					if (messages.length) {
+						const md = renderAgentMessagesMarkdown(messages);
+						const ctxDir = askContextDir();
+						fs.mkdirSync(ctxDir, { recursive: true });
+						contextFile = path.join(
+							ctxDir,
+							`.ask-context-${Date.now()}-${Math.random().toString(36).slice(2, 8)}.md`,
+						);
+						fs.writeFileSync(contextFile, md, { mode: 0o600 });
+					}
+				} catch {
+					contextFile = null;
+				}
+			}
+			const effectivePrompt = contextFile
+				? `The full pi conversation context (as markdown) is at: ${contextFile}\nRead that file first for context, then do the task below.\n\n---\n\n${finalPrompt}`
+				: finalPrompt;
+
 			const args: string[] = ["--add-dir", cwd];
 			const extra = extraArgs();
 			if (extra.length) args.push(...extra);
-			if (resolved) args.push("--model", resolved);
+			if (resolved.model) args.push("--model", resolved.model);
+			if (resolved.effort) args.push("--effort", resolved.effort);
 			args.push("--mode", mode);
 			// accept-edits auto-approves file edits but NOT shell commands, so a
 			// run_command would hang on an unanswerable y/n prompt in non-interactive
@@ -935,14 +1135,17 @@ export default async function (pi: ExtensionAPI) {
 			if (config.skipPermissions) args.push("--dangerously-skip-permissions");
 			if (isContinuation) args.push("--conversation", rawConvId as string);
 			args.push("--print-timeout", `${timeoutMin}m`);
-			args.push("-p", finalPrompt);
+			if (contextFile) args.push("--add-dir", askContextDir());
+			args.push("-p", effectivePrompt);
 
 			const details: AgyDetails = {
 				model: requestedModel,
-				resolvedModel: resolved,
+				resolvedModel: resolved.model,
+				thinking: resolved.effort ?? config.defaultThinking,
 				mode,
 				digest: useDigest,
 				conversationId: isContinuation ? (rawConvId as string) : null,
+				includeContext: contextFile !== null,
 				exitCode: 0,
 				aborted: false,
 				timedOut: false,
@@ -1183,16 +1386,30 @@ export default async function (pi: ExtensionAPI) {
 					details,
 				};
 			}
+			finally {
+				if (contextFile) {
+					try {
+						fs.unlinkSync(contextFile);
+					} catch {}
+				}
+			}
 		},
 	});
 }
 
-function emptyDetails(model: string | null, resolvedModel: string | null): AgyDetails {
+function emptyDetails(
+	model: string | null,
+	resolvedModel: string | null,
+	thinking: ThinkingTier | null = null,
+	includeContext: boolean = false,
+): AgyDetails {
 	return {
 		model,
 		resolvedModel,
+		thinking,
 		mode: "accept-edits",
 		digest: false,
+		includeContext,
 		conversationId: null,
 		exitCode: 0,
 		aborted: false,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@estebanforge/pi-ask-antigravity",
-  "version": "1.2.1",
+  "version": "1.2.4",
   "description": "Pi tool that delegates a self-contained sub-task to Google Antigravity's agy CLI (the CLI for Gemini). Friendly model aliases (flash/pro/gemini), configurable default model + thinking, and the AskAntigravity delegation tool.",
   "keywords": [
     "pi-package",