Merge pull request #673 from xiaomakuaiz/260610-ai-consent

260610 ai consent

Author: xiaomakuaiz

mobile/app/(tabs)/_layout.tsx

@@ -1,7 +1,8 @@
 import { Tabs, useRouter } from 'expo-router';
-import React from 'react';
+import React, { useState } from 'react';
 import { Pressable, Text, View } from 'react-native';
 import { useSafeAreaInsets } from 'react-native-safe-area-context';
+import { AiConsentModal, useAiConsent } from '@/components/AiConsent';
 import { Glass } from '@/components/glass';
 import { Icons } from '@/components/Icons';
 import { useTheme } from '@/theme';
@@ -51,11 +52,22 @@ function GlassDock({ state, navigation }: { state: any; navigation: any }) {
 }
 
 export default function TabsLayout() {
+  // 登录后进入首页（tab 区）首次提示 AI 数据处理同意（App Store 2.1）。已同意则不再弹；
+  // 「暂不使用」仅本次关闭（下次启动再问），真正的硬拦截在任务会话页/新建任务页。
+  const aiConsent = useAiConsent();
+  const [consentDismissed, setConsentDismissed] = useState(false);
   return (
-    <Tabs tabBar={(props) => <GlassDock {...(props as any)} />} screenOptions={{ headerShown: false }}>
-      <Tabs.Screen name="tasks" />
-      <Tabs.Screen name="projects" />
-      <Tabs.Screen name="profile" />
-    </Tabs>
+    <>
+      <Tabs tabBar={(props) => <GlassDock {...(props as any)} />} screenOptions={{ headerShown: false }}>
+        <Tabs.Screen name="tasks" />
+        <Tabs.Screen name="projects" />
+        <Tabs.Screen name="profile" />
+      </Tabs>
+      <AiConsentModal
+        visible={aiConsent.status === 'needed' && !consentDismissed}
+        onAgree={aiConsent.grant}
+        onDecline={() => setConsentDismissed(true)}
+      />
+    </>
   );
 }

mobile/app/(tabs)/profile.tsx

