@shanepadgett/tau-agent 0.33.1 → 0.34.0

package/extensions/explore/{ast/tools → tools}/show.ts

@@ -2,19 +2,19 @@ import { StringEnum } from "@earendil-works/pi-ai";
 import { defineTool } from "@earendil-works/pi-coding-agent";
 import { basename } from "node:path";
 import { Type, type Static } from "typebox";
-import { truncateBoundedHead } from "../../../../shared/bounded-text-result.ts";
-import type { ToolRowStateStore } from "../../../../shared/tool-row-state.ts";
-import type { ExploreEngine } from "../engine.ts";
-import { formatShowBatch } from "../format/show.ts";
-import { showTargets, type ShowTargetInput } from "../queries/show.ts";
-import { stripLeadingAt } from "../../traverse.ts";
+import { truncateBoundedHead } from "../../../shared/bounded-text-result.ts";
+import type { ToolRowStateStore } from "../../../shared/tool-row-state.ts";
+import type { ExploreEngine } from "../../../src/ast/engine.ts";
+import { formatShowBatch } from "../../../src/ast/format/show.ts";
+import { showTargets, type ShowTargetInput } from "../../../src/ast/queries/show.ts";
+import { stripLeadingAt } from "../../../src/ast/traverse.ts";
 import { ExploreCallComponent, renderExploreResult, shrinkingListVariants, type ExploreToolDetails } from "./render.ts";
 
 const showTargetSchema = Type.Object(
 	{
-		path: Type.String({ description: "File containing the declaration" }),
-		name: Type.String({ minLength: 1, description: "Declaration name; may be dotted (Type.method)" }),
-		line: Type.Optional(Type.Integer({ minimum: 1, description: "1-indexed line covered by the declaration range" })),
+		path: Type.String({ description: "Defining file" }),
+		name: Type.String({ minLength: 1, description: "Decl name; dotted Type.method ok" }),
+		line: Type.Optional(Type.Integer({ minimum: 1, description: "1-based line inside decl range" })),
 	},
 	{ additionalProperties: false },
 );
