@oh-my-pi/pi-coding-agent 3.30.0 → 3.31.0

package/CHANGELOG.md

@@ -2,6 +2,77 @@
 
 ## [Unreleased]
 
+## [3.31.0] - 2026-01-08
+
+### Added
+
+- Added temporary model selection: `Ctrl+Y` opens model selector for session-only model switching (not persisted to settings)
+- Added `setModelTemporary()` method to AgentSession for ephemeral model changes
+- Added empty Enter to flush queued messages: pressing Enter with empty editor while streaming aborts current stream
+- Added auto-chdir to temp directories when starting in home unless `--allow-home` is set
+- Added upfront diff parsing and filtering for code review command to exclude lock files, generated code, and binary assets
+
+### Fixed
+
+- Fixed auto-chdir to only use existing directories and fall back to `tmpdir()`
+- Added automatic reviewer agent count recommendation based on diff weight and file count
+- Added file grouping guidance for parallel review distribution across multiple agents
+- Added diff preview mode for large changesets that exceed size thresholds
+- Added in-memory session storage implementation for testing and ephemeral sessions
+- Added `createToolUIKit` helper to consolidate common UI formatting utilities across tool renderers
+- Added configurable bash interceptor rules via `bashInterceptor.patterns` setting for custom command blocking
+- Added `bashInterceptor.simpleLs` setting to control interception of bare ls commands
+- Added LSP server configuration via external JSON defaults file for easier customization
+- Added abort signal propagation to web scrapers for improved cancellation handling
+- Added `diagnosticsVersion` tracking to LSP client for more reliable diagnostic polling
+- Added 80+ specialized web scrapers for structured content extraction from popular sites including GitHub, GitLab, npm, PyPI, crates.io, Wikipedia, YouTube, Stack Overflow, Hacker News, Reddit, arXiv, PubMed, and many more
+- Added site-specific API integrations for package registries (npm, PyPI, crates.io, Hex, Hackage, NuGet, Maven, RubyGems, Packagist, pub.dev, Go packages)
+- Added scrapers for social platforms (Mastodon, Bluesky, Lemmy, Lobsters, Dev.to, Discourse)
+- Added scrapers for academic sources (arXiv, bioRxiv, PubMed, Semantic Scholar, ORCID, CrossRef, IACR)
+- Added scrapers for security databases (NVD, OSV, CISA KEV)
+- Added scrapers for documentation sites (MDN, Read the Docs, RFC Editor, W3C, SPDX, tldr, cheat.sh)
+- Added scrapers for media platforms (YouTube, Vimeo, Spotify, Discogs, MusicBrainz)
+- Added scrapers for AI/ML platforms (Hugging Face, Ollama)
+- Added scrapers for app stores and marketplaces (VS Code Marketplace, JetBrains Marketplace, Firefox Add-ons, Open VSX, Flathub, F-Droid, Snapcraft)
+- Added scrapers for business data (SEC EDGAR, OpenCorporates, CoinGecko)
+- Added scrapers for reference sources (Wikipedia, Wikidata, OpenLibrary, Choose a License)
+
+### Changed
+
+- Changed `Ctrl+P` to cycle through role models (slow → default → smol) instead of all available models
+- Changed `Shift+Ctrl+P` to cycle role models temporarily (not persisted)
+- Changed Extension Control Center to scale with terminal height instead of fixed 25-line limit
+- Changed review command to parse git diff upfront and provide structured context to reviewer agents
+- Changed session persistence to use structured logging instead of console.error for persistence failures
+- Changed find tool to use fd command for .gitignore discovery instead of Bun.Glob for better abort handling
+- Changed LSP config loading to only mark overrides when servers are actually defined
+- Changed task tool to require explicit task `id` field instead of auto-generating names from agent type
+- Changed grep and find tools to use native Bun file APIs instead of Node.js fs module for improved performance
+- Changed YouTube scraper to use async command execution with proper stream handling
+- Improved rust-analyzer diagnostic polling to use version-based stability detection instead of time-based delays
+- Changed theme icons for extension types to use Unicode symbols (✧, ⚒) instead of text abbreviations (SK, TL, MCP)
+- Changed task tool to use short CamelCase task IDs instead of agent-based naming (e.g., 'SessionStore' instead of 'explore_0')
+- Changed task tool to accept single `agent` parameter at top level instead of per-task agent specification
+- Changed reviewer agent to use `complete` tool instead of `submit_review` for finishing reviews
+- Changed theme icons for extensions to use Unicode symbols instead of text abbreviations
+- Changed LSP file type matching to support exact filename matches in addition to extensions
+- Improved rust-analyzer diagnostic polling to use version-based stability detection
+- Refactored web-fetch tool to use modular scraper architecture for improved maintainability
+
+### Removed
+
+- Removed `submit_review` tool - reviewers now finish via `complete` tool with structured output
+
+### Fixed
+
+- Fixed session persistence to call fsync before renaming temp file for durability
+- Fixed duplicate persistence error logging by tracking whether error was already reported
+- Fixed byte counting in task output truncation to correctly handle multi-byte Unicode characters
+- Fixed parallel task execution to propagate abort signals and fail fast on first error
+- Fixed task worker abort handling to properly clean up on cancellation
+- Fixed parallel task execution to fail fast on first error instead of waiting for all workers
+- Fixed byte counting in task output truncation to handle multi-byte Unicode characters correctly
+
 ## [3.30.0] - 2026-01-07
 ### Added
 

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@oh-my-pi/pi-coding-agent",
-	"version": "3.30.0",
+	"version": "3.31.0",
 	"description": "Coding agent CLI with read, bash, edit, write tools and session management",
 	"type": "module",
 	"ompConfig": {
@@ -39,10 +39,10 @@
 		"prepublishOnly": "bun run generate-template && bun run clean && bun run build"
 	},
 	"dependencies": {
-		"@mariozechner/pi-ai": "^0.37.4",
-		"@oh-my-pi/pi-agent-core": "3.30.0",
-		"@oh-my-pi/pi-git-tool": "3.30.0",
-		"@oh-my-pi/pi-tui": "3.30.0",
+		"@mariozechner/pi-ai": "^0.37.8",
+		"@oh-my-pi/pi-agent-core": "3.31.0",
+		"@oh-my-pi/pi-git-tool": "3.31.0",
+		"@oh-my-pi/pi-tui": "3.31.0",
 		"@openai/agents": "^0.3.7",
 		"@sinclair/typebox": "^0.34.46",
 		"ajv": "^8.17.1",

package/src/cli/args.ts

@@ -11,6 +11,7 @@ export type Mode = "text" | "json" | "rpc";
 
 export interface Args {
 	cwd?: string;
+	allowHome?: boolean;
 	provider?: string;
 	model?: string;
 	smol?: string;
@@ -62,6 +63,8 @@ export function parseArgs(args: string[], extensionFlags?: Map<string, { type: "
 			result.help = true;
 		} else if (arg === "--version" || arg === "-v") {
 			result.version = true;
+		} else if (arg === "--allow-home") {
+			result.allowHome = true;
 		} else if (arg === "--mode" && i + 1 < args.length) {
 			const mode = args[++i];
 			if (mode === "text" || mode === "json" || mode === "rpc") {
@@ -176,6 +179,7 @@ ${chalk.bold("Options:")}
   --api-key <key>                API key (defaults to env vars)
   --system-prompt <text>         System prompt (default: coding assistant prompt)
   --append-system-prompt <text>  Append text or file contents to the system prompt
+  --allow-home                   Allow starting in ~ without auto-switching to a temp dir
   --mode <mode>                  Output mode: text (default), json, or rpc
   --print, -p                    Non-interactive mode: process prompt and exit
   --continue, -c                 Continue previous session

package/src/core/agent-session.ts

@@ -1128,6 +1128,24 @@ export class AgentSession {
 		this.setThinkingLevel(this.thinkingLevel);
 	}
 
+	/**
+	 * Set model temporarily (for this session only).
+	 * Validates API key, saves to session log but NOT to settings.
+	 * @throws Error if no API key available for the model
+	 */
+	async setModelTemporary(model: Model<any>): Promise<void> {
+		const apiKey = await this._modelRegistry.getApiKey(model);
+		if (!apiKey) {
+			throw new Error(`No API key for ${model.provider}/${model.id}`);
+		}
+
+		this.agent.setModel(model);
+		this.sessionManager.appendModelChange(`${model.provider}/${model.id}`, "temporary");
+
+		// Re-clamp thinking level for new model's capabilities
+		this.setThinkingLevel(this.thinkingLevel);
+	}
+
 	/**
 	 * Cycle to next/previous model.
 	 * Uses scoped models (from --models flag) if available, otherwise all available models.
@@ -1144,8 +1162,13 @@ export class AgentSession {
 	/**
 	 * Cycle through configured role models in a fixed order.
 	 * Skips missing roles and deduplicates models.
+	 * @param roleOrder - Order of roles to cycle through (e.g., ["slow", "default", "smol"])
+	 * @param options - Optional settings: `temporary` to not persist to settings
 	 */
-	async cycleRoleModels(roleOrder: string[]): Promise<RoleModelCycleResult | undefined> {
+	async cycleRoleModels(
+		roleOrder: string[],
+		options?: { temporary?: boolean },
+	): Promise<RoleModelCycleResult | undefined> {
 		const availableModels = this._modelRegistry.getAvailable();
 		if (availableModels.length === 0) return undefined;
 
@@ -1185,7 +1208,11 @@ export class AgentSession {
 		const nextIndex = (currentIndex + 1) % roleModels.length;
 		const next = roleModels[nextIndex];
 
-		await this.setModel(next.model, next.role);
+		if (options?.temporary) {
+			await this.setModelTemporary(next.model);
+		} else {
+			await this.setModel(next.model, next.role);
+		}
 
 		return { model: next.model, thinkingLevel: this.thinkingLevel, role: next.role };
 	}

package/src/core/bash-executor.ts

@@ -10,6 +10,7 @@ import { createWriteStream, type WriteStream } from "node:fs";
 import { tmpdir } from "node:os";
 import { join } from "node:path";
 import type { Subprocess } from "bun";
+import { nanoid } from "nanoid";
 import stripAnsi from "strip-ansi";
 import { getShellConfig, killProcessTree, sanitizeBinaryOutput } from "../utils/shell";
 import { getOrCreateSnapshot, getSnapshotSourceCommand } from "../utils/shell-snapshot";
@@ -77,7 +78,7 @@ function createOutputSink(
 
 			// Spill to temp file if needed
 			if (totalBytes > spillThreshold && !fullOutputPath) {
-				fullOutputPath = join(tmpdir(), `omp-${crypto.randomUUID()}.buffer`);
+				fullOutputPath = join(tmpdir(), `omp-${nanoid()}.buffer`);
 				const ts = createWriteStream(fullOutputPath);
 				chunks.forEach((c) => {
 					ts.write(c);

package/src/core/custom-commands/bundled/review/index.ts

@@ -6,11 +6,296 @@
  * 2. Review uncommitted changes
  * 3. Review a specific commit
  * 4. Custom review instructions
+ *
+ * Runs git diff upfront, parses results, filters noise, and provides
+ * rich context for the orchestrating agent to distribute work across
+ * multiple reviewer agents based on diff weight and locality.
  */
 
+import reviewRequestTemplate from "../../../../prompts/review-request.md" with { type: "text" };
 import type { HookCommandContext } from "../../../hooks/types";
 import type { CustomCommand, CustomCommandAPI } from "../../types";
 
+// ─────────────────────────────────────────────────────────────────────────────
+// Types
+// ─────────────────────────────────────────────────────────────────────────────
+
+interface FileDiff {
+	path: string;
+	linesAdded: number;
+	linesRemoved: number;
+	hunks: string;
+}
+
+interface DiffStats {
+	files: FileDiff[];
+	totalAdded: number;
+	totalRemoved: number;
+	excluded: { path: string; reason: string; linesAdded: number; linesRemoved: number }[];
+}
+
+// ─────────────────────────────────────────────────────────────────────────────
+// Exclusion patterns for noise files
+// ─────────────────────────────────────────────────────────────────────────────
+
+const EXCLUDED_PATTERNS: { pattern: RegExp; reason: string }[] = [
+	// Lock files
+	{ pattern: /\.lock$/, reason: "lock file" },
+	{ pattern: /-lock\.(json|yaml|yml)$/, reason: "lock file" },
+	{ pattern: /package-lock\.json$/, reason: "lock file" },
+	{ pattern: /yarn\.lock$/, reason: "lock file" },
+	{ pattern: /pnpm-lock\.yaml$/, reason: "lock file" },
+	{ pattern: /Cargo\.lock$/, reason: "lock file" },
+	{ pattern: /Gemfile\.lock$/, reason: "lock file" },
+	{ pattern: /poetry\.lock$/, reason: "lock file" },
+	{ pattern: /composer\.lock$/, reason: "lock file" },
+	{ pattern: /flake\.lock$/, reason: "lock file" },
+
+	// Generated/build artifacts
+	{ pattern: /\.min\.(js|css)$/, reason: "minified" },
+	{ pattern: /\.generated\./, reason: "generated" },
+	{ pattern: /\.snap$/, reason: "snapshot" },
+	{ pattern: /\.map$/, reason: "source map" },
+	{ pattern: /^dist\//, reason: "build output" },
+	{ pattern: /^build\//, reason: "build output" },
+	{ pattern: /^out\//, reason: "build output" },
+	{ pattern: /node_modules\//, reason: "vendor" },
+	{ pattern: /vendor\//, reason: "vendor" },
+
+	// Binary/assets (usually shown as binary in diff anyway)
+	{ pattern: /\.(png|jpg|jpeg|gif|ico|webp|avif)$/i, reason: "image" },
+	{ pattern: /\.(woff|woff2|ttf|eot|otf)$/i, reason: "font" },
+	{ pattern: /\.(pdf|zip|tar|gz|rar|7z)$/i, reason: "binary" },
+];
+
+// ─────────────────────────────────────────────────────────────────────────────
+// Diff parsing
+// ─────────────────────────────────────────────────────────────────────────────
+
+/**
+ * Check if a file path should be excluded from review.
+ * Returns the exclusion reason if excluded, undefined otherwise.
+ */
+function getExclusionReason(path: string): string | undefined {
+	for (const { pattern, reason } of EXCLUDED_PATTERNS) {
+		if (pattern.test(path)) return reason;
+	}
+	return undefined;
+}
+
+/**
+ * Parse unified diff output into per-file stats.
+ * Splits on file boundaries, counts +/- lines, and filters excluded files.
+ */
+function parseDiff(diffOutput: string): DiffStats {
+	const files: FileDiff[] = [];
+	const excluded: DiffStats["excluded"] = [];
+	let totalAdded = 0;
+	let totalRemoved = 0;
+
+	// Split by file boundary: "diff --git a/... b/..."
+	const fileChunks = diffOutput.split(/^diff --git /m).filter(Boolean);
+
+	for (const chunk of fileChunks) {
+		// Extract file path from "a/path b/path" line
+		const headerMatch = chunk.match(/^a\/(.+?) b\/(.+)/);
+		if (!headerMatch) continue;
+
+		const path = headerMatch[2];
+
+		// Count added/removed lines (lines starting with + or - but not ++ or --)
+		let linesAdded = 0;
+		let linesRemoved = 0;
+
+		const lines = chunk.split("\n");
+		for (const line of lines) {
+			if (line.startsWith("+") && !line.startsWith("+++")) {
+				linesAdded++;
+			} else if (line.startsWith("-") && !line.startsWith("---")) {
+				linesRemoved++;
+			}
+		}
+
+		const exclusionReason = getExclusionReason(path);
+		if (exclusionReason) {
+			excluded.push({ path, reason: exclusionReason, linesAdded, linesRemoved });
+		} else {
+			files.push({
+				path,
+				linesAdded,
+				linesRemoved,
+				hunks: `diff --git ${chunk}`,
+			});
+			totalAdded += linesAdded;
+			totalRemoved += linesRemoved;
+		}
+	}
+
+	return { files, totalAdded, totalRemoved, excluded };
+}
+
+/**
+ * Get file extension for display purposes.
+ */
+function getFileExt(path: string): string {
+	const match = path.match(/\.([^.]+)$/);
+	return match ? match[1] : "";
+}
+
+/**
+ * Determine recommended number of reviewer agents based on diff weight.
+ * Uses total lines changed as the primary metric.
+ */
+function getRecommendedAgentCount(stats: DiffStats): number {
+	const totalLines = stats.totalAdded + stats.totalRemoved;
+	const fileCount = stats.files.length;
+
+	// Heuristics:
+	// - Tiny (<100 lines or 1-2 files): 1 agent
+	// - Small (<500 lines): 1-2 agents
+	// - Medium (<2000 lines): 2-4 agents
+	// - Large (<5000 lines): 4-8 agents
+	// - Huge (>5000 lines): 8-16 agents
+
+	if (totalLines < 100 || fileCount <= 2) return 1;
+	if (totalLines < 500) return Math.min(2, fileCount);
+	if (totalLines < 2000) return Math.min(4, Math.ceil(fileCount / 3));
+	if (totalLines < 5000) return Math.min(8, Math.ceil(fileCount / 2));
+	return Math.min(16, fileCount);
+}
+
+/**
+ * Format diff stats as a markdown table for the prompt.
+ */
+function formatFileTable(files: FileDiff[]): string {
+	if (files.length === 0) return "_No files to review._";
+
+	const rows = files.map((f) => {
+		const ext = getFileExt(f.path);
+		return `| ${f.path} | +${f.linesAdded}/-${f.linesRemoved} | ${ext} |`;
+	});
+
+	return `| File | +/- | Type |\n|------|-----|------|\n${rows.join("\n")}`;
+}
+
+/**
+ * Extract first N lines of actual diff content (excluding headers) for preview.
+ */
+function getDiffPreview(hunks: string, maxLines: number): string {
+	const lines = hunks.split("\n");
+	const contentLines: string[] = [];
+
+	for (const line of lines) {
+		// Skip diff headers, keep actual content
+		if (
+			line.startsWith("diff --git") ||
+			line.startsWith("index ") ||
+			line.startsWith("---") ||
+			line.startsWith("+++") ||
+			line.startsWith("@@")
+		) {
+			continue;
+		}
+		contentLines.push(line);
+		if (contentLines.length >= maxLines) break;
+	}
+
+	return contentLines.join("\n");
+}
+
+/**
+ * Format condensed diff previews for large changesets.
+ */
+function formatDiffPreviews(files: FileDiff[], linesPerFile: number): string {
+	const parts: string[] = [];
+
+	for (const f of files) {
+		const preview = getDiffPreview(f.hunks, linesPerFile);
+		if (preview.trim()) {
+			parts.push(`#### ${f.path}\n\`\`\`diff\n${preview}\n\`\`\``);
+		}
+	}
+
+	return parts.join("\n\n");
+}
+
+/**
+ * Format excluded files list for the prompt.
+ */
+function formatExcluded(excluded: DiffStats["excluded"]): string {
+	if (excluded.length === 0) return "";
+
+	const items = excluded.map((e) => `- \`${e.path}\` (+${e.linesAdded}/-${e.linesRemoved}) — ${e.reason}`);
+
+	return `### Excluded Files (${excluded.length})\n\n${items.join("\n")}`;
+}
+
+// Thresholds for diff inclusion
+const MAX_DIFF_CHARS = 50_000; // Don't include diff above this
+const MAX_FILES_FOR_INLINE_DIFF = 20; // Don't include diff if more files than this
+
+/**
+ * Build the full review prompt with diff stats and distribution guidance.
+ */
+function buildReviewPrompt(mode: string, stats: DiffStats, rawDiff: string): string {
+	const agentCount = getRecommendedAgentCount(stats);
+	const skipDiff = rawDiff.length > MAX_DIFF_CHARS || stats.files.length > MAX_FILES_FOR_INLINE_DIFF;
+	const totalLines = stats.totalAdded + stats.totalRemoved;
+
+	// Build distribution guidance
+	const distributionGuidance =
+		`Based on the diff weight (~${totalLines} lines across ${stats.files.length} files), ` +
+		(agentCount === 1 ? `use **1 reviewer agent**.` : `spawn **${agentCount} reviewer agents** in parallel.`);
+
+	// Build grouping guidance (only for multi-agent)
+	const groupingGuidance =
+		agentCount > 1
+			? `Group files by locality (related changes together). For example:
+- Files in the same directory or module → same agent
+- Files that implement related functionality → same agent
+- Test files with their implementation files → same agent
+
+Use the Task tool with \`agent: "reviewer"\` and the batch \`tasks\` array to run reviews in parallel.`
+			: "";
+
+	// Build diff section
+	let diffSection: string;
+	if (!skipDiff) {
+		diffSection = `### Diff
+
+<diff>
+${rawDiff.trim()}
+</diff>`;
+	} else {
+		const linesPerFile = Math.max(5, Math.floor(100 / stats.files.length));
+		diffSection = `### Diff Previews
+
+_Full diff too large (${stats.files.length} files). Showing first ~${linesPerFile} lines per file. Reviewers should fetch full diffs for assigned files._
+
+${formatDiffPreviews(stats.files, linesPerFile)}`;
+	}
+
+	// Build diff instruction
+	const diffInstruction = skipDiff
+		? "Run `git diff` or `git show` to get the diff for assigned files"
+		: "Use the diff hunks provided below (don't re-run git diff)";
+
+	// Replace template variables
+	return reviewRequestTemplate
+		.replace("{MODE}", mode)
+		.replace("{FILE_COUNT}", String(stats.files.length))
+		.replace("{LINES_ADDED}", String(stats.totalAdded))
+		.replace("{LINES_REMOVED}", String(stats.totalRemoved))
+		.replace("{FILE_TABLE}", formatFileTable(stats.files))
+		.replace("{EXCLUDED_SECTION}", stats.excluded.length > 0 ? formatExcluded(stats.excluded) : "")
+		.replace("{DISTRIBUTION_GUIDANCE}", distributionGuidance)
+		.replace("{GROUPING_GUIDANCE}", groupingGuidance)
+		.replace("{DIFF_INSTRUCTION}", diffInstruction)
+		.replace("{DIFF_SECTION}", diffSection)
+		.replace(/\n{3,}/g, "\n\n") // Collapse multiple blank lines
+		.trim();
+}
+
 export function createReviewCommand(api: CustomCommandAPI): CustomCommand {
 	return {
 		name: "review",
@@ -21,7 +306,6 @@ export function createReviewCommand(api: CustomCommandAPI): CustomCommand {
 				return "Use the Task tool to run the 'reviewer' agent to review recent code changes.";
 			}
 
-			// Main menu
 			const mode = await ctx.ui.select("Review Mode", [
 				"1. Review against a base branch (PR Style)",
 				"2. Review uncommitted changes",
@@ -46,26 +330,59 @@ export function createReviewCommand(api: CustomCommandAPI): CustomCommand {
 					if (!baseBranch) return undefined;
 
 					const currentBranch = await getCurrentBranch(api);
-					return `Use the Task tool to run the "reviewer" agent with this task:
+					const diffResult = await api.exec("git", ["diff", `${baseBranch}...${currentBranch}`], {
+						timeout: 30000,
+					});
+					if (diffResult.code !== 0) {
+						ctx.ui.notify(`Failed to get diff: ${diffResult.stderr}`, "error");
+						return undefined;
+					}
 
-Review the changes between "${baseBranch}" and "${currentBranch}".
+					if (!diffResult.stdout.trim()) {
+						ctx.ui.notify(`No changes between ${baseBranch} and ${currentBranch}`, "warning");
+						return undefined;
+					}
 
-Run \`git diff ${baseBranch}...${currentBranch}\` to see the changes, then analyze the modified files.`;
+					const stats = parseDiff(diffResult.stdout);
+					if (stats.files.length === 0) {
+						ctx.ui.notify("No reviewable files (all changes filtered out)", "warning");
+						return undefined;
+					}
+
+					return buildReviewPrompt(
+						`Reviewing changes between \`${baseBranch}\` and \`${currentBranch}\` (PR-style)`,
+						stats,
+						diffResult.stdout,
+					);
 				}
 
 				case 2: {
-					// Uncommitted changes
+					// Uncommitted changes - combine staged and unstaged
 					const status = await getGitStatus(api);
 					if (!status.trim()) {
 						ctx.ui.notify("No uncommitted changes found", "warning");
 						return undefined;
 					}
 
-					return `Use the Task tool to run the "reviewer" agent with this task:
+					const [unstagedResult, stagedResult] = await Promise.all([
+						api.exec("git", ["diff"], { timeout: 30000 }),
+						api.exec("git", ["diff", "--cached"], { timeout: 30000 }),
+					]);
 
-Review all uncommitted changes in the working directory.
+					const combinedDiff = [unstagedResult.stdout, stagedResult.stdout].filter(Boolean).join("\n");
+
+					if (!combinedDiff.trim()) {
+						ctx.ui.notify("No diff content found", "warning");
+						return undefined;
+					}
+
+					const stats = parseDiff(combinedDiff);
+					if (stats.files.length === 0) {
+						ctx.ui.notify("No reviewable files (all changes filtered out)", "warning");
+						return undefined;
+					}
 
-Run \`git diff\` for unstaged changes and \`git diff --cached\` for staged changes.`;
+					return buildReviewPrompt("Reviewing uncommitted changes (staged + unstaged)", stats, combinedDiff);
 				}
 
 				case 3: {
@@ -82,24 +399,62 @@ Run \`git diff\` for unstaged changes and \`git diff --cached\` for staged chang
 					// Extract commit hash from selection (format: "abc1234 message")
 					const hash = selected.split(" ")[0];
 
-					return `Use the Task tool to run the "reviewer" agent with this task:
+					// Get the commit diff (with timeout)
+					const showResult = await api.exec("git", ["show", "--format=", hash], { timeout: 30000 });
+					if (showResult.code !== 0) {
+						ctx.ui.notify(`Failed to get commit: ${showResult.stderr}`, "error");
+						return undefined;
+					}
 
-Review commit ${hash}.
+					if (!showResult.stdout.trim()) {
+						ctx.ui.notify("Commit has no diff content", "warning");
+						return undefined;
+					}
+
+					const stats = parseDiff(showResult.stdout);
+					if (stats.files.length === 0) {
+						ctx.ui.notify("No reviewable files in commit (all changes filtered out)", "warning");
+						return undefined;
+					}
 
-Run \`git show ${hash}\` to see the changes introduced by this commit.`;
+					return buildReviewPrompt(`Reviewing commit \`${hash}\``, stats, showResult.stdout);
 				}
 
 				case 4: {
-					// Custom instructions
+					// Custom instructions - still uses the old approach since user provides context
 					const instructions = await ctx.ui.editor(
 						"Enter custom review instructions",
 						"Review the following:\n\n",
 					);
 					if (!instructions?.trim()) return undefined;
 
-					return `Use the Task tool to run the "reviewer" agent with this task:
+					// For custom, we still try to get current diff for context
+					const diffResult = await api.exec("git", ["diff", "HEAD"], { timeout: 30000 });
+					const hasDiff = diffResult.code === 0 && diffResult.stdout.trim();
+
+					if (hasDiff) {
+						const stats = parseDiff(diffResult.stdout);
+						// Even if all files filtered, include the custom instructions
+						return (
+							buildReviewPrompt(
+								`Custom review: ${instructions.split("\n")[0].slice(0, 60)}...`,
+								stats,
+								diffResult.stdout,
+							) + `\n\n### Additional Instructions\n\n${instructions}`
+						);
+					}
+
+					// No diff available, just pass instructions
+					return `## Code Review Request
+
+### Mode
+Custom review instructions
+
+### Instructions
+
+${instructions}
 
-${instructions}`;
+Use the Task tool with \`agent: "reviewer"\` to execute this review.`;
 				}
 
 				default:

package/src/core/custom-commands/bundled/wt/index.ts

@@ -300,7 +300,7 @@ async function handleSpawn(args: SpawnArgs, ctx: HookCommandContext): Promise<st
 async function handleParallel(args: ParallelTask[], ctx: HookCommandContext): Promise<string> {
 	validateDisjointScopes(args.map((t) => t.scope));
 
-	const sessionId = `parallel-${Date.now()}`;
+	const sessionId = `parallel-${nanoid()}`;
 	const agent = await pickAgent(ctx.cwd);
 
 	const worktrees: Array<{ task: ParallelTask; wt: worktree.Worktree; session: worktree.WorktreeSession }> = [];