newpr 1.0.16 → 1.0.17

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "newpr",
-  "version": "1.0.16",
+  "version": "1.0.17",
   "description": "AI-powered large PR review tool - understand PRs with 1000+ lines of changes",
   "module": "src/cli/index.ts",
   "type": "module",

package/src/stack/publish.ts

@@ -10,6 +10,21 @@ export interface PublishInput {
 	repo: string;
 }
 
+export interface StackPublishPreviewItem {
+	group_id: string;
+	title: string;
+	base_branch: string;
+	head_branch: string;
+	order: number;
+	total: number;
+	body: string;
+}
+
+export interface StackPublishPreviewResult {
+	template_path: string | null;
+	items: StackPublishPreviewItem[];
+}
+
 const PR_TEMPLATE_PATHS = [
 	".github/PULL_REQUEST_TEMPLATE.md",
 	".github/pull_request_template.md",
@@ -28,6 +43,11 @@ const PR_TEMPLATE_PATHS = [
 const TEMPLATE_DIR_RE = /^\.github\/(?:PULL_REQUEST_TEMPLATE|pull_request_template)\/.+\.md$/i;
 const STACK_NAV_COMMENT_MARKER = "<!-- newpr:stack-navigation -->";
 
+interface PrTemplateData {
+	path: string;
+	content: string;
+}
+
 async function listCommitFiles(repoPath: string, headSha: string): Promise<string[]> {
 	const result = await Bun.$`git -C ${repoPath} ls-tree -r --name-only ${headSha}`.quiet().nothrow();
 	if (result.exitCode !== 0) return [];
@@ -51,14 +71,14 @@ function collectTemplateCandidates(files: string[]): string[] {
 	return deduped;
 }
 
-async function readPrTemplate(repoPath: string, headSha: string): Promise<string | null> {
+async function readPrTemplate(repoPath: string, headSha: string): Promise<PrTemplateData | null> {
 	const commitFiles = await listCommitFiles(repoPath, headSha);
 	const candidates = collectTemplateCandidates(commitFiles);
 	for (const path of candidates) {
 		const result = await Bun.$`git -C ${repoPath} show ${headSha}:${path}`.quiet().nothrow();
 		if (result.exitCode === 0) {
 			const content = result.stdout.toString().trim();
-			if (content) return content;
+			if (content) return { path, content };
 		}
 	}
 	return null;
@@ -79,7 +99,8 @@ export async function publishStack(input: PublishInput): Promise<StackPublishRes
 	const ghRepo = `${owner}/${repo}`;
 
 	const headSha = exec_result.group_commits.at(-1)?.commit_sha ?? "HEAD";
-	const prTemplate = await readPrTemplate(repo_path, headSha);
+	const prTemplateData = await readPrTemplate(repo_path, headSha);
+	const prTemplate = prTemplateData?.content ?? null;
 
 	const branches: BranchInfo[] = [];
 	const prs: PrInfo[] = [];
@@ -109,9 +130,7 @@ export async function publishStack(input: PublishInput): Promise<StackPublishRes
 		if (!prBase) continue;
 
 		const order = i + 1;
-		const title = gc.pr_title
-			? `[${order}/${total}] ${gc.pr_title}`
-			: `[Stack ${order}/${total}] ${gc.group_id}`;
+		const title = buildStackPrTitle(gc, pr_meta, order, total);
 
 		const placeholder = buildPlaceholderBody(gc.group_id, order, total, pr_meta, prTemplate);
 
@@ -144,6 +163,34 @@ export async function publishStack(input: PublishInput): Promise<StackPublishRes
 	return { branches, prs };
 }
 
+export async function buildStackPublishPreview(input: PublishInput): Promise<StackPublishPreviewResult> {
+	const { repo_path, exec_result, pr_meta, base_branch } = input;
+	const headSha = exec_result.group_commits.at(-1)?.commit_sha ?? "HEAD";
+	const prTemplateData = await readPrTemplate(repo_path, headSha);
+	const prTemplate = prTemplateData?.content ?? null;
+	const total = exec_result.group_commits.length;
+
+	const items = exec_result.group_commits.map((gc, i) => {
+		const order = i + 1;
+		const title = buildStackPrTitle(gc, pr_meta, order, total);
+		const prBase = i === 0 ? base_branch : exec_result.group_commits[i - 1]?.branch_name ?? base_branch;
+		return {
+			group_id: gc.group_id,
+			title,
+			base_branch: prBase,
+			head_branch: gc.branch_name,
+			order,
+			total,
+			body: buildDescriptionBody(gc.group_id, order, total, pr_meta, prTemplate),
+		};
+	});
+
+	return {
+		template_path: prTemplateData?.path ?? null,
+		items,
+	};
+}
+
 async function updatePrBodies(ghRepo: string, prs: PrInfo[], prMeta: PrMeta, prTemplate: string | null): Promise<void> {
 	if (prs.length === 0) return;
 
@@ -216,16 +263,25 @@ function buildPlaceholderBody(
 	return lines.join("\n");
 }
 
-function buildFullBody(
-	current: PrInfo,
-	index: number,
-	allPrs: PrInfo[],
+function buildStackPrTitle(
+	groupCommit: StackExecResult["group_commits"][number],
 	prMeta: PrMeta,
-	prTemplate: string | null,
+	order: number,
+	total: number,
 ): string {
-	const total = allPrs.length;
-	const order = index + 1;
+	const stackPrefix = `[PR#${prMeta.pr_number} ${order}/${total}]`;
+	return groupCommit.pr_title
+		? `${stackPrefix} ${groupCommit.pr_title}`
+		: `${stackPrefix} ${groupCommit.group_id}`;
+}
 
+function buildDescriptionBody(
+	groupId: string,
+	order: number,
+	total: number,
+	prMeta: PrMeta,
+	prTemplate: string | null,
+): string {
 	const lines = [
 		`> **Stack ${order}/${total}** — This PR is part of a stacked PR chain created by [newpr](https://github.com/jiwonMe/newpr).`,
 		`> Source: #${prMeta.pr_number} ${prMeta.pr_title}`,
@@ -233,18 +289,28 @@ function buildFullBody(
 		``,
 		`---`,
 		``,
-		`## ${current.group_id}`,
+		`## ${groupId}`,
 		``,
 		`*From PR [#${prMeta.pr_number}](${prMeta.pr_url}): ${prMeta.pr_title}*`,
 	];
 
 	if (prTemplate) {
-		lines.push(``, `---`, ``, prTemplate);
+		lines.push("", "---", "", prTemplate);
 	}
 
 	return lines.join("\n");
 }
 
+function buildFullBody(
+	current: PrInfo,
+	index: number,
+	allPrs: PrInfo[],
+	prMeta: PrMeta,
+	prTemplate: string | null,
+): string {
+	return buildDescriptionBody(current.group_id, index + 1, allPrs.length, prMeta, prTemplate);
+}
+
 function buildStackNavigationComment(index: number, allPrs: PrInfo[]): string {
 	const total = allPrs.length;
 	const order = index + 1;
@@ -254,7 +320,7 @@ function buildStackNavigationComment(index: number, allPrs: PrInfo[]): string {
 		const isCurrent = i === index;
 		const marker = isCurrent ? "👉" : statusEmoji(i, index);
 		const link = `[#${pr.number}](${pr.url})`;
-		const titleText = pr.title.replace(/^\[\d+\/\d+\]\s*/, "");
+		const titleText = pr.title.replace(/^\[(?:PR#\d+\s+\d+\/\d+|Stack\s+\d+\/\d+|\d+\/\d+)\]\s*/i, "");
 		return `| ${marker} | ${num}/${total} | ${link} | ${titleText} |`;
 	}).join("\n");
 

package/src/web/client/hooks/useStack.ts

@@ -82,6 +82,19 @@ interface PublishResultData {
 	publishedAt?: number;
 }
 
+interface PublishPreviewData {
+	template_path: string | null;
+	items: Array<{
+		group_id: string;
+		title: string;
+		base_branch: string;
+		head_branch: string;
+		order: number;
+		total: number;
+		body: string;
+	}>;
+}
+
 interface ServerStackState {
 	status: string;
 	phase: string | null;
@@ -109,6 +122,9 @@ export interface StackState {
 	execResult: ExecResultData | null;
 	verifyResult: VerifyResultData | null;
 	publishResult: PublishResultData | null;
+	publishPreview: PublishPreviewData | null;
+	publishPreviewLoading: boolean;
+	publishPreviewError: string | null;
 	progressMessage: string | null;
 }
 
@@ -152,6 +168,9 @@ export function useStack(sessionId: string | null | undefined, options?: UseStac
 		execResult: null,
 		verifyResult: null,
 		publishResult: null,
+		publishPreview: null,
+		publishPreviewLoading: false,
+		publishPreviewError: null,
 		progressMessage: null,
 	});
 
@@ -297,6 +316,47 @@ export function useStack(sessionId: string | null | undefined, options?: UseStac
 		}
 	}, [sessionId, options]);
 
+	const loadPublishPreview = useCallback(async (force = false) => {
+		if (!sessionId) return;
+
+		setState((s) => {
+			if (!force && s.publishPreviewLoading) return s;
+			return { ...s, publishPreviewLoading: true, publishPreviewError: null };
+		});
+
+		try {
+			const res = await fetch("/api/stack/publish/preview", {
+				method: "POST",
+				headers: { "Content-Type": "application/json" },
+				body: JSON.stringify({ sessionId }),
+			});
+			const data = await res.json() as { preview?: PublishPreviewData; error?: string };
+			if (!res.ok || !data.preview) throw new Error(data.error ?? "Failed to load publish preview");
+
+			setState((s) => ({
+				...s,
+				publishPreview: data.preview!,
+				publishPreviewLoading: false,
+				publishPreviewError: null,
+			}));
+		} catch (err) {
+			setState((s) => ({
+				...s,
+				publishPreviewLoading: false,
+				publishPreviewError: err instanceof Error ? err.message : String(err),
+			}));
+		}
+	}, [sessionId]);
+
+	useEffect(() => {
+		if (!sessionId) return;
+		if (state.phase !== "done") return;
+		if (!state.execResult) return;
+		if (state.publishResult) return;
+		if (state.publishPreview || state.publishPreviewLoading || state.publishPreviewError) return;
+		loadPublishPreview();
+	}, [sessionId, state.phase, state.execResult, state.publishResult, state.publishPreview, state.publishPreviewLoading, state.publishPreviewError, loadPublishPreview]);
+
 	const reset = useCallback(() => {
 		eventSourceRef.current?.close();
 		eventSourceRef.current = null;
@@ -311,6 +371,9 @@ export function useStack(sessionId: string | null | undefined, options?: UseStac
 			execResult: null,
 			verifyResult: null,
 			publishResult: null,
+			publishPreview: null,
+			publishPreviewLoading: false,
+			publishPreviewError: null,
 			progressMessage: null,
 		}));
 	}, []);
@@ -326,6 +389,7 @@ export function useStack(sessionId: string | null | undefined, options?: UseStac
 		setMaxGroups,
 		runFullPipeline,
 		startPublish,
+		loadPublishPreview,
 		reset,
 	};
 }

package/src/web/client/panels/StackPanel.tsx

@@ -1,4 +1,4 @@
-import { Loader2, Play, Upload, RotateCcw, CheckCircle2, AlertTriangle, Circle, GitPullRequestArrow, ArrowRight, Layers } from "lucide-react";
+import { Loader2, Play, Upload, RotateCcw, CheckCircle2, AlertTriangle, Circle, GitPullRequestArrow, ArrowRight, Layers, FileText, RefreshCw } from "lucide-react";
 import { useStack } from "../hooks/useStack.ts";
 import { FeasibilityAlert } from "../components/FeasibilityAlert.tsx";
 import { StackGroupCard } from "../components/StackGroupCard.tsx";
@@ -83,6 +83,7 @@ export function StackPanel({ sessionId, onTrackAnalysis }: StackPanelProps) {
 			return !stack.publishResult?.prs.some((pr) => pr.head_branch === branch.name);
 		})
 		: [];
+	const previewItems = stack.publishPreview?.items ?? [];
 
 	if (stack.phase === "idle") {
 		return (
@@ -260,6 +261,67 @@ export function StackPanel({ sessionId, onTrackAnalysis }: StackPanelProps) {
 				</div>
 			)}
 
+			{stack.phase === "done" && stack.execResult && !stack.publishResult && (
+				<div className="space-y-2 rounded-lg border border-border/70 bg-foreground/[0.015] p-2.5">
+					<div className="flex items-center justify-between px-1">
+						<div className="flex items-center gap-2">
+							<FileText className="h-3.5 w-3.5 text-muted-foreground/60" />
+							<span className="text-[11px] font-medium text-foreground/80">Description Preview</span>
+						</div>
+						<button
+							type="button"
+							onClick={() => stack.loadPublishPreview(true)}
+							className="inline-flex items-center gap-1 text-[10px] text-muted-foreground/45 hover:text-foreground/70 transition-colors"
+						>
+							<RefreshCw className="h-3 w-3" />
+							Refresh
+						</button>
+					</div>
+
+					<p className="text-[10px] text-muted-foreground/35 px-1">
+						Template: {stack.publishPreview?.template_path ?? "(none found, using stack metadata body only)"}
+					</p>
+
+					{stack.publishPreviewLoading && (
+						<div className="flex items-center gap-2 px-2.5 py-2 text-[10px] text-muted-foreground/45">
+							<Loader2 className="h-3 w-3 animate-spin" />
+							Preparing preview bodies...
+						</div>
+					)}
+
+					{stack.publishPreviewError && (
+						<div className="rounded-md bg-red-500/[0.06] px-2.5 py-2 text-[10px] text-red-600/80 dark:text-red-400/80">
+							{stack.publishPreviewError}
+						</div>
+					)}
+
+					{!stack.publishPreviewLoading && !stack.publishPreviewError && previewItems.length > 0 && (
+						<div className="space-y-1.5">
+							{previewItems.map((item) => (
+								<details key={`${item.group_id}-${item.order}`} className="rounded-md border border-border/60 bg-background/40">
+									<summary className="cursor-pointer list-none px-2.5 py-2 hover:bg-accent/25 transition-colors">
+										<div className="flex items-center justify-between gap-2">
+											<span className="text-[11px] font-medium truncate">{item.title}</span>
+											<span className="text-[10px] text-muted-foreground/35 tabular-nums shrink-0">{item.order}/{item.total}</span>
+										</div>
+										<div className="flex items-center gap-1 mt-0.5">
+											<span className="text-[10px] font-mono text-muted-foreground/30">{item.base_branch}</span>
+											<ArrowRight className="h-2.5 w-2.5 text-muted-foreground/20" />
+											<span className="text-[10px] font-mono text-muted-foreground/30">{item.head_branch}</span>
+										</div>
+									</summary>
+									<div className="px-2.5 pb-2.5">
+										<pre className="whitespace-pre-wrap break-words text-[10px] leading-relaxed text-foreground/75 bg-muted/40 rounded-md p-2.5 overflow-x-auto">
+											{item.body}
+										</pre>
+									</div>
+								</details>
+							))}
+						</div>
+					)}
+				</div>
+			)}
+
 			{stack.phase === "done" && stack.execResult && !stack.publishResult && (
 				<button
 					type="button"

package/src/web/server/routes.ts

@@ -15,7 +15,7 @@ import { getPlugin, getAllPlugins } from "../../plugins/registry.ts";
 import { chatWithTools, createLlmClient, type ChatTool, type ChatStreamEvent } from "../../llm/client.ts";
 import { detectAgents, runAgent } from "../../workspace/agent.ts";
 import { randomBytes } from "node:crypto";
-import { publishStack } from "../../stack/publish.ts";
+import { publishStack, buildStackPublishPreview } from "../../stack/publish.ts";
 import { startStack, getStackState, cancelStack, subscribeStack, restoreCompletedStacks, setStackPublishResult } from "./stack-manager.ts";
 import { getTelemetryConsent, setTelemetryConsent, telemetry } from "../../telemetry/index.ts";
 
@@ -1929,5 +1929,38 @@ Before posting an inline comment, ALWAYS call \`get_file_diff\` first to find th
 				return json({ error: msg }, 500);
 			}
 		},
+
+		"POST /api/stack/publish/preview": async (req: Request) => {
+			try {
+				const body = await req.json() as { sessionId: string };
+				if (!body.sessionId) return json({ error: "Missing sessionId" }, 400);
+
+				let state = getStackState(body.sessionId);
+				if (!state) {
+					await restoreCompletedStacks([body.sessionId]);
+					state = getStackState(body.sessionId);
+				}
+				if (!state) return json({ error: "No stack state found" }, 404);
+				if (!state.execResult) return json({ error: "Stack not executed yet" }, 400);
+				if (!state.context) return json({ error: "Missing context" }, 400);
+
+				const stored = await loadSession(body.sessionId);
+				if (!stored) return json({ error: "Session not found" }, 404);
+
+				const preview = await buildStackPublishPreview({
+					repo_path: state.context.repo_path,
+					exec_result: state.execResult,
+					pr_meta: stored.meta,
+					base_branch: state.context.base_branch,
+					owner: state.context.owner,
+					repo: state.context.repo,
+				});
+
+				return json({ preview });
+			} catch (err) {
+				const msg = err instanceof Error ? err.message : String(err);
+				return json({ error: msg }, 500);
+			}
+		},
 	};
 }