@oh-my-pi/pi-coding-agent 14.3.0 → 14.4.1

package/src/tools/index.ts

@@ -29,17 +29,7 @@ import { type CheckpointState, CheckpointTool, RewindTool } from "./checkpoint";
 import { DebugTool } from "./debug";
 import { ExitPlanModeTool } from "./exit-plan-mode";
 import { FindTool } from "./find";
-import {
-	GhIssueViewTool,
-	GhPrCheckoutTool,
-	GhPrDiffTool,
-	GhPrPushTool,
-	GhPrViewTool,
-	GhRepoViewTool,
-	GhRunWatchTool,
-	GhSearchIssuesTool,
-	GhSearchPrsTool,
-} from "./gh";
+import { GithubTool } from "./gh";
 import { GrepTool } from "./grep";
 import { InspectImageTool } from "./inspect-image";
 import { NotebookTool } from "./notebook";
@@ -53,9 +43,9 @@ import { ResolveTool } from "./resolve";
 import { reportFindingTool } from "./review";
 import { SearchToolBm25Tool } from "./search-tool-bm25";
 import { loadSshTool } from "./ssh";
-import { SubmitResultTool } from "./submit-result";
 import { type TodoPhase, TodoWriteTool } from "./todo-write";
 import { WriteTool } from "./write";
+import { YieldTool } from "./yield";
 
 // Exa MCP tools (22 tools)
 
@@ -77,9 +67,9 @@ export * from "./checkpoint";
 export * from "./debug";
 export * from "./exit-plan-mode";
 export * from "./find";
-export * from "./gemini-image";
 export * from "./gh";
 export * from "./grep";
+export * from "./image-gen";
 export * from "./inspect-image";
 export * from "./notebook";
 export * from "./poll-tool";
@@ -91,10 +81,10 @@ export * from "./resolve";
 export * from "./review";
 export * from "./search-tool-bm25";
 export * from "./ssh";
-export * from "./submit-result";
 export * from "./todo-write";
 export * from "./vim";
 export * from "./write";
+export * from "./yield";
 
 /** Tool type (AgentTool from pi-ai) */
 export type Tool = AgentTool<any, any, any>;
