newpr 0.1.3 → 0.3.0

package/src/llm/client.ts

@@ -238,3 +238,200 @@ export function createLlmClient(options: LlmClientOptions): LlmClient {
 	const { createClaudeCodeClient: create } = require("./claude-code-client.ts");
 	return create(options.timeout);
 }
+
+export interface ChatTool {
+	type: "function";
+	function: {
+		name: string;
+		description: string;
+		parameters: Record<string, unknown>;
+	};
+}
+
+export interface ChatToolCallDelta {
+	id: string;
+	name: string;
+	arguments: string;
+}
+
+export interface ChatStreamEvent {
+	type: "text" | "tool_call" | "tool_result" | "done" | "error";
+	content?: string;
+	toolCall?: ChatToolCallDelta;
+	toolResult?: { id: string; result: string };
+	error?: string;
+}
+
+export type ChatStreamCallback = (event: ChatStreamEvent) => void;
+
+interface OpenRouterChatMessage {
+	role: "system" | "user" | "assistant" | "tool";
+	content?: string | null;
+	tool_calls?: Array<{
+		id: string;
+		type: "function";
+		function: { name: string; arguments: string };
+	}>;
+	tool_call_id?: string;
+}
+
+interface OpenRouterStreamToolCallDelta {
+	index?: number;
+	id?: string;
+	type?: string;
+	function?: { name?: string; arguments?: string };
+}
+
+interface OpenRouterStreamChunkWithTools {
+	choices: Array<{
+		delta: {
+			content?: string;
+			tool_calls?: OpenRouterStreamToolCallDelta[];
+		};
+		finish_reason?: string | null;
+	}>;
+	model?: string;
+	usage?: { prompt_tokens?: number; completion_tokens?: number; total_tokens?: number };
+}
+
+export async function chatWithTools(
+	options: LlmClientOptions,
+	messages: OpenRouterChatMessage[],
+	tools: ChatTool[],
+	executeTool: (name: string, args: Record<string, unknown>) => Promise<string>,
+	onEvent: ChatStreamCallback,
+): Promise<void> {
+	const MAX_TOOL_ROUNDS = 10;
+
+	let currentMessages = [...messages];
+
+	for (let round = 0; round < MAX_TOOL_ROUNDS; round++) {
+		const controller = new AbortController();
+		const timeoutId = setTimeout(() => controller.abort(), options.timeout * 1000);
+
+		let response: Response;
+		try {
+			response = await fetch("https://openrouter.ai/api/v1/chat/completions", {
+				method: "POST",
+				signal: controller.signal,
+				headers: {
+					Authorization: `Bearer ${options.api_key}`,
+					"Content-Type": "application/json",
+					"HTTP-Referer": "https://github.com/sionic/newpr",
+					"X-Title": "newpr",
+				},
+				body: JSON.stringify({
+					model: options.model,
+					messages: currentMessages,
+					tools: tools.length > 0 ? tools : undefined,
+					temperature: 0.3,
+					stream: true,
+				}),
+			});
+		} catch (err) {
+			clearTimeout(timeoutId);
+			onEvent({ type: "error", error: err instanceof Error ? err.message : String(err) });
+			return;
+		}
+
+		clearTimeout(timeoutId);
+
+		if (!response.ok) {
+			const body = await response.text();
+			onEvent({ type: "error", error: `OpenRouter API error ${response.status}: ${body}` });
+			return;
+		}
+
+		const reader = response.body!.getReader();
+		const decoder = new TextDecoder();
+		let buffer = "";
+		let textContent = "";
+		const toolCalls = new Map<number, { id: string; name: string; arguments: string }>();
+
+		try {
+			while (true) {
+				const { done, value } = await reader.read();
+				if (done) break;
+
+				buffer += decoder.decode(value, { stream: true });
+				const lines = buffer.split("\n");
+				buffer = lines.pop() ?? "";
+
+				for (const line of lines) {
+					const trimmed = line.trim();
+					if (!trimmed || trimmed === "data: [DONE]") continue;
+					if (!trimmed.startsWith("data: ")) continue;
+
+					try {
+						const chunk = JSON.parse(trimmed.slice(6)) as OpenRouterStreamChunkWithTools;
+						const delta = chunk.choices[0]?.delta;
+						if (!delta) continue;
+
+						if (delta.content) {
+							textContent += delta.content;
+							onEvent({ type: "text", content: delta.content });
+						}
+
+						if (delta.tool_calls) {
+							for (const tc of delta.tool_calls) {
+								const idx = tc.index ?? 0;
+								if (!toolCalls.has(idx)) {
+									toolCalls.set(idx, { id: tc.id ?? "", name: "", arguments: "" });
+								}
+								const entry = toolCalls.get(idx)!;
+								if (tc.id) entry.id = tc.id;
+								if (tc.function?.name) entry.name += tc.function.name;
+								if (tc.function?.arguments) entry.arguments += tc.function.arguments;
+							}
+						}
+					} catch {}
+				}
+			}
+		} finally {
+			reader.releaseLock();
+		}
+
+		if (toolCalls.size === 0) {
+			onEvent({ type: "done" });
+			return;
+		}
+
+		const assistantMsg: OpenRouterChatMessage = {
+			role: "assistant",
+			content: textContent || null,
+			tool_calls: [...toolCalls.values()].map((tc) => ({
+				id: tc.id,
+				type: "function" as const,
+				function: { name: tc.name, arguments: tc.arguments },
+			})),
+		};
+		currentMessages.push(assistantMsg);
+
+		for (const tc of toolCalls.values()) {
+			onEvent({
+				type: "tool_call",
+				toolCall: { id: tc.id, name: tc.name, arguments: tc.arguments },
+			});
+
+			let args: Record<string, unknown> = {};
+			try { args = JSON.parse(tc.arguments); } catch {}
+
+			let result: string;
+			try {
+				result = await executeTool(tc.name, args);
+			} catch (err) {
+				result = `Error: ${err instanceof Error ? err.message : String(err)}`;
+			}
+
+			onEvent({ type: "tool_result", toolResult: { id: tc.id, result } });
+
+			currentMessages.push({
+				role: "tool",
+				content: result,
+				tool_call_id: tc.id,
+			});
+		}
+	}
+
+	onEvent({ type: "done" });
+}

