Consider it done. The open-source AI agent that works out of the box · 想到,就能做到。开源、开箱即用的 AI Agent。
TypeScript agentai-agentai-assistantandroidclaude-codecodexelectroniosllmmacosreact-nativetypescriptwindows
fix(remote): 在桌面和移动控制端显示输入框推荐指令
DavidShen519b433eeef4
diff --git a/apps/desktop/src/main/maker-ipc/__tests__/predictPromptIpcBoundary.test.ts b/apps/desktop/src/main/maker-ipc/__tests__/predictPromptIpcBoundary.test.tsindex e2a3e227df..a85adef2a4 100644--- a/apps/desktop/src/main/maker-ipc/__tests__/predictPromptIpcBoundary.test.ts+++ b/apps/desktop/src/main/maker-ipc/__tests__/predictPromptIpcBoundary.test.ts@@ -6,6 +6,7 @@* 必须做 sender 断言 + 运行期结构/长度/枚举校验(TS 类型不等于运行期校验)。*/import { beforeEach, describe, expect, it, vi } from 'vitest';+import { runDeviceLinkInvokeContext } from '../../device-link/invoke-context.js';const h = vi.hoisted(() => ({handlers: new Map<string, (...args: unknown[]) => unknown>(),@@ -336,6 +337,15 @@ beforeEach(() => {});describe('maker:predict-prompt — sender 断言', () => {+ it.each(['win32', 'darwin', 'ios', 'android'])('trusted %s controllers can request host predictions', async (controllerPlatform) => {+ h.trusted = false; // Tunnel dispatch has no local Renderer sender.+ const result = await runDeviceLinkInvokeContext({+ controllerDeviceId: 'controller-a', controllerPlatform, channel: 'maker:predict-prompt',+ }, () => invokePredict(VALID_REQUEST));+ expect(result).toEqual({ prompt: '下一步做什么' });+ expect(h.predict).toHaveBeenCalledTimes(1);+ });+it('非受信来源(子 frame / WebView)被拒,且不调用付费模型', async () => {h.trusted = false;@@ -504,6 +514,23 @@ describe('maker:predict-prompt — DB 防御纵深(远程会话拒绝)', () => {});describe('maker:predict-prompt — 多窗口同轮幂等', () => {+ it('cache-only navigation never starts a prediction and can reuse a later live result', async () => {+ await expect(invokePredict({ ...VALID_REQUEST, cacheOnly: true })).resolves.toEqual({ prompt: null });+ expect(h.predict).not.toHaveBeenCalled();+ expect(h.drainPersistQueue).not.toHaveBeenCalled();++ await expect(invokePredict(VALID_REQUEST)).resolves.toEqual({ prompt: '下一步做什么' });+ await expect(invokePredict({ ...VALID_REQUEST, cacheOnly: true })).resolves.toEqual({ prompt: '下一步做什么' });+ expect(h.predict).toHaveBeenCalledTimes(1);+ });++ it('cache-only requests still reject a cached result after a new turn starts', async () => {+ await invokePredict(VALID_REQUEST);+ h.sessionRow = { ...h.sessionRow!, activeTurnStartedAt: 3 };+ await expect(invokePredict({ ...VALID_REQUEST, cacheOnly: true })).resolves.toEqual({ prompt: null });+ expect(h.predict).toHaveBeenCalledTimes(1);+ });+it('同一 session 同一 completion revision 并发时共享 Promise 和结果', async () => {let resolveFirst!: (value: string) => void;h.predict.mockImplementationOnce(diff --git a/apps/desktop/src/main/maker-ipc/title.ts b/apps/desktop/src/main/maker-ipc/title.tsindex ed19e5b430..85d5d58509 100644--- a/apps/desktop/src/main/maker-ipc/title.ts+++ b/apps/desktop/src/main/maker-ipc/title.ts@@ -287,7 +287,7 @@ function parseAgentKind(raw: unknown): AgentKind {}/**- * `generate-title` / `regenerate-title` 可经 device-link allowlist 从受控设备调用。+ * 标题与输入推荐可经 device-link allowlist 从控制设备调用。* 远程来源只信主进程 AsyncLocalStorage 上下文,不信 payload 自报;本机调用仍要求真实* Electron 顶层 Renderer sender。*/@@ -355,6 +355,7 @@ interface PredictPromptRequest {agentKind: AgentKind;turnGen: number;completionRevision: number;+ cacheOnly?: boolean;}interface PromptPredictionCacheEntry {@@ -370,7 +371,10 @@ function parsePredictPromptRequest(raw: unknown): PredictPromptRequest {if (!raw || typeof raw !== 'object' || Array.isArray(raw)) {throwIpcError('INVALID_PARAMS', 'predict-prompt request must be a non-null object');}- const { sessionId, agentKind, turnGen, completionRevision } = raw as Record<string, unknown>;+ const { sessionId, agentKind, turnGen, completionRevision, cacheOnly } = raw as Record<string, unknown>;+ if (cacheOnly !== undefined && typeof cacheOnly !== 'boolean') {+ throwIpcError('INVALID_PARAMS', 'cacheOnly must be a boolean');+ }if (typeof sessionId !== 'string' || !sessionId || sessionId.length > SESSION_ID_MAX) {throwIpcError('INVALID_PARAMS', 'invalid or missing sessionId for predict-prompt');}@@ -399,6 +403,7 @@ function parsePredictPromptRequest(raw: unknown): PredictPromptRequest {agentKind: agentKind as AgentKind,turnGen,completionRevision,+ cacheOnly,};}@@ -462,6 +467,9 @@ async function predictPromptForCompletedRevision(if (cached.workingDir !== (sessionRow.workingDir ?? null)) return null;return cached.promise;}+ // Opening a completed remote task may reuse a live host prediction, but must+ // not turn historical navigation into a new paid model request.+ if (request.cacheOnly) return null;if (cached && cached.revision > completionRevision) {return null;}@@ -624,7 +632,7 @@ export function registerMakerTitleIpc(options: RegisterMakerTitleIpcOptions = {});// 输入框推荐提示词:turn 结束后预测用户下一步输入,复用 title one-shot 基础设施。// 本 handler 会触发一次付费模型调用,按 electron-security-and-process-boundaries §5- // 做 sender 断言 + 运行期 payload 校验 + DB 防御纵深(远程会话拒绝)。+ // 本机校验 sender,远程校验 dispatch 持有的身份上下文;素材与完成轮次仍由 DB 复核。// TODO: promptPrediction.ts 中新增的 system prompt 固定指令进入模型 system 段,// 按 docs/dev-rules/maker-core-and-agent-behavior.md §4 需在合并前取得维护者确认。// 跟踪: PR #1965 review thread #3791318742@@ -634,7 +642,7 @@ export function registerMakerTitleIpc(options: RegisterMakerTitleIpcOptions = {}event: Electron.IpcMainInvokeEvent,request: unknown,): Promise<{ prompt: string | null }> => {- assertTrustedAppRendererEvent(event);+ assertTitleIpcCaller(event);const parsed = parsePredictPromptRequest(request);try {return {diff --git a/apps/desktop/src/renderer/__tests__/makerTransportRouting.test.ts b/apps/desktop/src/renderer/__tests__/makerTransportRouting.test.tsindex f3dfaab9ed..c679658348 100644--- a/apps/desktop/src/renderer/__tests__/makerTransportRouting.test.ts+++ b/apps/desktop/src/renderer/__tests__/makerTransportRouting.test.ts@@ -27,6 +27,7 @@ function stubElectron() {dispatchOrcaUiAssignment: vi.fn(),disableOrca: vi.fn(),regenerateSessionTitle: vi.fn().mockResolvedValue({ title: 'local title' }),+ predictNextPrompt: vi.fn().mockResolvedValue({ prompt: 'local prompt' }),plugins: { getState: vi.fn().mockResolvedValue({ effectiveEnabled: true }) },input: { clearSession: vi.fn(), compact: vi.fn() },};@@ -241,6 +242,20 @@ describe('makerApiFor 路由(完整对等会话级操作)', () => {expect(invoke).not.toHaveBeenCalled();});+ it('输入框推荐在远程会话由被控端生成,不回落到控制端', async () => {+ const { makerSpies, invoke } = stubElectron();+ const { makerApiFor } = await import('@/lib/makerTransport');+ const { remoteProjectsStore } = await import('@/features/device-link/remoteProjectsStore');+ remoteProjectsStore.setDeviceSessions('dev-1', 'Mac', [sess('rs')]);++ const request = {+ sessionId: 'rs', agentKind: 'codex' as const, messages: [], turnGen: 2, completionRevision: 9,+ };+ await makerApiFor('rs').predictNextPrompt(request);+ expect(invoke).toHaveBeenCalledWith('dev-1', 'maker:predict-prompt', [request]);+ expect(makerSpies.predictNextPrompt).not.toHaveBeenCalled();+ });+it('远程会话 patchMeta(删/归档/改名/置顶)经隧道 local-db:sessions:patch-meta', async () => {const { invoke } = stubElectron();const { remoteProjectsStore } = await import('@/features/device-link/remoteProjectsStore');diff --git a/apps/desktop/src/renderer/components/new-chat/ChatInput.tsx b/apps/desktop/src/renderer/components/new-chat/ChatInput.tsxindex 0e6711a6f9..de4ad74bdc 100644--- a/apps/desktop/src/renderer/components/new-chat/ChatInput.tsx+++ b/apps/desktop/src/renderer/components/new-chat/ChatInput.tsx@@ -396,7 +396,7 @@ import { createWorkLouderCodexVoiceGesture } from '@/lib/workLouderCodexVoiceGesimport { appendMentionChip } from './mentionChipInsertion';// device-link 远程会话:设置变更不落本地 DB(会 404),改写远程内存层 + 运行时隧道。import { getSessionDeviceId } from '@/features/device-link/remoteProjectsStore';-import { makerApiFor, makerApiForDevice } from '@/lib/makerTransport';+import { makerApiFor, makerApiForDevice, makerApiForSticky } from '@/lib/makerTransport';import { SESSION_LINK_DROP_MIME } from '@/lib/sessionLinkDrop';const log = createLogger('ChatInput');@@ -1306,12 +1306,12 @@ export function ChatInput({dismissPromptRecommendation(sessionId, recommendation.revision);return;}- // remote / review/read-only 保持原有 fail-closed 语义。deviceLinkDeviceId=undefined- // 是归属尚未解析的暂态,先保留 candidate;解析为本地 null 后再继续。+ // deviceLinkDeviceId=undefined 是归属尚未解析的暂态,先保留 candidate;+ // 远程推荐通过被控端 maker 隧道生成,避免在控制端读取不到会话素材。if (deviceLinkDeviceId === undefined || runtimeAgentKind == null || !hasPredictionMessages) {return;}- if (deviceLinkDeviceId !== null || remoteHostId || disabled) {+ if (remoteHostId || disabled) {dismissPromptRecommendation(sessionId, recommendation.revision);return;}@@ -1342,7 +1342,7 @@ export function ChatInput({content: message.content,}));- window.electronAPI.maker+ makerApiForSticky(requestSessionId).predictNextPrompt({sessionId: requestSessionId,agentKind: runtimeAgentKind,diff --git a/apps/desktop/src/renderer/lib/makerTransport.ts b/apps/desktop/src/renderer/lib/makerTransport.tsindex 4d3a8f77ee..d953d3b72a 100644--- a/apps/desktop/src/renderer/lib/makerTransport.ts+++ b/apps/desktop/src/renderer/lib/makerTransport.ts@@ -42,6 +42,7 @@ type FullMaker = typeof window.electronAPI.maker;* REMOTE_INVOKE_ALLOWLIST 白名单内(被控端执行前还会再校验一层)。*/export interface RoutableMaker {+ predictNextPrompt: FullMaker['predictNextPrompt'];listBotDelegations: FullMaker['listBotDelegations'];cancelBotDelegation: FullMaker['cancelBotDelegation'];getBotDirectMessageThread: FullMaker['getBotDirectMessageThread'];@@ -144,6 +145,7 @@ function remoteMakerApi(deviceId: string): RoutableMaker {(...args: unknown[]): Promise<unknown> =>invokeRemote(deviceId, channel, args);return {+ predictNextPrompt: t('maker:predict-prompt') as FullMaker['predictNextPrompt'],listBotDelegations: t('maker:bot-delegations:list') as FullMaker['listBotDelegations'],cancelBotDelegation: t('maker:bot-delegation:cancel') as FullMaker['cancelBotDelegation'],getBotDirectMessageThread: t('maker:bot-direct-message-thread:get') as FullMaker['getBotDirectMessageThread'],diff --git a/apps/desktop/src/renderer/lib/promptRecommendationStore.ts b/apps/desktop/src/renderer/lib/promptRecommendationStore.tsindex 9c8bb73bca..1eaf053340 100644--- a/apps/desktop/src/renderer/lib/promptRecommendationStore.ts+++ b/apps/desktop/src/renderer/lib/promptRecommendationStore.ts@@ -8,6 +8,8 @@ import {syncPromptRecommendationPreferenceFromStorageValue,} from '@/hooks/usePromptRecommendationPreference';import { makerChatStore } from '@/lib/makerChatStore';+import { isDeviceLinkRemotePushCurrent } from '@/lib/remoteDataOwnerPushFence';+import { getStickySessionDeviceId } from '@/features/device-link/stickySessionOrigin';/*** 输入框推荐提示词的 session 级运行期状态。@@ -161,6 +163,10 @@ function applyRunningSnapshot(snapshot: ReadonlyMap<string, { isRunning: boolean}runningSessionIds.add(sessionId);sawRunningSessionIds.add(sessionId);+ // A new running edge is a new completion generation. Do not let the+ // previous generation's revision fence suppress a later completion that+ // happens to reuse the same millisecond timestamp.+ handledCompletionRevisions.delete(sessionId);if (startedAt != null) runStartedAtBySession.set(sessionId, startedAt);else runStartedAtBySession.delete(sessionId);// 新 turn 开始:旧完成 patch / 推荐 / 在途 renderer Promise 全部作废。@@ -220,6 +226,20 @@ export function initializePromptRecommendationStore(): void {}globalUnsubscribers.push(subscribePromptRecommendationPreference(handlePreferenceChanged));+ const remotePush = window.electronAPI?.deviceLink?.onRemotePush;+ if (remotePush) {+ globalUnsubscribers.push(remotePush((push, ownerStamp) => {+ if (push.channel !== 'local-db:sessions:patched' ||+ !isDeviceLinkRemotePushCurrent(push, ownerStamp)) return;+ const payload = push.payload as { sessionId?: string; patch?: Record<string, unknown> } | null;+ if (!payload?.sessionId || getStickySessionDeviceId(payload.sessionId) !== push.deviceId) return;+ if (payload.patch?.status === 'deleted') {+ clearPromptRecommendationSession(payload.sessionId);+ } else if (typeof payload.patch?.lastTurnEndedAt === 'number') {+ noteTurnEnded(payload.sessionId, payload.patch.lastTurnEndedAt);+ }+ }));+ }const onStorage = (event: StorageEvent) => {if (event.key !== PROMPT_RECOMMENDATION_KEY) return;// 先同步偏好模块的 memoryValue,再由 lifecycle subscription 清理 Store;diff --git a/apps/mobile/app/sessions/[sessionId].tsx b/apps/mobile/app/sessions/[sessionId].tsxindex 209f7ef4ff..da1de018fc 100644--- a/apps/mobile/app/sessions/[sessionId].tsx+++ b/apps/mobile/app/sessions/[sessionId].tsx@@ -77,6 +77,7 @@ import type { TextInput as NativeTextInput } from 'react-native';import { ScreenBackButton } from '@/components/MobilePrimitives';import { SafeAreaView, useSafeAreaInsets } from 'react-native-safe-area-context';import { useAuth } from '@/auth/AuthContext';+import { usePromptRecommendation } from '@/session/usePromptRecommendation';import { useGuardedBack } from '@/utils/useGuardedBack';import { useGuardedPush } from '@/utils/useGuardedPush';import { DEVICE_LINK_API_BASE_URL, MOBILE_VISUAL_MOCK_ENABLED } from '@/config/env';@@ -1072,6 +1073,12 @@ export default function SessionScreen() {const inputProjection = useSessionInputProjection(sessionId);const remoteSessionRunning = useSessionRunning(sessionId);const makerTurnRunning = useSessionMakerTurnRunning(sessionId);+ const recommendationSession = sessions.find((item) => item.id === sessionId);+ const { prompt: promptRecommendation, dismiss: dismissPromptRecommendation } = usePromptRecommendation({+ ownerId: auth.user?.id, deviceId, sessionId, maker,+ agentKind: recommendationSession ? agentKindForSession(recommendationSession) : null,+ revision: recommendationSession?.lastTurnEndedAt, running: remoteSessionRunning,+ });const remoteSessionRunStatus = useSessionRunStatus(sessionId);const taskUpdates = useSessionTaskUpdates(sessionId);const activeComposerDraftScopeKey = composerDraftScopeKey(sessionId, routeDraft);@@ -6129,6 +6136,7 @@ export default function SessionScreen() {return;}pendingSkillSelectionRef.current = null;+ dismissPromptRecommendation();// 乐观第一拍:点发送立刻清空输入框并跟到底部,不等任何网络往返(enqueue 是// device-link 远程调用,弱网下数秒;文字已捕获进 text)。失败时若输入框仍为空// 则恢复原文——用户可能在 await 期间又打了字,不能覆盖。@@ -9682,6 +9690,8 @@ export default function SessionScreen() {</View>) : null}<SessionComposerInput+ promptRecommendation={promptRecommendation}+ onDismissPromptRecommendation={dismissPromptRecommendation}key={activeComposerDraftScopeKey}source={composerDraftSource}sessionId={sessionId}@@ -10387,6 +10397,8 @@ interface SessionComposerControls {voiceButton: (style?: StyleProp<ViewStyle>) => ReactNode;}interface SessionComposerInputProps {+ promptRecommendation?: string | null;+ onDismissPromptRecommendation?: () => void;source: ComposerDraftSource;sessionId: string;composerInputRef: RefObject<ComposerRichInputHandle | null>;@@ -10425,6 +10437,8 @@ interface SessionComposerInputProps {/** High-frequency editor, dictation, timer and resize state stops at this boundary. */function SessionComposerInput({+ promptRecommendation,+ onDismissPromptRecommendation,source, sessionId, composerInputRef, canUseComposer, canStopComposer, canUseRemoteSessionControls, remoteUnavailableReason, voiceState, voiceStartPending, voiceError, composerVoiceHoldArmed, setComposerVoiceHoldArmed, modelSheetOpen, permissionSheetOpen, sending, queueBusy, nativeShellLayout, composerTouchLayout, keyboardState, attachmentError, visualFocusComposer, applyRichComposerChange, setComposerDraft, handleComposerInputPressIn, beginPastePlaceholders, failPastePlaceholders, resolvePastedSessionLinkLabel, openVoiceSettings,composerSendUnavailableReason, attachmentCount, pendingUploadCount,onPasteImages, onDragActiveChange, renderControls,@@ -10452,6 +10466,11 @@ function SessionComposerInput({// 引用已是 ComposerDocument 内的 atom;排队编辑同样可能只有引用而没有可见// 文本,因此必须计入 payload,否则「保存修改」会被错误禁用。const composerQuoteCount = composerDocumentQuotes(composerDocument).length;+ const visibleRecommendation = promptRecommendation+ && !draft.trim() && !composerQuoteCount && !attachmentCount && !pendingUploadCount+ && canUseComposer && !canStopComposer && !sending && !queueBusy+ && !voiceIsBusy && !voiceStartPending+ ? promptRecommendation : null;// Context 面板是 Modal sheet,不再有内联附件面板 → attachmentPickerOpen 恒 false。const composerLayout = useMemo(() => buildSessionComposerLayout({attachmentBusy: false,@@ -10792,6 +10811,32 @@ function SessionComposerInput({styles.composerSurface,compactComposer && !composerCardActive && styles.composerSurfaceCompact,]}>+ {visibleRecommendation ? (+ <View style={styles.promptRecommendationRow} testID="session.promptRecommendation">+ <Pressable+ accessibilityRole="button"+ accessibilityLabel={visibleRecommendation}+ onPress={() => { onDismissPromptRecommendation?.(); setComposerDraft(visibleRecommendation); composerInputRef.current?.focus(); }}+ style={styles.promptRecommendationAction}+ >+ <Sparkles color={colors.statusAccent} size={iconSize.md} strokeWidth={iconStroke.regular} />+ <Text numberOfLines={3} style={styles.promptRecommendationText}>+ {visibleRecommendation}+ </Text>+ <ChevronRight color={colors.textSecondary} size={iconSize.md} strokeWidth={iconStroke.regular} />+ </Pressable>+ <Pressable+ accessibilityLabel={t('session.common.dismissRecommendation')}+ accessibilityRole="button"+ hitSlop={COMPOSER_CONTROL_HIT_SLOP}+ onPress={onDismissPromptRecommendation}+ style={styles.promptRecommendationDismiss}+ testID="session.promptRecommendationDismiss"+ >+ <X color={colors.textSecondary} size={iconSize.md} strokeWidth={iconStroke.regular} />+ </Pressable>+ </View>+ ) : null}<MobileComposerInputRowkey={sessionId}frameOutside={nativeComposerFrameAvailable}@@ -11956,6 +12001,39 @@ const makeStyles = (colors: ThemeColors) => StyleSheet.create({...StyleSheet.absoluteFill,overflow: 'hidden',},+ promptRecommendationRow: {+ alignItems: 'center',+ flexDirection: 'row',+ marginBottom: spacing.sm,+ minHeight: MOBILE_COMPOSER_MIN_TOUCH_TARGET,+ },+ promptRecommendationAction: {+ minHeight: MOBILE_COMPOSER_MIN_TOUCH_TARGET,+ alignItems: 'center',+ // Use the base surface so the recommendation reads as a distinct inset card+ // inside the lighter composer frame in both themes.+ backgroundColor: colors.surface,+ borderColor: colors.border,+ borderRadius: radius.container,+ borderWidth: 1,+ flex: 1,+ flexDirection: 'row',+ minWidth: 0,+ paddingHorizontal: spacing.md,+ paddingVertical: spacing.sm,+ },+ promptRecommendationText: {+ ...MOBILE_COMPOSER_DRAFT_TEXT_STYLE,+ color: colors.textPrimary,+ flex: 1,+ marginHorizontal: spacing.sm,+ },+ promptRecommendationDismiss: {+ alignItems: 'center',+ justifyContent: 'center',+ height: MOBILE_COMPOSER_MIN_TOUCH_TARGET,+ width: MOBILE_COMPOSER_MIN_TOUCH_TARGET,+ },// 草稿滚动层填满外层触摸区(外层负责「点输入区停听写」,自身 pointerEvents 关闭)。voiceDraftScroll: {flex: 1,diff --git a/apps/mobile/src/__tests__/mobileMakerTransport.test.ts b/apps/mobile/src/__tests__/mobileMakerTransport.test.tsindex af2c6c3237..0ab72a6275 100644--- a/apps/mobile/src/__tests__/mobileMakerTransport.test.ts+++ b/apps/mobile/src/__tests__/mobileMakerTransport.test.ts@@ -220,6 +220,7 @@ describe("mobile maker transport", () => {"local-db:messages:dismiss-error","local-db:sessions:ack-interrupted","maker:regenerate-title",+ "maker:predict-prompt","local-db:messages:list","local-db:messages:view","local-db:messages:work-details",diff --git a/apps/mobile/src/__tests__/usePromptRecommendation.test.tsx b/apps/mobile/src/__tests__/usePromptRecommendation.test.tsxnew file mode 100644index 0000000000..980b7e8cc5--- /dev/null+++ b/apps/mobile/src/__tests__/usePromptRecommendation.test.tsx@@ -0,0 +1,84 @@+// @vitest-environment jsdom+import { act, createElement } from 'react';+import { createRoot, type Root } from 'react-dom/client';+import { afterEach, beforeEach, expect, it, vi } from 'vitest';+import { usePromptRecommendation } from '@/session/usePromptRecommendation';++Object.assign(globalThis, { IS_REACT_ACT_ENVIRONMENT: true });+let root: Root;+let props: Parameters<typeof usePromptRecommendation>[0];+let value: ReturnType<typeof usePromptRecommendation>;+let request: ReturnType<typeof vi.fn>;+let sequence = 0;+function Probe() { value = usePromptRecommendation(props); return null; }+async function render(patch: Partial<typeof props> = {}) {+ props = { ...props, ...patch };+ await act(async () => root.render(createElement(Probe)));+}+async function advance() { await act(async () => vi.advanceTimersByTimeAsync(500)); }+beforeEach(() => {+ vi.useFakeTimers();+ request = vi.fn().mockResolvedValue({ prompt: 'Suggested next step' });+ props = { ownerId: 'owner', deviceId: 'host', sessionId: `task-${++sequence}`, agentKind: 'codex',+ revision: 10, running: false, maker: { predictNextPrompt: request } };+ root = createRoot(document.createElement('div'));+});+afterEach(async () => { await act(async () => root.unmount()); vi.useRealTimers(); });++it('historical navigation only requests a cached host result', async () => {+ await render(); await advance();+ expect(request).toHaveBeenCalledWith(expect.objectContaining({ cacheOnly: true, completionRevision: 10 }));+ expect(value.prompt).toBe('Suggested next step');+});++it('waits for the new completion revision even when stopped arrives first', async () => {+ await render({ running: true }); await advance();+ expect(request).not.toHaveBeenCalled();+ await render({ running: false }); await advance();+ expect(request).toHaveBeenLastCalledWith(expect.objectContaining({ cacheOnly: true }));+ await render({ revision: 20 }); await advance();+ expect(request).toHaveBeenLastCalledWith(expect.objectContaining({ cacheOnly: false, completionRevision: 20 }));+});++it('dismissal or sending rejects late results and survives a page remount', async () => {+ let resolve!: (result: { prompt: string }) => void;+ request.mockImplementationOnce(() => new Promise((done) => { resolve = done; }));+ await render(); await advance();+ await act(async () => value.dismiss());+ await act(async () => resolve({ prompt: 'Late suggestion' }));+ expect(value.prompt).toBeNull();+ await act(async () => root.render(null));+ await render(); await advance();+ expect(value.prompt).toBeNull();+ expect(request).toHaveBeenCalledTimes(1);+ await render({ running: true });+ await render({ running: false, revision: 30 }); await advance();+ expect(value.prompt).toBe('Suggested next step');+});++it('does not show a previous task result while changing task or running again', async () => {+ await render(); await advance();+ expect(value.prompt).toBeTruthy();+ await render({ sessionId: `${props.sessionId}-other` });+ expect(value.prompt).toBeNull();+ await advance();+ await render({ running: true });+ expect(value.prompt).toBeNull();+});++it('owner and device changes cannot reuse a dismissed revision or an old promise', async () => {+ let resolve!: (result: { prompt: string }) => void;+ request.mockImplementationOnce(() => new Promise((done) => { resolve = done; }));+ await render(); await advance();+ await render({ ownerId: 'other', deviceId: 'other-host' });+ await act(async () => resolve({ prompt: 'Wrong owner' }));+ expect(value.prompt).toBeNull();+ await advance();+ expect(value.prompt).toBe('Suggested next step');+});++it('old hosts without the channel fail silently', async () => {+ request.mockRejectedValue(new Error('CHANNEL_NOT_ALLOWED'));+ await render(); await advance();+ expect(value.prompt).toBeNull();+});diff --git a/apps/mobile/src/device-link/mobileMakerTransport.ts b/apps/mobile/src/device-link/mobileMakerTransport.tsindex 63ae93600d..952503b661 100644--- a/apps/mobile/src/device-link/mobileMakerTransport.ts+++ b/apps/mobile/src/device-link/mobileMakerTransport.ts@@ -428,6 +428,14 @@ export type MobileWorktreeCreateResult =};export interface MobileMakerTransport {+ /** 在被控端生成当前任务完成后的输入框推荐提示词。 */+ predictNextPrompt(request: {+ sessionId: string;+ agentKind: MobileAgentKind;+ turnGen: number;+ completionRevision: number;+ cacheOnly?: boolean;+ }): Promise<{ prompt: string | null }>;createSession(opts: CreateSessionOptions): Promise<CreateSessionResult>;getCapabilities(agentKind: MobileAgentKind): Promise<unknown>;/**@@ -1047,6 +1055,7 @@ export function createMobileMakerTransport({call("maker:apply-new-maker-draft-pref", [pref]),getNewMakerDefaults: (agentKind) =>call("maker:get-new-maker-defaults", [agentKind]),+ predictNextPrompt: (request) => call('maker:predict-prompt', [request]),applyNewMakerWorktreePref: (worktreeEnabled) =>call("maker:apply-new-maker-worktree-pref", [{ worktreeEnabled }]),getNewMakerWorktreeBranchPref: (baseRepo) =>diff --git a/apps/mobile/src/i18n/locales/en/session.json b/apps/mobile/src/i18n/locales/en/session.jsonindex aea41fe373..ef0c4ad25d 100644--- a/apps/mobile/src/i18n/locales/en/session.json+++ b/apps/mobile/src/i18n/locales/en/session.json@@ -7,6 +7,7 @@},"common": {"cancel": "Cancel",+ "dismissRecommendation": "Dismiss recommendation","delete": "Delete","openContextPanel": "Open context panel","groupMode": "Mode",diff --git a/apps/mobile/src/i18n/locales/ja/session.json b/apps/mobile/src/i18n/locales/ja/session.jsonindex 86573ee91a..a1c1fa7122 100644--- a/apps/mobile/src/i18n/locales/ja/session.json+++ b/apps/mobile/src/i18n/locales/ja/session.json@@ -7,6 +7,7 @@},"common": {"cancel": "キャンセル",+ "dismissRecommendation": "おすすめを閉じる","delete": "削除","openContextPanel": "コンテキストパネルを開く","groupMode": "モード",diff --git a/apps/mobile/src/i18n/locales/ko/session.json b/apps/mobile/src/i18n/locales/ko/session.jsonindex 57d6c3457e..1a6af3f763 100644--- a/apps/mobile/src/i18n/locales/ko/session.json+++ b/apps/mobile/src/i18n/locales/ko/session.json@@ -7,6 +7,7 @@},"common": {"cancel": "취소",+ "dismissRecommendation": "추천 닫기","delete": "삭제","openContextPanel": "컨텍스트 패널 열기","groupMode": "모드",diff --git a/apps/mobile/src/i18n/locales/zh-CN/session.json b/apps/mobile/src/i18n/locales/zh-CN/session.jsonindex 1002e14993..6e0394256a 100644--- a/apps/mobile/src/i18n/locales/zh-CN/session.json+++ b/apps/mobile/src/i18n/locales/zh-CN/session.json@@ -7,6 +7,7 @@},"common": {"cancel": "取消",+ "dismissRecommendation": "关闭推荐","delete": "删除","openContextPanel": "打开上下文面板","groupMode": "模式",diff --git a/apps/mobile/src/i18n/locales/zh-TW/session.json b/apps/mobile/src/i18n/locales/zh-TW/session.jsonindex 211eb06669..055c128632 100644--- a/apps/mobile/src/i18n/locales/zh-TW/session.json+++ b/apps/mobile/src/i18n/locales/zh-TW/session.json@@ -7,6 +7,7 @@},"common": {"cancel": "取消",+ "dismissRecommendation": "關閉推薦","delete": "刪除","openContextPanel": "開啟上下文面板","groupMode": "模式",diff --git a/apps/mobile/src/session/usePromptRecommendation.ts b/apps/mobile/src/session/usePromptRecommendation.tsnew file mode 100644index 0000000000..ab114ec187--- /dev/null+++ b/apps/mobile/src/session/usePromptRecommendation.ts@@ -0,0 +1,99 @@+import { useCallback, useEffect, useRef, useState } from 'react';+import type { MobileAgentKind, MobileMakerTransport } from '@/device-link/mobileMakerTransport';++// Runtime-only consumption survives page remounts; owner/device/task are all part of the key.+const consumedRevisions = new Map<string, number>();++export function usePromptRecommendation({ ownerId, deviceId, sessionId, agentKind, revision, running, maker }: {+ ownerId?: string;+ deviceId: string;+ sessionId: string;+ agentKind: MobileAgentKind | null;+ revision?: number | null;+ running: boolean;+ maker: Pick<MobileMakerTransport, 'predictNextPrompt'>;+}) {+ const scope = JSON.stringify([ownerId, deviceId, sessionId]);+ const [result, setResult] = useState<{ scope: string; revision: number; prompt: string } | null>(null);+ // The transport is recreated when the device-link context refreshes. Keep the+ // latest callable without treating that refresh as a new recommendation run.+ const makerRef = useRef(maker);+ makerRef.current = maker;+ const request = useRef<{ scope: string; revision: number; cacheOnly: boolean } | null>(null);+ const observed = useRef({+ scope,+ running: false,+ sawRunning: false,+ revisionAtStart: 0,+ lastRevision: null as number | null,+ });+ const current = useRef({ scope, revision, running });+ current.current = { scope, revision, running };+ const dismiss = useCallback(() => {+ if (revision) consumedRevisions.set(scope, revision);+ setResult(null);+ }, [scope, revision]);++ useEffect(() => {+ if (observed.current.scope !== scope) {+ observed.current = {+ scope,+ running: false,+ sawRunning: false,+ revisionAtStart: 0,+ lastRevision: null,+ };+ request.current = null;+ setResult(null);+ }+ const run = observed.current;+ // A sessions patch can deliver the new completion revision without a+ // visible running edge (for example while the phone is reconnecting).+ // Remember the latest revision so that a strictly newer completion still+ // starts a live prediction instead of being treated as history.+ const revisionAdvanced = revision != null+ && run.lastRevision != null+ && revision > run.lastRevision;+ if (revision != null) run.lastRevision = revision;+ if (running) {+ if (!run.running) {+ // A fresh running edge starts a new completion generation. A dismissal+ // from the previous generation must not suppress this one.+ consumedRevisions.delete(scope);+ run.sawRunning = true;+ run.revisionAtStart = revision ?? 0;+ request.current = null;+ setResult(null);+ }+ run.running = true;+ return;+ }+ run.running = false;+ if (!deviceId || !sessionId || !agentKind || !revision || consumedRevisions.get(scope) === revision) return;+ // Historical navigation only reuses a host result; it never starts a paid prediction.+ // An ended patch may arrive after stopped, so keep the observed run until then.+ const cacheOnly = (!run.sawRunning && !revisionAdvanced)+ || (run.sawRunning && revision <= run.revisionAtStart);+ if (request.current?.scope === scope && request.current.revision === revision+ && request.current.cacheOnly === cacheOnly) return;+ request.current = { scope, revision, cacheOnly };+ let cancelled = false;+ const timer = setTimeout(() => {+ void makerRef.current.predictNextPrompt({ sessionId, agentKind, turnGen: 0, completionRevision: revision, cacheOnly })+ .then(({ prompt }) => {+ const latest = current.current;+ if (!cancelled && latest.scope === scope && latest.revision === revision && !latest.running+ && consumedRevisions.get(scope) !== revision && prompt) {+ setResult({ scope, revision, prompt });+ }+ }).catch(() => { /* Old hosts and unavailable predictions remain silent. */ });+ }, 500);+ return () => { cancelled = true; clearTimeout(timer); };+ }, [scope, deviceId, sessionId, agentKind, revision, running]);++ return {+ prompt: !running && result?.scope === scope && result.revision === revision+ && consumedRevisions.get(scope) !== revision ? result.prompt : null,+ dismiss,+ };+}diff --git a/packages/device-link/src/allowlist.ts b/packages/device-link/src/allowlist.tsindex a34670c965..3f2a7b9173 100644--- a/packages/device-link/src/allowlist.ts+++ b/packages/device-link/src/allowlist.ts@@ -396,6 +396,8 @@ const EXTENDED_INVOKE_CHANNELS: readonly string[] = [// 重生成标题(与 generate-title 同一 oneShot 通道)。老被控端无此 channel →// CHANNEL_NOT_ALLOWED → 控制端按生成失败提示。'maker:regenerate-title',+ // 输入框推荐提示词:在被控端读取会话素材并使用被控端模型凭证生成。+ 'maker:predict-prompt','maker:get-context-usage',// workflow 逐 agent 进度树(只读):handler 纯 fs 读 Claude Code workflow 记录文件,// 无 event.sender 依赖、无副作用;记录文件真相在被控端 HOME(控制端本机读必落空)。diff --git a/packages/maker-shared/src/deviceLinkContract.ts b/packages/maker-shared/src/deviceLinkContract.tsindex 433243b8ce..d31751a20c 100644--- a/packages/maker-shared/src/deviceLinkContract.ts+++ b/packages/maker-shared/src/deviceLinkContract.ts@@ -279,6 +279,8 @@ export const MOBILE_REMOTE_INVOKE_CHANNELS = [// 会话菜单重命名的「自动起名」:被控端读该会话素材重新生成标题(与桌面 Magic 按钮// 同一 handler;老被控端 CHANNEL_NOT_ALLOWED → 手机端展示失败提示,不阻塞手动改名)。'maker:regenerate-title',+ // 输入框推荐提示词:由被控端读取真实会话素材生成。+ 'maker:predict-prompt','local-db:messages:list','local-db:messages:view','local-db:messages:work-details',