@@ -131,8 +121,8 @@ export interface ToolSession {
 	eventBus?: EventBus;
 	/** Output schema for structured completion (subagents) */
 	outputSchema?: unknown;
-	/** Whether to include the submit_result tool by default */
-	requireSubmitResultTool?: boolean;
+	/** Whether to include the yield tool by default */
+	requireYieldTool?: boolean;
 	/** Task recursion depth (0 = top-level, 1 = first child, etc.) */
 	taskDepth?: number;
 	/** Get session file */
@@ -217,15 +207,7 @@ export const BUILTIN_TOOLS: Record<string, ToolFactory> = {
 	calc: s => new CalculatorTool(s),
 	ssh: loadSshTool,
 	edit: s => new EditTool(s),
-	gh_repo_view: GhRepoViewTool.createIf,
-	gh_issue_view: GhIssueViewTool.createIf,
-	gh_pr_view: GhPrViewTool.createIf,
-	gh_pr_diff: GhPrDiffTool.createIf,
-	gh_pr_checkout: GhPrCheckoutTool.createIf,
-	gh_pr_push: GhPrPushTool.createIf,
-	gh_run_watch: GhRunWatchTool.createIf,
-	gh_search_issues: GhSearchIssuesTool.createIf,
-	gh_search_prs: GhSearchPrsTool.createIf,
+	github: GithubTool.createIf,
 	find: s => new FindTool(s),
 	grep: s => new GrepTool(s),
 	lsp: LspTool.createIf,
@@ -245,7 +227,7 @@ export const BUILTIN_TOOLS: Record<string, ToolFactory> = {
 };
 
 export const HIDDEN_TOOLS: Record<string, ToolFactory> = {
-	submit_result: s => new SubmitResultTool(s),
+	yield: s => new YieldTool(s),
 	report_finding: () => reportFindingTool,
 	report_tool_issue: s => createReportToolIssueTool(s),
 	exit_plan_mode: s => new ExitPlanModeTool(s),
@@ -288,7 +270,7 @@ function getPythonModeFromEnv(): PythonToolMode | null {
  * Create tools from BUILTIN_TOOLS registry.
  */
 export async function createTools(session: ToolSession, toolNames?: string[]): Promise<Tool[]> {
-	const includeSubmitResult = session.requireSubmitResultTool === true;
+	const includeYield = session.requireYieldTool === true;
 	const enableLsp = session.enableLsp ?? true;
 	const requestedTools =
 		toolNames && toolNames.length > 0 ? [...new Set(toolNames.map(name => name.toLowerCase()))] : undefined;
@@ -390,10 +372,10 @@ export async function createTools(session: ToolSession, toolNames?: string[]): P
 		if (name === "bash") return allowBash;
 		if (name === "python") return allowPython;
 		if (name === "debug") return session.settings.get("debug.enabled");
-		if (name === "todo_write") return !includeSubmitResult && session.settings.get("todo.enabled");
+		if (name === "todo_write") return !includeYield && session.settings.get("todo.enabled");
 		if (name === "find") return session.settings.get("find.enabled");
 		if (name === "grep") return session.settings.get("grep.enabled");
-		if (name.startsWith("gh_")) return session.settings.get("github.enabled");
+		if (name === "github") return session.settings.get("github.enabled");
 		if (name === "ast_grep") return session.settings.get("astGrep.enabled");
 		if (name === "ast_edit") return session.settings.get("astEdit.enabled");
 		if (name === "render_mermaid") return session.settings.get("renderMermaid.enabled");
@@ -411,8 +393,8 @@ export async function createTools(session: ToolSession, toolNames?: string[]): P
 		}
 		return true;
 	};
-	if (includeSubmitResult && requestedTools && !requestedTools.includes("submit_result")) {
-		requestedTools.push("submit_result");
+	if (includeYield && requestedTools && !requestedTools.includes("yield")) {
+		requestedTools.push("yield");
 	}
 
 	const filteredRequestedTools = requestedTools?.filter(name => name in allTools && isToolAllowed(name));
@@ -421,7 +403,7 @@ export async function createTools(session: ToolSession, toolNames?: string[]): P
 			? filteredRequestedTools.filter(name => name !== "resolve").map(name => [name, allTools[name]] as const)
 			: [
 					...Object.entries(BUILTIN_TOOLS).filter(([name]) => isToolAllowed(name)),
-					...(includeSubmitResult ? ([["submit_result", HIDDEN_TOOLS.submit_result]] as const) : []),
+					...(includeYield ? ([["yield", HIDDEN_TOOLS.yield]] as const) : []),
 					...([["exit_plan_mode", HIDDEN_TOOLS.exit_plan_mode]] as const),
 				];
 

package/src/tools/inspect-image.ts

@@ -16,8 +16,8 @@ import { ToolError } from "./tool-errors";
 
 const inspectImageSchema = Type.Object(
 	{
-		path: Type.String({ description: "Filesystem path to an image" }),
-		question: Type.String({ description: "Question to ask about the image" }),
+		path: Type.String({ description: "image path", examples: ["image.png"] }),
+		question: Type.String({ description: "question about image", examples: ["What is in this image?"] }),
 	},
 	{ additionalProperties: false },
 );
@@ -43,7 +43,7 @@ export class InspectImageTool implements AgentTool<typeof inspectImageSchema, In
 	readonly label = "InspectImage";
 	readonly description: string;
 	readonly parameters = inspectImageSchema;
-	readonly strict = true;
+	readonly strict = false;
 
 	constructor(
 		private readonly session: ToolSession,

package/src/tools/json-tree.ts

@@ -13,17 +13,17 @@ export const JSON_TREE_MAX_LINES_EXPANDED = 200;
 export const JSON_TREE_SCALAR_LEN_COLLAPSED = 60;
 export const JSON_TREE_SCALAR_LEN_EXPANDED = 2000;
 
-/** Keys injected by the harness that should not be displayed to users */
-const HIDDEN_ARG_KEYS = new Set([INTENT_FIELD, "__partialJson"]);
-
-/** Strip harness-internal keys from tool args for display */
-export function stripInternalArgs(args: Record<string, unknown>): Record<string, unknown> {
-	const result: Record<string, unknown> = {};
-	for (const [key, value] of Object.entries(args)) {
-		if (!HIDDEN_ARG_KEYS.has(key)) result[key] = value;
-	}
-	return result;
+const HIDDEN_ARG_KEYS = { [INTENT_FIELD]: 1, __partialJson: 1 };
+
+const ARGS_INLINE_PAIR_SEP = ", ";
+const ARGS_INLINE_PAIR_SEP_WIDTH = Bun.stringWidth(ARGS_INLINE_PAIR_SEP);
+const ARGS_INLINE_MORE = "…";
+const ARGS_INLINE_MORE_WIDTH = Bun.stringWidth(ARGS_INLINE_MORE);
+
+function isRecord(value: unknown): value is Record<string, unknown> {
+	return !!value && typeof value === "object" && !Array.isArray(value);
 }
+
 /**
  * Format a scalar value for inline display.
  */
@@ -49,40 +49,35 @@ export function formatScalar(value: unknown, maxLen: number): string {
  * Format args inline for collapsed view.
  */
 export function formatArgsInline(args: Record<string, unknown>, maxWidth: number): string {
-	const entries = Object.entries(args).filter(([k]) => !HIDDEN_ARG_KEYS.has(k));
-	if (entries.length === 0) return "";
-
-	// Single arg: show key=value
-	if (entries.length === 1) {
-		const [key, value] = entries[0];
-		return `${key}=${formatScalar(value, maxWidth - key.length - 1)}`;
-	}
-
-	// Multiple args: show key=value, key=value...
-	const pairs: string[] = [];
-	let totalLen = 0;
-
-	for (const [key, value] of entries) {
-		const valueStr = formatScalar(value, 24);
-		const pairStr = `${key}=${valueStr}`;
-		const addLen = pairs.length > 0 ? pairStr.length + 2 : pairStr.length;
-
-		if (totalLen + addLen > maxWidth && pairs.length > 0) {
-			pairs.push("…");
-			break;
+	let result = "";
+	let width = 0;
+	for (const key in args) {
+		if (key in HIDDEN_ARG_KEYS) continue;
+		const value = args[key];
+		const sep = width > 0 ? ARGS_INLINE_PAIR_SEP : "";
+		const sepW = width > 0 ? ARGS_INLINE_PAIR_SEP_WIDTH : 0;
+		const current = width + sepW;
+		const cap = maxWidth - current - ARGS_INLINE_MORE_WIDTH;
+		if (cap <= 0) {
+			return `${result}${ARGS_INLINE_MORE}`;
 		}
-
-		pairs.push(pairStr);
-		totalLen += addLen;
+		const valueMaxLen = Math.min(maxWidth - current, 24);
+		const valueStr = formatScalar(value, valueMaxLen);
+		const piece = `${key}=${valueStr}`;
+		const pieceW = Bun.stringWidth(piece);
+		if (pieceW > cap) {
+			return `${result}${sep}${truncateToWidth(piece, cap)}`;
+		}
+		result += sep + piece;
+		width = current + pieceW;
 	}
-
-	return pairs.join(", ");
+	return result;
 }
 
 /**
  * Build tree prefix for nested rendering.
  */
-function buildTreePrefix(ancestors: boolean[], theme: Theme): string {
+function buildTreePrefix(theme: Theme, ancestors: readonly boolean[]): string {
 	return ancestors.map(hasNext => (hasNext ? `${theme.tree.vertical}  ` : "   ")).join("");
 }
 
@@ -119,109 +114,114 @@ export function renderJsonTreeLines(
 		}
 
 		const connector = isLast ? theme.tree.last : theme.tree.branch;
-		const prefix = `${buildTreePrefix(ancestors, theme)}${theme.fg("dim", connector)} `;
-
-		// Handle scalars
-		if (val === null || val === undefined || typeof val !== "object") {
-			const label = key ? theme.fg("muted", key) : theme.fg("muted", "value");
+		const prefix = `${buildTreePrefix(theme, ancestors)}${theme.fg("dim", connector)} `;
+
+		ancestors.push(!isLast);
+		try {
+			// Handle scalars
+			if (val === null || val === undefined || typeof val !== "object") {
+				const label = key ? theme.fg("muted", key) : theme.fg("muted", "value");
+
+				// Special handling for multiline strings
+				if (typeof val === "string" && val.includes("\n")) {
+					const strLines = val.split("\n");
+					const maxStrLines = Math.min(strLines.length, Math.max(1, maxLines - lines.length - 1));
+					const continuePrefix = buildTreePrefix(theme, ancestors);
+
+					// First line with label
+					const firstLine = truncateToWidth(strLines[0], maxScalarLen);
+					pushLine(`${prefix}${iconScalar} ${label}: ${theme.fg("dim", `"${firstLine}`)}`);
+
+					// Subsequent lines indented
+					for (let i = 1; i < maxStrLines; i++) {
+						if (lines.length >= maxLines) {
+							truncated = true;
+							break;
+						}
+						const line = truncateToWidth(strLines[i], maxScalarLen);
+						pushLine(`${continuePrefix}   ${theme.fg("dim", ` ${line}`)}`);
+					}
 
-			// Special handling for multiline strings
-			if (typeof val === "string" && val.includes("\n")) {
-				const strLines = val.split("\n");
-				const maxStrLines = Math.min(strLines.length, Math.max(1, maxLines - lines.length - 1));
-				const continuePrefix = buildTreePrefix([...ancestors, !isLast], theme);
+					// Show truncation and closing quote
+					if (strLines.length > maxStrLines) {
+						truncated = true;
+						pushLine(
+							`${continuePrefix}   ${theme.fg("dim", ` …(${strLines.length - maxStrLines} more lines)"`)}`,
+						);
+					} else {
+						// Add closing quote to last line - need to modify the last pushed line
+						const lastIdx = lines.length - 1;
+						lines[lastIdx] = `${lines[lastIdx]}${theme.fg("dim", '"')}`;
+					}
+					return;
+				}
 
-				// First line with label
-				const firstLine = truncateToWidth(strLines[0], maxScalarLen);
-				pushLine(`${prefix}${iconScalar} ${label}: ${theme.fg("dim", `"${firstLine}`)}`);
+				const scalar = formatScalar(val, maxScalarLen);
+				pushLine(`${prefix}${iconScalar} ${label}: ${theme.fg("dim", scalar)}`);
+				return;
+			}
 
-				// Subsequent lines indented
-				for (let i = 1; i < maxStrLines; i++) {
+			// Handle arrays
+			if (Array.isArray(val)) {
+				const header = key ? theme.fg("muted", key) : theme.fg("muted", "array");
+				pushLine(`${prefix}${iconArray} ${header}`);
+				if (val.length === 0) {
+					pushLine(
+						`${buildTreePrefix(theme, ancestors)}${theme.fg("dim", theme.tree.last)} ${theme.fg("dim", "[]")}`,
+					);
+					return;
+				}
+				if (depth >= maxDepth) {
+					pushLine(
+						`${buildTreePrefix(theme, ancestors)}${theme.fg("dim", theme.tree.last)} ${theme.fg("dim", "…")}`,
+					);
+					return;
+				}
+				for (let i = 0; i < val.length; i++) {
+					renderNode(val[i], `[${i}]`, ancestors, i === val.length - 1, depth + 1);
 					if (lines.length >= maxLines) {
 						truncated = true;
-						break;
+						return;
 					}
-					const line = truncateToWidth(strLines[i], maxScalarLen);
-					pushLine(`${continuePrefix}   ${theme.fg("dim", ` ${line}`)}`);
-				}
-
-				// Show truncation and closing quote
-				if (strLines.length > maxStrLines) {
-					truncated = true;
-					pushLine(`${continuePrefix}   ${theme.fg("dim", ` …(${strLines.length - maxStrLines} more lines)"`)}`);
-				} else {
-					// Add closing quote to last line - need to modify the last pushed line
-					const lastIdx = lines.length - 1;
-					lines[lastIdx] = `${lines[lastIdx]}${theme.fg("dim", '"')}`;
 				}
 				return;
 			}
 
-			const scalar = formatScalar(val, maxScalarLen);
-			pushLine(`${prefix}${iconScalar} ${label}: ${theme.fg("dim", scalar)}`);
-			return;
-		}
+			// Handle objects
+			if (!isRecord(val)) return;
 
-		// Handle arrays
-		if (Array.isArray(val)) {
-			const header = key ? theme.fg("muted", key) : theme.fg("muted", "array");
-			pushLine(`${prefix}${iconArray} ${header}`);
-			if (val.length === 0) {
-				pushLine(
-					`${buildTreePrefix([...ancestors, !isLast], theme)}${theme.fg("dim", theme.tree.last)} ${theme.fg("dim", "[]")}`,
-				);
+			const header = key ? theme.fg("muted", key) : theme.fg("muted", "object");
+			pushLine(`${prefix}${iconObject} ${header}`);
+			if (depth >= maxDepth) {
+				pushLine(`${buildTreePrefix(theme, ancestors)}${theme.fg("dim", theme.tree.last)} ${theme.fg("dim", "…")}`);
 				return;
 			}
-			if (depth >= maxDepth) {
+			const keys = Object.keys(val);
+			if (keys.length === 0) {
 				pushLine(
-					`${buildTreePrefix([...ancestors, !isLast], theme)}${theme.fg("dim", theme.tree.last)} ${theme.fg("dim", "…")}`,
+					`${buildTreePrefix(theme, ancestors)}${theme.fg("dim", theme.tree.last)} ${theme.fg("dim", "{}")}`,
 				);
 				return;
 			}
-			const nextAncestors = [...ancestors, !isLast];
-			for (let i = 0; i < val.length; i++) {
-				renderNode(val[i], `[${i}]`, nextAncestors, i === val.length - 1, depth + 1);
+			for (let i = 0; i < keys.length; i++) {
+				const childKey = keys[i];
+				const child = val[childKey];
+				renderNode(child, childKey, ancestors, i === keys.length - 1, depth + 1);
 				if (lines.length >= maxLines) {
 					truncated = true;
 					return;
 				}
 			}
-			return;
-		}
-
-		// Handle objects
-		const header = key ? theme.fg("muted", key) : theme.fg("muted", "object");
-		pushLine(`${prefix}${iconObject} ${header}`);
-		const entries = Object.entries(val as Record<string, unknown>);
-		if (entries.length === 0) {
-			pushLine(
-				`${buildTreePrefix([...ancestors, !isLast], theme)}${theme.fg("dim", theme.tree.last)} ${theme.fg("dim", "{}")}`,
-			);
-			return;
-		}
-		if (depth >= maxDepth) {
-			pushLine(
-				`${buildTreePrefix([...ancestors, !isLast], theme)}${theme.fg("dim", theme.tree.last)} ${theme.fg("dim", "…")}`,
-			);
-			return;
-		}
-		const nextAncestors = [...ancestors, !isLast];
-		for (let i = 0; i < entries.length; i++) {
-			const [childKey, child] = entries[i];
-			renderNode(child, childKey, nextAncestors, i === entries.length - 1, depth + 1);
-			if (lines.length >= maxLines) {
-				truncated = true;
-				return;
-			}
+		} finally {
+			ancestors.pop();
 		}
 	};
 
 	// Render root level
-	if (value && typeof value === "object" && !Array.isArray(value)) {
-		const entries = Object.entries(value as Record<string, unknown>);
-		for (let i = 0; i < entries.length; i++) {
-			const [childKey, child] = entries[i];
-			renderNode(child, childKey, [], i === entries.length - 1, 1);
+	if (isRecord(value)) {
+		for (const key in value) {
+			if (key in HIDDEN_ARG_KEYS) continue;
+			renderNode(value[key], key, [], true, 1);
 			if (lines.length >= maxLines) {
 				truncated = true;
 				break;

package/src/tools/match-line-format.ts

@@ -2,19 +2,20 @@ import { computeLineHash } from "../edit/line-hash";
 
 /**
  * Format a single line of match output for grep/ast-grep style results.
- * Uses hashline refs when hashlines are enabled, otherwise pads the number.
+ *
+ * Match lines use `>` as the anchor/content separator; context lines use `:`.
+ * In hashline mode the anchor is `LINE+ID` (no `#`); in plain mode it is
+ * just the line number. Line numbers are never padded.
  */
 export function formatMatchLine(
 	lineNumber: number,
 	line: string,
 	isMatch: boolean,
-	options: { useHashLines: boolean; lineWidth: number },
+	options: { useHashLines: boolean },
 ): string {
-	const separator = isMatch ? ":" : "-";
+	const separator = isMatch ? ">" : ":";
 	if (options.useHashLines) {
-		const ref = `${lineNumber}#${computeLineHash(lineNumber, line)}`;
-		return `${ref}${separator}${line}`;
+		return `${lineNumber}${computeLineHash(lineNumber, line)}${separator}${line}`;
 	}
-	const padded = lineNumber.toString().padStart(options.lineWidth, " ");
-	return `${padded}${separator}${line}`;
+	return `${lineNumber}${separator}${line}`;
 }

package/src/tools/notebook.ts

@@ -13,14 +13,16 @@ import { formatCount, formatErrorMessage, PREVIEW_LIMITS } from "./render-utils"
 
 const notebookSchema = Type.Object({
 	action: StringEnum(["edit", "insert", "delete"], {
-		description: "Action to perform on the notebook cell",
+		description: "cell action",
+		examples: ["edit", "insert", "delete"],
 	}),
-	notebook_path: Type.String({ description: "Path to the .ipynb file (relative or absolute)" }),
-	cell_index: Type.Number({ description: "0-based index of the cell to operate on" }),
-	content: Type.Optional(Type.String({ description: "New cell content (required for edit/insert)" })),
+	notebook_path: Type.String({ description: "notebook path", examples: ["analysis.ipynb"] }),
+	cell_index: Type.Number({ description: "cell index", examples: [0, 1] }),
+	content: Type.Optional(Type.String({ description: "new cell content" })),
 	cell_type: Type.Optional(
 		StringEnum(["code", "markdown"], {
-			description: "Cell type for insert (default: code)",
+			description: "cell type",
+			examples: ["code", "markdown"],
 		}),
 	),
 });
@@ -62,8 +64,7 @@ type NotebookParams = Static<typeof notebookSchema>;
 export class NotebookTool implements AgentTool<typeof notebookSchema, NotebookToolDetails> {
 	readonly name = "notebook";
 	readonly label = "Notebook";
-	readonly description =
-		"Edit, insert, or delete cells in Jupyter notebooks (.ipynb). cell_index is 0-based. Paths must be absolute.";
+	readonly description = "Edit, insert, or delete cells in Jupyter notebooks (.ipynb). cell_index is 0-based.";
 	readonly parameters = notebookSchema;
 	readonly strict = true;
 	readonly concurrency = "exclusive";

package/src/tools/poll-tool.ts

@@ -8,7 +8,8 @@ import type { ToolSession } from "./index";
 const pollSchema = Type.Object({
 	jobs: Type.Optional(
 		Type.Array(Type.String(), {
-			description: "Specific job IDs to wait for. If omitted, waits for any running job.",
+			description: "job ids to wait for",
+			examples: [["job-1234"]],
 		}),
 	),
 });

package/src/tools/python.ts

@@ -1,4 +1,3 @@
-import type * as fs from "node:fs";
 import * as path from "node:path";
 import type { AgentTool, AgentToolContext, AgentToolResult, AgentToolUpdateCallback } from "@oh-my-pi/pi-agent-core";
 import type { ImageContent } from "@oh-my-pi/pi-ai";
@@ -16,7 +15,6 @@ import { DEFAULT_MAX_BYTES, OutputSink, type OutputSummary, TailBuffer } from ".
 import { getTreeBranch, getTreeContinuePrefix, renderCodeCell } from "../tui";
 import type { ToolSession } from ".";
 import { formatStyledTruncationWarning, type OutputMeta } from "./output-meta";
-import { resolveToCwd } from "./path-utils";
 import { formatTitle, replaceTabs, shortenPath, truncateToWidth, wrapBrackets } from "./render-utils";
 import { ToolAbortError, ToolError } from "./tool-errors";
 import { toolResult } from "./tool-result";
@@ -47,14 +45,13 @@ function groupPreludeHelpers(helpers: PreludeHelper[]): PreludeCategory[] {
 export const pythonSchema = Type.Object({
 	cells: Type.Array(
 		Type.Object({
-			code: Type.String({ description: "Python code to execute" }),
-			title: Type.Optional(Type.String({ description: "Cell label, e.g. 'imports', 'helper'" })),
+			code: Type.String({ description: "python code", examples: ["print('hello')", "import json"] }),
+			title: Type.String({ description: "cell label", examples: ["imports", "helper"] }),
 		}),
-		{ description: "Cells to execute sequentially in persistent kernel" },
+		{ description: "cells to execute" },
 	),
-	timeout: Type.Optional(Type.Number({ description: "Timeout in seconds", default: 30 })),
-	cwd: Type.Optional(Type.String({ description: "Working directory (default: cwd)" })),
-	reset: Type.Optional(Type.Boolean({ description: "Restart kernel before execution" })),
+	timeout: Type.Optional(Type.Number({ description: "timeout in seconds", default: 30 })),
+	reset: Type.Optional(Type.Boolean({ description: "restart kernel" })),
 });
 export type PythonToolParams = Static<typeof pythonSchema>;
 
@@ -177,7 +174,7 @@ export class PythonTool implements AgentTool<typeof pythonSchema> {
 		}
 		const session = this.session;
 
-		const { cells, timeout: rawTimeout = 30, cwd, reset } = params;
+		const { cells, timeout: rawTimeout = 30, reset } = params;
 		// Clamp to reasonable range: 1s - 600s (10 min)
 		const timeoutSec = clampTimeout("python", rawTimeout);
 		const timeoutMs = timeoutSec * 1000;
@@ -204,17 +201,6 @@ export class PythonTool implements AgentTool<typeof pythonSchema> {
 				}
 				session.assertPythonExecutionAllowed?.();
 
-				const commandCwd = cwd ? resolveToCwd(cwd, session.cwd) : session.cwd;
-				let cwdStat: fs.Stats;
-				try {
-					cwdStat = await Bun.file(commandCwd).stat();
-				} catch {
-					throw new ToolError(`Working directory does not exist: ${commandCwd}`);
-				}
-				if (!cwdStat.isDirectory()) {
-					throw new ToolError(`Working directory is not a directory: ${commandCwd}`);
-				}
-
 				const tailBuffer = new TailBuffer(DEFAULT_MAX_BYTES * 2);
 				const jsonOutputs: unknown[] = [];
 				const images: ImageContent[] = [];
@@ -273,11 +259,11 @@ export class PythonTool implements AgentTool<typeof pythonSchema> {
 						pushUpdate();
 					},
 				});
-				const sessionId = sessionFile ? `session:${sessionFile}:cwd:${commandCwd}` : `cwd:${commandCwd}`;
+				const sessionId = sessionFile ? `session:${sessionFile}:cwd:${session.cwd}` : `cwd:${session.cwd}`;
 
 				if (getPreludeDocs().length === 0) {
 					const warmup = await warmPythonEnvironment(
-						commandCwd,
+						session.cwd,
 						sessionId,
 						session.settings.get("python.sharedGateway"),
 						sessionFile ?? undefined,
@@ -292,7 +278,7 @@ export class PythonTool implements AgentTool<typeof pythonSchema> {
 				}
 
 				const baseExecutorOptions = {
-					cwd: commandCwd,
+					cwd: session.cwd,
 					deadlineMs,
 					signal: combinedSignal,
 					sessionId,