@oh-my-pi/pi-coding-agent 3.21.0 → 3.25.0

package/src/core/tools/ls.ts

@@ -7,6 +7,7 @@ import { Type } from "@sinclair/typebox";
 import { getLanguageFromPath, type Theme } from "../../modes/interactive/theme/theme";
 import type { RenderResultOptions } from "../custom-tools/types";
 import { untilAborted } from "../utils";
+import type { ToolSession } from "./index";
 import { resolveToCwd } from "./path-utils";
 import {
 	formatAge,
@@ -37,7 +38,7 @@ export interface LsToolDetails {
 	entryLimitReached?: number;
 }
 
-export function createLsTool(cwd: string): AgentTool<typeof lsSchema> {
+export function createLsTool(session: ToolSession): AgentTool<typeof lsSchema> {
 	return {
 		name: "ls",
 		label: "Ls",
@@ -49,7 +50,7 @@ export function createLsTool(cwd: string): AgentTool<typeof lsSchema> {
 			signal?: AbortSignal,
 		) => {
 			return untilAborted(signal, async () => {
-				const dirPath = resolveToCwd(path || ".", cwd);
+				const dirPath = resolveToCwd(path || ".", session.cwd);
 				const effectiveLimit = limit ?? DEFAULT_LIMIT;
 
 				// Check if path exists
@@ -159,9 +160,6 @@ export function createLsTool(cwd: string): AgentTool<typeof lsSchema> {
 	};
 }
 
-/** Default ls tool using process.cwd() - for backwards compatibility */
-export const lsTool = createLsTool(process.cwd());
-
 // =============================================================================
 // TUI Renderer
 // =============================================================================
@@ -271,10 +269,7 @@ export const lsToolRenderer = {
 		}
 
 		if (hasTruncation) {
-			text += `\n ${uiTheme.fg("dim", uiTheme.tree.last)} ${uiTheme.fg(
-				"warning",
-				`truncated: ${truncationReasons.join(", ")}`,
-			)}`;
+			text += `\n ${uiTheme.fg("dim", uiTheme.tree.last)} ${uiTheme.fg("warning", `truncated: ${truncationReasons.join(", ")}`)}`;
 		}
 
 		return new Text(text, 0, 0);

package/src/core/tools/lsp/index.ts

@@ -7,6 +7,7 @@ import { type Theme, theme } from "../../../modes/interactive/theme/theme";
 import lspDescription from "../../../prompts/tools/lsp.md" with { type: "text" };
 import { logger } from "../../logger";
 import { once, untilAborted } from "../../utils";
+import type { ToolSession } from "../index";
 import { resolveToCwd } from "../path-utils";
 import {
 	ensureFileOpen,
@@ -687,7 +688,7 @@ export function createLspWritethrough(cwd: string, options?: WritethroughOptions
 }
 
 /** Create an LSP tool */
-export function createLspTool(cwd: string): AgentTool<typeof lspSchema, LspToolDetails, Theme> {
+export function createLspTool(session: ToolSession): AgentTool<typeof lspSchema, LspToolDetails, Theme> {
 	return {
 		name: "lsp",
 		label: "LSP",
@@ -713,7 +714,7 @@ export function createLspTool(cwd: string): AgentTool<typeof lspSchema, LspToolD
 				include_declaration,
 			} = params;
 
-			const config = await getConfig(cwd);
+			const config = await getConfig(session.cwd);
 
 			// Status action doesn't need a file
 			if (action === "status") {
@@ -730,7 +731,7 @@ export function createLspTool(cwd: string): AgentTool<typeof lspSchema, LspToolD
 
 			// Workspace diagnostics - check entire project
 			if (action === "workspace_diagnostics") {
-				const result = await runWorkspaceDiagnostics(cwd, config);
+				const result = await runWorkspaceDiagnostics(session.cwd, config);
 				return {
 					content: [
 						{
@@ -757,7 +758,7 @@ export function createLspTool(cwd: string): AgentTool<typeof lspSchema, LspToolD
 				const allServerNames = new Set<string>();
 
 				for (const target of targets) {
-					const resolved = resolveToCwd(target, cwd);
+					const resolved = resolveToCwd(target, session.cwd);
 					const servers = getServersForFile(config, resolved);
 					if (servers.length === 0) {
 						results.push(`${theme.status.error} ${target}: No language server found`);
@@ -765,7 +766,7 @@ export function createLspTool(cwd: string): AgentTool<typeof lspSchema, LspToolD
 					}
 
 					const uri = fileToUri(resolved);
-					const relPath = path.relative(cwd, resolved);
+					const relPath = path.relative(session.cwd, resolved);
 					const allDiagnostics: Diagnostic[] = [];
 
 					// Query all applicable servers for this file
@@ -773,12 +774,12 @@ export function createLspTool(cwd: string): AgentTool<typeof lspSchema, LspToolD
 						allServerNames.add(serverName);
 						try {
 							if (serverConfig.createClient) {
-								const linterClient = getLinterClient(serverName, serverConfig, cwd);
+								const linterClient = getLinterClient(serverName, serverConfig, session.cwd);
 								const diagnostics = await linterClient.lint(resolved);
 								allDiagnostics.push(...diagnostics);
 								continue;
 							}
-							const client = await getOrCreateClient(serverConfig, cwd);
+							const client = await getOrCreateClient(serverConfig, session.cwd);
 							await refreshFile(client, resolved);
 							const diagnostics = await waitForDiagnostics(client, uri);
 							allDiagnostics.push(...diagnostics);
@@ -847,7 +848,7 @@ export function createLspTool(cwd: string): AgentTool<typeof lspSchema, LspToolD
 				};
 			}
 
-			const resolvedFile = file ? resolveToCwd(file, cwd) : null;
+			const resolvedFile = file ? resolveToCwd(file, session.cwd) : null;
 			const serverInfo = resolvedFile
 				? getLspServerForFile(config, resolvedFile)
 				: getServerForWorkspaceAction(config, action);
@@ -862,10 +863,10 @@ export function createLspTool(cwd: string): AgentTool<typeof lspSchema, LspToolD
 			const [serverName, serverConfig] = serverInfo;
 
 			try {
-				const client = await getOrCreateClient(serverConfig, cwd);
+				const client = await getOrCreateClient(serverConfig, session.cwd);
 				let targetFile = resolvedFile;
 				if (action === "runnables" && !targetFile) {
-					targetFile = findFileForServer(cwd, serverConfig);
+					targetFile = findFileForServer(session.cwd, serverConfig);
 					if (!targetFile) {
 						return {
 							content: [{ type: "text", text: "Error: no matching files found for runnables" }],
@@ -914,7 +915,7 @@ export function createLspTool(cwd: string): AgentTool<typeof lspSchema, LspToolD
 								output = "No definition found";
 							} else {
 								output = `Found ${locations.length} definition(s):\n${locations
-									.map((loc) => `  ${formatLocation(loc, cwd)}`)
+									.map((loc) => `  ${formatLocation(loc, session.cwd)}`)
 									.join("\n")}`;
 							}
 						}
@@ -931,7 +932,7 @@ export function createLspTool(cwd: string): AgentTool<typeof lspSchema, LspToolD
 						if (!result || result.length === 0) {
 							output = "No references found";
 						} else {
-							const lines = result.map((loc) => `  ${formatLocation(loc, cwd)}`);
+							const lines = result.map((loc) => `  ${formatLocation(loc, session.cwd)}`);
 							output = `Found ${result.length} reference(s):\n${lines.join("\n")}`;
 						}
 						break;
@@ -964,7 +965,7 @@ export function createLspTool(cwd: string): AgentTool<typeof lspSchema, LspToolD
 								details: { action, serverName, success: false },
 							};
 						} else {
-							const relPath = path.relative(cwd, targetFile);
+							const relPath = path.relative(session.cwd, targetFile);
 							// Check if hierarchical (DocumentSymbol) or flat (SymbolInformation)
 							if ("selectionRange" in result[0]) {
 								// Hierarchical
@@ -998,10 +999,8 @@ export function createLspTool(cwd: string): AgentTool<typeof lspSchema, LspToolD
 						if (!result || result.length === 0) {
 							output = `No symbols matching "${query}"`;
 						} else {
-							const lines = result.map((s) => formatSymbolInformation(s, cwd));
-							output = `Found ${result.length} symbol(s) matching "${query}":\n${lines
-								.map((l) => `  ${l}`)
-								.join("\n")}`;
+							const lines = result.map((s) => formatSymbolInformation(s, session.cwd));
+							output = `Found ${result.length} symbol(s) matching "${query}":\n${lines.map((l) => `  ${l}`).join("\n")}`;
 						}
 						break;
 					}
@@ -1025,10 +1024,10 @@ export function createLspTool(cwd: string): AgentTool<typeof lspSchema, LspToolD
 						} else {
 							const shouldApply = apply !== false;
 							if (shouldApply) {
-								const applied = await applyWorkspaceEdit(result, cwd);
+								const applied = await applyWorkspaceEdit(result, session.cwd);
 								output = `Applied rename:\n${applied.map((a) => `  ${a}`).join("\n")}`;
 							} else {
-								const preview = formatWorkspaceEdit(result, cwd);
+								const preview = formatWorkspaceEdit(result, session.cwd);
 								output = `Rename preview:\n${preview.map((p) => `  ${p}`).join("\n")}`;
 							}
 						}
@@ -1114,7 +1113,7 @@ export function createLspTool(cwd: string): AgentTool<typeof lspSchema, LspToolD
 							}
 
 							if (isCodeAction(resolvedAction) && resolvedAction.edit) {
-								const applied = await applyWorkspaceEdit(resolvedAction.edit, cwd);
+								const applied = await applyWorkspaceEdit(resolvedAction.edit, session.cwd);
 								output = `Applied "${codeAction.title}":\n${applied.map((a) => `  ${a}`).join("\n")}`;
 							} else {
 								const commandPayload = getCommandPayload(resolvedAction);
@@ -1136,9 +1135,7 @@ export function createLspTool(cwd: string): AgentTool<typeof lspSchema, LspToolD
 								}
 								return `  [${i}] ${actionItem.title}`;
 							});
-							output = `Available code actions:\n${lines.join(
-								"\n",
-							)}\n\nUse action_index parameter to apply a specific action.`;
+							output = `Available code actions:\n${lines.join("\n")}\n\nUse action_index parameter to apply a specific action.`;
 						}
 						break;
 					}
@@ -1169,7 +1166,7 @@ export function createLspTool(cwd: string): AgentTool<typeof lspSchema, LspToolD
 								const lines = calls.map((call) => {
 									const loc = { uri: call.from.uri, range: call.from.selectionRange };
 									const detail = call.from.detail ? ` (${call.from.detail})` : "";
-									return `  ${call.from.name}${detail} @ ${formatLocation(loc, cwd)}`;
+									return `  ${call.from.name}${detail} @ ${formatLocation(loc, session.cwd)}`;
 								});
 								output = `Found ${calls.length} caller(s) of "${item.name}":\n${lines.join("\n")}`;
 							}
@@ -1184,7 +1181,7 @@ export function createLspTool(cwd: string): AgentTool<typeof lspSchema, LspToolD
 								const lines = calls.map((call) => {
 									const loc = { uri: call.to.uri, range: call.to.selectionRange };
 									const detail = call.to.detail ? ` (${call.to.detail})` : "";
-									return `  ${call.to.name}${detail} @ ${formatLocation(loc, cwd)}`;
+									return `  ${call.to.name}${detail} @ ${formatLocation(loc, session.cwd)}`;
 								});
 								output = `"${item.name}" calls ${calls.length} function(s):\n${lines.join("\n")}`;
 							}
@@ -1207,7 +1204,7 @@ export function createLspTool(cwd: string): AgentTool<typeof lspSchema, LspToolD
 						await rustAnalyzer.flycheck(client, resolvedFile ?? undefined);
 						const collected: Array<{ filePath: string; diagnostic: Diagnostic }> = [];
 						for (const [diagUri, diags] of client.diagnostics.entries()) {
-							const relPath = path.relative(cwd, uriToFile(diagUri));
+							const relPath = path.relative(session.cwd, uriToFile(diagUri));
 							for (const diag of diags) {
 								collected.push({ filePath: relPath, diagnostic: diag });
 							}
@@ -1274,13 +1271,13 @@ export function createLspTool(cwd: string): AgentTool<typeof lspSchema, LspToolD
 						const result = await rustAnalyzer.ssr(client, query, replacement, !shouldApply);
 
 						if (shouldApply) {
-							const applied = await applyWorkspaceEdit(result, cwd);
+							const applied = await applyWorkspaceEdit(result, session.cwd);
 							output =
 								applied.length > 0
 									? `Applied SSR:\n${applied.map((a) => `  ${a}`).join("\n")}`
 									: "SSR: no matches found";
 						} else {
-							const preview = formatWorkspaceEdit(result, cwd);
+							const preview = formatWorkspaceEdit(result, session.cwd);
 							output =
 								preview.length > 0
 									? `SSR preview:\n${preview.map((p) => `  ${p}`).join("\n")}`
@@ -1366,4 +1363,10 @@ export function createLspTool(cwd: string): AgentTool<typeof lspSchema, LspToolD
 	};
 }
 
-export const lspTool = createLspTool(process.cwd());
+export const lspTool = createLspTool({
+	cwd: process.cwd(),
+	hasUI: false,
+	rulebookRules: [],
+	getSessionFile: () => null,
+	getSessionSpawns: () => null,
+});

package/src/core/tools/lsp/render.ts

@@ -237,10 +237,7 @@ function renderDiagnostics(
 			}
 			const severityColor = severityToColor(item.severity);
 			const location = formatDiagnosticLocation(item.file, item.line, item.col, theme);
-			output += `\n ${theme.fg("dim", branch)} ${theme.fg(severityColor, location)} ${theme.fg(
-				"dim",
-				`[${item.severity}]`,
-			)}`;
+			output += `\n ${theme.fg("dim", branch)} ${theme.fg(severityColor, location)} ${theme.fg("dim", `[${item.severity}]`)}`;
 			if (item.message) {
 				output += `\n ${theme.fg("dim", detailPrefix)}${theme.fg(
 					"muted",
@@ -274,10 +271,7 @@ function renderDiagnostics(
 		output += `\n ${theme.fg("dim", branch)} ${theme.fg(severityColor, location)}${message}`;
 	}
 	if (remaining > 0) {
-		output += `\n ${theme.fg("dim", theme.tree.last)} ${theme.fg(
-			"muted",
-			`${theme.format.ellipsis} ${remaining} more`,
-		)}`;
+		output += `\n ${theme.fg("dim", theme.tree.last)} ${theme.fg("muted", `${theme.format.ellipsis} ${remaining} more`)}`;
 	}
 
 	return new Text(output, 0, 0);
@@ -332,10 +326,7 @@ function renderReferences(refMatch: RegExpMatchArray, lines: string[], expanded:
 					const isLastLoc = li === locsToShow.length - 1 && locs.length <= maxLocsPerFile;
 					const locBranch = isLastLoc ? theme.tree.last : theme.tree.branch;
 					const locCont = isLastLoc ? "   " : `${theme.tree.vertical}  `;
-					output += `\n ${theme.fg("dim", fileCont)}${theme.fg("dim", locBranch)} ${theme.fg(
-						"muted",
-						`line ${line}, col ${col}`,
-					)}`;
+					output += `\n ${theme.fg("dim", fileCont)}${theme.fg("dim", locBranch)} ${theme.fg("muted", `line ${line}, col ${col}`)}`;
 					if (expanded) {
 						const context = `at ${file}:${line}:${col}`;
 						output += `\n ${theme.fg("dim", fileCont)}${theme.fg("dim", locCont)}${theme.fg(
@@ -354,10 +345,7 @@ function renderReferences(refMatch: RegExpMatchArray, lines: string[], expanded:
 		}
 
 		if (files.length > maxFiles) {
-			output += `\n ${theme.fg("dim", theme.tree.last)} ${theme.fg(
-				"muted",
-				formatMoreItems(files.length - maxFiles, "file", theme),
-			)}`;
+			output += `\n ${theme.fg("dim", theme.tree.last)} ${theme.fg("muted", formatMoreItems(files.length - maxFiles, "file", theme))}`;
 		}
 
 		return output;
@@ -463,10 +451,7 @@ function renderSymbols(symbolsMatch: RegExpMatchArray, lines: string[], expanded
 		)}`;
 	}
 	if (topLevelCount > 3) {
-		output += `\n ${theme.fg("dim", theme.tree.last)} ${theme.fg(
-			"muted",
-			`${theme.format.ellipsis} ${topLevelCount - 3} more`,
-		)}`;
+		output += `\n ${theme.fg("dim", theme.tree.last)} ${theme.fg("muted", `${theme.format.ellipsis} ${topLevelCount - 3} more`)}`;
 	}
 
 	return new Text(output, 0, 0);
@@ -502,10 +487,7 @@ function renderGeneric(text: string, lines: string[], expanded: boolean, theme:
 
 	const firstLine = lines[0] || "No output";
 	const expandHint = formatExpandHint(false, lines.length > 1, theme);
-	let output = `${icon} ${theme.fg(
-		"dim",
-		truncate(firstLine, TRUNCATE_LENGTHS.TITLE, theme.format.ellipsis),
-	)}${expandHint}`;
+	let output = `${icon} ${theme.fg("dim", truncate(firstLine, TRUNCATE_LENGTHS.TITLE, theme.format.ellipsis))}${expandHint}`;
 
 	if (lines.length > 1) {
 		const previewLines = lines.slice(1, 4);
@@ -518,10 +500,7 @@ function renderGeneric(text: string, lines: string[], expanded: boolean, theme:
 			)}`;
 		}
 		if (lines.length > 4) {
-			output += `\n ${theme.fg("dim", theme.tree.last)} ${theme.fg(
-				"muted",
-				formatMoreItems(lines.length - 4, "line", theme),
-			)}`;
+			output += `\n ${theme.fg("dim", theme.tree.last)} ${theme.fg("muted", formatMoreItems(lines.length - 4, "line", theme))}`;
 		}
 	}
 

package/src/core/tools/notebook.ts

@@ -4,6 +4,7 @@ import { Text } from "@oh-my-pi/pi-tui";
 import { Type } from "@sinclair/typebox";
 import type { Theme } from "../../modes/interactive/theme/theme";
 import type { RenderResultOptions } from "../custom-tools/types";
+import type { ToolSession } from "../sdk";
 import { untilAborted } from "../utils";
 import { resolveToCwd } from "./path-utils";
 import {
@@ -61,7 +62,7 @@ function splitIntoLines(content: string): string[] {
 	return content.split("\n").map((line, i, arr) => (i < arr.length - 1 ? `${line}\n` : line));
 }
 
-export function createNotebookTool(cwd: string): AgentTool<typeof notebookSchema> {
+export function createNotebookTool(session: ToolSession): AgentTool<typeof notebookSchema> {
 	return {
 		name: "notebook",
 		label: "Notebook",
@@ -79,7 +80,7 @@ export function createNotebookTool(cwd: string): AgentTool<typeof notebookSchema
 			}: { action: string; notebook_path: string; cell_index: number; content?: string; cell_type?: string },
 			signal?: AbortSignal,
 		) => {
-			const absolutePath = resolveToCwd(notebook_path, cwd);
+			const absolutePath = resolveToCwd(notebook_path, session.cwd);
 
 			return untilAborted(signal, async () => {
 				// Check if file exists
@@ -190,9 +191,6 @@ export function createNotebookTool(cwd: string): AgentTool<typeof notebookSchema
 	};
 }
 
-/** Default notebook tool using process.cwd() */
-export const notebookTool = createNotebookTool(process.cwd());
-
 // =============================================================================
 // TUI Renderer
 // =============================================================================

package/src/core/tools/output.ts

@@ -14,7 +14,7 @@ import { Type } from "@sinclair/typebox";
 import type { Theme } from "../../modes/interactive/theme/theme";
 import outputDescription from "../../prompts/tools/output.md" with { type: "text" };
 import type { RenderResultOptions } from "../custom-tools/types";
-import type { SessionContext } from "./index";
+import type { ToolSession } from "./index";
 import {
 	formatCount,
 	formatEmptyMessage,
@@ -36,6 +36,11 @@ const outputSchema = Type.Object({
 			description: "Output format: raw (default), json (structured), stripped (no ANSI)",
 		}),
 	),
+	query: Type.Optional(
+		Type.String({
+			description: "jq-like query for JSON outputs (e.g., .result.items[0].name). Requires JSON output.",
+		}),
+	),
 	offset: Type.Optional(
 		Type.Number({
 			description: "Line number to start reading from (1-indexed)",
@@ -70,6 +75,7 @@ interface OutputEntry {
 	provenance?: OutputProvenance;
 	previewLines?: string[];
 	range?: OutputRange;
+	query?: string;
 }
 
 export interface OutputToolDetails {
@@ -83,6 +89,77 @@ function stripAnsi(text: string): string {
 	return text.replace(/\x1b\[[0-9;]*m/g, "");
 }
 
+function parseQuery(query: string): Array<string | number> {
+	let input = query.trim();
+	if (!input) return [];
+	if (input.startsWith(".")) input = input.slice(1);
+	if (!input) return [];
+
+	const tokens: Array<string | number> = [];
+	let i = 0;
+
+	const isIdentChar = (ch: string) => /[A-Za-z0-9_-]/.test(ch);
+
+	while (i < input.length) {
+		const ch = input[i];
+		if (ch === ".") {
+			i++;
+			continue;
+		}
+		if (ch === "[") {
+			const closeIndex = input.indexOf("]", i + 1);
+			if (closeIndex === -1) {
+				throw new Error(`Invalid query: missing ] in ${query}`);
+			}
+			const raw = input.slice(i + 1, closeIndex).trim();
+			if (!raw) {
+				throw new Error(`Invalid query: empty [] in ${query}`);
+			}
+			const quote = raw[0];
+			if ((quote === '"' || quote === "'") && raw.endsWith(quote)) {
+				let inner = raw.slice(1, -1);
+				inner = inner.replace(/\\(["'\\])/g, "$1");
+				tokens.push(inner);
+			} else if (/^\d+$/.test(raw)) {
+				tokens.push(Number(raw));
+			} else {
+				tokens.push(raw);
+			}
+			i = closeIndex + 1;
+			continue;
+		}
+
+		const start = i;
+		while (i < input.length && isIdentChar(input[i])) {
+			i++;
+		}
+		if (start === i) {
+			throw new Error(`Invalid query: unexpected token '${input[i]}' in ${query}`);
+		}
+		const ident = input.slice(start, i);
+		tokens.push(ident);
+	}
+
+	return tokens;
+}
+
+function applyQuery(data: unknown, query: string): unknown {
+	const tokens = parseQuery(query);
+	let current: unknown = data;
+	for (const token of tokens) {
+		if (current === null || current === undefined) return undefined;
+		if (typeof token === "number") {
+			if (!Array.isArray(current)) return undefined;
+			current = current[token];
+			continue;
+		}
+		if (typeof current !== "object") return undefined;
+		const record = current as Record<string, unknown>;
+		current = record[token];
+	}
+	return current;
+}
+
 /** List available output IDs in artifacts directory */
 function listAvailableOutputs(artifactsDir: string): string[] {
 	try {
@@ -120,10 +197,7 @@ function extractPreviewLines(content: string, maxLines: number): string[] {
 	return preview;
 }
 
-export function createOutputTool(
-	_cwd: string,
-	sessionContext?: SessionContext,
-): AgentTool<typeof outputSchema, OutputToolDetails> {
+export function createOutputTool(session: ToolSession): AgentTool<typeof outputSchema, OutputToolDetails> {
 	return {
 		name: "output",
 		label: "Output",
@@ -131,9 +205,15 @@ export function createOutputTool(
 		parameters: outputSchema,
 		execute: async (
 			_toolCallId: string,
-			params: { ids: string[]; format?: "raw" | "json" | "stripped"; offset?: number; limit?: number },
+			params: {
+				ids: string[];
+				format?: "raw" | "json" | "stripped";
+				query?: string;
+				offset?: number;
+				limit?: number;
+			},
 		): Promise<{ content: TextContent[]; details: OutputToolDetails }> => {
-			const sessionFile = sessionContext?.getSessionFile();
+			const sessionFile = session.getSessionFile();
 
 			if (!sessionFile) {
 				return {
@@ -153,7 +233,15 @@ export function createOutputTool(
 			const outputs: OutputEntry[] = [];
 			const notFound: string[] = [];
 			const outputContentById = new Map<string, string>();
-			const format = params.format ?? "raw";
+			const query = params.query?.trim();
+			const wantsQuery = query !== undefined && query.length > 0;
+			const format = params.format ?? (wantsQuery ? "json" : "raw");
+
+			if (wantsQuery && (params.offset !== undefined || params.limit !== undefined)) {
+				throw new Error("query cannot be combined with offset/limit");
+			}
+
+			const queryResults: Array<{ id: string; value: unknown }> = [];
 
 			for (const id of params.ids) {
 				const outputPath = path.join(artifactsDir, `${id}.out.md`);
@@ -171,7 +259,22 @@ export function createOutputTool(
 				let selectedContent = rawContent;
 				let range: OutputRange | undefined;
 
-				if (params.offset !== undefined || params.limit !== undefined) {
+				if (wantsQuery && query) {
+					let jsonValue: unknown;
+					try {
+						jsonValue = JSON.parse(rawContent);
+					} catch (err) {
+						const message = err instanceof Error ? err.message : String(err);
+						throw new Error(`Output ${id} is not valid JSON: ${message}`);
+					}
+					const value = applyQuery(jsonValue, query);
+					queryResults.push({ id, value });
+					try {
+						selectedContent = JSON.stringify(value, null, 2) ?? "null";
+					} catch {
+						selectedContent = String(value);
+					}
+				} else if (params.offset !== undefined || params.limit !== undefined) {
 					const startLine = Math.max(1, params.offset ?? 1);
 					if (startLine > totalLines) {
 						throw new Error(
@@ -189,11 +292,12 @@ export function createOutputTool(
 				outputs.push({
 					id,
 					path: outputPath,
-					lineCount: totalLines,
-					charCount: totalChars,
+					lineCount: wantsQuery ? selectedContent.split("\n").length : totalLines,
+					charCount: wantsQuery ? selectedContent.length : totalChars,
 					provenance: parseOutputProvenance(id),
 					previewLines: extractPreviewLines(selectedContent, 4),
 					range,
+					query: query,
 				});
 			}
 
@@ -215,15 +319,17 @@ export function createOutputTool(
 			let contentText: string;
 
 			if (format === "json") {
-				const jsonData = outputs.map((o) => ({
-					id: o.id,
-					lineCount: o.lineCount,
-					charCount: o.charCount,
-					provenance: o.provenance,
-					previewLines: o.previewLines,
-					range: o.range,
-					content: outputContentById.get(o.id) ?? "",
-				}));
+				const jsonData = wantsQuery
+					? queryResults
+					: outputs.map((o) => ({
+							id: o.id,
+							lineCount: o.lineCount,
+							charCount: o.charCount,
+							provenance: o.provenance,
+							previewLines: o.previewLines,
+							range: o.range,
+							content: outputContentById.get(o.id) ?? "",
+						}));
 				contentText = JSON.stringify(jsonData, null, 2);
 			} else {
 				// raw or stripped
@@ -253,9 +359,6 @@ export function createOutputTool(
 	};
 }
 
-/** Default output tool using process.cwd() - for backwards compatibility */
-export const outputTool = createOutputTool(process.cwd());
-
 // =============================================================================
 // TUI Renderer
 // =============================================================================
@@ -263,6 +366,7 @@ export const outputTool = createOutputTool(process.cwd());
 interface OutputRenderArgs {
 	ids: string[];
 	format?: "raw" | "json" | "stripped";
+	query?: string;
 	offset?: number;
 	limit?: number;
 }
@@ -291,6 +395,7 @@ export const outputToolRenderer = {
 
 		const meta: string[] = [];
 		if (args.format && args.format !== "raw") meta.push(`format:${args.format}`);
+		if (args.query) meta.push(`query:${args.query}`);
 		if (args.offset !== undefined) meta.push(`offset:${args.offset}`);
 		if (args.limit !== undefined) meta.push(`limit:${args.limit}`);
 		text += formatMeta(meta, uiTheme);
@@ -309,15 +414,9 @@ export const outputToolRenderer = {
 			const icon = uiTheme.styledSymbol("status.error", "error");
 			let text = `${icon} ${uiTheme.fg("error", `Error: Not found: ${details.notFound.join(", ")}`)}`;
 			if (details.availableIds?.length) {
-				text += `\n ${uiTheme.fg("dim", uiTheme.tree.last)} ${uiTheme.fg(
-					"muted",
-					`Available: ${details.availableIds.join(", ")}`,
-				)}`;
+				text += `\n ${uiTheme.fg("dim", uiTheme.tree.last)} ${uiTheme.fg("muted", `Available: ${details.availableIds.join(", ")}`)}`;
 			} else {
-				text += `\n ${uiTheme.fg("dim", uiTheme.tree.last)} ${uiTheme.fg(
-					"muted",
-					"No outputs available in current session",
-				)}`;
+				text += `\n ${uiTheme.fg("dim", uiTheme.tree.last)} ${uiTheme.fg("muted", "No outputs available in current session")}`;
 			}
 			return new Text(text, 0, 0);
 		}