@@ -97,8 +97,8 @@ function About({ t }: { t: Theme }) {
     const r = await checkOta();
     setOtaBusy(null);
     if (r.status === 'disabled') { Alert.alert('检查更新', '开发模式下不可用，正式包才会检查更新。'); return; }
-    if (r.status === 'error') { Alert.alert('检查失败', r.message || '请检查网络后重试。'); return; }
-    if (r.status === 'none') { Alert.alert('已是最新', `当前已是最新版本 ${verLine}。`); return; }
+    // error（OTA 服务未上线/网络异常，拿不到有效数据）视为已是最新，不向用户报错
+    if (r.status === 'error' || r.status === 'none') { Alert.alert('已是最新', `当前已是最新版本 ${verLine}。`); return; }
     Alert.alert('发现新版本', '有新版本可用，是否立即更新？\n（更新后将自动重启）', [
       { text: '取消', style: 'cancel' },
       { text: '立即更新', onPress: applyOtaNow },

mobile/app/new-task.tsx

@@ -4,6 +4,7 @@ import { ActivityIndicator, Platform, Pressable, ScrollView, Text, TextInput, Vi
 import { KeyboardAvoidingView } from 'react-native-keyboard-controller';
 import { useSafeAreaInsets } from 'react-native-safe-area-context';
 import { ApiError, createTask, getSubscription, listImages, listModels, listProjects } from '@/api/client';
+import { AiConsentModal, useAiConsent } from '@/components/AiConsent';
 import type { Model, Project } from '@/api/types';
 import { ConcurrentLimitModal } from '@/components/ConcurrentLimitModal';
 import { Icons, providerIconForUrl } from '@/components/Icons';
@@ -37,6 +38,7 @@ export default function NewTaskScreen() {
   const t = useTheme();
   const insets = useSafeAreaInsets();
   const router = useRouter();
+  const aiConsent = useAiConsent(); // 新建任务会把内容发给 AI，需先取得数据处理同意（App Store 2.1）
   const params = useLocalSearchParams<{ repo?: string; repoName?: string; projectId?: string }>();
 
   const [models, setModels] = useState<Model[]>([]);
@@ -199,6 +201,9 @@ export default function NewTaskScreen() {
       <ModelSheet visible={picking === 'model'} models={models} selectedId={modelId}
         onPick={(k) => { setModelId(k); setPicking(null); }} onClose={() => setPicking(null)} />
       <ConcurrentLimitModal visible={limitOpen} onClose={() => setLimitOpen(false)} onStopped={() => { setLimitOpen(false); setTimeout(() => submit(), 400); }} />
+
+      {/* AI 数据处理同意：新建任务会把内容发给 AI，未同意则退出 */}
+      <AiConsentModal visible={aiConsent.status === 'needed'} onAgree={aiConsent.grant} onDecline={() => router.back()} />
     </KeyboardAvoidingView>
   );
 }

mobile/app/task/[id].tsx

@@ -8,6 +8,7 @@ import { ApiError, getTaskDetail, getTaskRounds, listModels } from '@/api/client
 import { TaskControlClient, type PortForwardInfo, type RepoFileChange } from '@/api/control';
 import { TaskStreamClient, type StreamState } from '@/api/stream';
 import { MAX_ATTACHMENTS, pickImages, saveImageToAlbum, uploadImage } from '@/api/upload';
+import { AiConsentModal, useAiConsent } from '@/components/AiConsent';
 import type { Model, ProjectTask } from '@/api/types';
 import { Glass } from '@/components/glass';
 import { Icons, Spinner } from '@/components/Icons';
@@ -85,6 +86,7 @@ export default function TaskDetailScreen() {
   const insets = useSafeAreaInsets();
   const router = useRouter();
   const { id } = useLocalSearchParams<{ id: string }>();
+  const aiConsent = useAiConsent(); // 进入可交互任务前需先取得 AI 数据处理同意（App Store 2.1）
 
   const [task, setTask] = useState<ProjectTask | null>(null);
   const [historyMessages, setHistoryMessages] = useState<ChatMessage[]>([]);
@@ -647,6 +649,9 @@ export default function TaskDetailScreen() {
       <PreviewSheet visible={previewOpen} ports={previewPorts} refreshing={portsRefreshing} activeUrl={preview && preview.taskId === id ? preview.url : undefined} onOpen={openInBrowser} onRefresh={refreshPorts} onClose={() => setPreviewOpen(false)} />
       <CopySheet visible={copyText != null} text={copyText ?? ''} onClose={() => setCopyText(null)} onCopyAll={onCopyAll} />
 
+      {/* AI 数据处理同意：进入可交互（可对话）任务且未同意时弹出，未同意则退出该页 */}
+      <AiConsentModal visible={interactive && aiConsent.status === 'needed'} onAgree={aiConsent.grant} onDecline={() => router.back()} />
+
       {/* ⋯ 更多操作：低频/破坏性指令，点开后选择，避免误触 */}
       <Modal visible={moreOpen} transparent animationType="slide" onRequestClose={() => setMoreOpen(false)} statusBarTranslucent>
         <Scrim onPress={() => setMoreOpen(false)} />

mobile/src/components/AiConsent.tsx

@@ -0,0 +1,61 @@
+/**
+ * AI 数据处理同意（满足 App Store 审核 Guideline 2.1：向第三方 AI 服务发送数据前需取得用户明确同意）。
+ *
+ * 在「即将把用户内容发给 AI」的入口处（任务会话页、新建任务页）首次弹出，用户明确点「同意并继续」后
+ * 才放行；持久化到 AsyncStorage，之后不再打扰。点「暂不使用」则退出该页（不进行任何 AI 交互）。
+ */
+import AsyncStorage from '@react-native-async-storage/async-storage';
+import { useCallback, useEffect, useState } from 'react';
+import { Linking, Modal, Platform, Pressable, StyleSheet, Text, View } from 'react-native';
+import { getBaseUrl } from '@/api/client';
+import { useTheme } from '@/theme';
+
+const AI_CONSENT_KEY = 'mc.aiConsent.v2';
+
+export type AiConsentStatus = 'loading' | 'granted' | 'needed';
+
+/** 读取/写入「AI 数据处理同意」状态。loading 期间不弹窗，避免闪现。仅 iOS（App Store 审核要求），Android 直接视为已同意。 */
+export function useAiConsent() {
+  const [status, setStatus] = useState<AiConsentStatus>(Platform.OS === 'ios' ? 'loading' : 'granted');
+  useEffect(() => {
+    if (Platform.OS !== 'ios') return;
+    let alive = true;
+    AsyncStorage.getItem(AI_CONSENT_KEY)
+      .then((v) => { if (alive) setStatus(v === '1' ? 'granted' : 'needed'); })
+      .catch(() => { if (alive) setStatus('needed'); });
+    return () => { alive = false; };
+  }, []);
+  const grant = useCallback(() => {
+    setStatus('granted');
+    AsyncStorage.setItem(AI_CONSENT_KEY, '1').catch(() => undefined);
+  }, []);
+  return { status, grant };
+}
+
+export function AiConsentModal({ visible, onAgree, onDecline }: { visible: boolean; onAgree: () => void; onDecline: () => void }) {
+  const t = useTheme();
+  const openPrivacy = () => { Linking.openURL(`${getBaseUrl().replace(/\/+$/, '')}/privacy-policy`).catch(() => undefined); };
+  return (
+    <Modal visible={visible} transparent animationType="fade" onRequestClose={onDecline} statusBarTranslucent>
+      {/* 居中确认对话框需要压暗背景（共享 Scrim 是透明的，底部 sheet 惯例不压暗，这里局部加）；拦截背景点击 */}
+      <Pressable style={[StyleSheet.absoluteFill, { backgroundColor: 'rgba(0,0,0,0.45)' }]} />
+      <View style={{ position: 'absolute', left: 26, right: 26, top: 0, bottom: 0, alignItems: 'center', justifyContent: 'center' }} pointerEvents="box-none">
+        <View style={{ width: '100%', backgroundColor: t.bg2, borderRadius: 22, borderWidth: 1, borderColor: t.line2, padding: 22, ...t.shLift }}>
+          <Text style={{ color: t.tx, fontSize: 18, fontWeight: '700', marginBottom: 12 }}>使用 AI 编程助手</Text>
+          <Text style={{ color: t.tx2, fontSize: 14, lineHeight: 22 }}>
+            为给你提供 AI 编程协助，你在任务中提交的内容（你的指令、代码、文件、图片等）会被发送至 AI 模型进行处理，其中可能包含第三方 AI 服务商。点击「同意并继续」即表示你已知晓并同意上述数据处理方式。
+          </Text>
+          <Pressable onPress={openPrivacy} hitSlop={6} style={{ marginTop: 10 }}>
+            <Text style={{ color: t.acTx, fontSize: 13, fontWeight: '600' }}>查看《隐私政策》</Text>
+          </Pressable>
+          <Pressable onPress={onAgree} style={({ pressed }) => [{ marginTop: 20, backgroundColor: t.ac, borderRadius: 14, paddingVertical: 14, alignItems: 'center' }, pressed && { opacity: 0.85 }]}>
+            <Text style={{ color: t.acInk, fontSize: 15, fontWeight: '700' }}>同意并继续</Text>
+          </Pressable>
+          <Pressable onPress={onDecline} style={{ marginTop: 8, paddingVertical: 12, alignItems: 'center' }}>
+            <Text style={{ color: t.tx3, fontSize: 14, fontWeight: '600' }}>暂不使用</Text>
+          </Pressable>
+        </View>
+      </View>
+    </Modal>
+  );
+}