package/src/llm/prompts.ts

@@ -17,6 +17,8 @@ export interface FileSummaryInput {
 export interface PromptContext {
 	commits?: PrCommit[];
 	language?: string;
+	prBody?: string;
+	discussion?: Array<{ author: string; body: string }>;
 }
 
 function langDirective(lang?: string): string {
@@ -24,6 +26,21 @@ function langDirective(lang?: string): string {
 	return `\nCRITICAL LANGUAGE RULE: ALL text values in your response MUST be written in ${lang}. This includes every summary, description, name, purpose, scope, and impact field. JSON keys stay in English, but ALL string values MUST be in ${lang}. Do NOT use English for any descriptive text.`;
 }
 
+function formatDiscussion(ctx?: PromptContext): string {
+	const parts: string[] = [];
+	if (ctx?.prBody?.trim()) {
+		parts.push(`PR Description:\n${ctx.prBody.trim()}`);
+	}
+	if (ctx?.discussion && ctx.discussion.length > 0) {
+		const comments = ctx.discussion
+			.map((c) => `@${c.author}: ${c.body.length > 500 ? `${c.body.slice(0, 500)}…` : c.body}`)
+			.join("\n\n");
+		parts.push(`Discussion (${ctx.discussion.length} comments):\n${comments}`);
+	}
+	if (parts.length === 0) return "";
+	return `\n\n--- PR DISCUSSION ---\n${parts.join("\n\n")}`;
+}
+
 function formatCommitHistory(commits: PrCommit[]): string {
 	if (commits.length === 0) return "";
 	const lines = commits.map((c) => {
@@ -44,13 +61,15 @@ export function buildFileSummaryPrompt(chunks: DiffChunk[], ctx?: PromptContext)
 
 	const commitCtx = ctx?.commits ? formatCommitHistory(ctx.commits) : "";
 
+	const discussionCtx = formatDiscussion(ctx);
+
 	return {
 		system: `You are an expert code reviewer. Analyze the given diff and provide a 1-line summary for each changed file.
-Use the commit history to understand the intent behind each change — why the change was made, not just what changed.
+Use the commit history and PR discussion to understand the intent behind each change — why the change was made, not just what changed.
 Respond ONLY with a JSON array. Each element: {"path": "file/path", "summary": "one line description of what changed"}.
 The "path" value must be the exact file path. The "summary" value is a human-readable description.
 No markdown, no explanation, just the JSON array.${langDirective(ctx?.language)}`,
-		user: `${fileList}${commitCtx}`,
+		user: `${fileList}${commitCtx}${discussionCtx}`,
 	};
 }
 
@@ -61,15 +80,25 @@ export function buildGroupingPrompt(fileSummaries: FileSummaryInput[], ctx?: Pro
 
 	const commitCtx = ctx?.commits ? formatCommitHistory(ctx.commits) : "";
 
+	const discussionCtx = formatDiscussion(ctx);
+
 	return {
-		system: `You are an expert code reviewer. Group the following changed files by their semantic purpose.
-Each group should have a descriptive name, a type (one of: feature, refactor, bugfix, chore, docs, test, config), a description, and a list of file paths.
-A file MAY appear in multiple groups if it serves multiple purposes (e.g., index.ts re-exporting for both a feature and a refactor).
-Use the commit history to understand which changes belong together logically.
-Respond ONLY with a JSON array. Each element: {"name": "group name", "type": "feature|refactor|bugfix|chore|docs|test|config", "description": "what this group of changes does", "files": ["path1", "path2"]}.
-The "name" and "description" values are human-readable text. The "type" value must be one of the English keywords listed above. File paths stay as-is.
+		system: `You are an expert code reviewer. Group the following changed files by their semantic purpose and provide detailed analysis for each group.
+Each group should have:
+- "name": descriptive group name
+- "type": one of: feature, refactor, bugfix, chore, docs, test, config
+- "description": what this group of changes does (1-2 sentences)
+- "files": list of file paths
+- "key_changes": 2-5 bullet points describing the most important specific changes (e.g. "Add JWT token validation middleware", "Replace REST calls with GraphQL queries")
+- "risk": a brief risk assessment for this group (e.g. "Low - cosmetic changes only", "Medium - modifies auth flow, needs careful review", "High - changes database schema")
+- "dependencies": list of other group names that this group depends on or interacts with (empty array if none)
+
+A file MAY appear in multiple groups if it serves multiple purposes.
+Use the commit history and PR discussion to understand which changes belong together logically.
+Respond ONLY with a JSON array. Each element: {"name": "...", "type": "...", "description": "...", "files": [...], "key_changes": [...], "risk": "...", "dependencies": [...]}.
+The "type" value must be one of the English keywords listed above. File paths stay as-is.
 Every file must appear in at least one group. No markdown, no explanation, just the JSON array.${langDirective(ctx?.language)}`,
-		user: `Changed files:\n${fileList}${commitCtx}`,
+		user: `Changed files:\n${fileList}${commitCtx}${discussionCtx}`,
 	};
 }
 
@@ -86,13 +115,15 @@ export function buildOverallSummaryPrompt(
 	const fileList = fileSummaries.map((f) => `- ${f.path}: ${f.summary}`).join("\n");
 	const commitCtx = ctx?.commits ? formatCommitHistory(ctx.commits) : "";
 
+	const discussionCtx = formatDiscussion(ctx);
+
 	return {
 		system: `You are an expert code reviewer. Provide an overall summary of this Pull Request.
-Use the commit history to understand the development progression and intent.
+Use the commit history and PR discussion to understand the development progression and intent. The PR description and reviewer comments provide essential context about why changes were made.
 Respond ONLY with a JSON object: {"purpose": "why this PR exists (1-2 sentences)", "scope": "what areas of code are affected", "impact": "what is the impact of these changes", "risk_level": "low|medium|high"}.
 The "purpose", "scope", and "impact" values are human-readable text. The "risk_level" must be one of: low, medium, high (in English).
 No markdown, no explanation, just the JSON object.${langDirective(ctx?.language)}`,
-		user: `PR Title: ${prTitle}\n\nChange Groups:\n${groupList}\n\nFile Summaries:\n${fileList}${commitCtx}`,
+		user: `PR Title: ${prTitle}\n\nChange Groups:\n${groupList}\n\nFile Summaries:\n${fileList}${commitCtx}${discussionCtx}`,
 	};
 }
 
@@ -101,25 +132,54 @@ export function buildNarrativePrompt(
 	summary: PrSummary,
 	groups: FileGroup[],
 	ctx?: PromptContext,
+	fileDiffs?: Array<{ path: string; diff: string }>,
 ): PromptPair {
 	const groupDetails = groups
-		.map((g) => `### ${g.name} (${g.type})\n${g.description}\nFiles: ${g.files.join(", ")}`)
+		.map((g) => {
+			let detail = `### ${g.name} (${g.type})\n${g.description}\nFiles: ${g.files.join(", ")}`;
+			if (g.key_changes && g.key_changes.length > 0) {
+				detail += `\nKey changes:\n${g.key_changes.map((c) => `- ${c}`).join("\n")}`;
+			}
+			return detail;
+		})
 		.join("\n\n");
 
+	const diffContext = fileDiffs && fileDiffs.length > 0
+		? `\n\n--- FILE DIFFS (use these line numbers for [[line:...]] anchors) ---\n${fileDiffs.map((f) => `File: ${f.path}\n${f.diff}`).join("\n\n---\n\n")}`
+		: "";
+
 	const commitCtx = ctx?.commits ? formatCommitHistory(ctx.commits) : "";
 	const lang = ctx?.language && ctx.language !== "English" ? ctx.language : null;
 
+	const discussionCtx = formatDiscussion(ctx);
+
 	return {
 		system: `You are an expert code reviewer writing a review walkthrough for other developers.
 Write a clear, concise narrative that tells the "story" of this PR — what changes were made and in what logical order.
-Use the commit history to understand the development progression: which changes came first, how the PR evolved, and the intent behind each step.
+Use the commit history and PR discussion to understand the development progression: which changes came first, how the PR evolved, and the intent behind each step. The PR description often explains the author's motivation and approach.
 Use markdown formatting. Write 2-5 paragraphs. Do NOT use JSON. Write natural prose.
 ${lang ? `CRITICAL: Write the ENTIRE narrative in ${lang}. Every sentence must be in ${lang}. Do NOT use English except for code identifiers, file paths, and [[group:...]]/[[file:...]] tokens.` : "If the PR title is in a non-English language, write the narrative in that same language."}
 
-IMPORTANT: When referencing a change group, wrap it as [[group:Group Name]]. When referencing a specific file, wrap it as [[file:path/to/file.ts]].
-Use the EXACT group names and file paths provided. Every group MUST be referenced at least once. Reference key files where relevant.
-Example: "The [[group:Auth Flow]] group introduces session management via [[file:src/auth/session.ts]] and [[file:src/auth/token.ts]]."`,
-		user: `PR Title: ${prTitle}\n\nSummary:\n- Purpose: ${summary.purpose}\n- Scope: ${summary.scope}\n- Impact: ${summary.impact}\n- Risk: ${summary.risk_level}\n\nChange Groups:\n${groupDetails}${commitCtx}`,
+IMPORTANT: Use these anchor formats — they become clickable links in the UI:
+
+1. Group: [[group:Group Name]] — renders as a clickable chip.
+2. File: [[file:path/to/file.ts]] — renders as a clickable chip.
+3. Line reference: [[line:path/to/file.ts#L42-L50]](descriptive text here) — the "descriptive text" becomes an underlined clickable link that opens the diff at that line. The line info itself is NOT shown to the user — only the descriptive text is visible.
+
+RULES:
+- Use EXACT group names and file paths from the context above.
+- Every group MUST be referenced at least once with [[group:...]].
+- For line references, ALWAYS use the form [[line:path#Lstart-Lend]](text). NEVER use bare [[line:...]] without (text).
+- The (text) should be a natural description of what the code does, NOT the file name or line numbers. The reader should not see any line numbers — they just see underlined text they can click.
+- Do NOT place [[file:...]] and [[line:...]] next to each other for the same file. Use [[line:...]] with descriptive text instead — it already opens the file.
+- Aim for most sentences about code to have at least one [[line:...]](...) reference.
+
+GOOD example:
+"The [[group:Auth Flow]] group introduces session management. [[line:src/auth/session.ts#L15-L30]](The new validateToken function) handles JWT parsing, and [[line:src/auth/middleware.ts#L8-L12]](the auth middleware) invokes it on every request."
+
+BAD example (DO NOT do this):
+"The new validateToken function [[line:src/auth/session.ts#L15-L30]] in [[file:src/auth/session.ts]] handles JWT parsing."`,
+		user: `PR Title: ${prTitle}\n\nSummary:\n- Purpose: ${summary.purpose}\n- Scope: ${summary.scope}\n- Impact: ${summary.impact}\n- Risk: ${summary.risk_level}\n\nChange Groups:\n${groupDetails}${commitCtx}${discussionCtx}${diffContext}`,
 	};
 }
 
@@ -162,15 +222,16 @@ export function buildEnrichedNarrativePrompt(
 	groups: FileGroup[],
 	exploration: ExplorationResult,
 	ctx?: PromptContext,
+	fileDiffs?: Array<{ path: string; diff: string }>,
 ): PromptPair {
-	const base = buildNarrativePrompt(prTitle, summary, groups, ctx);
+	const base = buildNarrativePrompt(prTitle, summary, groups, ctx, fileDiffs);
 	const context = formatCodebaseContext(exploration);
 
 	return {
 		system: `${base.system}
 You have access to full codebase analysis. Use it to explain HOW the changes relate to existing code, not just WHAT changed.
 Mention specific existing functions, modules, or patterns that are affected.
-Remember to use [[group:Name]] and [[file:path]] tokens as instructed.`,
+Use [[group:Name]], [[file:path]], and [[line:path#L42-L50]](descriptive text) as instructed above.`,
 		user: `${base.user}\n\n--- CODEBASE CONTEXT (from agentic exploration) ---\n${context}`,
 	};
 }

package/src/llm/response-parser.ts

@@ -40,12 +40,24 @@ export function parseGroups(raw: string): FileGroup[] {
 			? (rawType as GroupType)
 			: "chore";
 
-		return {
+		const group: FileGroup = {
 			name: String(item.name ?? "Ungrouped"),
 			type,
 			description: String(item.description ?? ""),
 			files: Array.isArray(item.files) ? item.files.map(String) : [],
 		};
+
+		if (Array.isArray(item.key_changes) && item.key_changes.length > 0) {
+			group.key_changes = item.key_changes.map(String);
+		}
+		if (item.risk && typeof item.risk === "string") {
+			group.risk = item.risk;
+		}
+		if (Array.isArray(item.dependencies) && item.dependencies.length > 0) {
+			group.dependencies = item.dependencies.map(String);
+		}
+
+		return group;
 	});
 }
 

package/src/tui/Shell.tsx

@@ -7,7 +7,7 @@ import type { SessionRecord } from "../history/types.ts";
 import type { AgentToolName } from "../workspace/types.ts";
 import { parsePrInput } from "../github/parse-pr.ts";
 import { analyzePr } from "../analyzer/pipeline.ts";
-import { saveSession, listSessions, loadSession } from "../history/store.ts";
+import { saveSession, savePatchesSidecar, listSessions, loadSession } from "../history/store.ts";
 import { detectAgents } from "../workspace/agent.ts";
 import { App } from "./App.tsx";
 import { InputBar } from "./InputBar.tsx";
@@ -94,10 +94,12 @@ export function Shell({ token, config: initialConfig, initialPr }: ShellProps) {
 				setState({ phase: "loading", steps: [], startTime });
 				setElapsed(0);
 
+				let capturedPatches: Record<string, string> = {};
 				const result = await analyzePr({
 					pr,
 					token,
 					config: liveConfig,
+					onFilePatches: (patches) => { capturedPatches = patches; },
 					onProgress: (event: ProgressEvent) => {
 						const stamped = { ...event, timestamp: event.timestamp ?? Date.now() };
 						const prev = eventsRef.current;
@@ -117,7 +119,10 @@ export function Shell({ token, config: initialConfig, initialPr }: ShellProps) {
 					},
 				});
 
-				await saveSession(result);
+				const record = await saveSession(result);
+				if (Object.keys(capturedPatches).length > 0) {
+					await savePatchesSidecar(record.id, capturedPatches).catch(() => {});
+				}
 				const updated = await listSessions(10);
 				setSessions(updated);
 

package/src/types/github.ts

@@ -12,10 +12,24 @@ export interface PrCommit {
 	files: string[];
 }
 
+export interface PrComment {
+	id: number;
+	author: string;
+	author_avatar?: string;
+	body: string;
+	created_at: string;
+	updated_at: string;
+	html_url: string;
+}
+
+export type PrState = "open" | "closed" | "merged" | "draft";
+
 export interface GithubPrData {
 	number: number;
 	title: string;
+	body: string;
 	url: string;
+	state: PrState;
 	base_branch: string;
 	head_branch: string;
 	author: string;

package/src/types/output.ts

@@ -11,10 +11,14 @@ export type GroupType =
 
 export type RiskLevel = "low" | "medium" | "high";
 
+export type PrStateLabel = "open" | "closed" | "merged" | "draft";
+
 export interface PrMeta {
 	pr_number: number;
 	pr_title: string;
+	pr_body?: string;
 	pr_url: string;
+	pr_state?: PrStateLabel;
 	base_branch: string;
 	head_branch: string;
 	author: string;
@@ -39,6 +43,9 @@ export interface FileGroup {
 	type: GroupType;
 	description: string;
 	files: string[];
+	key_changes?: string[];
+	risk?: string;
+	dependencies?: string[];
 }
 
 export interface FileChange {
@@ -56,6 +63,49 @@ export interface CartoonImage {
 	generatedAt: string;
 }
 
+export interface DiffComment {
+	id: string;
+	sessionId: string;
+	filePath: string;
+	line: number;
+	startLine?: number;
+	side: "old" | "new";
+	body: string;
+	author: string;
+	authorAvatar?: string;
+	createdAt: string;
+	githubUrl?: string;
+	githubCommentId?: number;
+}
+
+export interface PendingComment {
+	tempId: string;
+	filePath: string;
+	line: number;
+	side: "old" | "new";
+	body: string;
+}
+
+export interface ChatToolCall {
+	id: string;
+	name: string;
+	arguments: Record<string, unknown>;
+	result?: string;
+}
+
+export type ChatSegment =
+	| { type: "text"; content: string }
+	| { type: "tool_call"; toolCall: ChatToolCall };
+
+export interface ChatMessage {
+	role: "user" | "assistant" | "tool";
+	content: string;
+	toolCalls?: ChatToolCall[];
+	segments?: ChatSegment[];
+	toolCallId?: string;
+	timestamp: string;
+}
+
 export interface NewprOutput {
 	meta: PrMeta;
 	summary: PrSummary;

package/src/web/client/App.tsx

@@ -10,6 +10,8 @@ import { LoadingTimeline } from "./components/LoadingTimeline.tsx";
 import { ResultsScreen } from "./components/ResultsScreen.tsx";
 import { ErrorScreen } from "./components/ErrorScreen.tsx";
 import { DetailPane, resolveDetail } from "./components/DetailPane.tsx";
+import { useChatState, ChatProvider, ChatInput } from "./components/ChatSection.tsx";
+import type { AnchorItem } from "./components/TipTapEditor.tsx";
 
 function getUrlParam(key: string): string | null {
 	return new URLSearchParams(window.location.search).get(key);
@@ -57,7 +59,7 @@ export function App() {
 		}
 	}, [analysis.phase, analysis.sessionId]);
 
-	const handleAnchorClick = useCallback((kind: "group" | "file", id: string) => {
+	const handleAnchorClick = useCallback((kind: "group" | "file" | "line", id: string) => {
 		const key = `${kind}:${id}`;
 		setActiveId((prev) => prev === key ? null : key);
 	}, []);
@@ -66,7 +68,7 @@ export function App() {
 		if (!activeId || !analysis.result) return null;
 		const [kind, ...rest] = activeId.split(":");
 		const id = rest.join(":");
-		return resolveDetail(kind as "group" | "file", id, analysis.result.groups, analysis.result.files);
+		return resolveDetail(kind as "group" | "file" | "line", id, analysis.result.groups, analysis.result.files);
 	}, [activeId, analysis.result]);
 
 	function handleSessionSelect(id: string) {
@@ -80,11 +82,29 @@ export function App() {
 		analysis.reset();
 	}
 
+	const diffSessionId = analysis.historyId ?? analysis.sessionId;
+	const prUrl = analysis.result?.meta.pr_url;
 	const detailPanel = detailTarget ? (
-		<DetailPane target={detailTarget} onClose={() => setActiveId(null)} />
+		<DetailPane target={detailTarget} sessionId={diffSessionId} prUrl={prUrl} onClose={() => setActiveId(null)} />
 	) : null;
 
+	const [activeTab, setActiveTab] = useState(() => getUrlParam("tab") ?? "story");
+	const chatState = useChatState(analysis.phase === "done" ? diffSessionId : null);
+
+	const anchorItems = useMemo<AnchorItem[]>(() => {
+		if (!analysis.result) return [];
+		const items: AnchorItem[] = [];
+		for (const g of analysis.result.groups) {
+			items.push({ kind: "group", id: g.name, label: g.name });
+		}
+		for (const f of analysis.result.files) {
+			items.push({ kind: "file", id: f.path, label: f.path });
+		}
+		return items;
+	}, [analysis.result]);
+
 	return (
+		<ChatProvider state={chatState} anchorItems={anchorItems}>
 		<AppShell
 			theme={themeCtx.theme}
 			onThemeChange={themeCtx.setTheme}
@@ -93,9 +113,15 @@ export function App() {
 			onSessionSelect={handleSessionSelect}
 			onNewAnalysis={handleNewAnalysis}
 			detailPanel={detailPanel}
+			bottomBar={analysis.phase === "done" && activeTab === "story" ? <ChatInput /> : undefined}
+			activeSessionId={diffSessionId}
 		>
 			{analysis.phase === "idle" && (
-				<InputScreen onSubmit={(pr) => analysis.start(pr)} />
+				<InputScreen
+					onSubmit={(pr) => analysis.start(pr)}
+					sessions={sessions}
+					onSessionSelect={handleSessionSelect}
+				/>
 			)}
 			{analysis.phase === "loading" && (
 				<LoadingTimeline
@@ -110,7 +136,8 @@ export function App() {
 					activeId={activeId}
 					onAnchorClick={handleAnchorClick}
 					cartoonEnabled={features.cartoon}
-					sessionId={analysis.sessionId}
+					sessionId={diffSessionId}
+					onTabChange={setActiveTab}
 				/>
 			)}
 			{analysis.phase === "error" && (
@@ -121,5 +148,6 @@ export function App() {
 				/>
 			)}
 		</AppShell>
+		</ChatProvider>
 	);
 }