newpr 1.0.21 → 1.0.22

package/package.json

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

package/src/stack/delta.ts

@@ -183,22 +183,57 @@ function checkForUnsupportedModes(
 	}
 }
 
+async function resolveParentTree(
+	repoPath: string,
+	baseSha: string,
+	gid: string,
+	expectedTrees: Map<string, string>,
+	dagParents: Map<string, string[]>,
+): Promise<string | null> {
+	const parentIds = dagParents.get(gid) ?? [];
+
+	if (parentIds.length === 0) {
+		return resolveTree(repoPath, baseSha);
+	}
+
+	if (parentIds.length === 1) {
+		return expectedTrees.get(parentIds[0]!) ?? resolveTree(repoPath, baseSha);
+	}
+
+	const parentTrees = parentIds.map((p) => expectedTrees.get(p)).filter((t): t is string => Boolean(t));
+	if (parentTrees.length === 0) return resolveTree(repoPath, baseSha);
+	if (parentTrees.length === 1) return parentTrees[0]!;
+
+	let mergedTree = parentTrees[0]!;
+	for (let i = 1; i < parentTrees.length; i++) {
+		const mergeResult = await Bun.$`git -C ${repoPath} merge-tree --write-tree --allow-unrelated-histories ${mergedTree} ${parentTrees[i]!}`.quiet().nothrow();
+		if (mergeResult.exitCode === 0) {
+			mergedTree = mergeResult.stdout.toString().trim().split("\n")[0]!.trim();
+		}
+	}
+
+	return mergedTree;
+}
+
 export async function computeGroupStats(
 	repoPath: string,
 	baseSha: string,
 	orderedGroupIds: string[],
 	expectedTrees: Map<string, string>,
+	dagParents?: Map<string, string[]>,
 ): Promise<Map<string, StackGroupStats>> {
 	const stats = new Map<string, StackGroupStats>();
+	const linearParents = new Map<string, string[]>(
+		orderedGroupIds.map((gid, i) => [gid, i === 0 ? [] : [orderedGroupIds[i - 1]!]]),
+	);
+	const effectiveDagParents = dagParents ?? linearParents;
 
 	for (let i = 0; i < orderedGroupIds.length; i++) {
 		const gid = orderedGroupIds[i]!;
 		const tree = expectedTrees.get(gid);
 		if (!tree) continue;
 
-		const prevTree = i === 0
-			? await resolveTree(repoPath, baseSha)
-			: expectedTrees.get(orderedGroupIds[i - 1]!);
+		const prevTree = await resolveParentTree(repoPath, baseSha, gid, expectedTrees, effectiveDagParents);
 		if (!prevTree) continue;
 
 		const numstatResult = await Bun.$`git -C ${repoPath} diff-tree --numstat -r ${prevTree} ${tree}`.quiet().nothrow();

package/src/stack/execute.ts

@@ -4,6 +4,7 @@ import type {
 	StackExecResult,
 	GroupCommitInfo,
 } from "./types.ts";
+import { buildAncestorSets } from "./plan.ts";
 
 export class StackExecutionError extends Error {
 	constructor(message: string) {
@@ -78,6 +79,10 @@ export async function executeStack(input: ExecuteInput): Promise<StackExecResult
 	const groupRank = new Map<string, number>();
 	groupOrder.forEach((gid, idx) => groupRank.set(gid, idx));
 
+	const dagParents = new Map<string, string[]>();
+	for (const g of plan.groups) dagParents.set(g.id, g.deps ?? []);
+	const ancestorSets = buildAncestorSets(groupOrder, dagParents);
+
 	try {
 		for (let i = 0; i < groupOrder.length; i++) {
 			const idxFile = `/tmp/newpr-exec-idx-${runId}-${i}`;
@@ -101,8 +106,12 @@ export async function executeStack(input: ExecuteInput): Promise<StackExecResult
 				const fileRank = groupRank.get(fileGroupId);
 				if (fileRank === undefined) continue;
 
-				// Suffix propagation: update index[fileRank] through index[N-1]
-				for (let idxNum = fileRank; idxNum < groupOrder.length; idxNum++) {
+				for (let idxNum = 0; idxNum < groupOrder.length; idxNum++) {
+					const targetGroupId = groupOrder[idxNum]!;
+					const isOwner = targetGroupId === fileGroupId;
+					const isAncestorOfOwner = ancestorSets.get(targetGroupId)?.has(fileGroupId) ?? false;
+					if (!isOwner && !isAncestorOfOwner) continue;
+
 					let batch = batchPerIndex.get(idxNum);
 					if (!batch) {
 						batch = [];
@@ -137,7 +146,7 @@ export async function executeStack(input: ExecuteInput): Promise<StackExecResult
 		}
 
 		const groupCommits: GroupCommitInfo[] = [];
-		let prevCommitSha = plan.base_sha;
+		const commitBySha = new Map<string, string>();
 
 		for (let i = 0; i < groupOrder.length; i++) {
 			const idxFile = tmpIndexFiles[i];
@@ -162,7 +171,13 @@ export async function executeStack(input: ExecuteInput): Promise<StackExecResult
 
 			const commitMessage = group.pr_title ?? `${group.type}(${group.name}): ${group.description}`;
 
-			const commitTree = await Bun.$`git -C ${repo_path} commit-tree ${treeSha} -p ${prevCommitSha} -m ${commitMessage}`.env({
+			const directParents = (group.deps ?? []).length > 0
+				? group.deps.map((dep) => commitBySha.get(dep) ?? plan.base_sha)
+				: [groupCommits[i - 1]?.commit_sha ?? plan.base_sha];
+
+			const parentArgs = directParents.flatMap((p) => ["-p", p]);
+
+			const commitTree = await Bun.$`git -C ${repo_path} commit-tree ${treeSha} ${parentArgs} -m ${commitMessage}`.env({
 				GIT_AUTHOR_NAME: pr_author.name,
 				GIT_AUTHOR_EMAIL: pr_author.email,
 				GIT_COMMITTER_NAME: pr_author.name,
@@ -175,6 +190,7 @@ export async function executeStack(input: ExecuteInput): Promise<StackExecResult
 				);
 			}
 			const commitSha = commitTree.stdout.toString().trim();
+			commitBySha.set(gid, commitSha);
 
 			const branchName = buildStackBranchName(pr_number, head_branch, group);
 
@@ -193,8 +209,6 @@ export async function executeStack(input: ExecuteInput): Promise<StackExecResult
 				branch_name: branchName,
 				pr_title: group.pr_title,
 			});
-
-			prevCommitSha = commitSha;
 		}
 
 		const lastCommit = groupCommits[groupCommits.length - 1];

package/src/stack/feasibility.ts

@@ -190,10 +190,11 @@ function deduplicateEdges(edges: ConstraintEdge[]): ConstraintEdge[] {
 
 function topologicalSort(
 	groups: string[],
-	edges: ConstraintEdge[],
+	acyclicEdges: ConstraintEdge[],
 	deltas: DeltaEntry[],
 	ownership?: Map<string, string>,
 ): FeasibilityResult {
+	const edges = acyclicEdges;
 	const inDegree = new Map<string, number>();
 	const adjacency = new Map<string, string[]>();
 	const edgeMap = new Map<string, ConstraintEdge>();
@@ -238,9 +239,13 @@ function topologicalSort(
 	}
 
 	if (sorted.length === groups.length) {
+		const dependencyEdges = acyclicEdges
+			.filter((e) => e.kind === "dependency" || e.kind === "path-order")
+			.map((e) => ({ from: e.from, to: e.to }));
 		return {
 			feasible: true,
 			ordered_group_ids: sorted,
+			dependency_edges: dependencyEdges,
 		};
 	}
 

package/src/stack/plan.ts

@@ -13,15 +13,19 @@ export interface PlanInput {
 	ownership: Map<string, string>;
 	group_order: string[];
 	groups: FileGroup[];
+	dependency_edges?: Array<{ from: string; to: string }>;
 }
 
 export async function createStackPlan(input: PlanInput): Promise<StackPlan> {
-	const { repo_path, base_sha, head_sha, deltas, ownership, group_order, groups } = input;
+	const { repo_path, base_sha, head_sha, deltas, ownership, group_order, groups, dependency_edges } = input;
 
 	const groupRank = new Map<string, number>();
 	group_order.forEach((gid, idx) => groupRank.set(gid, idx));
 
-	const stackGroups = buildStackGroups(groups, group_order, ownership);
+	const dagParents = buildDagParents(group_order, dependency_edges ?? []);
+	const ancestorSets = buildAncestorSets(group_order, dagParents);
+
+	const stackGroups = buildStackGroups(groups, group_order, ownership, dagParents);
 
 	const tmpIndexFiles: string[] = [];
 	const expectedTrees = new Map<string, string>();
@@ -47,8 +51,12 @@ export async function createStackPlan(input: PlanInput): Promise<StackPlan> {
 				const fileRank = groupRank.get(fileGroupId);
 				if (fileRank === undefined) continue;
 
-				// Suffix propagation: update index[fileRank] through index[N-1]
-				for (let idxNum = fileRank; idxNum < group_order.length; idxNum++) {
+				for (let idxNum = 0; idxNum < group_order.length; idxNum++) {
+					const targetGroupId = group_order[idxNum]!;
+					const isOwner = targetGroupId === fileGroupId;
+					const isAncestorOfOwner = ancestorSets.get(targetGroupId)?.has(fileGroupId) ?? false;
+					if (!isOwner && !isAncestorOfOwner) continue;
+
 					let batch = batchPerIndex.get(idxNum);
 					if (!batch) {
 						batch = [];
@@ -108,10 +116,60 @@ export async function createStackPlan(input: PlanInput): Promise<StackPlan> {
 	};
 }
 
+export function buildDagParents(
+	groupOrder: string[],
+	dependencyEdges: Array<{ from: string; to: string }>,
+): Map<string, string[]> {
+	const parents = new Map<string, string[]>();
+	for (const gid of groupOrder) parents.set(gid, []);
+
+	for (const edge of dependencyEdges) {
+		if (!parents.has(edge.to)) continue;
+		const arr = parents.get(edge.to)!;
+		if (!arr.includes(edge.from)) arr.push(edge.from);
+	}
+
+	for (const gid of groupOrder) {
+		if ((parents.get(gid) ?? []).length === 0) {
+			const rank = groupOrder.indexOf(gid);
+			if (rank > 0) {
+				const prev = groupOrder[rank - 1]!;
+				if (!dependencyEdges.some((e) => e.to === gid)) {
+					parents.set(gid, [prev]);
+				}
+			}
+		}
+	}
+
+	return parents;
+}
+
+export function buildAncestorSets(
+	groupOrder: string[],
+	dagParents: Map<string, string[]>,
+): Map<string, Set<string>> {
+	const ancestors = new Map<string, Set<string>>();
+
+	for (const gid of groupOrder) {
+		const set = new Set<string>();
+		const queue = [...(dagParents.get(gid) ?? [])];
+		while (queue.length > 0) {
+			const node = queue.shift()!;
+			if (set.has(node)) continue;
+			set.add(node);
+			for (const p of dagParents.get(node) ?? []) queue.push(p);
+		}
+		ancestors.set(gid, set);
+	}
+
+	return ancestors;
+}
+
 function buildStackGroups(
 	groups: FileGroup[],
 	groupOrder: string[],
 	ownership: Map<string, string>,
+	dagParents: Map<string, string[]>,
 ): StackGroup[] {
 	const groupNameMap = new Map<string, FileGroup>();
 	for (const g of groups) {
@@ -132,7 +190,7 @@ function buildStackGroups(
 			type: (original?.type ?? "chore") as GroupType,
 			description: original?.description ?? "",
 			files: files.sort(),
-			deps: original?.dependencies ?? [],
+			deps: dagParents.get(gid) ?? [],
 			order: idx,
 		};
 	});

package/src/stack/publish.ts

@@ -24,6 +24,7 @@ export interface StackPublishGroupMeta {
 	order: number;
 	type?: string;
 	pr_title?: string;
+	deps?: string[];
 }
 
 export interface StackPublishPreviewItem {
@@ -87,6 +88,45 @@ function buildGroupMetaMap(groups: StackPublishGroupMeta[] | undefined): Map<str
 	return map;
 }
 
+function buildDagLevelMap(
+	groupCommits: StackExecResult["group_commits"],
+	groupMetaById: Map<string, StackPublishGroupMeta>,
+): Map<string, number> {
+	const levels = new Map<string, number>();
+	const inDegree = new Map<string, number>();
+
+	for (const gc of groupCommits) {
+		inDegree.set(gc.group_id, 0);
+	}
+
+	for (const gc of groupCommits) {
+		const deps = groupMetaById.get(gc.group_id)?.deps ?? [];
+		if (deps.length > 0) {
+			inDegree.set(gc.group_id, deps.length);
+		}
+	}
+
+	const queue = groupCommits.filter((gc) => (inDegree.get(gc.group_id) ?? 0) === 0).map((gc) => gc.group_id);
+	for (const gid of queue) levels.set(gid, 0);
+
+	while (queue.length > 0) {
+		const gid = queue.shift()!;
+		const level = levels.get(gid) ?? 0;
+		for (const gc of groupCommits) {
+			const deps = groupMetaById.get(gc.group_id)?.deps ?? [];
+			if (deps.includes(gid)) {
+				const newLevel = Math.max(levels.get(gc.group_id) ?? 0, level + 1);
+				levels.set(gc.group_id, newLevel);
+				const remaining = (inDegree.get(gc.group_id) ?? 1) - 1;
+				inDegree.set(gc.group_id, remaining);
+				if (remaining === 0) queue.push(gc.group_id);
+			}
+		}
+	}
+
+	return levels;
+}
+
 function buildEffectiveGroupMeta(
 	execResult: StackExecResult,
 	groupMetaById: Map<string, StackPublishGroupMeta>,
@@ -458,6 +498,22 @@ export async function publishStack(input: PublishInput): Promise<StackPublishRes
 	const prs: PrInfo[] = [];
 	const total = exec_result.group_commits.length;
 
+	const branchByGroupId = new Map(exec_result.group_commits.map((gc) => [gc.group_id, gc.branch_name]));
+
+	const dagLevelMap = buildDagLevelMap(exec_result.group_commits, groupMetaById);
+
+	const resolvePrBase = (gc: typeof exec_result.group_commits[number], index: number): string => {
+		const planGroup = plan_groups?.find((g) => g.id === gc.group_id);
+		const directDeps: string[] = planGroup?.deps ?? [];
+		if (directDeps.length > 0) {
+			const depBranch = directDeps
+				.map((dep: string) => branchByGroupId.get(dep))
+				.find((b: string | undefined): b is string => Boolean(b));
+			if (depBranch) return depBranch;
+		}
+		return index === 0 ? base_branch : (exec_result.group_commits[index - 1]?.branch_name ?? base_branch);
+	};
+
 	for (const gc of exec_result.group_commits) {
 		const pushResult = await Bun.$`git -C ${repo_path} push origin refs/heads/${gc.branch_name}:refs/heads/${gc.branch_name} --force-with-lease`.quiet().nothrow();
 
@@ -480,11 +536,12 @@ export async function publishStack(input: PublishInput): Promise<StackPublishRes
 		if (!branchInfo?.pushed) continue;
 
 		const previewItem = previewByGroup.get(gc.group_id);
-		const prBase = previewItem?.base_branch ?? (i === 0 ? base_branch : exec_result.group_commits[i - 1]?.branch_name);
+		const prBase = previewItem?.base_branch ?? resolvePrBase(gc, i);
 		if (!prBase) continue;
 
 		const order = i + 1;
-		const title = previewItem?.title ?? buildStackPrTitle(gc, pr_meta, order, total);
+		const dagLevel = dagLevelMap.get(gc.group_id);
+		const title = previewItem?.title ?? buildStackPrTitle(gc, pr_meta, order, total, dagLevel);
 
 		const placeholder = previewItem?.body ?? buildPlaceholderBody(
 			gc.group_id,
@@ -507,6 +564,7 @@ export async function publishStack(input: PublishInput): Promise<StackPublishRes
 			const prUrl = prResult.stdout.toString().trim();
 			const prNumberMatch = prUrl.match(/\/pull\/(\d+)/);
 
+			const planGroupDeps = plan_groups?.find((g) => g.id === gc.group_id)?.deps ?? [];
 			prs.push({
 				group_id: gc.group_id,
 				number: prNumberMatch ? parseInt(prNumberMatch[1]!, 10) : 0,
@@ -514,6 +572,7 @@ export async function publishStack(input: PublishInput): Promise<StackPublishRes
 				title,
 				base_branch: prBase,
 				head_branch: gc.branch_name,
+				dep_group_ids: planGroupDeps,
 			});
 		} else {
 			const stderr = prResult.stderr.toString().trim();
@@ -522,7 +581,7 @@ export async function publishStack(input: PublishInput): Promise<StackPublishRes
 	}
 
 	await updatePrBodies(ghRepo, prs, pr_meta, prTemplate, groupMetaById, llmPrefillByGroup, previewByGroup);
-	await postStackNavigationComments(ghRepo, prs);
+	await postStackNavigationComments(ghRepo, prs, dagLevelMap);
 
 	return { branches, prs };
 }
@@ -613,7 +672,11 @@ async function updatePrBodies(
 	}
 }
 
-async function postStackNavigationComments(ghRepo: string, prs: PrInfo[]): Promise<void> {
+async function postStackNavigationComments(
+	ghRepo: string,
+	prs: PrInfo[],
+	dagLevelMap: Map<string, number>,
+): Promise<void> {
 	if (prs.length === 0) return;
 
 	for (let i = 0; i < prs.length; i++) {
@@ -621,7 +684,7 @@ async function postStackNavigationComments(ghRepo: string, prs: PrInfo[]): Promi
 		const alreadyPosted = await hasStackNavigationComment(ghRepo, pr.number);
 		if (alreadyPosted) continue;
 
-		const comment = buildStackNavigationComment(i, prs);
+		const comment = buildStackNavigationComment(i, prs, dagLevelMap);
 		const commentResult = await runWithBodyFile(
 			comment,
 			(filePath) => Bun.$`gh pr comment ${pr.number} --repo ${ghRepo} --body-file ${filePath}`.quiet().nothrow(),
@@ -664,8 +727,10 @@ function buildStackPrTitle(
 	prMeta: PrMeta,
 	order: number,
 	total: number,
+	dagLevel?: number,
 ): string {
-	const stackPrefix = `[PR#${prMeta.pr_number} ${order}/${total}]`;
+	const levelLabel = dagLevel !== undefined ? `L${dagLevel}` : `${order}/${total}`;
+	const stackPrefix = `[PR#${prMeta.pr_number} ${levelLabel}]`;
 	return groupCommit.pr_title
 		? `${stackPrefix} ${groupCommit.pr_title}`
 		: `${stackPrefix} ${groupCommit.group_id}`;
@@ -681,11 +746,16 @@ function buildDescriptionBody(
 	baseBranch?: string,
 	headBranch?: string,
 	llmBullets?: SectionBullets,
+	dagLevel?: number,
 ): string {
+	const positionLabel = dagLevel !== undefined ? `L${dagLevel}` : `${order}/${total}`;
+	const depNames = (groupMeta?.deps ?? []).length > 0
+		? `Depends on: ${(groupMeta?.deps ?? []).join(", ")}`
+		: "Base of stack";
 	const lines = [
-		`> **Stack ${order}/${total}** — This PR is part of a stacked PR chain created by [newpr](https://github.com/jiwonMe/newpr).`,
+		`> **Stack ${positionLabel}** — This PR is part of a stacked PR chain created by [newpr](https://github.com/jiwonMe/newpr).`,
 		`> Source: #${prMeta.pr_number} ${prMeta.pr_title}`,
-		`> Stack navigation is posted as a discussion comment.`,
+		`> ${depNames} · Stack navigation is posted as a discussion comment.`,
 		``,
 		`---`,
 		``,
@@ -725,35 +795,55 @@ function buildFullBody(
 	return buildDescriptionBody(current.group_id, index + 1, allPrs.length, prMeta, prTemplate, groupMeta, baseBranch, headBranch, llmBullets);
 }
 
-function buildStackNavigationComment(index: number, allPrs: PrInfo[]): string {
+function buildStackNavigationComment(
+	index: number,
+	allPrs: PrInfo[],
+	dagLevelMap: Map<string, number>,
+): string {
 	const total = allPrs.length;
-	const order = index + 1;
+	const currentPr = allPrs[index]!;
+	const currentLevel = dagLevelMap.get(currentPr.group_id) ?? index;
+	const prByGroupId = new Map(allPrs.map((pr) => [pr.group_id, pr]));
+
+	const depPrs = (currentPr.dep_group_ids ?? [])
+		.map((depId) => prByGroupId.get(depId))
+		.filter((pr): pr is PrInfo => Boolean(pr));
+
+	const dependentPrs = allPrs.filter((pr) =>
+		(pr.dep_group_ids ?? []).includes(currentPr.group_id),
+	);
 
 	const stackTable = allPrs.map((pr, i) => {
-		const num = i + 1;
 		const isCurrent = i === index;
 		const marker = isCurrent ? "👉" : statusEmoji(i, index);
 		const link = `[#${pr.number}](${pr.url})`;
 		const titleText = pr.title.replace(/^\[(?:PR#\d+\s+\d+\/\d+|Stack\s+\d+\/\d+|\d+\/\d+)\]\s*/i, "");
-		return `| ${marker} | ${num}/${total} | ${link} | ${titleText} |`;
+		const level = dagLevelMap.get(pr.group_id) ?? i;
+		const indent = level > 0 ? "  ".repeat(level) : "";
+		return `| ${marker} | L${level} | ${link} | ${indent}${titleText} |`;
 	}).join("\n");
 
-	const prev = index > 0
-		? `⬅️ Previous: [#${allPrs[index - 1]!.number}](${allPrs[index - 1]!.url})`
-		: "⬅️ Previous: base branch";
-	const next = index < total - 1
-		? `➡️ Next: [#${allPrs[index + 1]!.number}](${allPrs[index + 1]!.url})`
-		: "➡️ Next: top of stack";
+	const navLines: string[] = [];
+	if (depPrs.length > 0) {
+		navLines.push(`⬆️ Depends on: ${depPrs.map((p) => `[#${p.number}](${p.url})`).join(", ")}`);
+	} else {
+		navLines.push("⬆️ Depends on: base branch");
+	}
+	if (dependentPrs.length > 0) {
+		navLines.push(`⬇️ Required by: ${dependentPrs.map((p) => `[#${p.number}](${p.url})`).join(", ")}`);
+	} else {
+		navLines.push("⬇️ Required by: (top of stack)");
+	}
 
 	return [
 		STACK_NAV_COMMENT_MARKER,
-		`### 📚 Stack Navigation (${order}/${total})`,
+		`### 📚 Stack Navigation (L${currentLevel}, PR ${index + 1}/${total})`,
 		``,
-		`| | Order | PR | Title |`,
+		`| | Level | PR | Title |`,
 		`|---|---|---|---|`,
 		stackTable,
 		``,
-		`${prev} | ${next}`,
+		navLines.join(" | "),
 		``,
 		`_Posted by newpr during stack publish._`,
 	].join("\n");

package/src/stack/types.ts

@@ -89,6 +89,7 @@ export interface CycleReport {
 export interface FeasibilityResult {
 	feasible: boolean;
 	ordered_group_ids?: string[];
+	dependency_edges?: Array<{ from: string; to: string }>;
 	cycle?: CycleReport;
 	unassigned_paths?: Array<{ path: string; commits: string[] }>;
 	ambiguous_paths?: Array<{ path: string; groups: string[]; commits: string[] }>;
@@ -161,6 +162,7 @@ export interface PrInfo {
 	title: string;
 	base_branch: string;
 	head_branch: string;
+	dep_group_ids?: string[];
 }
 
 export interface StackPublishResult {

package/src/web/client/App.tsx

@@ -14,8 +14,7 @@ import { DetailPane, resolveDetail } from "./components/DetailPane.tsx";
 import { useChatState, ChatProvider, ChatInput } from "./components/ChatSection.tsx";
 import type { AnchorItem } from "./components/TipTapEditor.tsx";
 import { requestNotificationPermission } from "./lib/notify.ts";
-import { analytics, initAnalytics, getConsent } from "./lib/analytics.ts";
-import { AnalyticsConsent } from "./components/AnalyticsConsent.tsx";
+import { analytics, initAnalytics } from "./lib/analytics.ts";
 
 function getUrlParam(key: string): string | null {
 	return new URLSearchParams(window.location.search).get(key);
@@ -41,7 +40,7 @@ export function App() {
 	const features = useFeatures();
 	const bgAnalyses = useBackgroundAnalyses();
 	const initialLoadDone = useRef(false);
-	const [showConsent, setShowConsent] = useState(() => getConsent() === "pending");
+
 
 	useEffect(() => {
 		requestNotificationPermission();
@@ -160,7 +159,6 @@ export function App() {
 
 	return (
 		<ChatProvider state={chatState} anchorItems={anchorItems} analyzedAt={analysis.result?.meta.analyzed_at}>
-		{showConsent && <AnalyticsConsent onDone={() => setShowConsent(false)} />}
 		<AppShell
 			theme={themeCtx.theme}
 			onThemeChange={themeCtx.setTheme}

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

@@ -1,98 +1 @@
-import { useState } from "react";
-import { BarChart3, Shield } from "lucide-react";
-import { getConsent, setConsent, type ConsentState } from "../lib/analytics.ts";
-
-export function AnalyticsConsent({ onDone }: { onDone: () => void }) {
-	const [state] = useState<ConsentState>(() => getConsent());
-
-	if (state !== "pending") return null;
-
-	const syncServer = (consent: "granted" | "denied") => {
-		fetch("/api/config", {
-			method: "PUT",
-			headers: { "Content-Type": "application/json" },
-			body: JSON.stringify({ telemetry_consent: consent }),
-		}).catch(() => {});
-	};
-
-	const handleAccept = () => {
-		setConsent("granted");
-		syncServer("granted");
-		onDone();
-	};
-
-	const handleDecline = () => {
-		setConsent("denied");
-		syncServer("denied");
-		onDone();
-	};
-
-	return (
-		<div className="fixed inset-0 z-[100] flex items-center justify-center">
-			<div className="fixed inset-0 bg-background/70 backdrop-blur-sm" />
-			<div className="relative z-10 w-full max-w-md mx-4 rounded-2xl border bg-background shadow-2xl overflow-hidden">
-				<div className="px-6 pt-6 pb-4">
-					<div className="flex items-center gap-3 mb-4">
-						<div className="flex h-10 w-10 items-center justify-center rounded-xl bg-blue-500/10">
-							<BarChart3 className="h-5 w-5 text-blue-500" />
-						</div>
-						<div>
-						<h2 className="text-base font-semibold">Help improve newpr</h2>
-						<p className="text-xs text-muted-foreground">Anonymous usage analytics</p>
-					</div>
-				</div>
-
-				<p className="text-sm text-muted-foreground leading-relaxed mb-3">
-						We'd like to collect anonymous usage data to understand how newpr is used and improve the experience.
-					</p>
-
-					<div className="rounded-lg bg-muted/40 px-3.5 py-2.5 space-y-1.5 mb-4">
-						<div className="flex items-start gap-2">
-							<Shield className="h-3.5 w-3.5 text-emerald-500 mt-0.5 shrink-0" />
-						<div className="text-xs text-muted-foreground leading-relaxed">
-							<p className="font-medium text-foreground/80 mb-1">What we collect:</p>
-							<ul className="space-y-0.5 list-disc list-inside text-xs">
-									<li>Feature usage (which tabs, buttons, and actions you use)</li>
-									<li>Performance metrics (analysis duration, error rates)</li>
-									<li>Basic device info (browser, screen size)</li>
-								</ul>
-							</div>
-						</div>
-						<div className="flex items-start gap-2 pt-1">
-							<Shield className="h-3.5 w-3.5 text-emerald-500 mt-0.5 shrink-0" />
-						<div className="text-xs text-muted-foreground leading-relaxed">
-							<p className="font-medium text-foreground/80 mb-1">What we never collect:</p>
-							<ul className="space-y-0.5 list-disc list-inside text-xs">
-									<li>PR content, code, or commit messages</li>
-									<li>Chat messages or review comments</li>
-									<li>API keys, tokens, or personal data</li>
-								</ul>
-							</div>
-						</div>
-					</div>
-
-					<p className="text-xs text-muted-foreground/50 mb-4">
-						Powered by Google Analytics. You can change this anytime in Settings.
-					</p>
-				</div>
-
-				<div className="flex border-t">
-					<button
-						type="button"
-						onClick={handleDecline}
-						className="flex-1 px-4 py-3 text-sm text-muted-foreground hover:bg-muted/50 transition-colors"
-					>
-						Decline
-					</button>
-					<button
-						type="button"
-						onClick={handleAccept}
-						className="flex-1 px-4 py-3 text-sm font-medium bg-foreground text-background hover:opacity-90 transition-opacity"
-					>
-						Accept
-					</button>
-				</div>
-			</div>
-		</div>
-	);
-}
+export {};

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

@@ -389,11 +389,11 @@ export function AppShell({
 			<ResizeHandle onResize={handleLeftResize} side="right" />
 
 			<div className="flex-1 flex flex-col overflow-hidden relative" style={{ minWidth: 400 }}>
-				<main ref={mainRef} className="flex-1 overflow-y-auto">
-					<div className="mx-auto max-w-5xl px-10 py-10">
-						{children}
-					</div>
-				</main>
+			<main ref={mainRef} className="flex-1 overflow-y-auto">
+				<div className="mx-auto max-w-5xl px-10 pt-10 pb-24">
+					{children}
+				</div>
+			</main>
 				{bottomBar}
 				{showScrollTop && (
 					<button