@estebanforge/pi-ask-antigravity 1.2.3 → 1.2.5

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
@@ -69,6 +77,24 @@ const FAMILY_DEFAULT_TIER: Record<Family, ThinkingTier> = {
 
 const TIER_RANK: Record<ThinkingTier, number> = { low: 0, medium: 1, high: 2 };
 
+/** pi thinking-level vocabulary -> agy tier, for the thinking/effort tool
+ *  params. Unknown values fall to low (agy always thinks something). */
+function levelToTier(level: string): ThinkingTier {
+	switch (level) {
+		case "minimal":
+		case "low":
+			return "low";
+		case "medium":
+			return "medium";
+		case "high":
+		case "xhigh":
+		case "max":
+			return "high";
+		default:
+			return "low";
+	}
+}
+
 // Mode = which agy tool-loop policy to apply. Distinct from the alias layer.
 //   "plan"         → --mode plan     (no edits; review-only)
 //   "accept-edits" → --mode accept-edits (agy applies edits)
@@ -132,7 +158,12 @@ EXECUTION MODES (param: mode):
 - **accept-edits** (default): agy applies edits directly inside the workspace.
 - For agy's orthogonal \`--sandbox\` shell-containment flag, set the \`AGY_EXTRA_ARGS=--sandbox\` env var.
 
-COMPACT OUTPUT (param: digest): when true, the prompt is prefixed to request compact digests instead of full file contents. Defaults on for plan, off for accept-edits. Use true whenever you do not need full file payloads (review, exploration, planning).`;
+COMPACT OUTPUT (param: digest): when true, the prompt is prefixed to request compact digests instead of full file contents. Defaults on for plan, off for accept-edits. Use true whenever you do not need full file payloads (review, exploration, planning).
+
+THINKING LEVEL (params: thinking, effort - SYNONYMS for one knob):
+- pi calls it thinking, agy calls it effort. Same thing. Pass ONE of the two.
+- Values (pi vocabulary): minimal|low|medium|high|xhigh|max. Clamped to agy's low|medium|high; unknown values fall back to low. "peer review on high thinking" -> thinking: "high".
+- An explicit level beats a tier embedded in model ("flash high") and the configured default. Omit both for the configured default.`;
 
 // --- Types -----------------------------------------------------------------
 
@@ -310,6 +341,10 @@ export function resolveModel(
 	input: string,
 	entries: ModelEntry[],
 	defaultThinking: ThinkingTier,
+	/** Explicit thinking param (thinking/effort). Beats a tier embedded in
+	 *  the alias ("flash high") and the configured default; clamped to the
+	 *  family's real tiers, ignored for fixed-thinking families. */
+	preferredTier?: ThinkingTier,
 ): ResolvedModel | null {
 	const lower = input.toLowerCase().trim();
 
@@ -392,6 +427,7 @@ export function resolveModel(
 	if (familyTiers.size === 0) return toResolved(candidates[0].full, null); // no tiers on any entry
 
 	const preferred =
+		preferredTier ??
 		tier ??
 		(familyTiers.has(defaultThinking) ? defaultThinking : FAMILY_DEFAULT_TIER[family]);
 	const chosenTier = nearestTier([...familyTiers], preferred);
@@ -645,14 +681,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;
@@ -825,6 +929,18 @@ export default async function (pi: ExtensionAPI) {
 				}),
 			),
 			model: modelParam,
+			thinking: Type.Optional(
+				Type.String({
+					description:
+						"Thinking level (= agy effort tier). pi vocabulary: minimal|low|medium|high|xhigh|max, clamped to agy's low|medium|high. Overrides a tier embedded in `model`. Omit for the configured default.",
+				}),
+			),
+			effort: Type.Optional(
+				Type.String({
+					description:
+						"Alias for `thinking` (agy's own name for the same knob). Pass ONE of the two; different values on both is an error.",
+				}),
+			),
 			mode: Type.Optional(
 				Type.Union(
 					[
@@ -855,7 +971,86 @@ 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 thinkingArg = (args.thinking as string | undefined) ?? (args.effort as string | undefined);
+			const resolved =
+				resolveModel(
+					requestedModel,
+					discovered,
+					cfg.defaultThinking,
+					thinkingArg ? levelToTier(thinkingArg) : undefined,
+				) ?? { 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
@@ -901,8 +1096,29 @@ export default async function (pi: ExtensionAPI) {
 					details: emptyDetails(requestedModel, null),
 				};
 			}
+			if (
+				typeof params.thinking === "string" &&
+				typeof params.effort === "string" &&
+				params.thinking !== params.effort
+			) {
+				return {
+					content: [
+						{
+							type: "text",
+							text: "thinking and effort are synonyms for the same knob - pass one, not both with different values.",
+						},
+					],
+					details: emptyDetails(requestedModel, null),
+				};
+			}
+			const thinkingArg = (params.thinking as string | undefined) ?? (params.effort as string | undefined);
 			const resolved =
-				resolveModel(requestedModel, discovered, config.defaultThinking) ?? {
+				resolveModel(
+					requestedModel,
+					discovered,
+					config.defaultThinking,
+					thinkingArg ? levelToTier(thinkingArg) : undefined,
+				) ?? {
 					model: requestedModel,
 				};
 
@@ -951,6 +1167,29 @@ 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);
@@ -963,14 +1202,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.model,
+				thinking: resolved.effort ?? config.defaultThinking,
 				mode,
 				digest: useDigest,
 				conversationId: isContinuation ? (rawConvId as string) : null,
+				includeContext: contextFile !== null,
 				exitCode: 0,
 				aborted: false,
 				timedOut: false,
@@ -1211,16 +1453,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.3",
+  "version": "1.2.5",
   "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",
@@ -49,9 +49,10 @@
     }
   },
   "devDependencies": {
-    "@earendil-works/pi-coding-agent": "^0.84.0",
-    "@earendil-works/pi-ai": "^0.84.0",
-    "@earendil-works/pi-tui": "^0.84.0",
+    "@earendil-works/pi-ai": "^0.85.0",
+    "@earendil-works/pi-coding-agent": "^0.85.0",
+    "@earendil-works/pi-server": "^0.85.0",
+    "@earendil-works/pi-tui": "^0.85.0",
     "@types/node": "^22.0.0",
     "typebox": "^1.1.38",
     "typescript": "^5.8.0",