@@ -23,8 +23,8 @@ export interface CommandContext {
2323 connectMcpServer: (name: string) => Promise<void>;
2424 runSubagent: (
2525 prompt: string,
26- model?: string,
2726 ) => Promise<{ result: string; inputTokens: number; outputTokens: number }>;
27+
2828 cwd: string;
2929 }
3030
@@ -238,40 +238,34 @@ async function handleMcp(ctx: CommandContext, args: string): Promise<void> {
238238 // ─── Review ───────────────────────────────────────────────────────────────────
239239
240240 const REVIEW_PROMPT = (cwd: string, focus: string) => `\
241-You are a thorough code reviewer. Your job is to review the recent changes in \
242-this codebase and produce a structured, actionable report.
241+You are a code reviewer. Review recent changes and provide actionable feedback.
243242
244243 Working directory: ${cwd}
245-${focus ? `Focus area: ${focus}` : ""}
246-
247-Use the following hierarchy of concerns (most important first) to guide your review:
248-
249-1. **Comprehension & team alignment** — Is the intent of the change clear? \
250-Would a teammate be able to understand the system after reading this? \
251-Flag anything that lacks explanation or diverges from established patterns without reason.
252-
253-2. **Correctness** — Does the change actually solve the stated problem? \
254-Look for logic errors, missing edge cases, incorrect assumptions, and off-by-one errors.
255-
256-3. **Design** — Is the approach well-structured? \
257-Consider separation of concerns, abstraction quality, coupling, cohesion, \
258-and whether a simpler design could achieve the same goal.
259-
260-4. **Bugs & safety** — Identify potential runtime errors, unhandled rejections/exceptions, \
261-type unsafety, resource leaks, race conditions, or security issues.
262-
263-5. **Style & consistency** — Flag naming inconsistencies, formatting issues, \
264-dead code, missing or misleading comments — only after the above are addressed.
265-
266-Instructions:
267-- First use \`shell\` to use git diff commands to check for unstaged changes, if not focused \
268-on something else default to reviewing the git diff.
269-- Use \`glob\`, \`grep\`, and \`read\` as needed to understand the full context of changed files.
270-- Structure your output with a section per concern level above. \
271-Use "✔ nothing to flag" for levels with no issues.
272-- End with a short **Summary** of the most important items to address.
273-- Be specific: quote code, cite file names and line numbers.
274-- Be direct but constructive. Focus on the code, not the author.
244+${focus ? `Focus: ${focus}` : ""}
245+
246+## What to review
247+- No args: \`git diff\` (unstaged) + \`git diff --cached\` (staged) + \`git status --short\` (untracked)
248+- Commit hash: \`git show <hash>\`
249+- Branch: \`git diff <branch>...HEAD\`
250+- PR number/URL: \`gh pr view\` + \`gh pr diff\`
251+
252+## How to review
253+After getting the diff, read the full files changed — diffs alone miss context.
254+Check for AGENTS.md or CONVENTIONS.md for project conventions.
255+
256+## What to flag (priority order)
257+1. **Bugs** — logic errors, missing edge cases, unhandled errors, race conditions, security issues. Be certain before flagging; investigate first.
258+2. **Structure** — wrong abstraction, established patterns ignored, excessive nesting.
259+3. **Performance** — only if obviously problematic (O(n²) on unbounded data, N+1, blocking hot paths).
260+4. **Style** — only clear violations of project conventions. Don't be a zealot.
261+
262+Only review the changed code, not pre-existing code.
263+
264+## Output
265+- Be direct and specific: quote code, cite file and line number.
266+- State the scenario/input that triggers a bug — severity depends on this.
267+- No flattery, no filler. Matter-of-fact tone.
268+- End with a short **Summary** of the most important items.
275269 `;
276270
277271 async function handleReview(ctx: CommandContext, args: string): Promise<void> {