ralph-review 0.1.2 → 0.1.4

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ralph-review",
-  "version": "0.1.2",
+  "version": "0.1.4",
   "description": "A CLI tool that orchestrates agentic review-fix cycles until your code is clean.",
   "license": "MIT",
   "type": "module",

package/src/commands/run.ts

@@ -582,7 +582,26 @@ export async function startReview(
 
   const loadedConfig = await runtime.loadConfig();
 
-  const hasExplicitMode = options.base || options.uncommitted || options.commit || options.custom;
+  if (options.custom !== undefined && options.custom.trim().length === 0) {
+    runtime.prompt.log.error("--custom cannot be empty");
+    runtime.process.exit(1);
+    return;
+  }
+
+  if (options.commit !== undefined) {
+    options.commit = options.commit.trim();
+    if (options.commit.length === 0) {
+      runtime.prompt.log.error("--commit cannot be empty");
+      runtime.process.exit(1);
+      return;
+    }
+  }
+
+  const hasExplicitMode =
+    options.base !== undefined ||
+    options.uncommitted === true ||
+    options.commit !== undefined ||
+    options.custom !== undefined;
   if (!hasExplicitMode) {
     if (loadedConfig?.defaultReview?.type === "base") {
       options.base = loadedConfig.defaultReview.branch;
@@ -590,15 +609,35 @@ export async function startReview(
     // else: defaults to uncommitted behavior (no base flag)
   }
 
-  const modeOptions = [
-    options.base && "--base",
-    options.uncommitted && "--uncommitted",
-    options.commit && "--commit",
-    options.custom && "--custom",
-  ].filter(Boolean);
+  if (options.base !== undefined) {
+    options.base = options.base.trim();
+    if (options.base.length === 0) {
+      runtime.prompt.log.error("--base cannot be empty");
+      runtime.process.exit(1);
+      return;
+    }
+  }
+
+  if (options.base !== undefined && options.commit !== undefined) {
+    runtime.prompt.log.error("Cannot use --base and --commit together");
+    runtime.process.exit(1);
+    return;
+  }
+
+  if (options.uncommitted && options.base !== undefined) {
+    runtime.prompt.log.error("Cannot use --uncommitted and --base together");
+    runtime.process.exit(1);
+    return;
+  }
+
+  if (options.uncommitted && options.commit !== undefined) {
+    runtime.prompt.log.error("Cannot use --uncommitted and --commit together");
+    runtime.process.exit(1);
+    return;
+  }
 
-  if (modeOptions.length > 1) {
-    runtime.prompt.log.error(`Cannot use ${modeOptions.join(" and ")} together`);
+  if (options.uncommitted && options.custom !== undefined) {
+    runtime.prompt.log.error("Cannot use --uncommitted and --custom together");
     runtime.process.exit(1);
     return;
   }
@@ -611,6 +650,7 @@ export async function startReview(
       projectPath: runtime.process.cwd(),
       baseBranch: options.base,
       commitSha: options.commit,
+      customInstructions: options.custom,
       capabilityDiscoveryOptions: {
         probeAgents: getDynamicProbeAgents(loadedConfig),
       },

package/src/lib/agents/codex.ts

@@ -52,6 +52,12 @@ export const codexConfig: AgentConfig = {
 
     const baseReviewArgs = withReasoningEffort(["exec", "--json"], reasoning);
 
+    if (reviewOptions?.customInstructions) {
+      const fullPrompt = prompt ? `review ${prompt}` : "review";
+      const customArgs = withReasoningEffort(["exec", "--full-auto", "--json"], reasoning);
+      return withModel([...customArgs, fullPrompt], model);
+    }
+
     if (reviewOptions?.commitSha) {
       return withModel([...baseReviewArgs, "review", "--commit", reviewOptions.commitSha], model);
     }
@@ -60,12 +66,6 @@ export const codexConfig: AgentConfig = {
       return withModel([...baseReviewArgs, "review", "--base", reviewOptions.baseBranch], model);
     }
 
-    if (reviewOptions?.customInstructions) {
-      const fullPrompt = prompt ? `review ${prompt}` : "review";
-      const customArgs = withReasoningEffort(["exec", "--full-auto", "--json"], reasoning);
-      return withModel([...customArgs, fullPrompt], model);
-    }
-
     return withModel([...baseReviewArgs, "review", "--uncommitted"], model);
   },
   buildEnv: defaultBuildEnv,

package/src/lib/diagnostics/checks.ts

@@ -20,6 +20,7 @@ interface RunDiagnosticsDependencies {
   ) => Promise<AgentCapabilitiesMap>;
   isGitRepository?: (path: string) => Promise<boolean>;
   hasUncommittedChanges?: (path: string) => Promise<boolean>;
+  gitRefExists?: (path: string, ref: string) => Promise<boolean>;
   cleanupStaleLockfile?: typeof cleanupStaleLockfile;
   hasActiveLockfile?: typeof hasActiveLockfile;
   isTmuxInstalled?: () => boolean;
@@ -34,6 +35,7 @@ export interface RunDiagnosticsOptions {
   projectPath?: string;
   baseBranch?: string;
   commitSha?: string;
+  customInstructions?: string;
   capabilitiesByAgent?: AgentCapabilitiesMap;
   capabilityDiscoveryOptions?: CapabilityDiscoveryOptions;
   dependencies?: RunDiagnosticsDependencies;
@@ -136,6 +138,15 @@ async function hasGitUncommittedChanges(path: string): Promise<boolean> {
   return result.stdout.trim().length > 0;
 }
 
+async function hasGitRef(path: string, ref: string): Promise<boolean> {
+  if (ref.trim().length === 0) {
+    return false;
+  }
+
+  const result = await runGitInPath(path, ["rev-parse", "--verify", ref]);
+  return result.exitCode === 0;
+}
+
 function buildReport(
   context: DiagnosticContext,
   items: DiagnosticItem[],
@@ -165,6 +176,7 @@ export async function runDiagnostics(
   const resolveCapabilityDiscovery = deps.discoverAgentCapabilities ?? discoverAgentCapabilities;
   const resolveIsGitRepo = deps.isGitRepository ?? isGitRepository;
   const resolveHasChanges = deps.hasUncommittedChanges ?? hasGitUncommittedChanges;
+  const resolveGitRefExists = deps.gitRefExists ?? hasGitRef;
   const resolveCleanupStaleLockfile = deps.cleanupStaleLockfile ?? cleanupStaleLockfile;
   const resolveHasActiveLockfile = deps.hasActiveLockfile ?? hasActiveLockfile;
   const resolveIsTmuxInstalled = deps.isTmuxInstalled ?? isTmuxInstalled;
@@ -423,6 +435,79 @@ export async function runDiagnostics(
     }
 
     if (context === "run") {
+      if (insideGitRepo && !gitRepoError && options.baseBranch) {
+        let baseRefExists = false;
+        let baseRefError: string | null = null;
+        try {
+          baseRefExists = await resolveGitRefExists(projectPath, options.baseBranch);
+        } catch (error) {
+          baseRefError = `${error}`;
+        }
+
+        if (baseRefError) {
+          items.push({
+            id: "git-base-ref",
+            category: "git",
+            title: "Base ref",
+            severity: "error",
+            summary: `Unable to validate base ref '${options.baseBranch}'.`,
+            details: baseRefError,
+            remediation: [runStep("git branch --all"), thenStep("rr run --base <existing-ref>")],
+          });
+        } else {
+          items.push({
+            id: "git-base-ref",
+            category: "git",
+            title: "Base ref",
+            severity: baseRefExists ? "ok" : "error",
+            summary: baseRefExists
+              ? `Base ref '${options.baseBranch}' exists.`
+              : `Base ref '${options.baseBranch}' was not found.`,
+            remediation: baseRefExists
+              ? []
+              : [runStep("git branch --all"), thenStep("rr run --base <existing-ref>")],
+          });
+        }
+      }
+
+      if (insideGitRepo && !gitRepoError && options.commitSha) {
+        let commitRefExists = false;
+        let commitRefError: string | null = null;
+        try {
+          commitRefExists = await resolveGitRefExists(projectPath, options.commitSha);
+        } catch (error) {
+          commitRefError = `${error}`;
+        }
+
+        if (commitRefError) {
+          items.push({
+            id: "git-commit-ref",
+            category: "git",
+            title: "Commit ref",
+            severity: "error",
+            summary: `Unable to validate commit ref '${options.commitSha}'.`,
+            details: commitRefError,
+            remediation: [
+              runStep("git rev-parse --verify <commit>"),
+              thenStep("rr run --commit <sha>"),
+            ],
+          });
+        } else {
+          items.push({
+            id: "git-commit-ref",
+            category: "git",
+            title: "Commit ref",
+            severity: commitRefExists ? "ok" : "error",
+            summary: commitRefExists
+              ? `Commit ref '${options.commitSha}' exists.`
+              : `Commit ref '${options.commitSha}' was not found.`,
+            remediation: commitRefExists
+              ? []
+              : [runStep("git log --oneline -n 20"), thenStep("rr run --commit <existing-sha>")],
+          });
+        }
+      }
+
       if (!options.baseBranch && !options.commitSha && insideGitRepo && !gitRepoError) {
         let hasChanges = false;
         let hasChangesError: string | null = null;

package/src/lib/format.ts

@@ -1,23 +1,31 @@
 import type { ReviewOptions } from "@/lib/types";
 
+function formatCustomReviewType(customInstructions: string): string {
+  const instruction = customInstructions.slice(0, 40);
+  return customInstructions.length > 40 ? `custom (${instruction}...)` : `custom (${instruction})`;
+}
+
 export function formatReviewType(reviewOptions: ReviewOptions | undefined): string {
   if (!reviewOptions) return "uncommitted changes";
 
-  if (reviewOptions.customInstructions) {
-    const instruction = reviewOptions.customInstructions.slice(0, 40);
-    return reviewOptions.customInstructions.length > 40
-      ? `custom (${instruction}...)`
-      : `custom (${instruction})`;
-  }
-
   if (reviewOptions.commitSha) {
     const shortSha = reviewOptions.commitSha.slice(0, 7);
+    if (reviewOptions.customInstructions) {
+      return `commit (${shortSha}) + ${formatCustomReviewType(reviewOptions.customInstructions)}`;
+    }
     return `commit (${shortSha})`;
   }
 
   if (reviewOptions.baseBranch) {
+    if (reviewOptions.customInstructions) {
+      return `base (${reviewOptions.baseBranch}) + ${formatCustomReviewType(reviewOptions.customInstructions)}`;
+    }
     return `base (${reviewOptions.baseBranch})`;
   }
 
+  if (reviewOptions.customInstructions) {
+    return formatCustomReviewType(reviewOptions.customInstructions);
+  }
+
   return "uncommitted changes";
 }

package/src/lib/prompts/review.ts

@@ -19,6 +19,16 @@ const BASE_BRANCH_PROMPT_BACKUP = (branch: string) =>
 const COMMIT_PROMPT = (commitHash: string) =>
   `Review the code changes for the commit ${commitHash}. Provide prioritized, actionable findings.`;
 
+const CUSTOM_FOCUS_PROMPT = (customInstructions: string) =>
+  `Additional review focus from user instructions:\n${customInstructions}`;
+
+function withCustomFocus(instruction: string, customInstructions?: string): string {
+  if (!customInstructions) {
+    return instruction;
+  }
+  return `${instruction}\n\n${CUSTOM_FOCUS_PROMPT(customInstructions)}`;
+}
+
 export interface ReviewerPromptOptions {
   repoPath: string;
   baseBranch?: string;
@@ -26,19 +36,20 @@ export interface ReviewerPromptOptions {
   customInstructions?: string;
 }
 
-/** Priority: commitSha > baseBranch > customInstructions > uncommitted (default) */
+/** Target priority: commitSha > baseBranch > uncommitted (default), with custom focus overlay. */
 export function createReviewerPrompt(options: ReviewerPromptOptions): string {
   const { repoPath, baseBranch, commitSha, customInstructions } = options;
 
   let instruction: string;
 
   if (commitSha) {
-    instruction = COMMIT_PROMPT(commitSha);
+    instruction = withCustomFocus(COMMIT_PROMPT(commitSha), customInstructions);
   } else if (baseBranch) {
     const mergeBaseSha = mergeBaseWithHead(repoPath, baseBranch);
-    instruction = mergeBaseSha
+    const baseInstruction = mergeBaseSha
       ? BASE_BRANCH_PROMPT(baseBranch, mergeBaseSha)
       : BASE_BRANCH_PROMPT_BACKUP(baseBranch);
+    instruction = withCustomFocus(baseInstruction, customInstructions);
   } else if (customInstructions) {
     instruction = customInstructions;
   } else {

package/src/lib/tui/components/SessionPanel.tsx

@@ -1,5 +1,6 @@
 import { useTerminalDimensions } from "@opentui/react";
 import { useEffect, useMemo, useRef } from "react";
+import { formatReviewType } from "@/lib/format";
 import type { LockData } from "@/lib/lockfile";
 import { TUI_COLORS } from "@/lib/tui/colors";
 import type {
@@ -81,24 +82,6 @@ function toSingleLine(value: string): string {
   return value.replace(/\s+/g, " ").trim();
 }
 
-function formatReviewType(reviewOptions: ReviewOptions | undefined): string {
-  if (!reviewOptions) return "uncommitted changes";
-
-  if (reviewOptions.customInstructions) {
-    return `custom (${toSingleLine(reviewOptions.customInstructions)})`;
-  }
-
-  if (reviewOptions.commitSha) {
-    return `commit (${toSingleLine(reviewOptions.commitSha)})`;
-  }
-
-  if (reviewOptions.baseBranch) {
-    return `base (${toSingleLine(reviewOptions.baseBranch)})`;
-  }
-
-  return "uncommitted changes";
-}
-
 interface FixListProps {
   fixes: FixEntry[];
   showFiles: boolean;
@@ -566,7 +549,7 @@ export function SessionPanel({
       <box flexDirection="row" gap={1}>
         <text fg={TUI_COLORS.text.muted}>Review Type:</text>
         <text fg={TUI_COLORS.text.primary} wrapMode="none">
-          {formatReviewType(reviewOptions)}
+          {toSingleLine(formatReviewType(reviewOptions))}
         </text>
       </box>