@@ -23,16 +23,15 @@ const showParams = Type.Object(
 	{
 		targets: Type.Array(showTargetSchema, {
 			minItems: 1,
-			description: "One or more path+name targets (optional line to disambiguate)",
+			description: "path+name targets (optional line pin)",
 		}),
 		view: StringEnum(["signature", "signatureWithDocs", "declaration", "declarationWithImports"] as const, {
-			description:
-				"signature omits docs and bodies; signatureWithDocs adds attached docs; declaration is exact source; declarationWithImports adds import statements that mention identifiers in the declaration",
+			description: "signature | signatureWithDocs | declaration | declarationWithImports",
 		}),
 		contextLines: Type.Optional(
 			Type.Integer({
 				minimum: 0,
-				description: "Lines of source context before and after each declaration (view=declaration only)",
+				description: "Extra lines around decl (declaration only)",
 			}),
 		),
 	},
@@ -69,13 +68,11 @@ export function createShowTool(rowState: ToolRowStateStore, engineFor: (cwd: str
 		name: "show",
 		label: "show",
 		description:
-			"Return signatures, documented signatures, exact declarations, or declarations with related imports for path+name targets. Ambiguous or missing targets fail the whole batch with candidates — no partial bodies.",
-		promptSnippet: "Retrieve signatures or exact declarations for path+name targets",
+			"Exact signature or source for path+name targets. Whole batch fails on any missing/ambiguous target (candidate list, no partials). Views: signature → signatureWithDocs → declaration → declarationWithImports. Over budget throws — request fewer targets (bodies are not truncated).",
+		promptSnippet: "Signature or source for path+name targets",
 		promptGuidelines: [
-			"Prefer signature when the contract is enough; use signatureWithDocs only when attached docs matter.",
-			"Use declaration for exact implementation source; declarationWithImports when edit context needs imports.",
-			"Disambiguate with path and optional line. Do not guess among candidates.",
-			"If the batch exceeds the model-output budget, request fewer targets — show never truncates bodies.",
+			"Cheapest view that answers; declarationWithImports only when edits need imports.",
+			"Pin with path and line when names collide — do not guess.",
 		],
 		parameters: showParams,
 		async execute(_toolCallId, params, signal, _onUpdate, ctx) {

package/extensions/explore/tools/target-params.ts

@@ -0,0 +1,9 @@
+import { Type } from "typebox";
+
+/** Parameters every declaration-targeting Explore tool accepts. */
+export const targetParams = {
+	path: Type.String({ description: "Directory scope" }),
+	targetPath: Type.Optional(Type.String({ description: "Defining file when known" })),
+	name: Type.String({ minLength: 1, description: "Decl name; dotted Type.method ok" }),
+	line: Type.Optional(Type.Integer({ minimum: 1, description: "1-based line pin" })),
+};

package/extensions/footer/index.ts

@@ -260,12 +260,37 @@ async function saveEnabled(ctx: ExtensionContext, enabled: boolean): Promise<voi
 	await updateTauExtensionSettings("global", ctx, footerSettings, (current) => ({ ...current, enabled }));
 }
 
+function countGitLine(
+	line: string,
+	counts: { staged: number; modified: number; untracked: number; conflicts: number },
+): void {
+	const x = line[0];
+	const y = line[1];
+	if (x === "?" && y === "?") {
+		counts.untracked += 1;
+		return;
+	}
+	if (isConflict(x, y)) {
+		counts.conflicts += 1;
+		return;
+	}
+	if (x && x !== " ") counts.staged += 1;
+	if (y && y !== " ") counts.modified += 1;
+}
+
+function formatGitCounts(counts: { staged: number; modified: number; untracked: number; conflicts: number }): string {
+	const parts = [
+		counts.staged ? `+${counts.staged}` : "",
+		counts.modified ? `~${counts.modified}` : "",
+		counts.untracked ? `?${counts.untracked}` : "",
+		counts.conflicts ? `!${counts.conflicts}` : "",
+	].filter(Boolean);
+	return parts.length ? parts.join(" ") : "clean";
+}
+
 function parseGitStatus(stdout: string): GitSummary | undefined {
 	let branch = "";
-	let staged = 0;
-	let modified = 0;
-	let untracked = 0;
-	let conflicts = 0;
+	const counts = { staged: 0, modified: 0, untracked: 0, conflicts: 0 };
 
 	for (const line of stdout.split("\n")) {
 		if (!line) continue;
@@ -273,29 +298,11 @@ function parseGitStatus(stdout: string): GitSummary | undefined {
 			branch = line.slice(3).split("...")[0]?.trim() ?? "";
 			continue;
 		}
-
-		const x = line[0];
-		const y = line[1];
-		if (x === "?" && y === "?") {
-			untracked += 1;
-			continue;
-		}
-		if (isConflict(x, y)) {
-			conflicts += 1;
-			continue;
-		}
-		if (x && x !== " ") staged += 1;
-		if (y && y !== " ") modified += 1;
+		countGitLine(line, counts);
 	}
 
 	if (!branch) return undefined;
-	const parts = [
-		staged ? `+${staged}` : "",
-		modified ? `~${modified}` : "",
-		untracked ? `?${untracked}` : "",
-		conflicts ? `!${conflicts}` : "",
-	].filter(Boolean);
-	return { branch, text: parts.length ? parts.join(" ") : "clean" };
+	return { branch, text: formatGitCounts(counts) };
 }
 
 function gitText(git: GitSummary | undefined): string {
@@ -307,7 +314,7 @@ function isConflict(x: string | undefined, y: string | undefined): boolean {
 	return x === "U" || y === "U" || (x === "A" && y === "A") || (x === "D" && y === "D");
 }
 
-export function sessionCost(ctx: Pick<ExtensionContext, "sessionManager">): UsageSummary {
+function sessionCost(ctx: Pick<ExtensionContext, "sessionManager">): UsageSummary {
 	let usage = zeroUsage();
 	for (const entry of ctx.sessionManager.getEntries()) {
 		if (entry.type === "message" && entry.message.role === "assistant") {
@@ -380,7 +387,44 @@ async function scanDailyCost(): Promise<number> {
 	return total;
 }
 
-export function dailyCostFromJsonl(
+function usageIdentityFromEntry(
+	entry: Record<string, unknown>,
+): { usageValue: unknown; timestamp: number; identity: unknown[] } | undefined {
+	if (entry.type === "message") {
+		const message = asRecord(entry.message);
+		if (!message) return undefined;
+		const timestamp = timestampMs(message.timestamp, entry.timestamp);
+		if (message.role === "assistant" && asRecord(message.usage)) {
+			return {
+				usageValue: message.usage,
+				timestamp,
+				identity: ["assistant", message.provider, message.model],
+			};
+		}
+		if (message.role === "toolResult" && asRecord(message.usage)) {
+			return {
+				usageValue: message.usage,
+				timestamp,
+				identity: ["toolResult", message.toolName, message.toolCallId],
+			};
+		}
+		return undefined;
+	}
+	if ((entry.type === "compaction" || entry.type === "branch_summary") && asRecord(entry.usage)) {
+		return {
+			usageValue: entry.usage,
+			timestamp: timestampMs(undefined, entry.timestamp),
+			identity: [entry.type, entry.id],
+		};
+	}
+	return undefined;
+}
+
+function usageDedupeKey(identity: readonly unknown[], timestamp: number, usage: UsageSummary): string {
+	return [...identity, timestamp, usage.input, usage.output, usage.cacheRead, usage.cacheWrite, usage.cost].join(":");
+}
+
+function dailyCostFromJsonl(
 	raw: string,
 	range: { startMs: number; endMs: number },
 	seen: Set<string> = new Set<string>(),
@@ -389,36 +433,11 @@ export function dailyCostFromJsonl(
 	for (const line of raw.split("\n")) {
 		const entry = parseRecord(line);
 		if (!entry) continue;
-		let usageValue: unknown;
-		let timestamp: number;
-		let identity: unknown[];
-		if (entry.type === "message") {
-			const message = asRecord(entry.message);
-			if (!message) continue;
-			timestamp = timestampMs(message.timestamp, entry.timestamp);
-			if (message.role === "assistant" && asRecord(message.usage)) {
-				usageValue = message.usage;
-				identity = ["assistant", message.provider, message.model];
-			} else if (message.role === "toolResult" && asRecord(message.usage)) {
-				usageValue = message.usage;
-				identity = ["toolResult", message.toolName, message.toolCallId];
-			} else continue;
-		} else if ((entry.type === "compaction" || entry.type === "branch_summary") && asRecord(entry.usage)) {
-			usageValue = entry.usage;
-			timestamp = timestampMs(undefined, entry.timestamp);
-			identity = [entry.type, entry.id];
-		} else continue;
-		if (timestamp < range.startMs || timestamp >= range.endMs) continue;
-		const usage = normalizeUsage(usageValue);
-		const key = [
-			...identity,
-			timestamp,
-			usage.input,
-			usage.output,
-			usage.cacheRead,
-			usage.cacheWrite,
-			usage.cost,
-		].join(":");
+		const parsed = usageIdentityFromEntry(entry);
+		if (!parsed) continue;
+		if (parsed.timestamp < range.startMs || parsed.timestamp >= range.endMs) continue;
+		const usage = normalizeUsage(parsed.usageValue);
+		const key = usageDedupeKey(parsed.identity, parsed.timestamp, usage);
 		if (seen.has(key)) continue;
 		seen.add(key);
 		total += usage.cost;

package/extensions/handoff/index.ts

@@ -6,9 +6,9 @@ import {
 	type ExtensionAPI,
 	serializeConversation,
 } from "@earendil-works/pi-coding-agent";
-import { prepareAutoreadMessage, type AutoreadDetails } from "../../shared/autoread.ts";
 import { generateToolValidated, resolveCandidates } from "../../shared/model-fallback/index.ts";
 import { errorText } from "../../shared/text.ts";
+import { prepareFileInjection } from "@shanepadgett/tau-agent";
 import { buildHandoffRequest, type HandoffDraft, handoffDraftFromToolInput, HANDOFF_TOOL } from "./model.ts";
 
 export default function handoffExtension(pi: ExtensionAPI): void {
@@ -92,38 +92,16 @@ export default function handoffExtension(pi: ExtensionAPI): void {
 				return;
 			}
 
-			const batchId = randomUUID();
-			const cwd = ctx.cwd;
+			const fileMessages = await prepareFileInjection(pi, {
+				cwd: ctx.cwd,
+				source: "handoff",
+				batchId: randomUUID(),
+				files: draft.files.map((path) => ({ path, mode: "full" as const })),
+			});
 			const result = await ctx.newSession({
 				parentSession: currentSessionFile,
 				setup: async (sessionManager) => {
-					const messages = await Promise.all(
-						draft.files.map(async (path, index) => {
-							const details = {
-								rowId: `${batchId}:${index}`,
-								path,
-								cwd,
-								source: "handoff",
-								batchId,
-							};
-							try {
-								return await prepareAutoreadMessage({
-									...details,
-									signal: undefined,
-									isLifecycleCurrent: () => true,
-								});
-							} catch (error) {
-								const message = errorText(error);
-								return {
-									customType: "tau.autoread" as const,
-									content: `${path}\nAutoread failed: ${message}`,
-									display: true as const,
-									details: { ...details, status: "failed", error: message } satisfies AutoreadDetails,
-								};
-							}
-						}),
-					);
-					for (const message of messages) {
+					for (const message of fileMessages) {
 						sessionManager.appendCustomMessageEntry(
 							message.customType,
 							message.content,

package/extensions/image-gen/index.ts

@@ -1,6 +1,8 @@
 import { defineTool, type ExtensionAPI } from "@earendil-works/pi-coding-agent";
 import {
 	generateImage,
+	registerDeferredToolGroup,
+	type DeferredToolGroup,
 	type GeneratedImageResult,
 	type GenerateImageRequest,
 	type ImageGenerationContext,
@@ -31,51 +33,55 @@ type ImageGenParams = Static<typeof imageGenSchema>;
 type ImageGenDetails = Omit<GeneratedImageResult, "bytes">;
 
 export default function imageGenExtension(pi: ExtensionAPI): void {
-	pi.registerTool(
-		defineTool<typeof imageGenSchema, ImageGenDetails | undefined>({
-			name: "image_gen",
-			label: "Image Generation",
-			description:
-				"Generate a requested raster image or AI-edit existing images with OpenAI GPT Image or xAI Grok Imagine. Omit provider to follow the parent model; set it to openai or xai to override. Omit referenced_image_paths to generate; pass one to three local paths to edit or compose. Omit path to use Tau's external image store; pass path only when the user explicitly requests a repository file or other destination. Returns the image for inspection.",
-			parameters: imageGenSchema,
-			async execute(_toolCallId, params: ImageGenParams, signal, onUpdate, ctx) {
-				await onUpdate?.({
-					content: [
-						{
-							type: "text",
-							text: "Processing image request...",
-						},
-					],
-					details: undefined,
-				});
-				const request = {
-					prompt: params.prompt,
-					provider: params.provider,
-					path: params.path,
-					referencedImagePaths: params.referenced_image_paths,
-					signal,
-				} satisfies GenerateImageRequest;
-				const { bytes, ...details } = await generateImage(ctx satisfies ImageGenerationContext, request);
-				const verb = details.operation === "generate" ? "Generated" : "Edited";
-				if (bytes.length > MAX_INLINE_BYTES) {
-					return {
+	registerDeferredToolGroup(pi, {
+		id: "image",
+		description: "Raster image generation and editing",
+		tools: [
+			defineTool<typeof imageGenSchema, ImageGenDetails | undefined>({
+				name: "image_gen",
+				label: "Image Generation",
+				description:
+					"Generate a requested raster image or AI-edit existing images with OpenAI GPT Image or xAI Grok Imagine. Omit provider to follow the parent model; set it to openai or xai to override. Omit referenced_image_paths to generate; pass one to three local paths to edit or compose. Omit path to use Tau's external image store; pass path only when the user explicitly requests a repository file or other destination. Returns the image for inspection.",
+				parameters: imageGenSchema,
+				async execute(_toolCallId, params: ImageGenParams, signal, onUpdate, ctx) {
+					await onUpdate?.({
 						content: [
 							{
 								type: "text",
-								text: `${verb} image saved to ${details.path}. The image exceeds the 12 MiB attachment limit, so it was not added to model context.`,
+								text: "Processing image request...",
 							},
 						],
+						details: undefined,
+					});
+					const request = {
+						prompt: params.prompt,
+						provider: params.provider,
+						path: params.path,
+						referencedImagePaths: params.referenced_image_paths,
+						signal,
+					} satisfies GenerateImageRequest;
+					const { bytes, ...details } = await generateImage(ctx satisfies ImageGenerationContext, request);
+					const verb = details.operation === "generate" ? "Generated" : "Edited";
+					if (bytes.length > MAX_INLINE_BYTES) {
+						return {
+							content: [
+								{
+									type: "text",
+									text: `${verb} image saved to ${details.path}. The image exceeds the 12 MiB attachment limit, so it was not added to model context.`,
+								},
+							],
+							details,
+						};
+					}
+					return {
+						content: [
+							{ type: "text", text: `${verb} image saved to ${details.path}` },
+							{ type: "image", data: bytes.toString("base64"), mimeType: details.mimeType },
+						],
 						details,
 					};
-				}
-				return {
-					content: [
-						{ type: "text", text: `${verb} image saved to ${details.path}` },
-						{ type: "image", data: bytes.toString("base64"), mimeType: details.mimeType },
-					],
-					details,
-				};
-			},
-		}),
-	);
+				},
+			}),
+		],
+	} satisfies DeferredToolGroup);
 }