@agimon-ai/po-git 0.0.0-alpha.25 → 0.0.0-alpha.26

package/dist/extensions/native.mjs

@@ -1,12 +1,12 @@
 import { createApiClient, defineActivityGroup, defineChannelFile, defineFill, defineGlobalStore, defineNativePlugin, defineSessionStore, defineWebLifecycle, nativeApiTransport, sessionApiAddress } from "@agimon-ai/po-core/native";
-import { ArrowRightIcon, BranchIcon, Button, Dot, Input, ListRow, Sheet, SheetBody, SheetContent, SheetHeader, SheetTitle, Textarea, fontOf } from "@agimon-ai/po-native-components";
+import { AlertIcon, Badge, BranchIcon, Button, ChevronRightIcon, Dot, FileIcon, Input, MessageIcon, Sheet, SheetBody, SheetContent, SheetHeader, SheetTitle, Spinner, SyntaxLine, Textarea, fontOf } from "@agimon-ai/po-native-components";
 import { createElement, useCallback, useEffect, useRef, useState, useSyncExternalStore } from "react";
 import { View } from "react-native-unistyles/components/native/View";
 import { Text } from "react-native-unistyles/components/native/Text";
 import { ScrollView } from "react-native-unistyles/components/native/ScrollView";
-import { StyleSheet } from "react-native-unistyles";
-import { Fragment, jsx, jsxs } from "react/jsx-runtime";
 import { Pressable } from "react-native-unistyles/components/native/Pressable";
+import { StyleSheet, useUnistyles } from "react-native-unistyles";
+import { Fragment, jsx, jsxs } from "react/jsx-runtime";
 //#region src/types/webWorktrees.ts
 /**
 * The cockpit's view of this session's worktrees.
@@ -44,6 +44,15 @@ const GIT_WORKTREES_TYPE = "git_worktrees";
 * - `sendSessionFrame` for a command. It envelopes the frame as a session
 *   command bound for the agent, which never reaches a channel's `receive`.
 */
