newpr 0.6.5 → 1.0.0

package/src/stack/verify.ts

@@ -0,0 +1,201 @@
+import type { StackExecResult, StackWarning } from "./types.ts";
+
+export interface VerifyInput {
+	repo_path: string;
+	base_sha: string;
+	head_sha: string;
+	exec_result: StackExecResult;
+	ownership: Map<string, string>;
+}
+
+export interface VerifyResult {
+	verified: boolean;
+	errors: string[];
+	warnings: string[];
+	structured_warnings: StackWarning[];
+}
+
+export async function verifyStack(input: VerifyInput): Promise<VerifyResult> {
+	const { repo_path, base_sha, head_sha, exec_result, ownership } = input;
+	const errors: string[] = [];
+	const warnings: string[] = [];
+	const structuredWarnings: StackWarning[] = [];
+
+	const scopeLeaks: string[] = [];
+	const unionMissing: string[] = [];
+	const unionExtra: string[] = [];
+
+	await verifyPerGroupDiffScope(repo_path, base_sha, exec_result, ownership, warnings, scopeLeaks);
+	await verifyUnionCompleteness(repo_path, base_sha, head_sha, exec_result, warnings, unionMissing, unionExtra);
+	await verifyFinalTreeEquivalence(repo_path, head_sha, exec_result, errors);
+
+	if (scopeLeaks.length > 0) {
+		structuredWarnings.push({
+			category: "verification.scope",
+			severity: "warn",
+			title: `${scopeLeaks.length} file(s) appear in wrong group's diff`,
+			message: "Some files changed in a group's commit but are owned by a different group — usually harmless with merge commits",
+			details: scopeLeaks,
+		});
+	}
+	if (unionMissing.length > 0) {
+		structuredWarnings.push({
+			category: "verification.completeness",
+			severity: "warn",
+			title: `${unionMissing.length} file(s) in original diff but missing from stack`,
+			message: "These files were changed in the original PR but don't appear in the stacked commits",
+			details: unionMissing,
+		});
+	}
+	if (unionExtra.length > 0) {
+		structuredWarnings.push({
+			category: "verification.completeness",
+			severity: "warn",
+			title: `${unionExtra.length} extra file(s) in stack not in original diff`,
+			message: "The stacked commits touch files not in the original PR diff — usually transient changes from merge commits",
+			details: unionExtra,
+		});
+	}
+
+	return {
+		verified: errors.length === 0,
+		errors,
+		warnings,
+		structured_warnings: structuredWarnings,
+	};
+}
+
+async function verifyPerGroupDiffScope(
+	repoPath: string,
+	baseSha: string,
+	execResult: StackExecResult,
+	ownership: Map<string, string>,
+	warnings: string[],
+	scopeLeaks: string[],
+): Promise<void> {
+	let prevCommitSha = baseSha;
+
+	for (const gc of execResult.group_commits) {
+		const diffResult = await Bun.$`git -C ${repoPath} diff-tree -r --raw -z --no-commit-id ${prevCommitSha} ${gc.commit_sha}`.quiet().nothrow();
+
+		if (diffResult.exitCode !== 0) {
+			warnings.push(`Failed to diff group "${gc.group_id}": ${diffResult.stderr.toString().trim()}`);
+			prevCommitSha = gc.commit_sha;
+			continue;
+		}
+
+		const changedPaths = extractPathsFromRawDiff(diffResult.stdout);
+
+		for (const path of changedPaths) {
+			const fileOwner = ownership.get(path);
+			if (fileOwner !== gc.group_id) {
+				const detail = `"${path}" in "${gc.group_id}" diff, owned by "${fileOwner ?? "unassigned"}"`;
+				warnings.push(
+					`Group "${gc.group_id}" diff contains file "${path}" owned by "${fileOwner ?? "unassigned"}"`,
+				);
+				scopeLeaks.push(detail);
+			}
+		}
+
+		prevCommitSha = gc.commit_sha;
+	}
+}
+
+async function verifyUnionCompleteness(
+	repoPath: string,
+	baseSha: string,
+	headSha: string,
+	execResult: StackExecResult,
+	warnings: string[],
+	unionMissing: string[],
+	unionExtra: string[],
+): Promise<void> {
+	const expectedResult = await Bun.$`git -C ${repoPath} diff-tree -r --raw -z --no-commit-id ${baseSha} ${headSha}`.quiet().nothrow();
+
+	if (expectedResult.exitCode !== 0) {
+		warnings.push(`Failed to get expected diff: ${expectedResult.stderr.toString().trim()}`);
+		return;
+	}
+
+	const expectedPaths = new Set(extractPathsFromRawDiff(expectedResult.stdout));
+
+	const actualPaths = new Set<string>();
+	let prevSha = baseSha;
+	for (const gc of execResult.group_commits) {
+		const diffResult = await Bun.$`git -C ${repoPath} diff-tree -r --raw -z --no-commit-id ${prevSha} ${gc.commit_sha}`.quiet().nothrow();
+
+		if (diffResult.exitCode === 0) {
+			for (const path of extractPathsFromRawDiff(diffResult.stdout)) {
+				actualPaths.add(path);
+			}
+		}
+		prevSha = gc.commit_sha;
+	}
+
+	for (const path of expectedPaths) {
+		if (!actualPaths.has(path)) {
+			warnings.push(`File "${path}" present in original diff but missing from stack`);
+			unionMissing.push(path);
+		}
+	}
+
+	for (const path of actualPaths) {
+		if (!expectedPaths.has(path)) {
+			warnings.push(`File "${path}" present in stack but not in original diff`);
+			unionExtra.push(path);
+		}
+	}
+}
+
+async function verifyFinalTreeEquivalence(
+	repoPath: string,
+	headSha: string,
+	execResult: StackExecResult,
+	errors: string[],
+): Promise<void> {
+	const headTreeResult = await Bun.$`git -C ${repoPath} rev-parse ${headSha}^{tree}`.quiet().nothrow();
+
+	if (headTreeResult.exitCode !== 0) {
+		errors.push(`Failed to get HEAD tree: ${headTreeResult.stderr.toString().trim()}`);
+		return;
+	}
+
+	const headTree = headTreeResult.stdout.toString().trim();
+
+	if (execResult.final_tree_sha !== headTree) {
+		errors.push(
+			`Final tree mismatch: stack top = ${execResult.final_tree_sha}, HEAD = ${headTree}`,
+		);
+	}
+}
+
+function extractPathsFromRawDiff(output: Buffer): string[] {
+	const paths: string[] = [];
+	const entries = output.toString("utf-8").split("\0").filter((s) => s.length > 0);
+
+	for (let i = 0; i < entries.length; i++) {
+		const entry = entries[i];
+		if (!entry) continue;
+		if (!entry.startsWith(":")) continue;
+
+		const match = entry.match(/^:(\d+) (\d+) ([0-9a-f]+) ([0-9a-f]+) ([AMDRC])(\d*)$/);
+		if (!match) continue;
+
+		const status = match[5];
+		const pathEntry = entries[i + 1];
+		if (!pathEntry) continue;
+		i++;
+
+		if (status === "R") {
+			const newPath = entries[i + 1];
+			if (newPath) {
+				paths.push(newPath);
+				i++;
+			}
+		} else {
+			paths.push(pathEntry);
+		}
+	}
+
+	return paths;
+}

