fix: resolve merge conflict in claude_code.rs

Keep master's quiet system/rate_limit_event handlers while preserving
the story-62 permission_request handler (the core feature).

Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>

frontend/src/components/Chat.tsx

@@ -38,6 +38,11 @@ export function Chat({ projectPath, onCloseProject }: ChatProps) {
 		merge: [],
 	});
 	const [claudeSessionId, setClaudeSessionId] = useState<string | null>(null);
+	const [permissionRequest, setPermissionRequest] = useState<{
+		requestId: string;
+		toolName: string;
+		toolInput: Record<string, unknown>;
+	} | null>(null);
 	const [isNarrowScreen, setIsNarrowScreen] = useState(
 		window.innerWidth < NARROW_BREAKPOINT,
 	);
@@ -166,6 +171,9 @@ export function Chat({ projectPath, onCloseProject }: ChatProps) {
 			onPipelineState: (state) => {
 				setPipeline(state);
 			},
+			onPermissionRequest: (requestId, toolName, toolInput) => {
+				setPermissionRequest({ requestId, toolName, toolInput });
+			},
 		});
 
 		return () => {
@@ -319,6 +327,15 @@ export function Chat({ projectPath, onCloseProject }: ChatProps) {
 		}
 	};
 
+	const handlePermissionResponse = (approved: boolean) => {
+		if (!permissionRequest) return;
+		wsRef.current?.sendPermissionResponse(
+			permissionRequest.requestId,
+			approved,
+		);
+		setPermissionRequest(null);
+	};
+
 	const clearSession = async () => {
 		const confirmed = window.confirm(
 			"Are you sure? This will clear all messages and reset the conversation context.",
@@ -828,6 +845,107 @@ export function Chat({ projectPath, onCloseProject }: ChatProps) {
 					</div>
 				</div>
 			)}
+			{permissionRequest && (
+				<div
+					style={{
+						position: "fixed",
+						top: 0,
+						left: 0,
+						right: 0,
+						bottom: 0,
+						backgroundColor: "rgba(0, 0, 0, 0.7)",
+						display: "flex",
+						alignItems: "center",
+						justifyContent: "center",
+						zIndex: 1000,
+					}}
+				>
+					<div
+						style={{
+							backgroundColor: "#2f2f2f",
+							padding: "32px",
+							borderRadius: "12px",
+							maxWidth: "520px",
+							width: "90%",
+							border: "1px solid #444",
+						}}
+					>
+						<h2 style={{ marginTop: 0, color: "#ececec" }}>
+							Permission Request
+						</h2>
+						<p
+							style={{
+								color: "#aaa",
+								fontSize: "0.9em",
+								marginBottom: "12px",
+							}}
+						>
+							The agent wants to use the{" "}
+							<strong style={{ color: "#ececec" }}>
+								{permissionRequest.toolName}
+							</strong>{" "}
+							tool. Do you approve?
+						</p>
+						{Object.keys(permissionRequest.toolInput).length > 0 && (
+							<pre
+								style={{
+									background: "#1a1a1a",
+									border: "1px solid #333",
+									borderRadius: "6px",
+									padding: "12px",
+									fontSize: "0.8em",
+									color: "#ccc",
+									overflowX: "auto",
+									maxHeight: "200px",
+									marginBottom: "20px",
+									whiteSpace: "pre-wrap",
+									wordBreak: "break-word",
+								}}
+							>
+								{JSON.stringify(permissionRequest.toolInput, null, 2)}
+							</pre>
+						)}
+						<div
+							style={{
+								display: "flex",
+								gap: "12px",
+								justifyContent: "flex-end",
+							}}
+						>
+							<button
+								type="button"
+								onClick={() => handlePermissionResponse(false)}
+								style={{
+									padding: "10px 20px",
+									borderRadius: "8px",
+									border: "1px solid #555",
+									backgroundColor: "transparent",
+									color: "#aaa",
+									cursor: "pointer",
+									fontSize: "0.9em",
+								}}
+							>
+								Deny
+							</button>
+							<button
+								type="button"
+								onClick={() => handlePermissionResponse(true)}
+								style={{
+									padding: "10px 20px",
+									borderRadius: "8px",
+									border: "none",
+									backgroundColor: "#ececec",
+									color: "#000",
+									cursor: "pointer",
+									fontSize: "0.9em",
+								}}
+							>
+								Approve
+							</button>
+						</div>
+					</div>
+				</div>
+			)}
 		</div>
 	);
 }