+/** Presentation state follows hub operation labels, including session startup progress. */
+function worktreesPresentation(state) {
+	return {
+		working: state.worktrees.filter((item) => !item.orphaned && !item.unowned),
+		attention: state.worktrees.filter((item) => item.orphaned || item.unowned),
+		starting: state.requestedBranch !== void 0 ? !state.error && !state.worktrees.some((item) => item.branch === state.requestedBranch) : !!state.pending && /^(creating|starting session)/i.test(state.pending),
+		closeErrorId: state.errorTarget?.action === "close" ? state.errorTarget.id : void 0
+	};
+}
 const worktreeActivity = defineSessionStore({
 	worktrees: [],
 	pending: void 0,
@@ -118,8 +127,12 @@ const worktreesChannel = worktreeActivity.channel({
 			errorTarget: optionalErrorTarget$1(input.errorTarget)
 		};
 	},
-	reduce(_current, next) {
-		return next;
+	reduce(current, next) {
+		const requestedBranch = current.requestedBranch;
+		return {
+			...next,
+			...requestedBranch && next.pending && !next.error ? { requestedBranch } : {}
+		};
 	}
 });
 /** Sends one command to the session's worktrees channel. */
@@ -133,6 +146,13 @@ function command(sessionId, payload) {
 /** Asks the hub for a worktree. The hub answers on the same channel. */
 function requestWorktreeCreate(sessionId, branch, baseRef, reservationId) {
 	const trimmedBase = baseRef.trim();
+	if (worktreeSender.store.state) worktreeActivity.update(sessionId, (current) => ({
+		...current,
+		requestedBranch: branch.trim(),
+		pending: "creating",
+		error: void 0,
+		errorTarget: void 0
+	}));
 	command(sessionId, {
 		action: "create",
 		branch: branch.trim(),
@@ -163,137 +183,507 @@ function worktreesTab() {
 		panel: WorktreesPanel
 	};
 }
-function WorktreesPanel({ sessionId, sessionReservationId, openSession }) {
-	const state = useWorktrees(sessionId);
-	const [creating, setCreating] = useState(false);
-	const [branch, setBranch] = useState("");
-	const [baseRef, setBaseRef] = useState("");
-	const [closing, setClosing] = useState();
-	const busy = state.pending !== void 0;
-	return /* @__PURE__ */ jsxs(ScrollView, {
-		contentContainerStyle: styles$2.body,
+function WorktreesHeader({ activity = false, onNew, disabled = false }) {
+	return /* @__PURE__ */ jsxs(View, {
+		style: styles$2.header,
+		children: [/* @__PURE__ */ jsx(Text, {
+			style: styles$2.title,
+			children: activity ? "Activity" : "Worktrees"
+		}), !activity ? /* @__PURE__ */ jsx(Button, {
+			testID: "git-worktree-create",
+			variant: "ghost",
+			style: styles$2.newPill,
+			disabled,
+			onPress: onNew,
+			children: /* @__PURE__ */ jsx(Text, {
+				style: styles$2.jade,
+				children: "+ New"
+			})
+		}) : null]
+	});
+}
+function WorktreeRow({ item, error, compact = false, onClose, onOpen, disabled = false }) {
+	return /* @__PURE__ */ jsxs(View, {
+		style: styles$2.worktree,
 		children: [
-			/* @__PURE__ */ jsx(Button, {
-				testID: "git-worktree-create",
-				disabled: sessionId === null || busy,
-				onPress: () => setCreating(true),
-				children: "Create a worktree"
-			}),
-			state.pending ? /* @__PURE__ */ jsx(Text, {
-				style: styles$2.meta,
-				children: state.pending
-			}) : null,
-			state.error ? /* @__PURE__ */ jsx(Text, {
-				style: styles$2.error,
-				children: state.error
-			}) : null,
-			state.worktrees.map((worktree) => /* @__PURE__ */ jsxs(View, {
-				style: styles$2.card,
+			/* @__PURE__ */ jsxs(View, {
+				style: styles$2.line,
 				children: [
-					/* @__PURE__ */ jsx(ListRow, {
-						title: worktree.branch,
-						description: `${worktree.path}${worktree.orphaned ? "\nOrphaned" : ""}${worktree.unowned ? "\nUnowned" : ""}`
+					/* @__PURE__ */ jsx(Dot, {
+						tone: item.orphaned ? "yellow" : item.unowned ? "blue" : "green",
+						size: "md"
 					}),
-					worktree.sessionId && openSession ? /* @__PURE__ */ jsx(Button, {
-						variant: "outline",
-						onPress: () => openSession(worktree.sessionId),
-						children: "Open session"
+					/* @__PURE__ */ jsxs(Pressable, {
+						style: styles$2.grow,
+						accessibilityRole: onOpen ? "button" : void 0,
+						accessibilityLabel: onOpen ? `Open session for ${item.branch}` : void 0,
+						onPress: onOpen,
+						disabled: !onOpen,
+						children: [/* @__PURE__ */ jsx(Text, {
+							numberOfLines: 1,
+							ellipsizeMode: "middle",
+							style: styles$2.branch,
+							children: compact && item.branch.length > 36 ? `${item.branch.slice(0, 19)}…${item.branch.slice(-14)}` : item.branch
+						}), !compact ? /* @__PURE__ */ jsx(Text, {
+							style: styles$2.dim,
+							children: item.orphaned ? "Its folder is missing" : item.unowned ? "Its session has ended" : "Session running"
+						}) : null]
+					}),
+					item.orphaned ? /* @__PURE__ */ jsx(Badge, {
+						tone: "yellow",
+						style: styles$2.caution,
+						children: "Orphaned"
+					}) : null,
+					item.unowned ? /* @__PURE__ */ jsx(Badge, {
+						tone: "blue",
+						style: styles$2.info,
+						children: "Unowned"
 					}) : null,
-					/* @__PURE__ */ jsx(Button, {
-						variant: "danger-outline",
-						disabled: sessionId === null || busy,
-						testID: `git-worktree-close-${worktree.id}`,
-						onPress: () => setClosing(worktree.id),
-						children: "Close worktree"
+					!compact ? /* @__PURE__ */ jsx(Button, {
+						variant: "ghost",
+						style: styles$2.more,
+						accessibilityLabel: `Close ${item.branch}`,
+						testID: `git-worktree-close-${item.id}`,
+						onPress: onClose,
+						disabled,
+						children: "⋮"
+					}) : /* @__PURE__ */ jsx(ChevronRightIcon, {
+						size: 16,
+						color: "dim"
 					})
 				]
-			}, worktree.id)),
-			state.worktrees.length === 0 ? /* @__PURE__ */ jsx(Text, {
-				style: styles$2.meta,
-				children: "No worktrees yet. A worktree is its own checkout, branch and session."
+			}),
+			!compact ? /* @__PURE__ */ jsx(Text, {
+				numberOfLines: 1,
+				ellipsizeMode: "middle",
+				style: styles$2.path,
+				children: item.path
 			}) : null,
-			/* @__PURE__ */ jsx(Sheet, {
-				open: creating,
-				onOpenChange: setCreating,
-				children: /* @__PURE__ */ jsxs(SheetContent, { children: [/* @__PURE__ */ jsx(SheetHeader, { children: /* @__PURE__ */ jsx(SheetTitle, { children: "Create a worktree" }) }), /* @__PURE__ */ jsx(SheetBody, { children: /* @__PURE__ */ jsxs(View, {
+			error ? /* @__PURE__ */ jsx(Text, {
+				accessibilityRole: "alert",
+				style: styles$2.error,
+				children: error
+			}) : null
+		]
+	});
+}
+function WorktreeStarting({ branch }) {
+	return /* @__PURE__ */ jsxs(View, {
+		style: styles$2.starting,
+		children: [/* @__PURE__ */ jsx(Spinner, { label: "Starting session..." }), /* @__PURE__ */ jsxs(View, {
+			style: styles$2.grow,
+			children: [branch ? /* @__PURE__ */ jsx(Text, {
+				numberOfLines: 1,
+				ellipsizeMode: "middle",
+				style: styles$2.branch,
+				children: branch
+			}) : null, /* @__PURE__ */ jsx(Text, {
+				style: styles$2.dim,
+				children: "Starting session..."
+			})]
+		})]
+	});
+}
+function WorktreeGroup({ title, count }) {
+	return /* @__PURE__ */ jsxs(View, {
+		style: styles$2.group,
+		children: [/* @__PURE__ */ jsx(Text, {
+			style: styles$2.heading,
+			children: title
+		}), /* @__PURE__ */ jsx(Text, {
+			style: styles$2.dim,
+			children: count
+		})]
+	});
+}
+function WorktreeForm({ close = false, branch = "", baseRef = "", onBranch, onBaseRef, onConfirm, onCancel, disabled = false, framed = true }) {
+	return /* @__PURE__ */ jsxs(View, {
+		style: [styles$2.sheet, !framed && styles$2.unframed],
+		children: [
+			framed ? /* @__PURE__ */ jsx(View, { style: styles$2.handle }) : null,
+			/* @__PURE__ */ jsx(Text, {
+				style: styles$2.sheetTitle,
+				children: close ? "Close this worktree?" : "New worktree"
+			}),
+			close ? /* @__PURE__ */ jsxs(Fragment, { children: [/* @__PURE__ */ jsx(Text, {
+				style: styles$2.branch,
+				children: branch
+			}), /* @__PURE__ */ jsx(Text, {
+				style: styles$2.body,
+				children: "Removes the checkout and stops its session."
+			})] }) : /* @__PURE__ */ jsxs(Fragment, { children: [
+				/* @__PURE__ */ jsx(Text, {
 					style: styles$2.body,
-					children: [
-						/* @__PURE__ */ jsx(Input, {
-							accessibilityLabel: "Branch",
-							placeholder: "wt/fix-auth",
-							value: branch,
-							onChangeText: setBranch
-						}),
-						/* @__PURE__ */ jsx(Input, {
-							accessibilityLabel: "Base ref",
-							placeholder: "Base (current)",
-							value: baseRef,
-							onChangeText: setBaseRef
+					children: "A separate checkout on its own branch, with its own session. This session stays where it is."
+				}),
+				/* @__PURE__ */ jsx(Text, {
+					style: styles$2.label,
+					children: "Branch"
+				}),
+				/* @__PURE__ */ jsx(Input, {
+					accessibilityLabel: "Branch",
+					value: branch,
+					onChangeText: onBranch,
+					style: styles$2.monoInput
+				}),
+				/* @__PURE__ */ jsx(Text, {
+					style: styles$2.label,
+					children: "Start from"
+				}),
+				/* @__PURE__ */ jsx(Input, {
+					accessibilityLabel: "Start from",
+					value: baseRef,
+					onChangeText: onBaseRef,
+					placeholder: "Current branch"
+				})
+			] }),
+			/* @__PURE__ */ jsx(Button, {
+				onPress: onConfirm,
+				disabled: disabled || !close && branch.trim() === "",
+				variant: close ? "danger" : "primary",
+				style: [styles$2.fullButton, !close && styles$2.createButton],
+				children: close ? "Close worktree" : /* @__PURE__ */ jsx(Text, {
+					style: styles$2.createLabel,
+					children: "Create worktree"
+				})
+			}),
+			/* @__PURE__ */ jsx(Button, {
+				variant: "outline",
+				style: styles$2.fullButton,
+				onPress: onCancel,
+				children: "Cancel"
+			})
+		]
+	});
+}
+function WorktreesView({ state, disabled = false, onNew, onClose, onOpen }) {
+	const { working, attention, starting, closeErrorId } = worktreesPresentation(state);
+	const row = (item) => /* @__PURE__ */ jsx(WorktreeRow, {
+		item,
+		disabled: disabled || !!state.pending,
+		onClose: () => onClose?.(item),
+		onOpen: item.sessionId && onOpen ? () => onOpen(item.sessionId) : void 0,
+		error: state.errorTarget?.action === "close" && state.errorTarget.id === item.id ? state.error : void 0
+	}, item.id);
+	return /* @__PURE__ */ jsxs(View, {
+		style: styles$2.screen,
+		children: [
+			/* @__PURE__ */ jsx(WorktreesHeader, {
+				disabled: disabled || !!state.pending,
+				onNew
+			}),
+			state.worktrees.length || starting ? /* @__PURE__ */ jsxs(View, {
+				style: styles$2.content,
+				children: [
+					/* @__PURE__ */ jsx(WorktreeGroup, {
+						title: "Working",
+						count: `${working.length} open${starting ? " · 1 starting" : ""}`
+					}),
+					working.map(row),
+					starting ? /* @__PURE__ */ jsx(WorktreeStarting, { branch: state.requestedBranch }) : null,
+					attention.length ? /* @__PURE__ */ jsxs(Fragment, { children: [
+						/* @__PURE__ */ jsx(WorktreeGroup, {
+							title: "Needs a look",
+							count: `${attention.length} open`
 						}),
-						/* @__PURE__ */ jsx(Text, {
-							style: styles$2.meta,
-							children: "Creates the worktree outside the repository and starts a session nested under this one."
+						/* @__PURE__ */ jsxs(Text, {
+							style: styles$2.dim,
+							children: [
+								attention.length === 2 ? "Two worktrees" : attention.length === 1 ? "One worktree" : `${attention.length} worktrees`,
+								" ",
+								"would like your eye, whenever you are ready."
+							]
 						}),
-						/* @__PURE__ */ jsx(Button, {
-							disabled: sessionId === null || busy || branch.trim() === "",
-							onPress: () => {
-								if (sessionId === null) return;
-								requestWorktreeCreate(sessionId, branch, baseRef, sessionReservationId);
-								setCreating(false);
-								if (sessionReservationId === void 0) {
-									setBranch("");
-									setBaseRef("");
-								}
-							},
-							children: "Create"
-						})
-					]
-				}) })] })
+						attention.map(row)
+					] }) : null
+				]
+			}) : /* @__PURE__ */ jsxs(View, {
+				style: styles$2.empty,
+				children: [/* @__PURE__ */ jsx(Text, {
+					style: styles$2.heading,
+					children: "No worktrees yet"
+				}), /* @__PURE__ */ jsx(Text, {
+					style: styles$2.emptyCopy,
+					children: "Create a worktree to run a separate session on its own branch."
+				})]
 			}),
-			/* @__PURE__ */ jsx(Sheet, {
-				open: closing !== void 0,
-				onOpenChange: (open) => {
-					if (!open) setClosing(void 0);
-				},
-				children: /* @__PURE__ */ jsxs(SheetContent, { children: [/* @__PURE__ */ jsx(SheetHeader, { children: /* @__PURE__ */ jsx(SheetTitle, { children: "Close this worktree?" }) }), /* @__PURE__ */ jsxs(SheetBody, { children: [/* @__PURE__ */ jsx(Text, {
-					style: styles$2.meta,
-					children: "The checkout is removed. Git refuses a dirty worktree."
-				}), /* @__PURE__ */ jsx(Button, {
-					variant: "danger-outline",
-					disabled: busy,
-					onPress: () => {
-						if (sessionId !== null && closing !== void 0) requestWorktreeClose(sessionId, closing);
-						setClosing(void 0);
-					},
-					children: "Close worktree"
-				})] })] })
-			})
+			state.pending && !starting ? /* @__PURE__ */ jsx(Text, {
+				style: styles$2.dim,
+				children: state.pending
+			}) : null,
+			state.error && (!closeErrorId || !state.worktrees.some((item) => item.id === closeErrorId)) ? /* @__PURE__ */ jsx(Text, {
+				accessibilityRole: "alert",
+				style: styles$2.error,
+				children: state.error
+			}) : null
 		]
 	});
 }
+function WorktreesPanel({ sessionId, sessionReservationId, openSession }) {
+	const state = useWorktrees(sessionId);
+	const [creating, setCreating] = useState(false);
+	const [branch, setBranch] = useState("");
+	const [baseRef, setBaseRef] = useState("");
+	const [closing, setClosing] = useState();
+	const busy = sessionId === null || state.pending !== void 0;
+	return /* @__PURE__ */ jsxs(Fragment, { children: [
+		/* @__PURE__ */ jsx(ScrollView, {
+			contentContainerStyle: styles$2.scroll,
+			children: /* @__PURE__ */ jsx(WorktreesView, {
+				state,
+				disabled: sessionId === null,
+				onNew: () => setCreating(true),
+				onClose: setClosing,
+				onOpen: openSession
+			})
+		}),
+		/* @__PURE__ */ jsx(Sheet, {
+			open: creating,
+			onOpenChange: setCreating,
+			children: /* @__PURE__ */ jsx(SheetContent, { children: /* @__PURE__ */ jsx(WorktreeForm, {
+				framed: false,
+				branch,
+				baseRef,
+				onBranch: setBranch,
+				onBaseRef: setBaseRef,
+				disabled: busy,
+				onCancel: () => setCreating(false),
+				onConfirm: () => {
+					if (sessionId === null) return;
+					requestWorktreeCreate(sessionId, branch, baseRef, sessionReservationId);
+					setCreating(false);
+					if (sessionReservationId === void 0) {
+						setBranch("");
+						setBaseRef("");
+					}
+				}
+			}) })
+		}),
+		/* @__PURE__ */ jsx(Sheet, {
+			open: !!closing,
+			onOpenChange: (open) => {
+				if (!open) setClosing(void 0);
+			},
+			children: /* @__PURE__ */ jsx(SheetContent, { children: /* @__PURE__ */ jsx(WorktreeForm, {
+				framed: false,
+				close: true,
+				branch: closing?.branch,
+				disabled: busy,
+				onCancel: () => setClosing(void 0),
+				onConfirm: () => {
+					if (sessionId !== null && closing) requestWorktreeClose(sessionId, closing.id);
+					setClosing(void 0);
+				}
+			}) })
+		})
+	] });
+}
 const styles$2 = StyleSheet.create((theme) => ({
-	body: {
-		padding: theme.spacing(3),
+	screen: {
+		flex: 1,
+		backgroundColor: theme.colors.rail,
+		uni__dependencies: [0]
+	},
+	scroll: { flexGrow: 1 },
+	header: {
+		flexDirection: "row",
+		alignItems: "center",
+		justifyContent: "space-between",
+		padding: theme.spacing(5),
+		minHeight: 88,
+		uni__dependencies: [0]
+	},
+	title: {
+		fontFamily: fontOf(theme.fontFamily.sans),
+		fontSize: theme.fontSize["2xl"],
+		fontWeight: "600",
+		color: theme.colors.hi,
+		uni__dependencies: [0]
+	},
+	newPill: {
+		backgroundColor: theme.colors["tint-green"],
+		borderRadius: theme.borderRadius.full,
+		minHeight: 44,
+		paddingHorizontal: theme.spacing(4),
+		uni__dependencies: [0]
+	},
+	content: {
+		paddingHorizontal: theme.spacing(5),
 		gap: theme.spacing(2),
 		uni__dependencies: [0]
 	},
-	card: {
-		borderWidth: 1,
+	group: {
+		flexDirection: "row",
+		alignItems: "center",
+		gap: theme.spacing(3),
+		paddingTop: theme.spacing(4),
+		paddingBottom: theme.spacing(2),
+		borderBottomWidth: StyleSheet.hairlineWidth,
 		borderColor: theme.colors["border-soft"],
-		borderRadius: theme.borderRadius.md,
-		backgroundColor: theme.colors.panel,
-		padding: theme.spacing(2),
-		gap: theme.spacing(1),
 		uni__dependencies: [0]
 	},
-	meta: {
+	heading: {
+		fontFamily: fontOf(theme.fontFamily.sans),
+		fontSize: theme.fontSize.lg,
+		lineHeight: theme.lineHeight.lg,
+		fontWeight: "600",
+		color: theme.colors.hi,
+		uni__dependencies: [0]
+	},
+	dim: {
+		fontFamily: fontOf(theme.fontFamily.sans),
+		fontSize: theme.fontSize.sm,
+		lineHeight: theme.lineHeight.sm,
+		color: theme.colors.dim,
+		uni__dependencies: [0]
+	},
+	body: {
+		fontFamily: fontOf(theme.fontFamily.sans),
+		fontSize: theme.fontSize.base,
+		lineHeight: theme.lineHeight.lg,
 		color: theme.colors.dim,
+		uni__dependencies: [0]
+	},
+	label: {
+		fontFamily: fontOf(theme.fontFamily.sans),
+		fontSize: theme.fontSize.base,
+		fontWeight: "500",
+		color: theme.colors.text,
+		marginTop: theme.spacing(2),
+		uni__dependencies: [0]
+	},
+	branch: {
+		fontFamily: fontOf(theme.fontFamily.mono),
+		fontSize: theme.fontSize.base,
+		lineHeight: theme.lineHeight.lg,
+		color: theme.colors.hi,
+		uni__dependencies: [0]
+	},
+	path: {
+		fontFamily: fontOf(theme.fontFamily.mono),
 		fontSize: theme.fontSize.sm,
+		lineHeight: theme.lineHeight.sm,
+		color: theme.colors.dim,
+		marginLeft: theme.spacing(4.5),
+		uni__dependencies: [0]
+	},
+	worktree: {
+		gap: theme.spacing(1),
+		paddingVertical: theme.spacing(2),
+		borderBottomWidth: StyleSheet.hairlineWidth,
+		borderColor: theme.colors["border-soft"],
+		uni__dependencies: [0]
+	},
+	line: {
+		flexDirection: "row",
+		alignItems: "center",
+		gap: theme.spacing(2),
+		minHeight: 44,
+		uni__dependencies: [0]
+	},
+	grow: {
+		flex: 1,
+		minWidth: 0,
+		minHeight: 44,
+		justifyContent: "center",
+		gap: theme.spacing(1),
+		uni__dependencies: [0]
+	},
+	more: {
+		width: 44,
+		height: 44,
+		padding: 0
+	},
+	caution: {
+		backgroundColor: theme.colors["tint-yellow"],
+		uni__dependencies: [0]
+	},
+	info: {
+		backgroundColor: theme.colors["tint-blue"],
+		uni__dependencies: [0]
+	},
+	starting: {
+		flexDirection: "row",
+		alignItems: "center",
+		gap: theme.spacing(2),
+		minHeight: 52,
+		uni__dependencies: [0]
+	},
+	jade: {
+		fontFamily: fontOf(theme.fontFamily.sans),
+		fontSize: theme.fontSize.base,
+		lineHeight: theme.lineHeight.base,
+		color: theme.colors.green,
+		fontWeight: "500",
 		uni__dependencies: [0]
 	},
 	error: {
-		color: theme.colors.red,
+		fontFamily: fontOf(theme.fontFamily.sans),
 		fontSize: theme.fontSize.sm,
+		lineHeight: theme.lineHeight.sm,
+		color: theme.colors.red,
+		uni__dependencies: [0]
+	},
+	unframed: { borderTopWidth: 0 },
+	sheet: {
+		backgroundColor: theme.colors.bg,
+		borderTopWidth: 1,
+		borderColor: theme.colors.border,
+		borderTopLeftRadius: theme.borderRadius.lg,
+		borderTopRightRadius: theme.borderRadius.lg,
+		padding: theme.spacing(5),
+		gap: theme.spacing(3),
+		uni__dependencies: [0]
+	},
+	handle: {
+		alignSelf: "center",
+		width: 40,
+		height: 4,
+		borderRadius: theme.borderRadius.full,
+		backgroundColor: theme.colors.border,
+		marginBottom: theme.spacing(2),
+		uni__dependencies: [0]
+	},
+	sheetTitle: {
+		fontFamily: fontOf(theme.fontFamily.sans),
+		fontSize: theme.fontSize.xl,
+		fontWeight: "600",
+		color: theme.colors.hi,
+		uni__dependencies: [0]
+	},
+	monoInput: {
+		fontFamily: fontOf(theme.fontFamily.mono),
+		uni__dependencies: [0]
+	},
+	fullButton: {
+		height: 44,
+		alignSelf: "stretch"
+	},
+	createButton: {
+		backgroundColor: theme.colors.green,
+		uni__dependencies: [0]
+	},
+	createLabel: {
+		fontFamily: fontOf(theme.fontFamily.sans),
+		fontSize: theme.fontSize.base,
+		fontWeight: "600",
+		color: theme.colors.bg,
+		uni__dependencies: [0]
+	},
+	empty: {
+		flex: 1,
+		alignItems: "center",
+		justifyContent: "center",
+		padding: theme.spacing(8),
+		gap: theme.spacing(3),
+		uni__dependencies: [0]
+	},
+	emptyCopy: {
+		fontFamily: fontOf(theme.fontFamily.sans),
+		fontSize: theme.fontSize.base,
+		lineHeight: theme.lineHeight.lg,
+		color: theme.colors.dim,
+		textAlign: "center",
 		uni__dependencies: [0]
 	}
 }));
@@ -571,6 +961,31 @@ async function fetchReviewFile(sessionId, path, signal) {
 	};
 }
 //#endregion
+//#region src/extensions/workspaces/sessions/(frontend)/_lib/gitReviewSelection.ts
+/** A different side starts a fresh selection. The second same-side tap completes it. */
+function selectReviewLine(anchor, row) {
+	const side = row.marker === "-" ? "old" : "new";
+	if (!anchor || anchor.side !== side) return {
+		range: {
+			side,
+			startLine: row.line,
+			endLine: row.line
+		},
+		complete: false
+	};
+	return {
+		range: {
+			side,
+			startLine: Math.min(anchor.startLine, row.line),
+			endLine: Math.max(anchor.startLine, row.line)
+		},
+		complete: true
+	};
+}
+function reviewRangeRows(rows, range) {
+	return rows.filter((row) => (row.marker === "-" ? "old" : "new") === range.side && row.line >= range.startLine && row.line <= range.endLine);
+}
+//#endregion
 //#region src/extensions/workspaces/sessions/(frontend)/_lib/gitReviewStore.native.ts
 const gitReview = defineSessionStore({ comments: [] });
 function addReviewComment(sessionId, comment) {
@@ -616,6 +1031,23 @@ function conflictPrompt(branch, conflicts) {
 	].join("\n");
 }
 /**
+* The one sync the bar fills in: pull while the branch is behind (a push would
+* be rejected), push while it is only ahead or has no upstream yet. Nothing
+* while a rebase is paused, detached, or already level.
+*/
+function suggestedSyncAction(changes) {
+	if (changes?.branch === void 0 || changes.rebase !== void 0) return void 0;
+	if (changes.upstream === void 0) return "push";
+	if (changes.upstream.behind > 0) return "pull";
+	return changes.upstream.ahead > 0 ? "push" : void 0;
+}
+/** "2 to push, 1 new on origin/feat/git", or "Up to date with origin/feat/git". */
+function upstreamSummary(upstream) {
+	if (upstream === void 0) return "No upstream yet";
+	const parts = [...upstream.ahead > 0 ? [`${String(upstream.ahead)} to push`] : [], ...upstream.behind > 0 ? [`${String(upstream.behind)} new on ${upstream.ref}`] : []];
+	return parts.length === 0 ? `Up to date with ${upstream.ref}` : parts.join(", ");
+}
+/**
 * Hands one deferred follow-up to the session. Returns the reason it failed,
 * or undefined once sent. The sender throws when the session is disconnected.
 */
@@ -631,501 +1063,1163 @@ function deliverToAgent(send, sessionId, message) {
 	}
 }
 //#endregion
-//#region src/extensions/workspaces/sessions/(frontend)/_components/GitReviewPanel.native.tsx
-function useGitChanges(sessionId) {
-	const subscribe = useCallback((listener) => {
-		const sub = gitChanges.store.subscribe(listener);
-		return () => sub.unsubscribe();
-	}, []);
-	return useSyncExternalStore(subscribe, () => gitChanges.select(gitChanges.store.state, sessionId));
+//#region src/extensions/workspaces/sessions/(frontend)/_components/GitReviewView.native.tsx
+function Action({ children, variant = "outline", disabled = false, onPress }) {
+	const { theme } = useUnistyles();
+	return /* @__PURE__ */ jsx(Button, {
+		onPress,
+		variant,
+		disabled,
+		style: [styles$1.action, variant === "primary" && styles$1.primary],
+		children: variant === "primary" ? /* @__PURE__ */ jsx(Text, {
+			style: [styles$1.primaryLabel, { color: theme.scheme === "dark" ? theme.colors.rail : theme.colors["on-selected"] }],
+			children
+		}) : children
+	});
 }
-function reviewTab() {
-	return {
-		id: "git-review",
-		label: "review",
-		panel: GitReviewPanel
-	};
+function Footer({ count, discard = false, confirmation = false, onReview, onSend, onDiscard }) {
+	return /* @__PURE__ */ jsxs(View, {
+		style: styles$1.footer,
+		children: [discard ? /* @__PURE__ */ jsx(Action, {
+			variant: "ghost",
+			onPress: onDiscard,
+			children: "Discard"
+		}) : /* @__PURE__ */ jsxs(Pressable, {
+			accessibilityRole: "button",
+			accessibilityLabel: "Review queued comments",
+			onPress: onReview,
+			style: [styles$1.inline, styles$1.action],
+			children: [/* @__PURE__ */ jsx(MessageIcon, {
+				size: 16,
+				color: "blue"
+			}), /* @__PURE__ */ jsxs(Text, {
+				style: styles$1.dim,
+				children: [
+					count,
+					" ",
+					count === 1 ? "comment" : "comments",
+					" queued"
+				]
+			})]
+		}), /* @__PURE__ */ jsx(Action, {
+			variant: confirmation ? "outline" : "primary",
+			disabled: count === 0,
+			onPress: onSend,
+			children: "Send review"
+		})]
+	});
 }
-function GitReviewPanel({ sessionId, sendSessionFrame }) {
-	const activity = useGitChanges(sessionId);
-	const subscribe = useCallback((listener) => {
-		const sub = gitReview.store.subscribe(listener);
-		return () => sub.unsubscribe();
-	}, []);
-	const comments = useSyncExternalStore(subscribe, () => gitReview.select(gitReview.store.state, sessionId).comments);
-	const [summary, setSummary] = useState();
-	const [file, setFile] = useState();
-	const [error, setError] = useState();
-	const [dismissedError, setDismissedError] = useState();
-	const [confirm, setConfirm] = useState();
-	const [draft, setDraft] = useState();
-	const [comment, setComment] = useState("");
-	const [start, setStart] = useState("");
-	const [end, setEnd] = useState("");
-	const request = useRef(void 0);
-	const fingerprint = JSON.stringify(activity.changes);
-	useEffect(() => {
-		if (sessionId === null) return void 0;
-		const controller = new AbortController();
-		fetchReviewSummary(sessionId, controller.signal).then((result) => {
-			if (!controller.signal.aborted) {
-				if (result.ok) setSummary(result.summary);
-				else setError(result.error);
-			}
-		}).catch((cause) => {
-			if (!controller.signal.aborted) setError(cause instanceof Error ? cause.message : String(cause));
-		});
-		return () => {
-			controller.abort();
-			request.current?.abort();
-		};
-	}, [sessionId, fingerprint]);
-	const loadFile = async (path) => {
-		if (sessionId === null) return;
-		request.current?.abort();
-		const controller = new AbortController();
-		request.current = controller;
-		setFile(void 0);
-		setError(void 0);
-		try {
-			const result = await fetchReviewFile(sessionId, path, controller.signal);
-			if (!controller.signal.aborted) {
-				if (result.ok) setFile(result.diff);
-				else setError(result.error);
-			}
-		} catch (cause) {
-			if (!controller.signal.aborted) setError(cause instanceof Error ? cause.message : String(cause));
-		}
-	};
-	if (sessionId === null) return null;
-	const changes = activity.changes;
-	const busy = activity.pending !== void 0;
-	const paused = changes?.rebase !== void 0;
-	const send = (message, onSent) => {
-		const failure = deliverToAgent(sendSessionFrame, sessionId, message);
-		setError(failure);
-		if (failure === void 0) onSent?.();
-	};
-	const sync = (action) => requestGitSync(sessionId, action);
-	const forceRequired = activity.error !== dismissedError && activity.errorTarget?.action === "push" && activity.errorTarget.forceRequired === true;
-	return /* @__PURE__ */ jsxs(ScrollView, {
-		contentContainerStyle: styles$1.body,
+function SyncCard({ changes, busy = false, onSync }) {
+	const suggested = suggestedSyncAction(changes);
+	return /* @__PURE__ */ jsxs(View, {
+		style: styles$1.card,
 		children: [
-			/* @__PURE__ */ jsx(Text, {
-				style: styles$1.title,
-				children: changes?.branch ?? "Detached HEAD"
-			}),
-			/* @__PURE__ */ jsxs(Text, {
-				style: styles$1.meta,
-				children: [
-					changes?.base ? `vs ${changes.base}` : "Uncommitted changes",
-					" · +",
-					changes?.added ?? 0,
-					" -",
-					changes?.removed ?? 0,
-					"\\n",
-					changes?.upstream ? `↑${changes.upstream.ahead} ↓${changes.upstream.behind} ${changes.upstream.ref}` : "No upstream yet"
-				]
-			}),
 			/* @__PURE__ */ jsxs(View, {
-				style: styles$1.actions,
+				style: styles$1.inline,
 				children: [
-					/* @__PURE__ */ jsx(Button, {
-						variant: "outline",
-						disabled: busy || paused || changes?.upstream === void 0,
-						onPress: () => sync("pull"),
-						children: "Pull"
+					/* @__PURE__ */ jsx(BranchIcon, {
+						size: 18,
+						color: "dim"
+					}),
+					/* @__PURE__ */ jsx(Text, {
+						style: styles$1.branch,
+						children: changes?.branch ?? "Detached HEAD"
 					}),
-					/* @__PURE__ */ jsx(Button, {
-						variant: "outline",
-						disabled: busy || paused || changes?.branch === void 0,
-						onPress: () => sync("push"),
-						children: "Push"
+					/* @__PURE__ */ jsx(View, { style: styles$1.grow }),
+					/* @__PURE__ */ jsxs(Text, {
+						style: styles$1.green,
+						children: ["+", changes?.added ?? 0]
 					}),
-					/* @__PURE__ */ jsx(Button, {
-						variant: "outline",
-						disabled: busy || paused || changes?.base === void 0,
-						onPress: () => sync("rebase"),
-						children: "Rebase"
+					/* @__PURE__ */ jsxs(Text, {
+						style: styles$1.red,
+						children: ["-", changes?.removed ?? 0]
 					})
 				]
 			}),
-			activity.pending ? /* @__PURE__ */ jsx(Text, {
-				style: styles$1.meta,
-				children: activity.pending
-			}) : null,
-			activity.error && activity.error !== dismissedError ? /* @__PURE__ */ jsxs(View, { children: [/* @__PURE__ */ jsx(Text, {
-				style: styles$1.error,
-				children: activity.error
-			}), /* @__PURE__ */ jsx(Button, {
-				variant: "ghost",
-				onPress: () => setDismissedError(activity.error),
-				children: "Dismiss"
-			})] }) : null,
-			forceRequired ? /* @__PURE__ */ jsx(Button, {
-				variant: "danger-outline",
-				disabled: busy,
-				onPress: () => setConfirm("force"),
-				children: "Force push with lease…"
-			}) : null,
-			paused ? /* @__PURE__ */ jsxs(View, {
-				style: styles$1.body,
+			/* @__PURE__ */ jsx(Text, {
+				style: [styles$1.dim, styles$1.mono],
+				children: changes?.base ? `vs ${changes.base}` : "Uncommitted changes"
+			}),
+			/* @__PURE__ */ jsx(Text, {
+				style: styles$1.dim,
+				children: upstreamSummary(changes?.upstream)
+			}),
+			/* @__PURE__ */ jsx(View, {
+				style: styles$1.inline,
 				children: [
+					"pull",
+					"push",
+					"rebase"
+				].map((action) => /* @__PURE__ */ jsx(Button, {
+					variant: suggested === action ? "outline" : "ghost",
+					style: suggested === action ? [styles$1.action, styles$1.suggested] : styles$1.action,
+					disabled: busy || changes?.rebase !== void 0 || (action === "pull" ? changes?.upstream === void 0 : action === "push" ? changes?.branch === void 0 : changes?.base === void 0),
+					onPress: () => onSync?.(action),
+					children: action === "pull" ? "Pull" : action === "push" ? "Push" : "Rebase"
+				}, action))
+			})
+		]
+	});
+}
+function FileList({ files, comments = [], onFile }) {
+	return /* @__PURE__ */ jsxs(View, {
+		style: styles$1.list,
+		children: [/* @__PURE__ */ jsxs(Text, {
+			style: styles$1.section,
+			children: [files.length, " files"]
+		}), files.map((file) => /* @__PURE__ */ jsxs(Pressable, {
+			accessibilityRole: "button",
+			testID: `git-review-file-${file.path}`,
+			onPress: () => onFile?.(file.path),
+			style: styles$1.fileRow,
+			children: [
+				/* @__PURE__ */ jsx(Text, {
+					style: file.status === "added" ? styles$1.green : file.status === "untracked" ? styles$1.blue : styles$1.yellow,
+					children: file.status[0]?.toUpperCase()
+				}),
+				/* @__PURE__ */ jsxs(View, {
+					style: styles$1.grow,
+					children: [/* @__PURE__ */ jsx(Text, {
+						style: styles$1.body,
+						children: file.path.split("/").at(-1)
+					}), /* @__PURE__ */ jsx(Text, {
+						numberOfLines: 1,
+						style: [styles$1.dim, styles$1.mono],
+						children: file.path.split("/").slice(0, -1).join("/") || "."
+					})]
+				}),
+				/* @__PURE__ */ jsxs(Text, { children: [
 					/* @__PURE__ */ jsxs(Text, {
-						style: styles$1.error,
-						children: ["Rebase paused\\n", changes.rebase?.conflicts.join("\n")]
+						style: styles$1.green,
+						children: ["+", file.added]
 					}),
-					/* @__PURE__ */ jsx(Button, {
-						disabled: busy,
-						onPress: () => send(conflictPrompt(changes.branch, changes.rebase?.conflicts ?? [])),
-						children: "Ask agent to resolve"
-					}),
-					/* @__PURE__ */ jsx(Button, {
-						variant: "danger-outline",
-						disabled: busy,
-						onPress: () => setConfirm("abort"),
-						children: "Abort rebase…"
+					" ",
+					/* @__PURE__ */ jsxs(Text, {
+						style: styles$1.red,
+						children: ["-", file.removed]
 					})
-				]
-			}) : null,
-			error ? /* @__PURE__ */ jsx(Text, {
-				style: styles$1.error,
-				children: error
-			}) : null,
-			summary ? summary.files.map((entry) => /* @__PURE__ */ jsxs(Button, {
-				variant: "ghost",
-				testID: `git-review-file-${entry.path}`,
-				onPress: () => void loadFile(entry.path),
-				children: [
-					entry.path,
-					" · ",
-					entry.status,
-					" · +",
-					entry.added,
-					" -",
-					entry.removed
-				]
-			}, entry.path)) : /* @__PURE__ */ jsx(Text, {
-				style: styles$1.meta,
-				children: "Loading changes…"
+				] }),
+				comments.some((comment) => comment.path === file.path) ? /* @__PURE__ */ jsxs(View, {
+					style: styles$1.inline,
+					children: [/* @__PURE__ */ jsx(MessageIcon, {
+						size: 12,
+						color: "blue"
+					}), /* @__PURE__ */ jsx(Text, {
+						style: styles$1.blue,
+						children: comments.filter((comment) => comment.path === file.path).length
+					})]
+				}) : null,
+				/* @__PURE__ */ jsx(ChevronRightIcon, {
+					size: 16,
+					color: "dim"
+				})
+			]
+		}, file.path))]
+	});
+}
+function RebaseCard({ confirmation = false, conflicts, busy = false, onResolve, onAbort }) {
+	return /* @__PURE__ */ jsxs(View, {
+		style: [styles$1.card, styles$1.caution],
+		children: [
+			/* @__PURE__ */ jsxs(View, {
+				style: styles$1.inline,
+				children: [/* @__PURE__ */ jsx(AlertIcon, {
+					size: 20,
+					color: "yellow"
+				}), /* @__PURE__ */ jsx(Text, {
+					style: styles$1.section,
+					children: "Rebase paused"
+				})]
 			}),
-			summary?.files.length === 0 ? /* @__PURE__ */ jsx(Text, {
-				style: styles$1.meta,
-				children: summary.repository ? "No changed files" : "Not a Git checkout"
-			}) : null,
-			summary?.truncated ? /* @__PURE__ */ jsx(Text, {
-				style: styles$1.meta,
-				children: "The file list was truncated."
-			}) : null,
-			file ? /* @__PURE__ */ jsxs(View, {
+			/* @__PURE__ */ jsx(Text, {
 				style: styles$1.body,
+				children: "Resolve conflicts or ask Po to do it for you."
+			}),
+			/* @__PURE__ */ jsx(Text, {
+				style: [styles$1.dim, styles$1.mono],
+				children: conflicts.join("\n")
+			}),
+			/* @__PURE__ */ jsx(Action, {
+				disabled: busy,
+				onPress: onResolve,
+				variant: confirmation ? "outline" : "primary",
+				children: "Ask Po to resolve"
+			}),
+			/* @__PURE__ */ jsx(Action, {
+				disabled: busy,
+				onPress: onAbort,
+				variant: "danger-outline",
+				children: "Abort rebase"
+			})
+		]
+	});
+}
+function FileHeader({ entry, index, total, onPrevious, onNext, onChanges }) {
+	return /* @__PURE__ */ jsxs(View, {
+		style: styles$1.content,
+		children: [
+			/* @__PURE__ */ jsx(Text, {
+				style: styles$1.heading,
+				children: entry.path.split("/").at(-1)
+			}),
+			/* @__PURE__ */ jsx(Text, {
+				style: [styles$1.dim, styles$1.mono],
+				children: entry.path.split("/").slice(0, -1).join("/") || "."
+			}),
+			/* @__PURE__ */ jsxs(View, {
+				style: styles$1.inline,
 				children: [
-					/* @__PURE__ */ jsx(Text, {
-						style: styles$1.title,
-						children: file.path
+					/* @__PURE__ */ jsxs(Text, {
+						style: styles$1.dim,
+						children: [entry.status[0]?.toUpperCase(), entry.status.slice(1)]
 					}),
-					file.binary || file.tooLarge ? /* @__PURE__ */ jsx(Text, {
-						style: styles$1.meta,
-						children: file.binary ? "Binary file" : "Diff too large to display"
-					}) : file.hunks.map((hunk, index) => /* @__PURE__ */ jsx(View, { children: hunk.rows.map((row, rowIndex) => /* @__PURE__ */ jsxs(Text, {
-						selectable: true,
-						style: styles$1.diff(row.marker),
-						onPress: () => {
-							setDraft({
-								path: file.path,
-								rows: hunk.rows
-							});
-							setStart(String(row.line));
-							setEnd(String(row.line));
-						},
-						children: [
-							row.marker,
-							" ",
-							row.line,
-							" ",
-							row.content
-						]
-					}, rowIndex)) }, index)),
-					/* @__PURE__ */ jsx(Button, {
-						variant: "outline",
-						onPress: () => {
-							setDraft({
-								path: file.path,
-								rows: []
-							});
-							setStart("");
-							setEnd("");
-						},
-						children: "Comment on file"
+					/* @__PURE__ */ jsxs(Text, {
+						style: styles$1.green,
+						children: ["+", entry.added]
+					}),
+					/* @__PURE__ */ jsxs(Text, {
+						style: styles$1.red,
+						children: ["-", entry.removed]
 					})
 				]
-			}) : null,
-			comments.map((item) => /* @__PURE__ */ jsxs(View, { children: [/* @__PURE__ */ jsxs(Text, {
-				style: styles$1.meta,
+			}),
+			/* @__PURE__ */ jsxs(View, {
+				style: styles$1.navigation,
 				children: [
-					item.relPath,
-					item.startLine === void 0 ? "" : `:${item.startLine}-${item.endLine ?? item.startLine}`,
-					"\\n",
-					item.body
+					/* @__PURE__ */ jsx(Action, {
+						variant: "ghost",
+						disabled: index === 0,
+						onPress: onPrevious,
+						children: "Previous"
+					}),
+					/* @__PURE__ */ jsx(Pressable, {
+						accessibilityRole: "button",
+						accessibilityLabel: "Return to changes",
+						onPress: onChanges,
+						style: [styles$1.inline, styles$1.action],
+						children: /* @__PURE__ */ jsxs(Text, {
+							style: styles$1.dim,
+							children: [
+								onChanges ? "Changes · " : "",
+								index + 1,
+								" of ",
+								total
+							]
+						})
+					}),
+					/* @__PURE__ */ jsx(Action, {
+						variant: "ghost",
+						disabled: index === total - 1,
+						onPress: onNext,
+						children: "Next"
+					})
 				]
-			}), /* @__PURE__ */ jsx(Button, {
-				variant: "ghost",
-				onPress: () => removeReviewComment(sessionId, item.id),
-				children: "Remove comment"
-			})] }, item.id)),
-			comments.length > 0 ? /* @__PURE__ */ jsxs(View, {
-				style: styles$1.actions,
-				children: [/* @__PURE__ */ jsx(Button, {
-					onPress: () => {
-						const body = comments.map((item) => {
-							return `### ${item.startLine === void 0 ? item.relPath : item.side === "old" ? `${item.relPath} (removed lines ${item.startLine}-${item.endLine ?? item.startLine})` : `${item.relPath}:${item.startLine}-${item.endLine ?? item.startLine}`}\n\n${item.snippet.split("\n").slice(0, 20).join("\n").slice(0, 2e3).split("\n").map((line) => `> ${line}`).join("\n")}\n\n${item.body.trim()}`;
-						}).join("\n\n");
-						send(`${reviewHeading(comments.length, summary?.branch, summary?.base)}\n\n${body}`, () => clearReviewComments(sessionId));
-					},
-					children: "Send review"
-				}), /* @__PURE__ */ jsx(Button, {
-					variant: "outline",
-					onPress: () => setConfirm("discard"),
-					children: "Discard review…"
-				})]
+			})
+		]
+	});
+}
+function DiffRows({ rows, comments = [], selection, onLine, showInlineComments = true }) {
+	return /* @__PURE__ */ jsx(View, { children: rows.map((row, i) => {
+		const side = row.marker === "-" ? "old" : "new";
+		const anchored = comments.filter((comment) => comment.side === side && (comment.endLine ?? comment.startLine) === row.line);
+		return /* @__PURE__ */ jsxs(View, { children: [/* @__PURE__ */ jsxs(Pressable, {
+			accessibilityRole: "button",
+			accessibilityLabel: `Select ${side} line ${row.line}`,
+			onPress: () => onLine?.(row),
+			style: [
+				styles$1.diffRow,
+				row.marker === "+" && styles$1.added,
+				row.marker === "-" && styles$1.removed,
+				selection?.side === side && row.line >= selection.startLine && row.line <= selection.endLine && styles$1.selection
+			],
+			children: [
+				/* @__PURE__ */ jsx(Text, {
+					style: [styles$1.mono, styles$1.gutter],
+					children: row.line
+				}),
+				/* @__PURE__ */ jsx(Text, {
+					style: [styles$1.dim, styles$1.mono],
+					children: row.marker
+				}),
+				/* @__PURE__ */ jsx(SyntaxLine, {
+					text: row.content || " ",
+					style: [styles$1.mono, styles$1.code]
+				}),
+				anchored.length ? /* @__PURE__ */ jsx(MessageIcon, {
+					size: 12,
+					color: "blue"
+				}) : null
+			]
+		}), showInlineComments && anchored.map((comment) => /* @__PURE__ */ jsxs(View, {
+			style: styles$1.inlineComment,
+			children: [/* @__PURE__ */ jsxs(Text, {
+				style: styles$1.blue,
+				children: ["Queued comment · ", lineLabel(comment)]
+			}), /* @__PURE__ */ jsx(Text, {
+				style: styles$1.body,
+				children: comment.body
+			})]
+		}, comment.id))] }, i);
+	}) });
+}
+function lineLabel(comment) {
+	return comment.startLine === void 0 ? "File comment" : comment.endLine === comment.startLine || comment.endLine === void 0 ? `Line ${comment.startLine}` : `Lines ${comment.startLine} to ${comment.endLine}`;
+}
+function CommentSheet({ range, snippet, value, onChange, onAdd, onCancel }) {
+	return /* @__PURE__ */ jsxs(View, {
+		style: styles$1.sheet,
+		children: [
+			/* @__PURE__ */ jsx(View, { style: styles$1.handle }),
+			/* @__PURE__ */ jsx(Text, {
+				style: styles$1.sheetTitle,
+				children: range ? lineLabel(range) : "Comment on file"
+			}),
+			snippet ? /* @__PURE__ */ jsx(View, {
+				style: styles$1.quote,
+				children: /* @__PURE__ */ jsx(SyntaxLine, {
+					text: snippet,
+					style: [styles$1.body, styles$1.mono]
+				})
 			}) : null,
-			/* @__PURE__ */ jsx(Sheet, {
-				open: draft !== void 0,
-				onOpenChange: (open) => {
-					if (!open) setDraft(void 0);
-				},
-				children: /* @__PURE__ */ jsxs(SheetContent, { children: [/* @__PURE__ */ jsx(SheetHeader, { children: /* @__PURE__ */ jsx(SheetTitle, { children: "Review comment" }) }), /* @__PURE__ */ jsx(SheetBody, { children: /* @__PURE__ */ jsxs(View, {
-					style: styles$1.body,
-					children: [
-						draft?.rows.length ? /* @__PURE__ */ jsxs(Fragment, { children: [/* @__PURE__ */ jsx(Input, {
-							accessibilityLabel: "Start line",
-							value: start,
-							onChangeText: setStart,
-							keyboardType: "number-pad"
-						}), /* @__PURE__ */ jsx(Input, {
-							accessibilityLabel: "End line",
-							value: end,
-							onChangeText: setEnd,
-							keyboardType: "number-pad"
-						})] }) : null,
-						/* @__PURE__ */ jsx(Textarea, {
-							accessibilityLabel: "Comment",
-							value: comment,
-							onChangeText: setComment
-						}),
-						/* @__PURE__ */ jsx(Button, {
-							disabled: comment.trim() === "" || Boolean(draft?.rows.length) && (!Number.isInteger(Number(start)) || Number(start) < 1 || !Number.isInteger(Number(end)) || Number(end) < Number(start)),
-							onPress: () => {
-								if (!draft) return;
-								const rows = draft.rows.filter((row) => row.line >= Number(start) && row.line <= Number(end));
-								const kept = rows.filter((row) => row.marker !== "-");
-								const numbered = kept.length > 0 ? kept : rows;
-								addReviewComment(sessionId, {
-									path: draft.path,
-									relPath: draft.path,
-									body: comment.trim(),
-									snippet: numbered.map((row) => row.content).join("\n"),
-									...numbered.length === 0 ? {} : {
-										side: kept.length > 0 ? "new" : "old",
-										startLine: Math.min(...numbered.map((row) => row.line)),
-										endLine: Math.max(...numbered.map((row) => row.line))
-									}
-								});
-								setDraft(void 0);
-								setComment("");
-							},
-							children: "Add comment"
-						})
-					]
-				}) })] })
+			/* @__PURE__ */ jsx(Textarea, {
+				accessibilityLabel: "What should change here?",
+				placeholder: "What should change here?",
+				rows: 4,
+				value,
+				onChangeText: onChange
 			}),
-			/* @__PURE__ */ jsx(Sheet, {
-				open: confirm !== void 0,
-				onOpenChange: (open) => {
-					if (!open) setConfirm(void 0);
-				},
-				children: /* @__PURE__ */ jsxs(SheetContent, { children: [/* @__PURE__ */ jsx(SheetHeader, { children: /* @__PURE__ */ jsx(SheetTitle, { children: confirm === "force" ? "Force push with lease?" : confirm === "abort" ? "Abort rebase?" : "Discard review?" }) }), /* @__PURE__ */ jsxs(SheetBody, { children: [/* @__PURE__ */ jsx(Text, {
-					style: styles$1.meta,
-					children: confirm === "force" ? "Git refuses this if the remote holds commits you never fetched and integrated." : confirm === "abort" ? "Abort discards any conflict resolution in progress." : "Your queued comments will be removed."
-				}), /* @__PURE__ */ jsx(Button, {
-					variant: "danger-outline",
-					onPress: () => {
-						if (confirm === "force") requestGitSync(sessionId, "push", true);
-						else if (confirm === "abort") sync("abort-rebase");
-						else clearReviewComments(sessionId);
-						setConfirm(void 0);
-					},
-					children: "Confirm"
-				})] })] })
+			/* @__PURE__ */ jsx(Action, {
+				variant: "primary",
+				disabled: value !== void 0 && value.trim() === "",
+				onPress: onAdd,
+				children: "Add comment"
+			}),
+			/* @__PURE__ */ jsx(Action, {
+				variant: "ghost",
+				onPress: onCancel,
+				children: "Cancel"
 			})
 		]
 	});
 }
+function CommentCards({ comments, onRemove }) {
+	return /* @__PURE__ */ jsxs(View, {
+		style: styles$1.content,
+		children: [/* @__PURE__ */ jsxs(Text, {
+			style: styles$1.body,
+			children: [
+				comments.length === 2 ? "Two" : comments.length,
+				" ",
+				comments.length === 1 ? "comment" : "comments",
+				" queued for Po, whenever you are ready."
+			]
+		}), comments.map((comment) => /* @__PURE__ */ jsxs(View, {
+			style: styles$1.card,
+			children: [
+				/* @__PURE__ */ jsx(Text, {
+					style: [styles$1.body, styles$1.mono],
+					children: comment.relPath
+				}),
+				/* @__PURE__ */ jsx(Text, {
+					style: styles$1.dim,
+					children: lineLabel(comment)
+				}),
+				comment.snippet ? /* @__PURE__ */ jsx(View, {
+					style: styles$1.quote,
+					children: /* @__PURE__ */ jsx(SyntaxLine, {
+						text: comment.snippet,
+						style: [styles$1.body, styles$1.mono]
+					})
+				}) : null,
+				/* @__PURE__ */ jsx(Text, {
+					style: styles$1.body,
+					children: comment.body
+				}),
+				/* @__PURE__ */ jsx(View, {
+					style: styles$1.remove,
+					children: /* @__PURE__ */ jsx(Action, {
+						variant: "ghost",
+						onPress: () => onRemove?.(comment.id),
+						children: "Remove"
+					})
+				})
+			]
+		}, comment.id))]
+	});
+}
 const styles$1 = StyleSheet.create((theme) => ({
-	body: {
-		padding: theme.spacing(3),
-		gap: theme.spacing(2),
+	heading: {
+		fontFamily: fontOf(theme.fontFamily.sans),
+		fontSize: theme.fontSize["2xl"],
+		fontWeight: "600",
+		color: theme.colors.hi,
 		uni__dependencies: [0]
 	},
-	actions: {
-		flexDirection: "row",
-		flexWrap: "wrap",
-		gap: theme.spacing(1),
+	sheetTitle: {
+		fontFamily: fontOf(theme.fontFamily.sans),
+		fontSize: theme.fontSize.xl,
+		fontWeight: "600",
+		color: theme.colors.hi,
 		uni__dependencies: [0]
 	},
-	title: {
+	section: {
+		fontFamily: fontOf(theme.fontFamily.sans),
+		fontSize: theme.fontSize.lg,
+		fontWeight: "600",
 		color: theme.colors.hi,
+		uni__dependencies: [0]
+	},
+	body: {
+		fontFamily: fontOf(theme.fontFamily.sans),
 		fontSize: theme.fontSize.base,
-		fontWeight: "600",
+		lineHeight: theme.lineHeightRelaxed.base,
+		color: theme.colors.text,
 		uni__dependencies: [0]
 	},
-	meta: {
+	dim: {
+		fontFamily: fontOf(theme.fontFamily.sans),
+		fontSize: theme.fontSize.sm,
+		lineHeight: theme.lineHeightRelaxed.sm,
 		color: theme.colors.dim,
+		uni__dependencies: [0]
+	},
+	mono: {
+		fontFamily: fontOf(theme.fontFamily.mono),
 		fontSize: theme.fontSize.sm,
+		lineHeight: theme.lineHeightRelaxed.sm,
 		uni__dependencies: [0]
 	},
-	error: {
+	branch: {
+		fontFamily: fontOf(theme.fontFamily.mono),
+		fontSize: theme.fontSize.lg,
+		fontWeight: "600",
+		color: theme.colors.hi,
+		uni__dependencies: [0]
+	},
+	green: {
+		fontSize: theme.fontSize.sm,
+		color: theme.colors.green,
+		uni__dependencies: [0]
+	},
+	red: {
+		fontSize: theme.fontSize.sm,
 		color: theme.colors.red,
+		uni__dependencies: [0]
+	},
+	blue: {
+		fontFamily: fontOf(theme.fontFamily.sans),
 		fontSize: theme.fontSize.sm,
+		color: theme.colors.blue,
 		uni__dependencies: [0]
 	},
-	diff: (marker) => ({
-		fontFamily: fontOf(theme.fontFamily.mono),
+	yellow: {
 		fontSize: theme.fontSize.sm,
-		color: marker === "+" ? theme.colors.green : marker === "-" ? theme.colors.red : theme.colors.text,
+		color: theme.colors.yellow,
+		uni__dependencies: [0]
+	},
+	content: {
+		padding: theme.spacing(4),
+		gap: theme.spacing(3),
+		uni__dependencies: [0]
+	},
+	card: {
+		borderWidth: 1,
+		borderColor: theme.colors.border,
+		borderRadius: theme.borderRadius.lg,
+		padding: theme.spacing(3),
+		gap: theme.spacing(2),
+		uni__dependencies: [0]
+	},
+	inline: {
+		flexDirection: "row",
+		alignItems: "center",
+		gap: theme.spacing(2),
+		uni__dependencies: [0]
+	},
+	grow: {
+		flex: 1,
+		minWidth: 0
+	},
+	action: { minHeight: 44 },
+	primary: {
+		backgroundColor: theme.colors.green,
+		uni__dependencies: [0]
+	},
+	primaryLabel: {
+		fontFamily: fontOf(theme.fontFamily.sans),
+		fontSize: theme.fontSize.base,
+		fontWeight: "600",
+		color: theme.scheme === "dark" ? theme.colors.rail : theme.colors["on-selected"],
+		uni__dependencies: [0]
+	},
+	suggested: {
+		backgroundColor: theme.colors["tint-green"],
+		borderColor: theme.colors["edge-green"],
+		flex: 1,
+		uni__dependencies: [0]
+	},
+	list: {
+		gap: theme.spacing(2),
+		uni__dependencies: [0]
+	},
+	fileRow: {
+		minHeight: 44,
+		paddingVertical: theme.spacing(2),
+		flexDirection: "row",
+		alignItems: "center",
+		gap: theme.spacing(2),
+		borderBottomWidth: StyleSheet.hairlineWidth,
+		borderColor: theme.colors.border,
+		uni__dependencies: [0]
+	},
+	footer: {
+		minHeight: 76,
+		padding: theme.spacing(4),
+		flexDirection: "row",
+		alignItems: "center",
+		justifyContent: "space-between",
+		gap: theme.spacing(2),
+		borderTopWidth: 1,
+		borderColor: theme.colors.border,
+		backgroundColor: theme.colors.rail,
+		uni__dependencies: [0]
+	},
+	caution: {
+		backgroundColor: theme.colors["tint-yellow"],
+		borderColor: theme.colors["edge-yellow"],
+		uni__dependencies: [0]
+	},
+	failure: {
+		backgroundColor: theme.colors["tint-red"],
+		borderColor: theme.colors["edge-red"],
+		uni__dependencies: [0]
+	},
+	sheet: {
+		padding: theme.spacing(4),
+		gap: theme.spacing(3),
+		borderTopWidth: 1,
+		borderColor: theme.colors.border,
+		borderTopLeftRadius: theme.borderRadius.lg,
+		borderTopRightRadius: theme.borderRadius.lg,
+		backgroundColor: theme.colors.rail,
+		uni__dependencies: [0]
+	},
+	handle: {
+		height: 4,
+		width: 40,
+		borderRadius: theme.borderRadius.md,
+		backgroundColor: theme.colors.border,
+		alignSelf: "center",
+		uni__dependencies: [0]
+	},
+	empty: {
+		flex: 1,
+		alignItems: "center",
+		justifyContent: "center",
+		gap: theme.spacing(3),
+		padding: theme.spacing(6),
+		uni__dependencies: [0]
+	},
+	navigation: {
+		flexDirection: "row",
+		justifyContent: "space-between",
+		alignItems: "center"
+	},
+	diffRow: {
+		flexDirection: "row",
+		alignItems: "flex-start",
+		gap: theme.spacing(2),
+		paddingHorizontal: theme.spacing(2),
 		paddingVertical: theme.spacing(1),
+		borderLeftWidth: 3,
+		borderLeftColor: theme.colors.bg,
+		uni__dependencies: [0]
+	},
+	gutter: {
+		color: theme.colors.dim,
+		width: 24,
+		textAlign: "right",
+		uni__dependencies: [0]
+	},
+	code: {
+		flex: 1,
+		minWidth: 0,
+		color: theme.colors.text,
+		uni__dependencies: [0]
+	},
+	added: {
+		backgroundColor: theme.colors["tint-green"],
+		uni__dependencies: [0]
+	},
+	removed: {
+		backgroundColor: theme.colors["tint-red"],
+		uni__dependencies: [0]
+	},
+	selection: {
+		borderLeftColor: theme.colors.green,
+		uni__dependencies: [0]
+	},
+	inlineComment: {
+		margin: theme.spacing(2),
+		padding: theme.spacing(3),
+		borderWidth: 1,
+		borderColor: theme.colors["edge-blue"],
+		borderRadius: theme.borderRadius.md,
+		gap: theme.spacing(1),
+		uni__dependencies: [0]
+	},
+	quote: {
+		padding: theme.spacing(2),
+		backgroundColor: theme.colors.panel,
+		borderRadius: theme.borderRadius.md,
 		uni__dependencies: [0]
-	})
+	},
+	remove: { alignSelf: "flex-end" }
 }));
-//#endregion
-//#region src/extensions/workspaces/sessions/(frontend)/fill/_components/WorktreesActivitySection.native.tsx
-function WorktreesActivitySection({ sessionId, openTransientTab }) {
-	const git = useGitChanges(sessionId);
-	const state = useWorktrees(sessionId);
-	const worktrees = state.worktrees.filter((item) => item.sessionId !== sessionId);
+function GitReviewView(props) {
+	const { screen, activity, summary, file, path, comments } = props;
+	const index = summary?.files.findIndex((entry) => entry.path === path) ?? -1;
+	const entry = summary?.files[index];
 	return /* @__PURE__ */ jsxs(View, {
-		style: styles.section,
+		style: styles$1.grow,
 		children: [
-			git.changes ? /* @__PURE__ */ jsxs(Pressable, {
-				accessibilityRole: "button",
-				accessibilityLabel: `${git.changes.branch ?? "Detached HEAD"}, ${git.changes.added} added, ${git.changes.removed} removed`,
-				testID: "activity-diff-changes",
-				onPress: () => openTransientTab(reviewTab()),
-				style: styles.changes,
-				children: [
-					/* @__PURE__ */ jsx(Text, {
-						numberOfLines: 1,
-						style: styles.branch,
-						children: git.changes.branch ?? "Detached HEAD"
-					}),
-					/* @__PURE__ */ jsxs(Text, {
-						style: styles.added,
-						children: ["+", git.changes.added]
+			screen === "review" ? /* @__PURE__ */ jsxs(View, {
+				style: styles$1.inline,
+				children: [/* @__PURE__ */ jsx(Action, {
+					variant: "ghost",
+					onPress: () => props.onScreen("changes"),
+					children: "Changes"
+				}), screen === "review" && path ? /* @__PURE__ */ jsx(Action, {
+					variant: "ghost",
+					onPress: () => props.onScreen("file"),
+					children: "File diff"
+				}) : null]
+			}) : null,
+			/* @__PURE__ */ jsxs(ScrollView, {
+				style: styles$1.grow,
+				children: [screen === "changes" ? /* @__PURE__ */ jsxs(View, {
+					style: styles$1.content,
+					children: [
+						summary?.repository !== false ? /* @__PURE__ */ jsx(SyncCard, {
+							changes: activity.changes,
+							busy: activity.pending !== void 0,
+							onSync: props.onSync
+						}) : null,
+						activity.pending ? /* @__PURE__ */ jsx(Text, {
+							style: styles$1.dim,
+							children: activity.pending
+						}) : null,
+						activity.error ? /* @__PURE__ */ jsxs(View, {
+							style: [styles$1.card, props.forceRequired ? styles$1.caution : styles$1.failure],
+							children: [
+								/* @__PURE__ */ jsx(Text, {
+									style: styles$1.body,
+									children: activity.error
+								}),
+								props.forceRequired ? /* @__PURE__ */ jsx(Action, {
+									variant: "danger-outline",
+									onPress: props.onForce,
+									children: "Force push with lease"
+								}) : null,
+								/* @__PURE__ */ jsx(Action, {
+									variant: "ghost",
+									onPress: props.onDismiss,
+									children: "Dismiss"
+								})
+							]
+						}) : null,
+						activity.changes?.rebase ? /* @__PURE__ */ jsx(RebaseCard, {
+							conflicts: activity.changes.rebase.conflicts,
+							busy: activity.pending !== void 0,
+							onResolve: props.onResolve,
+							onAbort: props.onAbort
+						}) : null,
+						!summary ? /* @__PURE__ */ jsx(Text, {
+							style: styles$1.dim,
+							children: "Loading changes…"
+						}) : summary.files.length ? /* @__PURE__ */ jsx(FileList, {
+							files: summary.files,
+							comments,
+							onFile: props.onFile
+						}) : /* @__PURE__ */ jsxs(View, {
+							style: styles$1.empty,
+							children: [/* @__PURE__ */ jsx(Text, {
+								style: styles$1.sheetTitle,
+								children: summary.repository ? "No changes yet" : "Not a Git checkout"
+							}), /* @__PURE__ */ jsx(Text, {
+								style: styles$1.dim,
+								children: summary.repository ? `Nothing to review on ${summary.branch ?? "this checkout"}.` : "This folder is not a Git repository, so there is nothing to sync."
+							})]
+						}),
+						summary?.truncated ? /* @__PURE__ */ jsx(Text, {
+							style: styles$1.dim,
+							children: "The file list was truncated."
+						}) : null
+					]
+				}) : screen === "file" ? /* @__PURE__ */ jsxs(Fragment, { children: [
+					entry ? /* @__PURE__ */ jsx(FileHeader, {
+						entry,
+						index,
+						total: summary?.files.length ?? 0,
+						onChanges: () => props.onScreen("changes"),
+						onPrevious: () => {
+							const previous = summary?.files[index - 1];
+							if (previous) props.onFile(previous.path);
+						},
+						onNext: () => {
+							const next = summary?.files[index + 1];
+							if (next) props.onFile(next.path);
+						}
+					}) : /* @__PURE__ */ jsx(Text, {
+						style: styles$1.heading,
+						children: path
 					}),
-					/* @__PURE__ */ jsxs(Text, {
-						style: styles.removed,
-						children: ["-", git.changes.removed]
+					!file ? /* @__PURE__ */ jsxs(View, {
+						style: styles$1.content,
+						children: [/* @__PURE__ */ jsx(Text, {
+							style: styles$1.dim,
+							children: props.error ? "The diff could not be loaded. Please try again." : "Loading diff…"
+						}), props.error && path ? /* @__PURE__ */ jsx(Action, {
+							onPress: () => props.onFile(path),
+							children: "Retry"
+						}) : null]
+					}) : file.binary || file.tooLarge ? /* @__PURE__ */ jsx(View, {
+						style: styles$1.content,
+						children: /* @__PURE__ */ jsx(Text, {
+							style: styles$1.section,
+							children: file.binary ? "Binary file" : "Diff too large to display"
+						})
+					}) : file.hunks.map((hunk, i) => /* @__PURE__ */ jsx(DiffRows, {
+						rows: hunk.rows,
+						comments: comments.filter((comment) => comment.path === file.path),
+						selection: props.selection,
+						onLine: props.onLine
+					}, i)),
+					comments.filter((comment) => comment.path === path && comment.startLine === void 0).map((comment) => /* @__PURE__ */ jsxs(View, {
+						style: styles$1.inlineComment,
+						children: [/* @__PURE__ */ jsx(Text, {
+							style: styles$1.blue,
+							children: "Queued file comment"
+						}), /* @__PURE__ */ jsx(Text, {
+							style: styles$1.body,
+							children: comment.body
+						})]
+					}, comment.id)),
+					/* @__PURE__ */ jsx(View, {
+						style: styles$1.content,
+						children: /* @__PURE__ */ jsx(Action, {
+							onPress: props.onComment,
+							children: "Comment on file"
+						})
 					})
-				]
-			}) : null,
-			state.pending ? /* @__PURE__ */ jsx(ListRow, { title: state.pending }) : null,
-			worktrees.map((item) => /* @__PURE__ */ jsx(ListRow, {
-				leading: /* @__PURE__ */ jsx(Dot, { tone: item.orphaned ? "red" : item.sessionId === null ? "muted" : "blue" }),
-				title: /* @__PURE__ */ jsx(Button, {
+				] }) : /* @__PURE__ */ jsx(CommentCards, {
+					comments,
+					onRemove: props.onRemove
+				}), props.error ? /* @__PURE__ */ jsx(Text, {
+					style: [styles$1.red, styles$1.content],
+					children: props.error
+				}) : null]
+			}),
+			/* @__PURE__ */ jsx(Footer, {
+				count: comments.length,
+				confirmation: screen === "changes" && activity.changes?.rebase !== void 0,
+				discard: screen === "review",
+				onReview: () => props.onScreen("review"),
+				onSend: props.onSend,
+				onDiscard: props.onDiscard
+			})
+		]
+	});
+}
+//#endregion
+//#region src/extensions/workspaces/sessions/(frontend)/_components/GitReviewPanel.native.tsx
+function useGitChanges(sessionId) {
+	const subscribe = useCallback((listener) => {
+		const sub = gitChanges.store.subscribe(listener);
+		return () => sub.unsubscribe();
+	}, []);
+	return useSyncExternalStore(subscribe, () => gitChanges.select(gitChanges.store.state, sessionId));
+}
+function reviewTab() {
+	return {
+		id: "git-review",
+		label: "review",
+		panel: GitReviewPanel
+	};
+}
+function GitReviewPanel(props) {
+	return /* @__PURE__ */ jsx(GitReviewPanelSession, { ...props }, props.sessionId);
+}
+function GitReviewPanelSession({ sessionId, sendSessionFrame }) {
+	const activity = useGitChanges(sessionId);
+	const subscribe = useCallback((listener) => {
+		const sub = gitReview.store.subscribe(listener);
+		return () => sub.unsubscribe();
+	}, []);
+	const comments = useSyncExternalStore(subscribe, () => gitReview.select(gitReview.store.state, sessionId).comments);
+	const [summary, setSummary] = useState();
+	const [file, setFile] = useState();
+	const [error, setError] = useState();
+	const [dismissedError, setDismissedError] = useState();
+	const [confirm, setConfirm] = useState();
+	const [screen, setScreen] = useState("changes");
+	const [path, setPath] = useState();
+	const [selection, setSelection] = useState();
+	const [draft, setDraft] = useState();
+	const [comment, setComment] = useState("");
+	const request = useRef(void 0);
+	const fingerprint = JSON.stringify(activity.changes);
+	useEffect(() => {
+		if (sessionId === null) return void 0;
+		const controller = new AbortController();
+		fetchReviewSummary(sessionId, controller.signal).then((result) => {
+			if (!controller.signal.aborted) {
+				if (result.ok) setSummary(result.summary);
+				else setError(result.error);
+			}
+		}).catch((cause) => {
+			if (!controller.signal.aborted) setError(cause instanceof Error ? cause.message : String(cause));
+		});
+		return () => {
+			controller.abort();
+			request.current?.abort();
+		};
+	}, [sessionId, fingerprint]);
+	const loadFile = async (path) => {
+		if (sessionId === null) return;
+		setScreen("file");
+		setPath(path);
+		setSelection(void 0);
+		setDraft(void 0);
+		request.current?.abort();
+		const controller = new AbortController();
+		request.current = controller;
+		setFile(void 0);
+		setError(void 0);
+		try {
+			const result = await fetchReviewFile(sessionId, path, controller.signal);
+			if (!controller.signal.aborted) {
+				if (result.ok) setFile(result.diff);
+				else setError(result.error);
+			}
+		} catch (cause) {
+			if (!controller.signal.aborted) setError(cause instanceof Error ? cause.message : String(cause));
+		}
+	};
+	if (sessionId === null) return null;
+	const changes = activity.changes;
+	const send = (message, onSent) => {
+		const failure = deliverToAgent(sendSessionFrame, sessionId, message);
+		setError(failure);
+		if (failure === void 0) onSent?.();
+	};
+	const sync = (action) => requestGitSync(sessionId, action);
+	const forceRequired = activity.error !== dismissedError && activity.errorTarget?.action === "push" && activity.errorTarget.forceRequired === true;
+	const sendReview = () => {
+		if (comments.length === 0) return;
+		const body = comments.map((item) => {
+			return `### ${item.startLine === void 0 ? item.relPath : item.side === "old" ? `${item.relPath} (removed lines ${item.startLine}-${item.endLine ?? item.startLine})` : `${item.relPath}:${item.startLine}-${item.endLine ?? item.startLine}`}\n\n${item.snippet.split("\n").slice(0, 20).join("\n").slice(0, 2e3).split("\n").map((line) => `> ${line}`).join("\n")}\n\n${item.body.trim()}`;
+		}).join("\n\n");
+		send(`${reviewHeading(comments.length, summary?.branch, summary?.base)}\n\n${body}`, () => clearReviewComments(sessionId));
+	};
+	const selectLine = (row) => {
+		if (!file) return;
+		const next = selectReviewLine(selection, row);
+		setSelection(next.range);
+		if (next.complete) {
+			const rows = reviewRangeRows(file.hunks.flatMap((hunk) => hunk.rows), next.range);
+			setDraft({
+				path: file.path,
+				range: next.range,
+				snippet: rows.map((item) => item.content).join("\n")
+			});
+		}
+	};
+	return /* @__PURE__ */ jsxs(Fragment, { children: [
+		/* @__PURE__ */ jsx(GitReviewView, {
+			screen,
+			activity: {
+				...activity,
+				error: activity.error === dismissedError ? void 0 : activity.error
+			},
+			summary,
+			file,
+			path,
+			comments,
+			error,
+			forceRequired,
+			selection,
+			onScreen: setScreen,
+			onFile: (path) => void loadFile(path),
+			onLine: selectLine,
+			onSync: sync,
+			onForce: () => setConfirm("force"),
+			onAbort: () => setConfirm("abort"),
+			onResolve: () => send(conflictPrompt(changes?.branch, changes?.rebase?.conflicts ?? [])),
+			onDismiss: () => setDismissedError(activity.error),
+			onComment: () => {
+				if (path) {
+					setSelection(void 0);
+					setDraft({
+						path,
+						snippet: ""
+					});
+				}
+			},
+			onRemove: (id) => removeReviewComment(sessionId, id),
+			onSend: sendReview,
+			onDiscard: () => setConfirm("discard")
+		}),
+		/* @__PURE__ */ jsx(Sheet, {
+			open: draft !== void 0,
+			onOpenChange: (open) => {
+				if (!open) {
+					setDraft(void 0);
+					setSelection(void 0);
+					setComment("");
+				}
+			},
+			children: /* @__PURE__ */ jsx(SheetContent, { children: /* @__PURE__ */ jsx(SheetBody, { children: /* @__PURE__ */ jsx(CommentSheet, {
+				range: draft?.range,
+				snippet: draft?.snippet ?? "",
+				value: comment,
+				onChange: setComment,
+				onCancel: () => {
+					setDraft(void 0);
+					setSelection(void 0);
+					setComment("");
+				},
+				onAdd: () => {
+					if (!draft || !comment.trim()) return;
+					addReviewComment(sessionId, {
+						path: draft.path,
+						relPath: draft.path,
+						body: comment.trim(),
+						snippet: draft.snippet,
+						...draft.range
+					});
+					setDraft(void 0);
+					setSelection(void 0);
+					setComment("");
+				}
+			}) }) })
+		}),
+		/* @__PURE__ */ jsx(Sheet, {
+			open: confirm !== void 0,
+			onOpenChange: (open) => {
+				if (!open) setConfirm(void 0);
+			},
+			children: /* @__PURE__ */ jsxs(SheetContent, { children: [/* @__PURE__ */ jsx(SheetHeader, { children: /* @__PURE__ */ jsx(SheetTitle, { children: confirm === "force" ? "Force push with lease?" : confirm === "abort" ? "Abort rebase?" : "Discard review?" }) }), /* @__PURE__ */ jsxs(SheetBody, { children: [
+				/* @__PURE__ */ jsx(Text, {
+					style: styles$1.dim,
+					children: confirm === "force" ? "Git refuses this if the remote holds commits you never fetched and integrated." : confirm === "abort" ? "Abort discards any conflict resolution in progress." : "Your queued comments will be removed."
+				}),
+				/* @__PURE__ */ jsx(Button, {
+					variant: "danger",
+					disabled: confirm !== "discard" && activity.pending !== void 0,
+					onPress: () => {
+						if (confirm === "force") requestGitSync(sessionId, "push", true);
+						else if (confirm === "abort") sync("abort-rebase");
+						else clearReviewComments(sessionId);
+						setConfirm(void 0);
+					},
+					children: confirm === "force" ? "Force push with lease" : confirm === "abort" ? "Abort rebase" : "Discard"
+				}),
+				/* @__PURE__ */ jsx(Button, {
 					variant: "ghost",
-					onPress: () => openTransientTab(worktreesTab()),
-					children: item.branch
+					onPress: () => setConfirm(void 0),
+					children: "Cancel"
+				})
+			] })] })
+		})
+	] });
+}
+//#endregion
+//#region src/extensions/workspaces/sessions/(frontend)/fill/_components/WorktreesActivitySection.native.tsx
+function GitChangesRow({ state = "changes", branch = "Detached HEAD", added = 0, removed = 0, onReview }) {
+	return /* @__PURE__ */ jsxs(Pressable, {
+		testID: "activity-diff-changes",
+		accessibilityRole: "button",
+		accessibilityLabel: "Open changes review",
+		onPress: onReview,
+		style: styles.changeRow,
+		children: [/* @__PURE__ */ jsxs(View, {
+			style: styles.line,
+			children: [
+				/* @__PURE__ */ jsx(FileIcon, {
+					size: 18,
+					color: "dim"
+				}),
+				/* @__PURE__ */ jsx(Text, {
+					style: [styles.heading, styles.grow],
+					children: "Changes"
 				}),
-				description: [item.orphaned ? "Orphaned" : "", item.unowned ? "Unowned" : ""].filter(Boolean).join(" · ")
+				/* @__PURE__ */ jsx(ChevronRightIcon, {
+					size: 16,
+					color: "dim"
+				})
+			]
+		}), /* @__PURE__ */ jsxs(View, {
+			style: styles.changeDetail,
+			children: [/* @__PURE__ */ jsx(Text, {
+				style: [styles.branch, styles.grow],
+				children: branch
+			}), state === "changes" ? /* @__PURE__ */ jsxs(Fragment, { children: [/* @__PURE__ */ jsxs(Text, {
+				style: styles.jade,
+				children: ["+", added]
+			}), /* @__PURE__ */ jsxs(Text, {
+				style: styles.error,
+				children: ["-", removed]
+			})] }) : state === "pushing" ? /* @__PURE__ */ jsxs(Fragment, { children: [/* @__PURE__ */ jsx(Spinner, { label: "Pushing..." }), /* @__PURE__ */ jsx(Text, {
+				style: styles.dim,
+				children: "Pushing..."
+			})] }) : /* @__PURE__ */ jsx(Text, {
+				style: styles.dim,
+				children: "No changes yet"
+			})]
+		})]
+	});
+}
+function WorktreesActivityView({ git, state, disabled = false, onReview, onWorktrees }) {
+	const { starting } = worktreesPresentation(state);
+	return /* @__PURE__ */ jsxs(View, {
+		style: styles.section,
+		children: [
+			git.changes ? /* @__PURE__ */ jsx(GitChangesRow, {
+				branch: git.changes.branch ?? "Detached HEAD",
+				added: git.changes.added,
+				removed: git.changes.removed,
+				state: git.pending?.startsWith("pushing") ? "pushing" : git.changes.added === 0 && git.changes.removed === 0 && git.changes.files === 0 ? "clean" : "changes",
+				onReview
+			}) : null,
+			/* @__PURE__ */ jsx(WorktreeGroup, {
+				title: "Worktrees",
+				count: `${state.worktrees.length} open${starting ? " · 1 starting" : ""}`
+			}),
+			state.worktrees.map((item) => /* @__PURE__ */ jsx(WorktreeRow, {
+				item,
+				compact: true,
+				onOpen: onWorktrees
 			}, item.id)),
-			worktrees.length === 0 && state.pending === void 0 ? /* @__PURE__ */ jsxs(View, {
+			starting ? /* @__PURE__ */ jsx(WorktreeStarting, { branch: state.requestedBranch }) : state.pending ? /* @__PURE__ */ jsx(Text, {
+				style: styles.dim,
+				children: state.pending
+			}) : null,
+			state.worktrees.length === 0 && !state.pending ? /* @__PURE__ */ jsxs(View, {
 				style: styles.idle,
 				children: [/* @__PURE__ */ jsx(Text, {
-					style: styles.status,
+					style: styles.dim,
 					children: "Idle"
-				}), /* @__PURE__ */ jsxs(Pressable, {
-					accessibilityRole: "button",
-					accessibilityState: { disabled: sessionId === null },
+				}), /* @__PURE__ */ jsx(Button, {
 					testID: "activity-git-create",
-					disabled: sessionId === null,
-					hitSlop: 10,
-					onPress: () => openTransientTab(worktreesTab()),
-					style: styles.action,
-					children: [/* @__PURE__ */ jsx(Text, {
-						style: styles.actionText(sessionId === null),
-						children: "Create a worktree"
-					}), /* @__PURE__ */ jsx(ArrowRightIcon, {
-						size: 14,
-						color: sessionId === null ? "dim" : "green"
-					})]
+					variant: "ghost",
+					style: styles.link,
+					disabled,
+					onPress: onWorktrees,
+					children: /* @__PURE__ */ jsx(Text, {
+						style: styles.jade,
+						children: "Create a worktree →"
+					})
 				})]
 			}) : null
 		]
 	});
 }
-const styles = StyleSheet.create((theme) => {
-	const sm = {
+function WorktreesActivitySection({ sessionId, openTransientTab }) {
+	const git = useGitChanges(sessionId);
+	const state = useWorktrees(sessionId);
+	return /* @__PURE__ */ jsx(WorktreesActivityView, {
+		git,
+		state: {
+			...state,
+			worktrees: state.worktrees.filter((item) => item.sessionId !== sessionId)
+		},
+		disabled: sessionId === null,
+		onReview: () => openTransientTab(reviewTab()),
+		onWorktrees: () => openTransientTab(worktreesTab())
+	});
+}
+const styles = StyleSheet.create((theme) => ({
+	section: {
+		gap: theme.spacing(2),
+		uni__dependencies: [0]
+	},
+	heading: {
+		fontFamily: fontOf(theme.fontFamily.sans),
+		fontSize: theme.fontSize.lg,
+		lineHeight: theme.lineHeight.lg,
+		fontWeight: "600",
+		color: theme.colors.hi,
+		uni__dependencies: [0]
+	},
+	dim: {
 		fontFamily: fontOf(theme.fontFamily.sans),
 		fontSize: theme.fontSize.sm,
-		lineHeight: theme.lineHeight.sm
-	};
-	return {
-		section: {
-			gap: theme.spacing(1.5),
-			uni__dependencies: [0]
-		},
-		changes: {
-			flexDirection: "row",
-			alignItems: "center",
-			gap: theme.spacing(2),
-			uni__dependencies: [0]
-		},
-		branch: {
-			...sm,
-			flex: 1,
-			fontFamily: fontOf(theme.fontFamily.mono),
-			fontWeight: theme.fontWeight.semibold,
-			color: theme.colors.hi,
-			uni__dependencies: [0]
-		},
-		added: {
-			...sm,
-			color: theme.colors.green,
-			uni__dependencies: [0]
-		},
-		removed: {
-			...sm,
-			color: theme.colors.red,
-			uni__dependencies: [0]
-		},
-		idle: {
-			flexDirection: "row",
-			alignItems: "center",
-			flexWrap: "wrap",
-			gap: theme.spacing(4),
-			uni__dependencies: [0]
-		},
-		status: {
-			...sm,
-			color: theme.colors.dim,
-			uni__dependencies: [0]
-		},
-		action: {
-			flexDirection: "row",
-			alignItems: "center",
-			gap: theme.spacing(1),
-			uni__dependencies: [0]
-		},
-		actionText: (disabled) => ({
-			fontFamily: fontOf(theme.fontFamily.sans),
-			fontSize: theme.fontSize.base,
-			lineHeight: theme.lineHeight.base,
-			fontWeight: theme.fontWeight.medium,
-			color: disabled ? theme.colors.dim : theme.colors.green,
-			uni__dependencies: [0]
-		})
-	};
-});
+		lineHeight: theme.lineHeight.sm,
+		color: theme.colors.dim,
+		uni__dependencies: [0]
+	},
+	branch: {
+		fontFamily: fontOf(theme.fontFamily.mono),
+		fontSize: theme.fontSize.base,
+		lineHeight: theme.lineHeight.lg,
+		color: theme.colors.hi,
+		uni__dependencies: [0]
+	},
+	line: {
+		flexDirection: "row",
+		alignItems: "center",
+		gap: theme.spacing(2),
+		minHeight: 44,
+		uni__dependencies: [0]
+	},
+	grow: {
+		flex: 1,
+		minWidth: 0,
+		gap: theme.spacing(1),
+		uni__dependencies: [0]
+	},
+	jade: {
+		fontFamily: fontOf(theme.fontFamily.sans),
+		fontSize: theme.fontSize.base,
+		lineHeight: theme.lineHeight.base,
+		color: theme.colors.green,
+		fontWeight: "500",
+		uni__dependencies: [0]
+	},
+	error: {
+		fontFamily: fontOf(theme.fontFamily.sans),
+		fontSize: theme.fontSize.sm,
+		lineHeight: theme.lineHeight.sm,
+		color: theme.colors.red,
+		uni__dependencies: [0]
+	},
+	changeRow: {
+		gap: theme.spacing(1),
+		paddingVertical: theme.spacing(2),
+		borderBottomWidth: StyleSheet.hairlineWidth,
+		borderColor: theme.colors["border-soft"],
+		uni__dependencies: [0]
+	},
+	changeDetail: {
+		flexDirection: "row",
+		alignItems: "center",
+		gap: theme.spacing(3),
+		paddingLeft: theme.spacing(6),
+		minHeight: 28,
+		uni__dependencies: [0]
+	},
+	idle: {
+		flexDirection: "row",
+		alignItems: "center",
+		gap: theme.spacing(4),
+		uni__dependencies: [0]
+	},
+	link: {
+		minHeight: 44,
+		paddingHorizontal: 0
+	}
+}));
 //#endregion
 //#region src/extensions/workspaces/sessions/(frontend)/fill/Worktrees.activity.git.native.tsx
 var Worktrees_activity_git_native_default = defineFill({ component: WorktreesActivitySection });