package/src/web/client/components/FeasibilityAlert.tsx

@@ -0,0 +1,64 @@
+import { CheckCircle2, XCircle, ChevronRight } from "lucide-react";
+import { useState } from "react";
+import type { FeasibilityResult } from "../../../stack/types.ts";
+
+export function FeasibilityAlert({ result }: { result: FeasibilityResult }) {
+	const [expanded, setExpanded] = useState(false);
+
+	if (result.feasible) {
+		return (
+			<div className="flex items-center gap-2 px-3 py-2 rounded-md bg-green-500/[0.04]">
+				<CheckCircle2 className="h-3.5 w-3.5 text-green-600/60 dark:text-green-400/60 shrink-0" />
+				<span className="text-[11px] text-green-700/70 dark:text-green-300/70 font-medium">Feasible</span>
+				{result.ordered_group_ids && (
+					<span className="text-[10px] text-muted-foreground/25 truncate">
+						{result.ordered_group_ids.join(" → ")}
+					</span>
+				)}
+			</div>
+		);
+	}
+
+	const hasCycleDetails = result.cycle && result.cycle.edge_cycle.length > 0;
+
+	return (
+		<div className="rounded-md bg-red-500/[0.04] px-3 py-2.5 space-y-2">
+			<button
+				type="button"
+				onClick={() => hasCycleDetails && setExpanded(!expanded)}
+				className={`flex items-center gap-2 w-full text-left ${hasCycleDetails ? "cursor-pointer" : "cursor-default"}`}
+			>
+				<XCircle className="h-3.5 w-3.5 text-red-500/60 shrink-0" />
+				<span className="text-[11px] text-red-600/80 dark:text-red-400/80 font-medium flex-1">
+					Not feasible — dependency cycle
+				</span>
+				{hasCycleDetails && (
+					<ChevronRight className={`h-3 w-3 text-red-500/30 shrink-0 transition-transform duration-150 ${expanded ? "rotate-90" : ""}`} />
+				)}
+			</button>
+
+			{result.cycle && (
+				<p className="text-[10px] text-red-500/50 pl-5.5">
+					{result.cycle.group_cycle.join(" → ")} → {result.cycle.group_cycle[0]}
+				</p>
+			)}
+
+			{expanded && result.cycle && (
+				<div className="pl-5.5 space-y-1">
+					{result.cycle.edge_cycle.map((edge, i) => (
+						<div key={i} className="text-[10px] text-red-500/40">
+							{edge.from} → {edge.to}
+							<span className="text-red-500/25"> ({edge.kind}{edge.evidence?.path ? `: ${edge.evidence.path}` : ""})</span>
+						</div>
+					))}
+				</div>
+			)}
+
+			{result.unassigned_paths && result.unassigned_paths.length > 0 && (
+				<p className="text-[10px] text-red-500/40 pl-5.5">
+					{result.unassigned_paths.length} unassigned file(s)
+				</p>
+			)}
+		</div>
+	);
+}

