newpr 0.6.2 → 0.6.4

package/package.json

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

package/src/cli/preflight.ts

@@ -62,16 +62,18 @@ async function checkAgent(name: AgentToolName): Promise<ToolStatus> {
 }
 
 export async function runPreflight(): Promise<PreflightResult> {
-	const [github, claude, opencode, codex] = await Promise.all([
+	const [github, claude, cursor, gemini, opencode, codex] = await Promise.all([
 		checkGithubCli(),
 		checkAgent("claude"),
+		checkAgent("cursor"),
+		checkAgent("gemini"),
 		checkAgent("opencode"),
 		checkAgent("codex"),
 	]);
 
 	return {
 		github,
-		agents: [claude, opencode, codex],
+		agents: [claude, cursor, gemini, opencode, codex],
 		openrouterKey: !!(process.env.OPENROUTER_API_KEY || await hasStoredApiKey()),
 	};
 }
@@ -115,11 +117,14 @@ export function printPreflight(result: PreflightResult): void {
 		}
 	}
 
+	const hasAgent = result.agents.some((a) => a.installed);
 	if (result.openrouterKey) {
 		console.log(`  ${check} OpenRouter API key`);
+	} else if (hasAgent) {
+		console.log(`  ${dim("·")} OpenRouter API key ${dim("· not configured (using agent as LLM fallback)")}`);
 	} else {
 		console.log(`  ${cross} OpenRouter API key ${dim("· not configured")}`);
-		console.log(`    ${dim("run: newpr auth")}`);
+		console.log(`    ${dim("run: newpr auth  —or—  install an agent (claude, gemini, etc.)")}`);
 	}
 
 	console.log("");

package/src/llm/client.ts

@@ -239,6 +239,10 @@ export function createLlmClient(options: LlmClientOptions): LlmClient {
 	return create(options.timeout);
 }
 
+export function hasApiKey(options: LlmClientOptions): boolean {
+	return !!options.api_key;
+}
+
 export interface ChatTool {
 	type: "function";
 	function: {

package/src/web/client/App.tsx

@@ -14,6 +14,8 @@ 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";
 
 function getUrlParam(key: string): string | null {
 	return new URLSearchParams(window.location.search).get(key);
@@ -39,8 +41,12 @@ export function App() {
 	const features = useFeatures();
 	const bgAnalyses = useBackgroundAnalyses();
 	const initialLoadDone = useRef(false);
+	const [showConsent, setShowConsent] = useState(() => getConsent() === "pending");
 
-	useEffect(() => { requestNotificationPermission(); }, []);
+	useEffect(() => {
+		requestNotificationPermission();
+		initAnalytics();
+	}, []);
 	const [activeId, setActiveId] = useState<string | null>(null);
 
 	useEffect(() => {
@@ -73,6 +79,7 @@ export function App() {
 
 	const scrollGuardRef = useRef<number | null>(null);
 	const handleAnchorClick = useCallback((kind: "group" | "file" | "line", id: string) => {
+		analytics.detailOpened(kind);
 		const key = `${kind}:${id}`;
 		const main = document.querySelector("main");
 		const savedScroll = main?.scrollTop ?? 0;
@@ -133,6 +140,10 @@ export function App() {
 	) : null;
 
 	const [activeTab, setActiveTab] = useState(() => getUrlParam("tab") ?? "story");
+	const handleTabChange = useCallback((tab: string) => {
+		analytics.tabChanged(tab);
+		setActiveTab(tab);
+	}, []);
 	const chatState = useChatState(analysis.phase === "done" ? diffSessionId : null);
 
 	const anchorItems = useMemo<AnchorItem[]>(() => {
@@ -149,6 +160,7 @@ 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}
@@ -187,7 +199,7 @@ export function App() {
 					onAnchorClick={handleAnchorClick}
 					cartoonEnabled={features.cartoon}
 					sessionId={diffSessionId}
-					onTabChange={setActiveTab}
+					onTabChange={handleTabChange}
 					onReanalyze={(prUrl: string) => { analysis.start(prUrl); }}
 					enabledPlugins={features.enabledPlugins}
 				/>

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

@@ -0,0 +1,88 @@
+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 handleAccept = () => {
+		setConsent("granted");
+		onDone();
+	};
+
+	const handleDecline = () => {
+		setConsent("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-sm font-semibold">Help improve newpr</h2>
+							<p className="text-[11px] text-muted-foreground">Anonymous usage analytics</p>
+						</div>
+					</div>
+
+					<p className="text-xs 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-[11px] 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-[10.5px]">
+									<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-[11px] 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-[10.5px]">
+									<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-[10px] 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-xs text-muted-foreground hover:bg-muted/50 transition-colors"
+					>
+						Decline
+					</button>
+					<button
+						type="button"
+						onClick={handleAccept}
+						className="flex-1 px-4 py-3 text-xs font-medium bg-foreground text-background hover:opacity-90 transition-opacity"
+					>
+						Accept
+					</button>
+				</div>
+			</div>
+		</div>
+	);
+}

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

@@ -7,6 +7,7 @@ import type { SessionRecord } from "../../../history/types.ts";
 import type { GithubUser } from "../hooks/useGithubUser.ts";
 import { SettingsPanel } from "./SettingsPanel.tsx";
 import { ResizeHandle } from "./ResizeHandle.tsx";
+import { analytics } from "../lib/analytics.ts";
 
 type Theme = "light" | "dark" | "system";
 
@@ -276,7 +277,7 @@ export function AppShell({
 								<button
 									type="button"
 									disabled={update.updating}
-									onClick={update.doUpdate}
+									onClick={() => { analytics.updateClicked(); update.doUpdate(); }}
 									className="w-full flex items-center justify-center gap-1.5 rounded-md bg-blue-500 hover:bg-blue-600 text-white text-[11px] font-medium py-1.5 transition-colors disabled:opacity-50"
 								>
 									{update.updating ? (
@@ -375,7 +376,7 @@ export function AppShell({
 						<div className="flex-1" />
 						<button
 							type="button"
-							onClick={() => setSettingsOpen(true)}
+							onClick={() => { analytics.settingsOpened(); setSettingsOpen(true); }}
 							className="flex h-6 w-6 items-center justify-center rounded-md text-muted-foreground/40 hover:bg-accent/40 hover:text-foreground transition-colors"
 							title="Settings"
 						>

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

@@ -2,6 +2,7 @@ import { useState, useRef, useCallback } from "react";
 import { X, Check, MessageSquare, Loader2, AlertCircle, ExternalLink } from "lucide-react";
 import { TipTapEditor, getTextWithAnchors } from "./TipTapEditor.tsx";
 import type { useEditor } from "@tiptap/react";
+import { analytics } from "../lib/analytics.ts";
 
 type ReviewEvent = "APPROVE" | "REQUEST_CHANGES" | "COMMENT";
 
@@ -53,6 +54,7 @@ export function ReviewModal({ prUrl, onClose }: ReviewModalProps) {
 			});
 			const data = await res.json() as { ok?: boolean; html_url?: string; error?: string };
 			if (data.ok) {
+				analytics.reviewSubmitted(event);
 				setResult({ ok: true, html_url: data.html_url });
 			} else {
 				setResult({ ok: false, error: data.error ?? "Failed to submit review" });

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

@@ -1,5 +1,6 @@
 import { useState, useEffect, useCallback, useRef } from "react";
 import { X, Check, Loader2, Search, ChevronDown } from "lucide-react";
+import { analytics, getConsent, setConsent } from "../lib/analytics.ts";
 
 interface ConfigData {
 	model: string;
@@ -69,6 +70,8 @@ export function SettingsPanel({ onClose, onFeaturesChange }: { onClose: () => vo
 	const save = useCallback(async (update: Record<string, unknown>) => {
 		setSaving(true);
 		setSaved(false);
+		const field = Object.keys(update).filter((k) => k !== "openrouter_api_key").join(",");
+		if (field) analytics.settingsChanged(field);
 		try {
 			await fetch("/api/config", {
 				method: "PUT",
@@ -265,11 +268,47 @@ export function SettingsPanel({ onClose, onFeaturesChange }: { onClose: () => vo
 						</div>
 					</Section>
 				)}
+				<Section title="Privacy">
+					<AnalyticsToggle />
+				</Section>
 			</div>
 		</div>
 	);
 }
 
+function AnalyticsToggle() {
+	const [consent, setLocal] = useState(() => getConsent());
+	const enabled = consent === "granted";
+
+	const toggle = () => {
+		const next = enabled ? "denied" : "granted";
+		setConsent(next);
+		setLocal(next);
+		analytics.settingsChanged("analytics");
+	};
+
+	return (
+		<Row label="Usage Analytics">
+			<div className="flex items-center gap-2">
+				<span className="text-[11px] text-muted-foreground/50">
+					{enabled ? "Enabled" : "Disabled"}
+				</span>
+				<button
+					type="button"
+					onClick={toggle}
+					className={`relative inline-flex h-4 w-7 items-center rounded-full shrink-0 transition-colors ${
+						enabled ? "bg-foreground" : "bg-muted"
+					}`}
+				>
+					<span className={`inline-block h-3 w-3 rounded-full bg-background transition-transform ${
+						enabled ? "translate-x-3.5" : "translate-x-0.5"
+					}`} />
+				</button>
+			</div>
+		</Row>
+	);
+}
+
 function ModelSelect({ value, models: allModels, onChange }: { value: string; models: ModelInfo[]; onChange: (id: string) => void }) {
 	const [open, setOpen] = useState(false);
 	const [search, setSearch] = useState("");

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

@@ -1,6 +1,7 @@
 import { useState, useCallback, useRef } from "react";
 import type { ProgressEvent } from "../../../analyzer/progress.ts";
 import type { NewprOutput } from "../../../types/output.ts";
+import { analytics } from "../lib/analytics.ts";
 
 type Phase = "idle" | "loading" | "done" | "error";
 
@@ -29,6 +30,7 @@ export function useAnalysis() {
 	const eventSourceRef = useRef<EventSource | null>(null);
 
 	const start = useCallback(async (prInput: string) => {
+		analytics.analysisStarted(0);
 		setState({
 			phase: "loading",
 			sessionId: null,
@@ -79,12 +81,16 @@ export function useAnalysis() {
 				eventSourceRef.current = null;
 				const resultRes = await fetch(`/api/analysis/${sessionId}`);
 				const data = await resultRes.json() as { result?: NewprOutput; historyId?: string };
-				setState((s) => ({
-					...s,
-					phase: "done",
-					result: data.result ?? null,
-					historyId: data.historyId ?? null,
-				}));
+				setState((s) => {
+					const durationSec = s.startedAt ? Math.round((Date.now() - s.startedAt) / 1000) : 0;
+					analytics.analysisCompleted(data.result?.files.length ?? 0, durationSec);
+					return {
+						...s,
+						phase: "done",
+						result: data.result ?? null,
+						historyId: data.historyId ?? null,
+					};
+				});
 			});
 
 			es.addEventListener("analysis_error", (e) => {
@@ -92,6 +98,7 @@ export function useAnalysis() {
 				eventSourceRef.current = null;
 				let msg = "Analysis failed";
 				try { msg = JSON.parse((e as MessageEvent).data).message ?? msg; } catch {}
+				analytics.analysisError(msg.slice(0, 100));
 				setState((s) => ({ ...s, phase: "error", error: msg }));
 			});
 
@@ -125,6 +132,7 @@ export function useAnalysis() {
 			const res = await fetch(`/api/sessions/${sessionId}`);
 			if (!res.ok) throw new Error("Session not found");
 			const data = await res.json() as NewprOutput;
+			analytics.sessionLoaded();
 			setState((s) => ({
 				...s,
 				phase: "done",

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

@@ -1,5 +1,6 @@
 import { useEffect, useCallback, useSyncExternalStore } from "react";
 import { sendNotification } from "../lib/notify.ts";
+import { analytics } from "../lib/analytics.ts";
 import type { ChatMessage, ChatToolCall, ChatSegment } from "../../../types/output.ts";
 
 interface ChatSessionState {
@@ -73,6 +74,7 @@ class ChatStore {
 		if (s.loading) return;
 
 		const startTime = Date.now();
+		analytics.chatSent();
 		const userMsg: ChatMessage = { role: "user", content: text, timestamp: new Date().toISOString() };
 		this.update(sessionId, { messages: [...s.messages, userMsg], loading: true, streaming: { segments: [] } });
 
@@ -152,6 +154,8 @@ class ChatStore {
 			}
 
 			const cur = this.getOrCreate(sessionId);
+			const durationMs = Date.now() - startTime;
+			analytics.chatCompleted(Math.round(durationMs / 1000), allToolCalls.length > 0);
 			this.update(sessionId, {
 				messages: [...cur.messages, {
 					role: "assistant",
@@ -159,7 +163,7 @@ class ChatStore {
 					toolCalls: allToolCalls.length > 0 ? allToolCalls : undefined,
 					segments: orderedSegments.length > 0 ? orderedSegments : undefined,
 					timestamp: new Date().toISOString(),
-					durationMs: Date.now() - startTime,
+					durationMs,
 				}],
 			});
 			sendNotification("Chat response ready", fullText.slice(0, 100));

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

@@ -1,4 +1,5 @@
 import { useState, useEffect, useCallback } from "react";
+import { analytics } from "../lib/analytics.ts";
 
 type Theme = "light" | "dark" | "system";
 
@@ -28,6 +29,7 @@ export function useTheme() {
 	const setTheme = useCallback((t: Theme) => {
 		localStorage.setItem("newpr-theme", t);
 		setThemeState(t);
+		analytics.themeChanged(t);
 	}, []);
 
 	return { theme, setTheme };

package/src/web/client/lib/analytics.ts

@@ -0,0 +1,111 @@
+declare global {
+	interface Window {
+		gtag?: (...args: unknown[]) => void;
+		dataLayer?: unknown[];
+	}
+}
+
+const GA_ID = "G-L3SL6T6JQ1";
+const CONSENT_KEY = "newpr-analytics-consent";
+
+export type ConsentState = "granted" | "denied" | "pending";
+
+export function getConsent(): ConsentState {
+	const stored = localStorage.getItem(CONSENT_KEY);
+	if (stored === "granted" || stored === "denied") return stored;
+	return "pending";
+}
+
+export function setConsent(state: "granted" | "denied"): void {
+	localStorage.setItem(CONSENT_KEY, state);
+	if (state === "granted") {
+		loadGA();
+	} else {
+		disableGA();
+	}
+}
+
+let gaLoaded = false;
+
+function loadGA(): void {
+	if (gaLoaded) return;
+	gaLoaded = true;
+
+	const script = document.createElement("script");
+	script.async = true;
+	script.src = `https://www.googletagmanager.com/gtag/js?id=${GA_ID}`;
+	document.head.appendChild(script);
+
+	window.dataLayer = window.dataLayer || [];
+	window.gtag = function (...args: unknown[]) {
+		window.dataLayer!.push(args);
+	};
+	window.gtag("js", new Date());
+	window.gtag("config", GA_ID);
+}
+
+function disableGA(): void {
+	(window as unknown as Record<string, unknown>)[`ga-disable-${GA_ID}`] = true;
+}
+
+export function initAnalytics(): void {
+	if (getConsent() === "granted") {
+		loadGA();
+	}
+}
+
+function gtag(command: string, ...args: unknown[]): void {
+	if (getConsent() !== "granted") return;
+	window.gtag?.(command, ...args);
+}
+
+function trackEvent(name: string, params?: Record<string, string | number | boolean>): void {
+	gtag("event", name, params);
+}
+
+export const analytics = {
+	analysisStarted: (fileCount: number) =>
+		trackEvent("analysis_started", { file_count: fileCount }),
+
+	analysisCompleted: (fileCount: number, durationSec: number) =>
+		trackEvent("analysis_completed", { file_count: fileCount, duration_sec: durationSec }),
+
+	analysisError: (errorType: string) =>
+		trackEvent("analysis_error", { error_type: errorType }),
+
+	tabChanged: (tab: string) =>
+		trackEvent("tab_changed", { tab }),
+
+	chatSent: () =>
+		trackEvent("chat_sent"),
+
+	chatCompleted: (durationSec: number, hasTools: boolean) =>
+		trackEvent("chat_completed", { duration_sec: durationSec, has_tools: hasTools }),
+
+	detailOpened: (kind: string) =>
+		trackEvent("detail_opened", { kind }),
+
+	themeChanged: (theme: string) =>
+		trackEvent("theme_changed", { theme }),
+
+	settingsOpened: () =>
+		trackEvent("settings_opened"),
+
+	settingsChanged: (field: string) =>
+		trackEvent("settings_changed", { field }),
+
+	sessionLoaded: () =>
+		trackEvent("session_loaded"),
+
+	reviewSubmitted: (event: string) =>
+		trackEvent("review_submitted", { review_event: event }),
+
+	agentUsed: (agent: string) =>
+		trackEvent("agent_used", { agent }),
+
+	updateClicked: () =>
+		trackEvent("update_clicked"),
+
+	featureUsed: (feature: string) =>
+		trackEvent("feature_used", { feature }),
+};

package/src/web/server/routes.ts

@@ -12,7 +12,7 @@ import { startAnalysis, getSession, cancelAnalysis, subscribe, listActiveSession
 import { generateCartoon } from "../../llm/cartoon.ts";
 import { generateSlides } from "../../llm/slides.ts";
 import { getPlugin, getAllPlugins } from "../../plugins/registry.ts";
-import { chatWithTools, type ChatTool, type ChatStreamEvent } from "../../llm/client.ts";
+import { chatWithTools, createLlmClient, type ChatTool, type ChatStreamEvent } from "../../llm/client.ts";
 import { detectAgents, runAgent } from "../../workspace/agent.ts";
 import { randomBytes } from "node:crypto";
 
@@ -72,6 +72,33 @@ export function createRoutes(token: string, config: NewprConfig, options: RouteO
 		return { login: "anonymous" };
 	}
 
+	function buildFallbackPrompt(
+		systemPrompt: string,
+		chatHistory: ChatMessage[],
+		patches?: Record<string, string> | null,
+	): string {
+		const parts: string[] = [systemPrompt];
+
+		if (patches && Object.keys(patches).length > 0) {
+			const patchSummary = Object.entries(patches)
+				.map(([path, diff]) => `### ${path}\n\`\`\`diff\n${diff.slice(0, 3000)}\n\`\`\``)
+				.join("\n\n");
+			parts.push(`\n\n<file_diffs>\n${patchSummary}\n</file_diffs>`);
+		}
+
+		for (const msg of chatHistory) {
+			if (msg.isCompactSummary) {
+				parts.push(`\n[Conversation summary]: ${msg.content}`);
+			} else if (msg.role === "user") {
+				parts.push(`\nUser: ${msg.content}`);
+			} else if (msg.role === "assistant") {
+				parts.push(`\nAssistant: ${msg.content}`);
+			}
+		}
+
+		return parts.join("\n");
+	}
+
 	interface SlideJob {
 		status: "running" | "done" | "error";
 		message: string;
@@ -580,6 +607,7 @@ Before posting an inline comment, ALWAYS call \`get_file_diff\` first to find th
 			const stored = await readStoredConfig();
 			const pluginList = getAllPlugins().map((p) => ({ id: p.id, name: p.name }));
 			const enabledPlugins = stored.enabled_plugins ?? pluginList.map((p) => p.id);
+			const agents = await detectAgents();
 			return json({
 				model: config.model,
 				agent: config.agent ?? null,
@@ -588,6 +616,7 @@ Before posting an inline comment, ALWAYS call \`get_file_diff\` first to find th
 				timeout: config.timeout,
 				concurrency: config.concurrency,
 				has_api_key: !!config.openrouter_api_key,
+				has_agent_fallback: agents.length > 0,
 				has_github_token: !!token,
 				enabled_plugins: enabledPlugins,
 				available_plugins: pluginList,
@@ -885,10 +914,6 @@ Before posting an inline comment, ALWAYS call \`get_file_diff\` first to find th
 			const segments = url.pathname.split("/");
 			const sessionId = segments[3]!;
 
-			if (!config.openrouter_api_key) {
-				return json({ error: "OpenRouter API key required" }, 400);
-			}
-
 			const body = await req.json() as { message: string };
 			if (!body.message?.trim()) return json({ error: "Missing message" }, 400);
 
@@ -908,31 +933,44 @@ Before posting an inline comment, ALWAYS call \`get_file_diff\` first to find th
 						controller.enqueue(encoder.encode(`event: ${eventType}\ndata: ${data}\n\n`));
 					};
 					try {
-						await chatWithTools(
-							{ api_key: config.openrouter_api_key, model: config.model, timeout: config.timeout },
-							apiMessages as Parameters<typeof chatWithTools>[1],
-							buildChatTools(),
-							async (name: string, args: Record<string, unknown>): Promise<string> => {
-								if (name === "get_file_diff") {
-									const filePath = args.path as string;
-									if (!filePath) return "Error: path required";
-									const patches = await loadPatchesSidecar(sessionId);
-									if (patches?.[filePath]) return patches[filePath];
-									const patch = await loadSinglePatch(sessionId, filePath);
-									if (patch) return patch;
-									return `File "${filePath}" not found`;
-								}
-								if (name === "list_files") {
-									return sessionData.files.map((f) => `${f.path} (${f.status}): ${f.summary}`).join("\n");
-								}
-								return `Tool ${name} not available in inline mode`;
-							},
-							(event: ChatStreamEvent) => {
-								if (event.type === "text") send("text", JSON.stringify({ content: event.content }));
-								else if (event.type === "error") send("chat_error", JSON.stringify({ message: event.error }));
-								else if (event.type === "done") send("done", JSON.stringify({}));
-							},
-						);
+						if (config.openrouter_api_key) {
+							await chatWithTools(
+								{ api_key: config.openrouter_api_key, model: config.model, timeout: config.timeout },
+								apiMessages as Parameters<typeof chatWithTools>[1],
+								buildChatTools(),
+								async (name: string, args: Record<string, unknown>): Promise<string> => {
+									if (name === "get_file_diff") {
+										const filePath = args.path as string;
+										if (!filePath) return "Error: path required";
+										const inlinePatches = await loadPatchesSidecar(sessionId);
+										if (inlinePatches?.[filePath]) return inlinePatches[filePath];
+										const patch = await loadSinglePatch(sessionId, filePath);
+										if (patch) return patch;
+										return `File "${filePath}" not found`;
+									}
+									if (name === "list_files") {
+										return sessionData.files.map((f) => `${f.path} (${f.status}): ${f.summary}`).join("\n");
+									}
+									return `Tool ${name} not available in inline mode`;
+								},
+								(event: ChatStreamEvent) => {
+									if (event.type === "text") send("text", JSON.stringify({ content: event.content }));
+									else if (event.type === "error") send("chat_error", JSON.stringify({ message: event.error }));
+									else if (event.type === "done") send("done", JSON.stringify({}));
+								},
+							);
+						} else {
+							const llm = createLlmClient({ api_key: "", model: config.model, timeout: config.timeout });
+							const inlinePatches = await loadPatchesSidecar(sessionId);
+							const fallbackPrompt = buildFallbackPrompt(systemPrompt, [{ role: "user", content: body.message.trim(), timestamp: new Date().toISOString() }], inlinePatches);
+							await llm.completeStream(
+								"You are a helpful PR review assistant. Answer based on the provided context.",
+								fallbackPrompt,
+								(chunk: string) => {
+									send("text", JSON.stringify({ content: chunk }));
+								},
+							);
+						}
 						send("done", JSON.stringify({}));
 					} catch (err) {
 						send("chat_error", JSON.stringify({ message: err instanceof Error ? err.message : String(err) }));
@@ -1010,10 +1048,6 @@ Before posting an inline comment, ALWAYS call \`get_file_diff\` first to find th
 			const segments = url.pathname.split("/");
 			const sessionId = segments[3]!;
 
-			if (!config.openrouter_api_key) {
-				return json({ error: "OpenRouter API key required for chat" }, 400);
-			}
-
 			const body = await req.json() as { message: string };
 			if (!body.message?.trim()) return json({ error: "Missing message" }, 400);
 
@@ -1046,7 +1080,6 @@ Before posting an inline comment, ALWAYS call \`get_file_diff\` first to find th
 
 				try {
 					const compactPrompt = `Summarize the following conversation concisely for continuation. Focus on: what was discussed, key decisions made, actions taken (tool calls and their outcomes), and any unresolved topics. Be thorough but concise.\n\n${summaryLines.join("\n")}`;
-					const { createLlmClient } = require("../../llm/client.ts") as typeof import("../../llm/client.ts");
 					const llm = createLlmClient({ api_key: config.openrouter_api_key, model: config.model, timeout: config.timeout });
 					const result = await llm.complete("You are a conversation summarizer. Output a concise summary.", compactPrompt);
 
@@ -1377,64 +1410,83 @@ Before posting an inline comment, ALWAYS call \`get_file_diff\` first to find th
 					let lastSegmentWasText = false;
 
 					try {
-						await chatWithTools(
-							{
-								api_key: config.openrouter_api_key,
-								model: config.model,
-								timeout: config.timeout,
-							},
-							apiMessages as Parameters<typeof chatWithTools>[1],
-							chatTools,
-							executeTool,
-							(event: ChatStreamEvent) => {
-								switch (event.type) {
-									case "text":
-										fullText += event.content ?? "";
-										if (lastSegmentWasText && orderedSegments.length > 0) {
-											const last = orderedSegments[orderedSegments.length - 1]!;
-											if (last.type === "text") {
-												last.content += event.content ?? "";
+						if (config.openrouter_api_key) {
+							await chatWithTools(
+								{
+									api_key: config.openrouter_api_key,
+									model: config.model,
+									timeout: config.timeout,
+								},
+								apiMessages as Parameters<typeof chatWithTools>[1],
+								chatTools,
+								executeTool,
+								(event: ChatStreamEvent) => {
+									switch (event.type) {
+										case "text":
+											fullText += event.content ?? "";
+											if (lastSegmentWasText && orderedSegments.length > 0) {
+												const last = orderedSegments[orderedSegments.length - 1]!;
+												if (last.type === "text") {
+													last.content += event.content ?? "";
+												}
+											} else {
+												orderedSegments.push({ type: "text", content: event.content ?? "" });
+												lastSegmentWasText = true;
 											}
-										} else {
-											orderedSegments.push({ type: "text", content: event.content ?? "" });
-											lastSegmentWasText = true;
-										}
-										send("text", JSON.stringify({ content: event.content }));
-										break;
-									case "tool_call":
-										if (event.toolCall) {
-											let args: Record<string, unknown> = {};
-											try { args = JSON.parse(event.toolCall.arguments); } catch {}
-											const tc: ChatToolCall = {
-												id: event.toolCall.id,
-												name: event.toolCall.name,
-												arguments: args,
-											};
-											collectedToolCalls.push(tc);
-											orderedSegments.push({ type: "tool_call", toolCall: tc });
-											lastSegmentWasText = false;
-											send("tool_call", JSON.stringify({
-												id: event.toolCall.id,
-												name: event.toolCall.name,
-												arguments: args,
-											}));
-										}
-										break;
-									case "tool_result":
-										if (event.toolResult) {
-											const tc = collectedToolCalls.find((c) => c.id === event.toolResult!.id);
-											if (tc) tc.result = event.toolResult.result;
-											send("tool_result", JSON.stringify(event.toolResult));
-										}
-										break;
-									case "error":
-										send("chat_error", JSON.stringify({ message: event.error }));
-										break;
-									case "done":
-										break;
-								}
-							},
-						);
+											send("text", JSON.stringify({ content: event.content }));
+											break;
+										case "tool_call":
+											if (event.toolCall) {
+												let args: Record<string, unknown> = {};
+												try { args = JSON.parse(event.toolCall.arguments); } catch {}
+												const tc: ChatToolCall = {
+													id: event.toolCall.id,
+													name: event.toolCall.name,
+													arguments: args,
+												};
+												collectedToolCalls.push(tc);
+												orderedSegments.push({ type: "tool_call", toolCall: tc });
+												lastSegmentWasText = false;
+												send("tool_call", JSON.stringify({
+													id: event.toolCall.id,
+													name: event.toolCall.name,
+													arguments: args,
+												}));
+											}
+											break;
+										case "tool_result":
+											if (event.toolResult) {
+												const tc = collectedToolCalls.find((c) => c.id === event.toolResult!.id);
+												if (tc) tc.result = event.toolResult.result;
+												send("tool_result", JSON.stringify(event.toolResult));
+											}
+											break;
+										case "error":
+											send("chat_error", JSON.stringify({ message: event.error }));
+											break;
+										case "done":
+											break;
+									}
+								},
+							);
+						} else {
+							const llm = createLlmClient({ api_key: "", model: config.model, timeout: config.timeout });
+							const prompt = buildFallbackPrompt(
+								systemPrompt,
+								chatHistory,
+								patches,
+							);
+							const result = await llm.completeStream(
+								"You are a helpful PR review assistant. Answer based on the provided context.",
+								prompt,
+								(chunk: string) => {
+									fullText += chunk;
+									send("text", JSON.stringify({ content: chunk }));
+								},
+							);
+							fullText = result.content;
+							orderedSegments.push({ type: "text", content: fullText });
+						}
 
 						const assistantMsg: ChatMessage = {
 							role: "assistant",