package/src/web/client/components/InputScreen.tsx

@@ -1,5 +1,5 @@
 import { useState, useEffect } from "react";
-import { CornerDownLeft, Clock, GitPullRequest, Check, X, Minus, ExternalLink } from "lucide-react";
+import { CornerDownLeft, GitPullRequest, ExternalLink, ChevronUp } from "lucide-react";
 import type { SessionRecord } from "../../../history/types.ts";
 import { analytics } from "../lib/analytics.ts";
 
@@ -35,46 +35,50 @@ function timeAgo(date: string): string {
 	return `${Math.floor(d / 30)}mo ago`;
 }
 
-function StatusIcon({ ok, optional }: { ok: boolean; optional?: boolean }) {
-	if (ok) return <Check className="h-3 w-3 text-green-500" />;
-	if (optional) return <Minus className="h-3 w-3 text-muted-foreground/30" />;
-	return <X className="h-3 w-3 text-red-500" />;
+function StatusDot({ ok, optional }: { ok: boolean; optional?: boolean }) {
+	if (ok) return <span className="h-1.5 w-1.5 rounded-full bg-green-500" />;
+	if (optional) return <span className="h-1.5 w-1.5 rounded-full bg-muted-foreground/15" />;
+	return <span className="h-1.5 w-1.5 rounded-full bg-red-500" />;
 }
 
-function PreflightStatus({ data }: { data: PreflightData }) {
+function CompactStatus({ data }: { data: PreflightData }) {
+	const [open, setOpen] = useState(false);
 	const gh = data.github;
+	const allOk = gh.installed && gh.authenticated && data.openrouterKey;
 	return (
-		<div className="space-y-1.5">
-			<div className="text-[10px] font-medium text-muted-foreground/40 uppercase tracking-wider mb-2">Status</div>
-			<div className="flex items-center gap-2">
-				<StatusIcon ok={gh.installed && gh.authenticated} />
-				<span className="text-[11px] font-mono">gh</span>
-				{gh.installed && gh.authenticated && gh.user && (
-					<span className="text-[10px] text-muted-foreground/40">{gh.user}</span>
-				)}
-				{gh.installed && !gh.authenticated && (
-					<span className="text-[10px] text-red-500/70">not authenticated</span>
-				)}
-				{!gh.installed && (
-					<span className="text-[10px] text-red-500/70">not installed</span>
-				)}
-			</div>
-			{data.agents.map((agent) => (
-				<div key={agent.name} className="flex items-center gap-2">
-					<StatusIcon ok={agent.installed} optional />
-					<span className={`text-[11px] font-mono ${agent.installed ? "" : "text-muted-foreground/30"}`}>{agent.name}</span>
-					{agent.installed && agent.version && (
-						<span className="text-[10px] text-muted-foreground/30">{agent.version}</span>
-					)}
+		<div className="flex flex-col items-end gap-1">
+			<button
+				type="button"
+				onClick={() => setOpen((v) => !v)}
+				className="flex items-center gap-1.5 hover:opacity-70 transition-opacity"
+			>
+				<StatusDot ok={allOk} />
+				<span className="text-[10px] font-mono text-muted-foreground/30">status</span>
+				<ChevronUp className={`h-2.5 w-2.5 text-muted-foreground/20 transition-transform ${open ? "" : "rotate-180"}`} />
+			</button>
+			{open && (
+				<div className="flex flex-col items-end gap-1 animate-in fade-in slide-in-from-bottom-1 duration-150">
+					<div className="flex items-center gap-1.5">
+						<StatusDot ok={gh.installed && gh.authenticated} />
+						<span className="text-[10px] font-mono text-muted-foreground/30">gh</span>
+						{gh.installed && gh.authenticated && gh.user && (
+							<span className="text-[10px] text-muted-foreground/20">{gh.user}</span>
+						)}
+					</div>
+					{data.agents.map((agent) => (
+						<div key={agent.name} className="flex items-center gap-1.5">
+							<StatusDot ok={agent.installed} optional />
+							<span className={`text-[10px] font-mono ${agent.installed ? "text-muted-foreground/30" : "text-muted-foreground/10"}`}>
+								{agent.name}
+							</span>
+						</div>
+					))}
+					<div className="flex items-center gap-1.5">
+						<StatusDot ok={data.openrouterKey} />
+						<span className="text-[10px] font-mono text-muted-foreground/30">OpenRouter</span>
+					</div>
 				</div>
-			))}
-			<div className="flex items-center gap-2">
-				<StatusIcon ok={data.openrouterKey} />
-				<span className="text-[11px]">OpenRouter</span>
-				{!data.openrouterKey && (
-					<span className="text-[10px] text-red-500/70">run newpr auth</span>
-				)}
-			</div>
+			)}
 		</div>
 	);
 }
@@ -110,26 +114,29 @@ export function InputScreen({
 	const recents = sessions?.slice(0, 5) ?? [];
 
 	return (
-		<div className="flex flex-col items-center justify-center min-h-[60vh]">
-			<div className="w-full max-w-lg space-y-8">
-				<SponsorBanner />
-
-				<div className="space-y-2">
-						<div className="flex items-baseline gap-2">
-							<h1 className="text-sm font-semibold tracking-tight font-mono">newpr</h1>
-							{version && <span className="text-[10px] text-muted-foreground/30">v{version}</span>}
-							<span className="text-[10px] text-muted-foreground/40">AI code review</span>
-						</div>
-						<p className="text-xs text-muted-foreground">
-							Paste a GitHub PR URL to start analysis
-						</p>
+		<div className="relative flex flex-col items-center justify-center min-h-[80vh]">
+			<div className="w-full max-w-xl space-y-10">
+
+				<div className="flex flex-col items-center text-center space-y-3">
+					<div className="flex items-center gap-2.5">
+						<h1 className="text-2xl font-bold font-mono tracking-tighter">newpr</h1>
+						{version && (
+							<span className="text-[10px] text-muted-foreground/30 bg-foreground/[0.03] border border-border/50 rounded-full px-2 py-0.5 font-mono">
+								v{version}
+							</span>
+						)}
 					</div>
+					<p className="text-sm text-muted-foreground/50">
+						Turn PRs into navigable stories
+					</p>
+				</div>
 
+				<div>
 					<form onSubmit={handleSubmit}>
 						<div className={`flex items-center rounded-xl border bg-background transition-all ${
 							focused ? "ring-1 ring-ring border-foreground/15 shadow-sm" : "border-border"
 						}`}>
-							<GitPullRequest className="h-3.5 w-3.5 text-muted-foreground/40 ml-4 shrink-0" />
+							<GitPullRequest className="h-4 w-4 text-muted-foreground/30 ml-4 shrink-0" />
 							<input
 								type="text"
 								value={value}
@@ -137,62 +144,66 @@ export function InputScreen({
 								onFocus={() => setFocused(true)}
 								onBlur={() => setFocused(false)}
 								placeholder="https://github.com/owner/repo/pull/123"
-								className="flex-1 h-11 bg-transparent px-3 text-xs font-mono placeholder:text-muted-foreground/40 focus:outline-none"
+								className="flex-1 h-12 bg-transparent px-3 text-sm font-mono placeholder:text-muted-foreground/25 focus:outline-none"
 								autoFocus
 							/>
 							<button
 								type="submit"
 								disabled={!value.trim()}
-								className="flex h-7 w-7 items-center justify-center rounded-lg bg-foreground text-background mr-2 transition-opacity disabled:opacity-20 hover:opacity-80"
+								className="flex h-8 w-8 items-center justify-center rounded-lg bg-foreground text-background mr-2 transition-opacity disabled:opacity-15 hover:opacity-80"
 							>
 								<CornerDownLeft className="h-3.5 w-3.5" />
 							</button>
 						</div>
-						<div className="flex justify-end mt-2 pr-1">
-							<span className="text-[10px] text-muted-foreground/30">
-								Enter to analyze
+						<div className="flex justify-center mt-2.5">
+							<span className="text-[10px] text-muted-foreground/20 font-mono">
+								↵ Enter to analyze
 							</span>
 						</div>
 					</form>
+					<div className="mt-4">
+						<SponsorBanner />
+					</div>
+				</div>
 
-					{recents.length > 0 && (
-						<div className="space-y-2">
-							<div className="text-[10px] font-medium text-muted-foreground/40 uppercase tracking-wider px-0.5">
-								Recent
-							</div>
-							<div className="space-y-px">
-								{recents.map((s) => (
-									<button
-										key={s.id}
-										type="button"
-										onClick={() => onSessionSelect?.(s.id)}
-										className="w-full flex items-center gap-3 rounded-lg px-3 py-2.5 text-left hover:bg-accent/50 transition-colors group"
-									>
-										<span className={`h-1.5 w-1.5 shrink-0 rounded-full ${RISK_DOT[s.risk_level] ?? RISK_DOT.medium}`} />
-										<div className="flex-1 min-w-0">
-											<div className="text-xs truncate group-hover:text-foreground transition-colors">
-												{s.pr_title}
-											</div>
-											<div className="flex items-center gap-1.5 mt-0.5 text-[10px] text-muted-foreground/50">
-												<span className="font-mono truncate">{s.repo.split("/").pop()}</span>
-												<span className="font-mono">#{s.pr_number}</span>
-												<span className="text-muted-foreground/20">·</span>
-												<span className="text-green-600 dark:text-green-400">+{s.total_additions}</span>
-												<span className="text-red-600 dark:text-red-400">-{s.total_deletions}</span>
-											</div>
-										</div>
-										<div className="flex items-center gap-1 text-[10px] text-muted-foreground/30 shrink-0">
-											<Clock className="h-2.5 w-2.5" />
-											<span>{timeAgo(s.analyzed_at)}</span>
+				{recents.length > 0 && (
+					<div className="space-y-3">
+						<div className="text-[10px] font-medium text-muted-foreground/25 uppercase tracking-[0.15em] text-center">
+							Recent
+						</div>
+						<div className="space-y-px">
+							{recents.map((s) => (
+								<button
+									key={s.id}
+									type="button"
+									onClick={() => onSessionSelect?.(s.id)}
+									className="w-full flex items-center gap-3 rounded-lg px-3 py-2 text-left hover:bg-accent/30 transition-colors group"
+								>
+									<span className={`h-1.5 w-1.5 shrink-0 rounded-full ${RISK_DOT[s.risk_level] ?? RISK_DOT.medium}`} />
+									<div className="flex-1 min-w-0">
+										<div className="text-[12px] truncate text-foreground/70 group-hover:text-foreground transition-colors">
+											{s.pr_title}
 										</div>
-									</button>
-								))}
-							</div>
+									</div>
+									<div className="flex items-center gap-2 shrink-0 text-[10px] text-muted-foreground/25">
+										<span className="font-mono">{s.repo.split("/").pop()}</span>
+										<span className="font-mono">#{s.pr_number}</span>
+										<span className="text-muted-foreground/15">·</span>
+										<span>{timeAgo(s.analyzed_at)}</span>
+									</div>
+								</button>
+							))}
 						</div>
-					)}
+					</div>
+				)}
 
-					{preflight && <PreflightStatus data={preflight} />}
 			</div>
+
+			{preflight && (
+				<div className="absolute bottom-4 right-0">
+					<CompactStatus data={preflight} />
+				</div>
+			)}
 		</div>
 	);
 }

package/src/web/client/components/ResultsScreen.tsx

@@ -1,5 +1,5 @@
 import { useState, useCallback, useEffect, useRef } from "react";
-import { ArrowLeft, Layers, FolderTree, BookOpen, MessageSquare, GitBranch, Sparkles, Check, ChevronDown, AlertTriangle, RefreshCw, Presentation } from "lucide-react";
+import { ArrowLeft, Layers, FolderTree, BookOpen, MessageSquare, GitBranch, Sparkles, Check, ChevronDown, AlertTriangle, RefreshCw, Presentation, GitPullRequestArrow } from "lucide-react";
 import { Tabs, TabsList, TabsTrigger, TabsContent } from "../../components/ui/tabs.tsx";
 import type { NewprOutput } from "../../../types/output.ts";
 import { GroupsPanel } from "../panels/GroupsPanel.tsx";
@@ -8,10 +8,11 @@ import { StoryPanel } from "../panels/StoryPanel.tsx";
 import { DiscussionPanel } from "../panels/DiscussionPanel.tsx";
 import { CartoonPanel } from "../panels/CartoonPanel.tsx";
 import { SlidesPanel } from "../panels/SlidesPanel.tsx";
+import { StackPanel } from "../panels/StackPanel.tsx";
 import { ReviewModal } from "./ReviewModal.tsx";
 import { useOutdatedCheck } from "../hooks/useOutdatedCheck.ts";
 
-const VALID_TABS = ["story", "discussion", "groups", "files", "slides", "cartoon"] as const;
+const VALID_TABS = ["story", "discussion", "groups", "files", "stack", "slides", "cartoon"] as const;
 type TabValue = typeof VALID_TABS[number];
 
 function getInitialTab(): TabValue {
@@ -236,6 +237,10 @@ export function ResultsScreen({
 						<FolderTree className="h-3 w-3 shrink-0" />
 						Files
 					</TabsTrigger>
+					<TabsTrigger value="stack">
+						<GitPullRequestArrow className="h-3 w-3 shrink-0" />
+						Stack
+					</TabsTrigger>
 					{(!enabledPlugins || enabledPlugins.includes("slides")) && (
 						<TabsTrigger value="slides">
 							<Presentation className="h-3 w-3 shrink-0" />
@@ -268,6 +273,9 @@ export function ResultsScreen({
 					onFileSelect={(path: string) => onAnchorClick("file", path)}
 				/>
 			</TabsContent>
+			<TabsContent value="stack">
+				<StackPanel sessionId={sessionId} />
+			</TabsContent>
 			<TabsContent value="slides">
 				<SlidesPanel data={data} sessionId={sessionId} />
 			</TabsContent>