Consider it done. The open-source AI agent that works out of the box · 想到,就能做到。开源、开箱即用的 AI Agent。
TypeScript agentai-agentai-assistantandroidclaude-codecodexelectroniosllmmacosreact-nativetypescriptwindows
fix: 为旧任务闭流错误提供可读历史恢复入口
DavidShenddeaf5da7c49
diff --git a/apps/desktop/src/main/maker-host/__tests__/codexProxyHost.test.ts b/apps/desktop/src/main/maker-host/__tests__/codexProxyHost.test.tsindex f52aa51128..dbaaf2ab8b 100644--- a/apps/desktop/src/main/maker-host/__tests__/codexProxyHost.test.ts+++ b/apps/desktop/src/main/maker-host/__tests__/codexProxyHost.test.ts@@ -466,6 +466,38 @@ describe('codex gateway config', () => {});describe('createCrossProviderCompactionCompatTransform', () => {+ it('preserves child ciphertext on GPT API routes even when recorded under a subscription parent', async () => {+ const host = await freshCodexProxyHost();+ const legacy = 'OLD_SUBSCRIPTION_COLLAB';+ const oldPart = { type: 'encrypted_content', encrypted_content: legacy };+ const freshPart = { type: 'encrypted_content', encrypted_content: 'NEW_API_COLLAB' };+ const readable = { type: 'input_text', text: 'readable result' };+ const mixed = { type: 'agent_message', id: 'amsg_old', author: 'worker', recipient: 'parent', content: [readable, oldPart, freshPart] };+ const opaque = { type: 'agent_message', content: [oldPart] };+ const reasoning = { type: 'reasoning', encrypted_content: legacy };+ const compaction = { type: 'compaction', encrypted_content: legacy };+ const tool = { type: 'function_call_output', call_id: 'call_1', output: JSON.stringify(opaque) };+ const body = { model: 'openai/gpt-6-luna', input: [mixed, opaque, reasoning, compaction, tool] };+ const before = structuredClone(body);+ host.registerComposed('legacy-session', 'legacy-thread', 'PRODUCT_PROMPT');+ const transform = host.createCrossProviderCompactionCompatTransform();+ const ctx = { ...CTX_BASE, upstreamBase: 'https://gateway.example.com/v1', headers: { 'thread-id': 'legacy-thread' } };+ expect(transform(body, ctx)).toBeNull();+ expect(body).toEqual(before);+ expect(transform(body, { ...ctx, upstreamBase: 'https://chatgpt.com/backend-api/codex' })).toBeNull();+ expect(transform(body, { ...ctx, headers: { 'thread-id': 'unrelated-thread' } })).toBeNull();+ expect(host.registerChildThread('legacy-thread', 'child-thread')).toBe(true);+ expect(transform(body, { ...ctx, headers: { 'thread-id': 'child-thread' } })).toBeNull();+ const onlyNew = { model: body.model, input: [{ ...mixed, content: [freshPart] }] };+ expect(transform(onlyNew, ctx)).toBeNull();+ expect(transform(onlyNew, { ...ctx, headers: { 'thread-id': 'child-thread' } })).toBeNull();+ host.unregister('legacy-session');+ expect(transform(body, ctx)).toBeNull();+ expect(transform(body, { ...ctx, headers: { 'thread-id': 'child-thread' } })).toBeNull();+ host.registerComposed('new-session', 'legacy-thread', 'PRODUCT_PROMPT');+ expect(transform(body, ctx)).toBeNull();+ host.unregister('new-session');+ });const CTX_BASE = { reqId: 1, method: 'POST', url: '/responses', headers: { 'thread-id': 't-1' } };const compactionItem = { type: 'compaction', encrypted_content: 'ENC' };const contextCompactionItem = { type: 'context_compaction', id: 'cc_1', encrypted_content: 'ENC2' };diff --git a/apps/desktop/src/main/maker-host/codex-proxy-host.ts b/apps/desktop/src/main/maker-host/codex-proxy-host.tsindex ced5e19469..56094828db 100644--- a/apps/desktop/src/main/maker-host/codex-proxy-host.ts+++ b/apps/desktop/src/main/maker-host/codex-proxy-host.ts@@ -2089,7 +2089,7 @@ function isGptEncryptedHistoryModel(model: string | null | undefined): boolean {** - 加密 compaction 仍替换成明文上下文缺失提示。* - 多 Agent 历史会在 agent_message.content 里夹带仅兼容 GPT Responses 上游可解的- * encrypted_content;ChatGPT 与版本化 gpt-* / namespace/gpt-* 模型原样透传。其它模型+ * encrypted_content;ChatGPT 与 GPT API 原样透传,记录线程的身份不能证明子消息的密文来源。其它模型* 只删除这些嵌套密文,保留可读正文与路由元数据;若消息只剩密文则整条丢弃。* - reasoning.encrypted_content 不属于本故障;继续交给后续供应商兼容层判断,* 不在这里扩大删除面。@@ -2134,10 +2134,10 @@ export function createCrossProviderCompactionCompatTransform(): RequestTransformif (!ctx.upstreamBase) return null;const requestModel = isPlainObject(body) && typeof body.model === 'string' ? body.model : '';const providerContext = providerContextForRequest(ctx.headers, requestModel);- if (- isChatGptUpstreamBase(ctx.upstreamBase) ||- isGptEncryptedHistoryModel(providerContext.catalogModel)- ) return null;+ // A subscription parent can receive messages from an independently routed API+ // child. Native parent identity is not evidence that its ciphertext is invalid.+ if (isChatGptUpstreamBase(ctx.upstreamBase)+ || isGptEncryptedHistoryModel(providerContext.catalogModel)) return null;const replaced = rewriteCrossProviderHistoryItems(body);if (!replaced) return null;log.info('rewrote incompatible Codex history for non-GPT model', {diff --git a/apps/desktop/src/renderer/components/chat/ErrorBanner.tsx b/apps/desktop/src/renderer/components/chat/ErrorBanner.tsxindex d06ece65e8..3146e8aa5c 100644--- a/apps/desktop/src/renderer/components/chat/ErrorBanner.tsx+++ b/apps/desktop/src/renderer/components/chat/ErrorBanner.tsx@@ -1,6 +1,7 @@import { useCodexRateLimits } from '@/hooks/useCodexRateLimits';import { useCodexRateLimitReset } from '@/hooks/useCodexRateLimitReset';import { Button } from '@/components/ui/button';+import { isSharedTaskPeer } from '@cindy/device-link';import { isCodexGatewayWireModel, isOpenAiSubscriptionProvider } from '@cindy/model-providers';import { useProviders } from '@/hooks/useProviders';/**@@ -19,7 +20,7 @@ import { useProviders } from '@/hooks/useProviders';import { useEffect, useState } from 'react';import { isCodexResumeNotReadyProjectionError } from '@cindy/maker-shared/agent-input-projection';-import { isCindyGatewayProxyTokenInvalidError, isResponsesLiteParallelToolCallsError, parseAgentErrorCode, redactSensitiveText } from '@cindy/maker-shared/error-redaction';+import { canOfferCodexHistoryRecovery, isCindyGatewayProxyTokenInvalidError, isResponsesLiteParallelToolCallsError, parseAgentErrorCode, redactSensitiveText } from '@cindy/maker-shared/error-redaction';import { chatRemoteErrorGuidanceKey } from '@/lib/autoReviewUnavailableGuidance';import {AlertCircle,@@ -207,6 +208,9 @@ export function ErrorBanner({!isAnyRemoteSession &&!silentEncryptedRetryEnabled &&isInvalidEncryptedContentError(error);+ const showHistoryRecovery = Boolean(onForkStripEncrypted) && !isSharedTaskPeer(deviceLinkDeviceId) && canOfferCodexHistoryRecovery({+ message: error, agentKind, remoteHostId, agentDeviceId, running: isRecoverable,+ });const isOversizedHistoryError =agentKind === 'codex' && errorReason === 'codex_history_oversized';// SSH 不能自动剥图。本机 / device-link 由 main 侧协调器就地恢复,横幅不给按钮。@@ -648,6 +652,19 @@ export function ErrorBanner({>{displayError}</span>+ {showHistoryRecovery && (+ <div className="mt-2 space-y-2">+ <p className="text-12 text-[var(--text-secondary)]">+ {t('chat.errorBanner.readableHistoryRecoveryDescription')}+ </p>+ <Button size="sm" compact data-split-pane-route-action=""+ loading={forkStripEncryptedRunning}+ onClick={() => void onForkStripEncrypted?.()}>+ <GitFork size={12} />+ {t('chat.errorBanner.readableHistoryRecovery')}+ </Button>+ </div>+ )}{(isNetworkishError ||isOverloadError ||isStreamInterrupted ||@@ -806,13 +823,14 @@ export function ErrorBanner({{safeRetryText && (<buttontype="button"+ disabled={forkStripEncryptedRunning}onClick={() => onRetry(safeRetryText)}className={cn('shrink-0 flex items-center gap-1 text-xs font-medium',isOpenAiConnectionExpired? 'text-[var(--text-primary)]': 'text-[var(--error-fg)]',- 'hover:opacity-70 transition-opacity',+ 'enabled:hover:opacity-70 transition-opacity disabled:opacity-60',)}title={t('chat.errorBanner.retryTitle')}>diff --git a/apps/desktop/src/renderer/components/chat/__tests__/ErrorBannerCodexOAuth.test.tsx b/apps/desktop/src/renderer/components/chat/__tests__/ErrorBannerCodexOAuth.test.tsxindex cfe79b620d..6ef04f1805 100644--- a/apps/desktop/src/renderer/components/chat/__tests__/ErrorBannerCodexOAuth.test.tsx+++ b/apps/desktop/src/renderer/components/chat/__tests__/ErrorBannerCodexOAuth.test.tsx@@ -1,8 +1,10 @@// @vitest-environment jsdomimport { act, fireEvent, render, renderHook, screen, waitFor } from '@testing-library/react';+import { useState } from 'react';import { beforeEach, describe, expect, it, vi } from 'vitest';import { CODEX_RESUME_NOT_READY_WIRE_MESSAGE } from '@cindy/maker-shared/agent-input-projection';+import { sharedTaskHostPeer } from '@cindy/device-link';import { ErrorBanner } from '../ErrorBanner';import { ErrorTailErrorBanner } from '../InterruptedTurnBanner';@@ -50,10 +52,12 @@ function emitCodexStateChanged(payload: Omit<AuthStateChangedPayload, 'agentKindfunction deferred<T>() {let resolve!: (value: T) => void;- const promise = new Promise<T>((done) => {+ let reject!: (error: Error) => void;+ const promise = new Promise<T>((done, fail) => {resolve = done;+ reject = fail;});- return { promise, resolve };+ return { promise, resolve, reject };}vi.mock('react-i18next', () => ({@@ -75,6 +79,75 @@ vi.mock('@/lib/toast', () => ({}));describe('ErrorBanner OpenAI connection recovery', () => {+ const streamClosed = 'stream disconnected before completion: stream closed before response.completed';+ it.each([undefined, 'controlled-device'])('offers manual recovery and keeps retry on device %s', async deviceLinkDeviceId => {+ const recover = vi.fn();+ const retry = vi.fn();+ render(<ErrorBanner error={streamClosed} agentKind="codex" deviceLinkDeviceId={deviceLinkDeviceId}+ silentEncryptedRetryEnabled onForkStripEncrypted={recover} onRetry={retry} retryText="original" />);+ expect(recover).not.toHaveBeenCalled();+ expect(screen.getByText('chat.errorBanner.readableHistoryRecoveryDescription')).toBeTruthy();+ fireEvent.click(screen.getByRole('button', { name: 'chat.errorBanner.retry' }));+ expect(retry).toHaveBeenCalledWith('original');+ expect(recover).not.toHaveBeenCalled();+ fireEvent.click(screen.getByRole('button', { name: 'chat.errorBanner.readableHistoryRecovery' }));+ expect(recover).toHaveBeenCalledOnce();+ });++ it.each([+ { isRecoverable: true }, { remoteHostId: 'ssh' }, { agentDeviceId: 'hosted' },+ { deviceLinkDeviceId: sharedTaskHostPeer('shared-task', 'owner-device') },+ { agentKind: 'cc' as const }, { onForkStripEncrypted: undefined },+ { error: 'Connection reset' },+ ])('hides manual history recovery when unavailable: %s', props => {+ render(<ErrorBanner error={streamClosed} agentKind="codex" onRetry={vi.fn()}+ onForkStripEncrypted={vi.fn()} {...props} />);+ expect(screen.queryByRole('button', { name: 'chat.errorBanner.readableHistoryRecovery' })).toBeNull();+ });++ it('offers the same recovery for a persisted error and disables it while pending', () => {+ const recover = vi.fn();+ const retry = vi.fn();+ const { rerender } = render(<ErrorTailErrorBanner errorText={streamClosed} agentKind="codex" onContinue={retry}+ onDismiss={vi.fn()} onForkStripEncrypted={recover} forkStripEncryptedRunning />);+ const button = screen.getByRole('button', { name: 'chat.errorBanner.readableHistoryRecovery' });+ expect((button as HTMLButtonElement).disabled).toBe(true);+ fireEvent.click(button);+ expect(recover).not.toHaveBeenCalled();+ const retryButton = screen.getByRole('button', { name: 'chat.errorBanner.retry' }) as HTMLButtonElement;+ expect(retryButton.disabled).toBe(true);+ fireEvent.click(retryButton);+ expect(retry).not.toHaveBeenCalled();+ rerender(<ErrorTailErrorBanner errorText={streamClosed} agentKind="codex" onContinue={retry}+ onDismiss={vi.fn()} onForkStripEncrypted={recover} />);+ fireEvent.click(screen.getByRole('button', { name: 'chat.errorBanner.retry' }));+ expect(retry).toHaveBeenCalledOnce();+ });++ it('blocks live retry until recovery settles and restores it on recovery failure', async () => {+ const retry = vi.fn();+ const pending = deferred<void>();+ function Harness() {+ const [busy, setBusy] = useState(false);+ return <ErrorBanner error={streamClosed} agentKind="codex" retryText="original" onRetry={retry}+ forkStripEncryptedRunning={busy} onForkStripEncrypted={async () => {+ setBusy(true);+ try { await pending.promise; } catch { /* parent displays recovery error */ }+ finally { setBusy(false); }+ }} />;+ }+ render(<Harness />);+ fireEvent.click(screen.getByRole('button', { name: 'chat.errorBanner.readableHistoryRecovery' }));+ const retryButton = screen.getByRole('button', { name: 'chat.errorBanner.retry' }) as HTMLButtonElement;+ expect(retryButton.disabled).toBe(true);+ fireEvent.click(retryButton);+ expect(retry).not.toHaveBeenCalled();+ await act(async () => pending.reject(new Error('recovery unavailable')));+ expect(retryButton.disabled).toBe(false);+ fireEvent.click(retryButton);+ expect(retry).toHaveBeenCalledWith('original');+ });+beforeEach(() => {vi.clearAllMocks();mocks.stateChangedListeners.clear();diff --git a/apps/desktop/src/renderer/components/chat/__tests__/embeddedSessionNavigation.test.tsx b/apps/desktop/src/renderer/components/chat/__tests__/embeddedSessionNavigation.test.tsxindex 6c07a2f0af..65e8b3f19a 100644--- a/apps/desktop/src/renderer/components/chat/__tests__/embeddedSessionNavigation.test.tsx+++ b/apps/desktop/src/renderer/components/chat/__tests__/embeddedSessionNavigation.test.tsx@@ -443,7 +443,7 @@ describe('sidebar-embedded session navigation boundary', () => {'if (sessionNavigationVersionRef.current !== navigationRequestVersion) return;',);expect(source).toContain(- 'if (sessionNavigationVersionRef.current !== forkStripNavigationVersion) return;',+ 'if (sessionNavigationVersionRef.current !== forkStripNavigationVersion || !recovery.isCurrent()) return;',);expect(source).toContain('isNavigationCurrent:');expect(source).toContain('[navigationMode, sessionId],');diff --git a/apps/desktop/src/renderer/features/cc-agent/CCAgentSessionView.tsx b/apps/desktop/src/renderer/features/cc-agent/CCAgentSessionView.tsxindex 54b9c3633b..1a226be4d1 100644--- a/apps/desktop/src/renderer/features/cc-agent/CCAgentSessionView.tsx+++ b/apps/desktop/src/renderer/features/cc-agent/CCAgentSessionView.tsx@@ -188,6 +188,7 @@ import {useRemoteSessionConnection,} from '@/features/cc-agent/hooks/useRemoteSessionConnection';import { useSessionTurnActiveTruth } from '@/features/cc-agent/hooks/useSessionTurnActiveTruth';+import { useHistoryRecoveryNavigation } from '@/features/cc-agent/hooks/useHistoryRecoveryNavigation';import { useRemoteSessionLoading } from '@/features/cc-agent/hooks/useRemoteSessionLoading';import { RemoteSessionBanner } from './RemoteSessionBanner';import { decideRemoteSessionExit } from './remoteSessionExit';@@ -841,7 +842,6 @@ export function CCAgentSessionView({const setRightSidebarSessionId = outletContext?.setRightSidebarSessionId;const setRightSidebarWorkdir = outletContext?.setRightSidebarWorkdir;const { enabled: silentEncryptedRetryEnabled } = useSilentEncryptedRetry();- const [forkStripEncryptedRunning, setForkStripEncryptedRunning] = useState(false);// 从 Automations 的 RunHistoryCard 跳过来的 navigate 会带 state.from='automations',// 在聊天区左上角显示一个返回按钮;点别的 session 入口(不带 state)时按钮自然消失。const navState = location.state as { from?: string } | null;@@ -2058,6 +2058,18 @@ export function CCAgentSessionView({// device-link 远程会话用被控端经隧道带来的 providers(per-provider,fast 判定与本地同口径)。const { providers: localProviders } = useProviders();const { mode: authMode, user: authUser, dataOwnerId, deviceId: selfDeviceId } = useAuth();+ const {+ begin: beginHistoryRecovery,+ invalidate: invalidateHistoryRecoveryNavigation,+ isPending: isHistoryRecoveryPending,+ pending: forkStripEncryptedRunning,+ } =+ useHistoryRecoveryNavigation({+ source: `${dataOwnerId}:${remoteDeviceId ?? ''}:${sessionId}:${navigationMode}`,+ running: agentStatus.isRunning || isStreaming || remoteTurnActive,+ startedAt: session?.activeTurnStartedAt ?? null,+ endedAt: session?.lastTurnEndedAt ?? null,+ });// Agent 在另一台电脑运行的任务:模型目录同样以那台为准(任务本身在本机)。const agentDeviceId = remoteDeviceId ? undefined : (session?.agentDeviceId ?? undefined);// 远程 Agent:本机任务的模型面板也列出其他电脑的供应商(选中 = 把 Agent 挪过去,下一条消息@@ -2388,7 +2400,8 @@ export function CCAgentSessionView({}}, [syntheticContinuationPending, errorTailBannerHiddenFor]);const handleErrorTailContinue = useCallback(async () => {- if (!sessionId || !errorTailMsg) return;+ if (!sessionId || !errorTailMsg || isHistoryRecoveryPending()) return;+ invalidateHistoryRecoveryNavigation();setErrorTailBannerHiddenFor(errorTailMsg.clientId);try {// 隐藏的英文续跑指令([UI_ACTION_TRIGGER] 前缀,消息流不渲染)——用户视角@@ -2420,6 +2433,8 @@ export function CCAgentSessionView({}, [errorTailKind,errorTailMsg,+ invalidateHistoryRecoveryNavigation,+ isHistoryRecoveryPending,markCurrentUnreadFailedScheduleRun,rebuildClaudeSubscriptionSessionBeforeRetry,sessionId,@@ -3750,6 +3765,7 @@ export function CCAgentSessionView({) => {if (readOnly) return false;if (cindyMakeInputLocked) return false;+ invalidateHistoryRecoveryNavigation();const deliveryMode = opts?.deliveryMode ?? 'queue';const originalMessage = message;const navigationRequestVersion =@@ -4019,6 +4035,7 @@ export function CCAgentSessionView({[maybeDispatchDesktopSlashCommand,maybeShowContextUsage,+ invalidateHistoryRecoveryNavigation,folderPickerOpen,isCodex,canNavigateSession,@@ -4224,12 +4241,14 @@ export function CCAgentSessionView({// useSessionRunningStatus 在 running 上升沿把 orphan 的 error 角标 explicit 清掉。// 失败路径则天然保留红点,与仍在展示的横幅一致。const handleRetry = useCallback(() => {+ if (isHistoryRecoveryPending()) return;+ invalidateHistoryRecoveryNavigation();void rebuildClaudeSubscriptionSessionBeforeRetry(errorReason).then(() => retryLastError()).catch((error) => {log.warn('retryLastError failed', error);});- }, [errorReason, rebuildClaudeSubscriptionSessionBeforeRetry, retryLastError]);+ }, [errorReason, invalidateHistoryRecoveryNavigation, isHistoryRecoveryPending, rebuildClaudeSubscriptionSessionBeforeRetry, retryLastError]);const handleSwitchToClaudeSubscription = useCallback(async (): Promise<void> => {if (!sessionId || !session || !canSwitchToClaudeSubscription) return;@@ -4315,20 +4334,22 @@ export function CCAgentSessionView({}, [clearError, sessionId]);const handleForkStripEncrypted = useCallback(async () => {- if (!sessionId || session?.agentKind !== 'codex') return;+ if (!sessionId || session?.agentKind !== 'codex' ||+ isSharedTaskPeer(getSessionDeviceId(sessionId))) return;if (!canNavigateSession) {log.info('encrypted-session fork ignored by embedded sidebar view', { sessionId });return;}+ const recovery = beginHistoryRecovery();+ if (!recovery) return;const forkStripNavigationVersion = ++sessionNavigationVersionRef.current;- setForkStripEncryptedRunning(true);try {const newSession = await sessionService.forkStripEncrypted(sessionId);await refreshServerSession();// 远程会话:新会话在被控端,先重拉该设备会话列表注册新 sessionId 再 navigate(否则 404)。const deviceId = getSessionDeviceId(sessionId);if (deviceId) await refreshRemoteDeviceSessions(deviceId);- if (sessionNavigationVersionRef.current !== forkStripNavigationVersion) return;+ if (sessionNavigationVersionRef.current !== forkStripNavigationVersion || !recovery.isCurrent()) return;onSessionNavigate?.(newSession.id, newSession.id);navigate(`/cc-agent/${newSession.id}`);} catch (err) {@@ -4342,10 +4363,11 @@ export function CCAgentSessionView({: detail,);} finally {- setForkStripEncryptedRunning(false);+ recovery.release();}}, [canNavigateSession,+ beginHistoryRecovery,navigate,onSessionNavigate,refreshServerSession,@@ -5299,7 +5321,7 @@ export function CCAgentSessionView({}silentEncryptedRetryEnabled={silentEncryptedRetryEnabled}onForkStripEncrypted={- !readOnly && canNavigateSession ? handleForkStripEncrypted : undefined+ !readOnly && canNavigateSession && !isSharedTaskPeer(remoteDeviceId) ? handleForkStripEncrypted : undefined}forkStripEncryptedRunning={forkStripEncryptedRunning}style={{ width: inputWidth }}@@ -5376,7 +5398,7 @@ export function CCAgentSessionView({errorSourceProviderId={liveErrorSourceProviderId}silentEncryptedRetryEnabled={silentEncryptedRetryEnabled}onForkStripEncrypted={- !readOnly && canNavigateSession ? handleForkStripEncrypted : undefined+ !readOnly && canNavigateSession && !isSharedTaskPeer(remoteDeviceId) ? handleForkStripEncrypted : undefined}forkStripEncryptedRunning={forkStripEncryptedRunning}style={{ width: inputWidth }}diff --git a/apps/desktop/src/renderer/features/cc-agent/hooks/__tests__/useHistoryRecoveryNavigation.test.tsx b/apps/desktop/src/renderer/features/cc-agent/hooks/__tests__/useHistoryRecoveryNavigation.test.tsxnew file mode 100644index 0000000000..4ca5445dba--- /dev/null+++ b/apps/desktop/src/renderer/features/cc-agent/hooks/__tests__/useHistoryRecoveryNavigation.test.tsx@@ -0,0 +1,119 @@+// @vitest-environment jsdom+import { act, renderHook } from '@testing-library/react';+import { describe, expect, it, vi } from 'vitest';+import { useHistoryRecoveryNavigation } from '../useHistoryRecoveryNavigation';++const idle = { source: 'owner:device:task', running: false, startedAt: 100, endedAt: 101 };+type Recovery = NonNullable<ReturnType<ReturnType<typeof useHistoryRecoveryNavigation>['begin']>>;++function begin(result: { current: ReturnType<typeof useHistoryRecoveryNavigation> }): Recovery {+ let recovery!: Recovery;+ act(() => { recovery = result.current.begin()!; });+ return recovery;+}++function deferred() {+ let resolve!: () => void;+ const promise = new Promise<void>(done => { resolve = done; });+ return { promise, resolve };+}++describe('history recovery navigation', () => {+ it('allows an unchanged source to navigate when recovery completes', async () => {+ const { result, rerender } = renderHook(props => useHistoryRecoveryNavigation(props), { initialProps: idle });+ const pending = deferred();+ const navigate = vi.fn();+ const recovery = begin(result);+ const completion = pending.promise.then(() => { if (recovery.isCurrent()) navigate(); });+ rerender({ ...idle });+ await act(async () => { pending.resolve(); await completion; });+ expect(navigate).toHaveBeenCalledOnce();+ });++ it.each(['running', 'turn-between-renders', 'input', 'route', 'url-before-render', 'url-roundtrip-before-render', 'unmount'] as const)(+ 'does not navigate after %s supersedes a pending recovery', async change => {+ const { result, rerender, unmount } = renderHook(props => useHistoryRecoveryNavigation(props), { initialProps: idle });+ const pending = deferred();+ const navigate = vi.fn();+ const recovery = begin(result);+ const completion = pending.promise.then(() => { if (recovery.isCurrent()) navigate(); });+ if (change === 'running') {+ rerender({ ...idle, running: true });+ expect(result.current.begin()).toBeNull();+ // Returning to idle must not revive the earlier navigation.+ rerender({ ...idle });+ } else if (change === 'turn-between-renders') {+ rerender({ ...idle, startedAt: 200, endedAt: 201 });+ } else if (change === 'input') {+ act(() => result.current.invalidate());+ } else if (change === 'route') {+ rerender({ ...idle, source: 'owner:device:other-task' });+ rerender({ ...idle });+ } else if (change === 'url-before-render' || change === 'url-roundtrip-before-render') {+ const previousUrl = window.location.href;+ window.history.pushState({ key: 'other-task' }, '', '#/cc-agent/other-task');+ if (change === 'url-roundtrip-before-render') {+ window.history.pushState({ key: 'returned-task' }, '', previousUrl);+ }+ } else {+ unmount();+ }+ await act(async () => { pending.resolve(); await completion; });+ expect(navigate).not.toHaveBeenCalled();+ },+ );++ it('allows a later recovery without reviving the superseded one', () => {+ const { result } = renderHook(() => useHistoryRecoveryNavigation(idle));+ const old = begin(result);+ act(() => result.current.invalidate());+ expect(old.isCurrent()).toBe(false);+ act(() => old.release());+ const fresh = begin(result);+ expect(fresh.isCurrent()).toBe(true);+ act(() => old.release());+ expect(result.current.pending).toBe(true);+ expect(result.current.isPending()).toBe(true);+ });++ it.each(['source-first', 'destination-first'] as const)(+ 'keeps pending recovery scoped to its task when completion order is %s', order => {+ const { result, rerender } = renderHook(props => useHistoryRecoveryNavigation(props), { initialProps: idle });+ const sourceRecovery = begin(result);+ expect(result.current.pending).toBe(true);+ expect(result.current.isPending()).toBe(true);+ expect(result.current.begin()).toBeNull();++ const destination = { ...idle, source: 'owner:device:other-task' };+ rerender(destination);+ expect(result.current.pending).toBe(false);+ expect(result.current.isPending()).toBe(false);+ expect(sourceRecovery.isCurrent()).toBe(false);+ const destinationRecovery = begin(result);+ expect(result.current.pending).toBe(true);++ const first = order === 'source-first' ? sourceRecovery : destinationRecovery;+ const last = order === 'source-first' ? destinationRecovery : sourceRecovery;+ act(() => first.release());+ expect(result.current.pending).toBe(order === 'source-first');+ expect(result.current.isPending()).toBe(order === 'source-first');+ rerender(idle);+ expect(result.current.pending).toBe(order === 'destination-first');+ expect(result.current.isPending()).toBe(order === 'destination-first');+ expect(sourceRecovery.isCurrent()).toBe(false);+ act(() => last.release());+ expect(result.current.pending).toBe(false);+ rerender(destination);+ expect(result.current.pending).toBe(false);+ },+ );++ it('locks synchronously before a second same-task request can start', () => {+ const { result } = renderHook(() => useHistoryRecoveryNavigation(idle));+ act(() => {+ expect(result.current.begin()).not.toBeNull();+ expect(result.current.isPending()).toBe(true);+ expect(result.current.begin()).toBeNull();+ });+ });+});diff --git a/apps/desktop/src/renderer/features/cc-agent/hooks/useHistoryRecoveryNavigation.ts b/apps/desktop/src/renderer/features/cc-agent/hooks/useHistoryRecoveryNavigation.tsnew file mode 100644index 0000000000..8817773502--- /dev/null+++ b/apps/desktop/src/renderer/features/cc-agent/hooks/useHistoryRecoveryNavigation.ts@@ -0,0 +1,48 @@+import { useCallback, useEffect, useRef, useState } from 'react';++/** A new source turn or input intent permanently supersedes an in-flight recovery's navigation. */+export function useHistoryRecoveryNavigation(input: {+ source: string;+ running: boolean;+ startedAt: number | null;+ endedAt: number | null;+}) {+ const [operations, setOperations] = useState<ReadonlyMap<string, symbol>>(() => new Map());+ const operationsRef = useRef(operations);+ const current = useRef({ ...input });+ const previous = current.current;+ if (previous.source !== input.source || previous.running !== input.running ||+ previous.startedAt !== input.startedAt || previous.endedAt !== input.endedAt) {+ current.current = { ...input };+ }+ const invalidate = useCallback(() => {+ current.current = { ...current.current };+ }, []);+ useEffect(() => invalidate, [invalidate]);++ const isPending = useCallback(() => operationsRef.current.has(current.current.source), []);+ const begin = useCallback(() => {+ const source = current.current;+ if (source.running || operationsRef.current.has(source.source)) return null;+ // HashRouter can update browser history before React renders the new source.+ const href = window.location.href;+ const locationKey = window.history.state?.key;+ const token = Symbol();+ const next = new Map(operationsRef.current);+ next.set(source.source, token);+ operationsRef.current = next;+ setOperations(next);+ return {+ isCurrent: () => current.current === source && window.location.href === href &&+ window.history.state?.key === locationKey,+ release: () => {+ if (operationsRef.current.get(source.source) !== token) return;+ const remaining = new Map(operationsRef.current);+ remaining.delete(source.source);+ operationsRef.current = remaining;+ setOperations(remaining);+ },+ };+ }, []);+ return { begin, invalidate, isPending, pending: operations.has(input.source) };+}diff --git a/apps/desktop/src/renderer/i18n/locales/en/common.json b/apps/desktop/src/renderer/i18n/locales/en/common.jsonindex 82019c9eee..9ede9690f9 100644--- a/apps/desktop/src/renderer/i18n/locales/en/common.json+++ b/apps/desktop/src/renderer/i18n/locales/en/common.json@@ -10505,6 +10505,8 @@"syncAuthFailed": "Sync failed: {{msg}}","syncAuthDaemonRestartFailed": "Credentials pushed, but the old daemon did not restart — reconnect to the remote before retrying","invalidEncryptedContent": "Switching providers made the previous encryption unusable. This session can only continue under the original provider, or click Fork to drop the protocol-encrypted content and continue in a new session.",+ "readableHistoryRecovery": "New task from readable history",+ "readableHistoryRecoveryDescription": "If retry keeps failing, create a new task using readable history. Internal encrypted information is omitted. The original task is kept, and the failed message is not resent automatically.","forkStripEncrypted": "Fork and strip","forkStripEncryptedRunning": "Forking…","forkStripEncryptedTitle": "Fork and strip into a new session",diff --git a/apps/desktop/src/renderer/i18n/locales/ja/common.json b/apps/desktop/src/renderer/i18n/locales/ja/common.jsonindex 06dfced78d..eae8ba780b 100644--- a/apps/desktop/src/renderer/i18n/locales/ja/common.json+++ b/apps/desktop/src/renderer/i18n/locales/ja/common.json@@ -10463,6 +10463,8 @@"syncAuthFailed": "同期に失敗しました:{{msg}}","syncAuthDaemonRestartFailed": "認証情報はリモートに送信されましたが、古い daemon が再起動されませんでした — リモートに再接続してから再試行してください","invalidEncryptedContent": "プロバイダーを変更したため、以前の暗号化が使用できなくなりました。このセッションは元のプロバイダーでのみ続行できます。または Fork をクリックしてプロトコル暗号化コンテンツを破棄し、新しいセッションで続行してください。",+ "readableHistoryRecovery": "読み取れる履歴から新しいタスクを作成",+ "readableHistoryRecoveryDescription": "再試行しても失敗する場合は、読み取れる履歴から新しいタスクを作成できます。内部の暗号化情報は省略されます。元のタスクは保持され、失敗したメッセージは自動で再送信されません。","forkStripEncrypted": "Fork して切り離す","forkStripEncryptedRunning": "Fork 中…","forkStripEncryptedTitle": "暗号化推論を除いた新しいセッションを Fork で作成",diff --git a/apps/desktop/src/renderer/i18n/locales/ko/common.json b/apps/desktop/src/renderer/i18n/locales/ko/common.jsonindex 94bd506dd4..5c5e504aa3 100644--- a/apps/desktop/src/renderer/i18n/locales/ko/common.json+++ b/apps/desktop/src/renderer/i18n/locales/ko/common.json@@ -10463,6 +10463,8 @@"syncAuthFailed": "동기화 실패: {{msg}}","syncAuthDaemonRestartFailed": "자격 증명이 원격에 푸시되었지만 이전 daemon이 재시작되지 않았습니다 — 원격에 다시 연결한 후 재시도하세요","invalidEncryptedContent": "제공자 변경으로 이전 암호화를 사용할 수 없습니다. 이 세션은 원래 제공자에서만 계속할 수 있으며, 또는 Fork를 클릭하여 프로토콜 암호화 콘텐츠를 버리고 새 세션에서 계속할 수 있습니다.",+ "readableHistoryRecovery": "읽을 수 있는 기록으로 새 작업 만들기",+ "readableHistoryRecoveryDescription": "재시도해도 실패하면 읽을 수 있는 기록으로 새 작업을 만들 수 있습니다. 내부 암호화 정보는 제외됩니다. 기존 작업은 유지되며 실패한 메시지는 자동으로 다시 전송되지 않습니다.","forkStripEncrypted": "Fork 및 분리","forkStripEncryptedRunning": "Fork 중…","forkStripEncryptedTitle": "암호화 추론을 제거한 새 세션으로 Fork",diff --git a/apps/desktop/src/renderer/i18n/locales/zh-CN/common.json b/apps/desktop/src/renderer/i18n/locales/zh-CN/common.jsonindex d87aa77c41..45a962c26c 100644--- a/apps/desktop/src/renderer/i18n/locales/zh-CN/common.json+++ b/apps/desktop/src/renderer/i18n/locales/zh-CN/common.json@@ -10463,6 +10463,8 @@"syncAuthFailed": "同步失败:{{msg}}","syncAuthDaemonRestartFailed": "凭证已推送到远端,但旧 daemon 没重启 — 请重连远端后再点重试","invalidEncryptedContent": "由于更换供应商导致加密不可用,本任务只能在原供应商下使用,或点此 Fork 丢弃协议加密内容并在新任务继续。",+ "readableHistoryRecovery": "用可读历史新建任务",+ "readableHistoryRecoveryDescription": "如果重试仍然失败,可用可读历史新建任务,省略内部加密信息。原任务保留,失败消息不会自动重发。","forkStripEncrypted": "Fork 并剥离","forkStripEncryptedRunning": "Fork 中…","forkStripEncryptedTitle": "Fork 并剥离出新任务(去掉加密推理内容)",diff --git a/apps/desktop/src/renderer/i18n/locales/zh-TW/common.json b/apps/desktop/src/renderer/i18n/locales/zh-TW/common.jsonindex 97b22b6400..35dfaec9ed 100644--- a/apps/desktop/src/renderer/i18n/locales/zh-TW/common.json+++ b/apps/desktop/src/renderer/i18n/locales/zh-TW/common.json@@ -10462,6 +10462,8 @@"syncAuthFailed": "同步失敗:{{msg}}","syncAuthDaemonRestartFailed": "憑證已推送到遠端,但舊 daemon 沒重啟 — 請重連遠端後再點重試","invalidEncryptedContent": "由於更換供應商導致加密不可用,本任務只能在原供應商下使用,或點此 Fork 丟棄協議加密內容並在新任務繼續。",+ "readableHistoryRecovery": "用可讀歷史建立新任務",+ "readableHistoryRecoveryDescription": "如果重試仍然失敗,可用可讀歷史建立新任務,略過內部加密資訊。原任務會保留,失敗訊息不會自動重新傳送。","forkStripEncrypted": "Fork 並剝離","forkStripEncryptedRunning": "Fork 中…","forkStripEncryptedTitle": "Fork 並剝離出新任務(去掉加密推理內容)",diff --git a/apps/mobile/app/sessions/[sessionId].tsx b/apps/mobile/app/sessions/[sessionId].tsxindex 21cbed8738..3b03856b82 100644--- a/apps/mobile/app/sessions/[sessionId].tsx+++ b/apps/mobile/app/sessions/[sessionId].tsx@@ -413,6 +413,8 @@ import {} from '@/session/queueEditLifecycle';import { findErrorTailClientId, isContinuationQueueItem, resolveSessionTailBanner } from '@/session/sessionTailBannerModel';import { SessionTailBanner } from '@/session/SessionTailBanner';+import { useHistoryRecoveryNavigation } from '@/session/useHistoryRecoveryNavigation';+import { canOfferCodexHistoryRecovery } from '@cindy/maker-shared/error-redaction';import {CONTINUE_AFTER_APP_EXIT_PROMPT,CONTINUE_AFTER_ERROR_PROMPT,@@ -4433,6 +4435,18 @@ export default function SessionScreen() {() => sending || canStopQueue || remoteSessionRunning || currentTurnStreaming,[canStopQueue, currentTurnStreaming, remoteSessionRunning, sending],);+ const {+ begin: beginHistoryRecovery,+ invalidate: invalidateHistoryRecoveryNavigation,+ isPending: isHistoryRecoveryPending,+ pending: historyRecoveryBusy,+ } = useHistoryRecoveryNavigation({+ source: JSON.stringify([auth.accountGeneration, deviceId, sessionId]),+ running: isSessionStreaming,+ startedAt: currentSession?.activeTurnStartedAt ?? null,+ endedAt: currentSession?.lastTurnEndedAt ?? null,+ });+ useFocusEffect(useCallback(() => invalidateHistoryRecoveryNavigation, [invalidateHistoryRecoveryNavigation]));// Sending/queueing drives the composer immediately, but cannot reopen the loaded previous// turn before the new user message arrives. Only remote activity drives message grouping.const isMessageListStreaming = remoteSessionRunning || currentTurnStreaming;@@ -6270,6 +6284,7 @@ export default function SessionScreen() {return;}const connectionDispatchBlockedAtSend = outboxConnectionBlockedNow();+ invalidateHistoryRecoveryNavigation();sendInFlightRef.current = true;setSending(true);const messageWorkLease = remoteSessionStore.acquireSessionMessageWork(sessionId, true);@@ -7660,7 +7675,8 @@ export default function SessionScreen() {}, [cancelQueueEdit, inputProjection.pendingQueue, queueEditing]);const retryQueueError = () => {- if (queueAvailabilityReason || !inputProjection.errorRetryText) return;+ if (queueAvailabilityReason || !inputProjection.errorRetryText || isHistoryRecoveryPending()) return;+ invalidateHistoryRecoveryNavigation();void runQueueAction(() => maker.input.retryLastError(sessionId));};@@ -7758,12 +7774,13 @@ export default function SessionScreen() {const continueTailBanner = useCallback(async () => {const state = tailBannerState;const sessionAtSend = currentSession;- if (!state || tailBannerBusy || !sessionId) return;+ if (!state || tailBannerBusy || !sessionId || isHistoryRecoveryPending()) return;if (!sessionAtSend || sessionAtSend.cacheSeeded) {setError(t('session.screen.sessionNotSyncedRetry'));return;}const interrupted = state.kind === 'interrupted' || state.continueKind === 'interrupted';+ invalidateHistoryRecoveryNavigation();const prompt = interrupted ? CONTINUE_AFTER_APP_EXIT_PROMPT : CONTINUE_AFTER_ERROR_PROMPT;setTailBannerBusy(true);// 乐观熄灭:error-tail 走短窗口 hidden(交棒释放见上方声明处注释);interrupted@@ -7795,7 +7812,7 @@ export default function SessionScreen() {} finally {setTailBannerBusy(false);}- }, [currentSession, maker, sessionId, t, tailBannerBusy, tailBannerState]);+ }, [currentSession, invalidateHistoryRecoveryNavigation, isHistoryRecoveryPending, maker, sessionId, t, tailBannerBusy, tailBannerState]);//「忽略」:error-tail 持久化 dismiss(被控端 merge dismissed:true,重拉不复活),// 本地 dismissed 集合乐观熄灭 banner,同时错误卡回流消息流(errorTailClientId 排除@@ -9093,6 +9110,33 @@ export default function SessionScreen() {);}, [deviceId, messageActionBusy, performForkAtMessage, t]);+ const historyRecoveryError = inputProjection.error ?? (tailBannerState?.kind === 'error-tail'+ ? tailBannerState.rawError ?? tailBannerState.text : '');+ const canRecoverHistory = !isSharedTaskPeer(deviceId) && canUseRemoteSessionControls &&+ !queueAvailabilityReason && !messageActionBusy && !tailBannerBusy && !queueBusy &&+ Boolean(currentSession?.sdkSessionId) && canOfferCodexHistoryRecovery({+ message: historyRecoveryError, agentKind: sessionAgentKind,+ remoteHostId: currentSession?.remoteHostId, agentDeviceId: currentSession?.agentDeviceId,+ running: isSessionStreaming || remoteSessionRunning,+ });+ const recoverReadableHistory = useCallback(async () => {+ if (!canRecoverHistory || !deviceId) return;+ const recovery = beginHistoryRecovery();+ if (!recovery) return;+ try {+ const forked = await maker.forkStripEncrypted(sessionId);+ if (!recovery.isCurrent() || !navigation.isFocused()) return;+ remoteSessionStore.upsertDeviceSession(deviceId, deviceName, forked);+ router.push({ pathname: '/sessions/[sessionId]', params: { sessionId: forked.id, deviceId, deviceName } });+ } catch (err) {+ if (recovery.isCurrent() && navigation.isFocused()) {+ setError(formatRemoteError(err));+ }+ } finally {+ recovery.release();+ }+ }, [beginHistoryRecovery, canRecoverHistory, deviceId, deviceName, maker, navigation, router, sessionId]);+const openForkOrigin = useCallback(() => {const parentSessionId = currentSession?.parentSessionId;const forkedAtMessageId = currentSession?.forkedAtMessageId;@@ -10011,7 +10055,8 @@ export default function SessionScreen() {(resolveSessionTailBanner 内部已按 projection.error 抑制)。 */}{tailBannerState ? (<SessionTailBanner- busy={tailBannerBusy}+ busy={tailBannerBusy || historyRecoveryBusy}+ onRecoverHistory={canRecoverHistory ? () => void recoverReadableHistory() : undefined}onContinue={() => void continueTailBanner()}onDismiss={dismissTailBanner}state={tailBannerState}@@ -10032,7 +10077,8 @@ export default function SessionScreen() {{/* 队列状态横幅(错误 / 凭证等待 / 停止确认 / 暂停)。待发送气泡不在这里,它们是消息流里的 pending_send 项。 */}<InlineQueueSection- busy={queueBusy}+ busy={queueBusy || historyRecoveryBusy}+ onRecoverHistory={canRecoverHistory ? () => void recoverReadableHistory() : undefined}sessionSource={currentSession?.source}onClearError={clearQueueError}onCancelUsageLimitWait={cancelUsageLimitWait}diff --git a/apps/mobile/src/__tests__/AgentErrorLocalization.test.tsx b/apps/mobile/src/__tests__/AgentErrorLocalization.test.tsxindex 2e9289d58d..2e495fbbf1 100644--- a/apps/mobile/src/__tests__/AgentErrorLocalization.test.tsx+++ b/apps/mobile/src/__tests__/AgentErrorLocalization.test.tsx@@ -44,6 +44,29 @@ const clickText = (text: string) => {};describe.each(SUPPORTED_LOCALES)('mobile errors in %s', locale => {+ it.each(['live', 'tail'] as const)('offers explicit %s recovery without automatically retrying', async surface => {+ await i18n.changeLanguage(locale);+ const recover = vi.fn();+ const retry = vi.fn();+ const error = 'stream disconnected before completion: stream closed before response.completed';+ const renderBanner = (busy: boolean) => surface === 'live'+ ? <InlineQueueSection projection={{ error, errorRetryText: 'original' } as InputProjection} busy={busy}+ onRecoverHistory={recover} onRetryError={retry} onClearError={vi.fn()} onResume={vi.fn()} />+ : <SessionTailBanner state={{ kind: 'error-tail', text: error, rawError: error, clientId: 'e', continueKind: 'error', retryable: true }}+ busy={busy} onRecoverHistory={recover} onContinue={retry} onDismiss={vi.fn()} />;+ await act(async () => root.render(renderBanner(false)));+ expect(host.textContent).toContain(i18n.t('session.tail.readableHistoryRecoveryDescription'));+ expect(recover).not.toHaveBeenCalled();+ await act(async () => clickText(i18n.t('session.tail.readableHistoryRecovery')));+ expect(recover).toHaveBeenCalledOnce();+ expect(retry).not.toHaveBeenCalled();+ await act(async () => root.render(renderBanner(true)));+ const button = host.querySelector<HTMLButtonElement>('[data-testid="session.readableHistoryRecovery"]')!;+ expect(button.disabled).toBe(true);+ await act(async () => button.click());+ expect(recover).toHaveBeenCalledOnce();+ });+it.each(['live', 'tail'] as const)('localizes %s, preserves retry and switches locale without another request', async surface => {await i18n.changeLanguage(locale);for (const key of ['requestFormatError', 'replyFailed', 'showErrorDetails', 'hideErrorDetails', 'retry']) {diff --git a/apps/mobile/src/__tests__/mobileMakerTransport.test.ts b/apps/mobile/src/__tests__/mobileMakerTransport.test.tsindex fc9529ff38..ce2b205cef 100644--- a/apps/mobile/src/__tests__/mobileMakerTransport.test.ts+++ b/apps/mobile/src/__tests__/mobileMakerTransport.test.ts@@ -352,6 +352,7 @@ describe("mobile maker transport", () => {"maker:goal:resume","maker:goal:update","maker:fork",+ "maker:fork-strip-encrypted","maker:get-session-tree","maker:navigate-session-tree","maker:rewind:preview",@@ -982,6 +983,7 @@ describe("mobile maker transport", () => {const { calls, maker } = harness();await maker.fork("s1", "m2");+ await maker.forkStripEncrypted("s1");await maker.getSessionTree("s1");await maker.navigateSessionTree("s1", "entry-2", {summarize: true,@@ -994,6 +996,7 @@ describe("mobile maker transport", () => {expect(calls.map((call) => [call.channel, call.args])).toEqual([["maker:fork", ["s1", "m2"]],+ ["maker:fork-strip-encrypted", ["s1"]],["maker:get-session-tree", ["s1"]],["maker:navigate-session-tree",diff --git a/apps/mobile/src/__tests__/useHistoryRecoveryNavigation.test.tsx b/apps/mobile/src/__tests__/useHistoryRecoveryNavigation.test.tsxnew file mode 100644index 0000000000..c3e189494d--- /dev/null+++ b/apps/mobile/src/__tests__/useHistoryRecoveryNavigation.test.tsx@@ -0,0 +1,128 @@+// @vitest-environment jsdom+import { act } from 'react';+import { createRoot } from 'react-dom/client';+import { afterEach, describe, expect, it, vi } from 'vitest';+import { useHistoryRecoveryNavigation } from '../session/useHistoryRecoveryNavigation';++Object.assign(globalThis, { IS_REACT_ACT_ENVIRONMENT: true });+const cleanups: Array<() => void> = [];+afterEach(() => { cleanups.splice(0).forEach(cleanup => cleanup()); });+function renderHook<T, P = undefined>(hook: (props: P) => T, options?: { initialProps: P }) {+ const root = createRoot(document.createElement('div'));+ const result = {} as { current: T };+ let mounted = true;+ function Harness({ value }: { value: P }) { result.current = hook(value); return null; }+ const rerender = (value: P) => act(() => root.render(<Harness value={value} />));+ const unmount = () => { if (mounted) { act(() => root.unmount()); mounted = false; } };+ cleanups.push(unmount);+ rerender(options?.initialProps as P);+ return { result, rerender, unmount };+}+const idle = { source: 'owner:device:task', running: false, startedAt: 100, endedAt: 101 };+type Recovery = NonNullable<ReturnType<ReturnType<typeof useHistoryRecoveryNavigation>['begin']>>;++function begin(result: { current: ReturnType<typeof useHistoryRecoveryNavigation> }): Recovery {+ let recovery!: Recovery;+ act(() => { recovery = result.current.begin()!; });+ return recovery;+}++function deferred() {+ let resolve!: () => void;+ const promise = new Promise<void>(done => { resolve = done; });+ return { promise, resolve };+}++describe('history recovery navigation', () => {+ it('allows an unchanged source to navigate when recovery completes', async () => {+ const { result, rerender } = renderHook(props => useHistoryRecoveryNavigation(props), { initialProps: idle });+ const pending = deferred();+ const navigate = vi.fn();+ const recovery = begin(result);+ const completion = pending.promise.then(() => { if (recovery.isCurrent()) navigate(); });+ rerender({ ...idle });+ await act(async () => { pending.resolve(); await completion; });+ expect(navigate).toHaveBeenCalledOnce();+ });++ it.each(['running', 'turn-between-renders', 'input', 'route', 'unmount'] as const)(+ 'does not navigate after %s supersedes a pending recovery', async change => {+ const { result, rerender, unmount } = renderHook(props => useHistoryRecoveryNavigation(props), { initialProps: idle });+ const pending = deferred();+ const navigate = vi.fn();+ const recovery = begin(result);+ const completion = pending.promise.then(() => { if (recovery.isCurrent()) navigate(); });+ if (change === 'running') {+ rerender({ ...idle, running: true });+ expect(result.current.begin()).toBeNull();+ // Returning to idle must not revive the earlier navigation.+ rerender({ ...idle });+ } else if (change === 'turn-between-renders') {+ rerender({ ...idle, startedAt: 200, endedAt: 201 });+ } else if (change === 'input') {+ act(() => result.current.invalidate());+ } else if (change === 'route') {+ rerender({ ...idle, source: 'owner:device:other-task' });+ rerender({ ...idle });+ } else {+ unmount();+ }+ await act(async () => { pending.resolve(); await completion; });+ expect(navigate).not.toHaveBeenCalled();+ },+ );++ it('allows a later recovery without reviving the superseded one', () => {+ const { result } = renderHook(() => useHistoryRecoveryNavigation(idle));+ const old = begin(result);+ act(() => result.current.invalidate());+ expect(old.isCurrent()).toBe(false);+ act(() => old.release());+ const fresh = begin(result);+ expect(fresh.isCurrent()).toBe(true);+ act(() => old.release());+ expect(result.current.pending).toBe(true);+ expect(result.current.isPending()).toBe(true);+ });++ it.each(['source-first', 'destination-first'] as const)(+ 'keeps pending recovery scoped to its task when completion order is %s', order => {+ const { result, rerender } = renderHook(props => useHistoryRecoveryNavigation(props), { initialProps: idle });+ const sourceRecovery = begin(result);+ expect(result.current.pending).toBe(true);+ expect(result.current.isPending()).toBe(true);+ expect(result.current.begin()).toBeNull();++ const destination = { ...idle, source: 'owner:device:other-task' };+ rerender(destination);+ expect(result.current.pending).toBe(false);+ expect(result.current.isPending()).toBe(false);+ expect(sourceRecovery.isCurrent()).toBe(false);+ const destinationRecovery = begin(result);+ expect(result.current.pending).toBe(true);++ const first = order === 'source-first' ? sourceRecovery : destinationRecovery;+ const last = order === 'source-first' ? destinationRecovery : sourceRecovery;+ act(() => first.release());+ expect(result.current.pending).toBe(order === 'source-first');+ expect(result.current.isPending()).toBe(order === 'source-first');+ rerender(idle);+ expect(result.current.pending).toBe(order === 'destination-first');+ expect(result.current.isPending()).toBe(order === 'destination-first');+ expect(sourceRecovery.isCurrent()).toBe(false);+ act(() => last.release());+ expect(result.current.pending).toBe(false);+ rerender(destination);+ expect(result.current.pending).toBe(false);+ },+ );++ it('locks synchronously before a second same-task request can start', () => {+ const { result } = renderHook(() => useHistoryRecoveryNavigation(idle));+ act(() => {+ expect(result.current.begin()).not.toBeNull();+ expect(result.current.isPending()).toBe(true);+ expect(result.current.begin()).toBeNull();+ });+ });+});diff --git a/apps/mobile/src/device-link/mobileMakerTransport.ts b/apps/mobile/src/device-link/mobileMakerTransport.tsindex c3c842e59a..6c0abb573e 100644--- a/apps/mobile/src/device-link/mobileMakerTransport.ts+++ b/apps/mobile/src/device-link/mobileMakerTransport.ts@@ -743,6 +743,7 @@ export interface MobileMakerTransport {sourceSessionId: string,messageClientId: string,): Promise<RemoteSession>;+ forkStripEncrypted(sourceSessionId: string): Promise<RemoteSession>;rewindPreview(sessionId: string,clientId: string,@@ -1376,6 +1377,8 @@ export function createMobileMakerTransport({call("maker:get-context-usage", [sessionId, createOpts]),fork: (sourceSessionId, messageClientId) =>call("maker:fork", [sourceSessionId, messageClientId]),+ forkStripEncrypted: (sourceSessionId) =>+ call("maker:fork-strip-encrypted", [sourceSessionId]),rewindPreview: (sessionId, clientId) =>call("maker:rewind:preview", [sessionId, clientId]),rewindCommit: (sessionId, clientId, opts) =>diff --git a/apps/mobile/src/i18n/locales/en/session.json b/apps/mobile/src/i18n/locales/en/session.jsonindex 3da0ca4756..54ace12d35 100644--- a/apps/mobile/src/i18n/locales/en/session.json+++ b/apps/mobile/src/i18n/locales/en/session.json@@ -491,6 +491,8 @@"deleteOne": "Delete this message"},"tail": {+ "readableHistoryRecovery": "New task from readable history",+ "readableHistoryRecoveryDescription": "If retry keeps failing, create a new task using readable history. Internal encrypted information is omitted. The original task is kept, and the failed message is not resent automatically.","requestFormatError": "The app sent an invalid request, so this reply could not be completed.","replyFailed": "This reply could not be completed. Check the error details for more information.","showErrorDetails": "Show Error Details",diff --git a/apps/mobile/src/i18n/locales/ja/session.json b/apps/mobile/src/i18n/locales/ja/session.jsonindex 1e87be3353..b7c7dceea9 100644--- a/apps/mobile/src/i18n/locales/ja/session.json+++ b/apps/mobile/src/i18n/locales/ja/session.json@@ -491,6 +491,8 @@"deleteOne": "このメッセージを削除"},"tail": {+ "readableHistoryRecovery": "読み取れる履歴から新しいタスクを作成",+ "readableHistoryRecoveryDescription": "再試行しても失敗する場合は、読み取れる履歴から新しいタスクを作成できます。内部の暗号化情報は省略されます。元のタスクは保持され、失敗したメッセージは自動で再送信されません。","requestFormatError": "アプリが送信したリクエストの形式に問題があり、返信を完了できませんでした。","replyFailed": "返信を完了できませんでした。原因を確認するには、エラーの詳細をご覧ください。","showErrorDetails": "エラーの詳細を表示",diff --git a/apps/mobile/src/i18n/locales/ko/session.json b/apps/mobile/src/i18n/locales/ko/session.jsonindex 9440777c09..587495829f 100644--- a/apps/mobile/src/i18n/locales/ko/session.json+++ b/apps/mobile/src/i18n/locales/ko/session.json@@ -487,6 +487,8 @@"deleteOne": "이 메시지 삭제"},"tail": {+ "readableHistoryRecovery": "읽을 수 있는 기록으로 새 작업 만들기",+ "readableHistoryRecoveryDescription": "재시도해도 실패하면 읽을 수 있는 기록으로 새 작업을 만들 수 있습니다. 내부 암호화 정보는 제외됩니다. 기존 작업은 유지되며 실패한 메시지는 자동으로 다시 전송되지 않습니다.","requestFormatError": "앱이 보낸 요청 형식에 문제가 있어 답변을 완료하지 못했습니다.","replyFailed": "답변을 완료하지 못했습니다. 오류 세부 정보에서 원인을 확인하세요.","showErrorDetails": "오류 세부 정보 보기",diff --git a/apps/mobile/src/i18n/locales/zh-CN/session.json b/apps/mobile/src/i18n/locales/zh-CN/session.jsonindex 1b867bb352..b08a2b63c9 100644--- a/apps/mobile/src/i18n/locales/zh-CN/session.json+++ b/apps/mobile/src/i18n/locales/zh-CN/session.json@@ -487,6 +487,8 @@"deleteOne": "删除本条消息"},"tail": {+ "readableHistoryRecovery": "用可读历史新建任务",+ "readableHistoryRecoveryDescription": "如果重试仍然失败,可用可读历史新建任务,省略内部加密信息。原任务保留,失败消息不会自动重发。","requestFormatError": "应用发送的请求格式有误,本次回复未能完成。","replyFailed": "本次回复未能完成。请查看错误详情以了解原因。","showErrorDetails": "查看错误详情",diff --git a/apps/mobile/src/i18n/locales/zh-TW/session.json b/apps/mobile/src/i18n/locales/zh-TW/session.jsonindex 678a3b5a5e..53c544a384 100644--- a/apps/mobile/src/i18n/locales/zh-TW/session.json+++ b/apps/mobile/src/i18n/locales/zh-TW/session.json@@ -491,6 +491,8 @@"deleteOne": "刪除本條訊息"},"tail": {+ "readableHistoryRecovery": "用可讀歷史建立新任務",+ "readableHistoryRecoveryDescription": "如果重試仍然失敗,可用可讀歷史建立新任務,略過內部加密資訊。原任務會保留,失敗訊息不會自動重新傳送。","requestFormatError": "應用程式送出的請求格式有誤,本次回覆未能完成。","replyFailed": "本次回覆未能完成。請查看錯誤詳情以瞭解原因。","showErrorDetails": "查看錯誤詳情",diff --git a/apps/mobile/src/session/InlineQueueSection.tsx b/apps/mobile/src/session/InlineQueueSection.tsxindex 8b0e5bc8ca..353b3ac6ac 100644--- a/apps/mobile/src/session/InlineQueueSection.tsx+++ b/apps/mobile/src/session/InlineQueueSection.tsx@@ -11,6 +11,7 @@* 问题,留在 footer 最自然。*/import { AgentErrorDetails } from './AgentErrorDetails';+import { ReadableHistoryRecovery } from './ReadableHistoryRecovery';import { useTranslation } from 'react-i18next';import {ActivityIndicator,@@ -39,6 +40,7 @@ import {import { radius, spacing, typeScale } from '@/theme/tokens';export interface InlineQueueSectionProps {+ onRecoverHistory?: () => void;projection: InputProjection;sessionSource?: string | null;busy?: boolean;@@ -51,6 +53,7 @@ export interface InlineQueueSectionProps {}export function InlineQueueSection({+ onRecoverHistory,projection,sessionSource,busy,@@ -101,6 +104,7 @@ export function InlineQueueSection({{/* 稳定错误 marker 按当前显示端语言翻译;其它错误保留 auth 引导,否则使用本地化摘要。 */}<Text style={styles.errorText}>{projectionError}</Text><AgentErrorDetails message={projection.error} />+ {onRecoverHistory ? <ReadableHistoryRecovery onRecover={onRecoverHistory} busy={controlsDisabled} /> : null}<View style={styles.errorActions}>{retryable ? <ActionPillbusy={busy}diff --git a/apps/mobile/src/session/ReadableHistoryRecovery.tsx b/apps/mobile/src/session/ReadableHistoryRecovery.tsxnew file mode 100644index 0000000000..f2a52804c3--- /dev/null+++ b/apps/mobile/src/session/ReadableHistoryRecovery.tsx@@ -0,0 +1,29 @@+import { Pressable, StyleSheet, View } from 'react-native';+import { useTranslation } from 'react-i18next';+import { Text } from '@/components/AppText';+import { mobileInteractionStyles } from '@/components/mobileInteractionStyles';+import { fontWeight, lineHeight, useThemedStyles, type ThemeColors } from '@/theme';+import { radius, spacing, typeScale } from '@/theme/tokens';++/** Explicit recovery only; never sends a message or interprets the cause of a stream failure. */+export function ReadableHistoryRecovery({ onRecover, busy }: { onRecover(): void; busy?: boolean }) {+ const { t } = useTranslation();+ const styles = useThemedStyles(makeStyles);+ return <View style={styles.container}>+ <Text style={styles.description}>{t('session.tail.readableHistoryRecoveryDescription')}</Text>+ <Pressable accessibilityRole="button" disabled={busy}+ accessibilityState={{ disabled: !!busy, busy: !!busy }}+ onPress={onRecover} testID="session.readableHistoryRecovery"+ style={({ pressed }) => [styles.button, pressed && mobileInteractionStyles.pressed, busy && styles.disabled]}>+ <Text style={styles.label}>{t('session.tail.readableHistoryRecovery')}</Text>+ </Pressable>+ </View>;+}++const makeStyles = (colors: ThemeColors) => StyleSheet.create({+ container: { gap: spacing.sm },+ description: { color: colors.textSecondary, fontSize: typeScale.footnote, lineHeight: lineHeight.caption, fontWeight: fontWeight.regular },+ button: { minHeight: 44, borderRadius: radius.pill, backgroundColor: colors.surfaceChip, paddingHorizontal: spacing.md, paddingVertical: spacing.sm, alignItems: 'center', justifyContent: 'center', alignSelf: 'flex-start' },+ label: { color: colors.textPrimary, fontSize: typeScale.body, lineHeight: lineHeight.body, fontWeight: fontWeight.medium },+ disabled: { opacity: 0.5 },+});diff --git a/apps/mobile/src/session/SessionTailBanner.tsx b/apps/mobile/src/session/SessionTailBanner.tsxindex f88ff5d5c5..37476f7962 100644--- a/apps/mobile/src/session/SessionTailBanner.tsx+++ b/apps/mobile/src/session/SessionTailBanner.tsx@@ -10,6 +10,7 @@* - 「忽略」→ error-tail 持久化 dismiss / interrupted 写 ack,不再提示。*/import { AgentErrorDetails } from './AgentErrorDetails';+import { ReadableHistoryRecovery } from './ReadableHistoryRecovery';import { Pressable, StyleSheet } from 'react-native';import { useTranslation } from 'react-i18next';import { Text } from '@/components/AppText';@@ -22,11 +23,12 @@ import { radius, spacing, typeScale } from '@/theme/tokens';export interface SessionTailBannerProps {state: NonNullable<SessionTailBannerState>;busy?: boolean;+ onRecoverHistory?: () => void;onContinue(): void;onDismiss(): void;}-export function SessionTailBanner({ state, busy, onContinue, onDismiss }: SessionTailBannerProps) {+export function SessionTailBanner({ state, busy, onContinue, onDismiss, onRecoverHistory }: SessionTailBannerProps) {const styles = useThemedStyles(makeStyles);const { t } = useTranslation();const isInterrupted = state.kind === 'interrupted' || state.continueKind === 'interrupted';@@ -43,6 +45,7 @@ export function SessionTailBanner({ state, busy, onContinue, onDismiss }: Sessio{text}</Text>{state.kind === 'error-tail' && state.rawError && !isInterrupted ? <AgentErrorDetails message={state.rawError} /> : null}+ {onRecoverHistory ? <ReadableHistoryRecovery onRecover={onRecoverHistory} busy={busy} /> : null}<View style={styles.actions}>{showContinue ? (<TailPilldiff --git a/apps/mobile/src/session/useHistoryRecoveryNavigation.ts b/apps/mobile/src/session/useHistoryRecoveryNavigation.tsnew file mode 100644index 0000000000..49a059dffb--- /dev/null+++ b/apps/mobile/src/session/useHistoryRecoveryNavigation.ts@@ -0,0 +1,44 @@+import { useCallback, useEffect, useRef, useState } from 'react';++/** A new source turn or input intent permanently supersedes an in-flight recovery's navigation. */+export function useHistoryRecoveryNavigation(input: {+ source: string;+ running: boolean;+ startedAt: number | null;+ endedAt: number | null;+}) {+ const [operations, setOperations] = useState<ReadonlyMap<string, symbol>>(() => new Map());+ const operationsRef = useRef(operations);+ const current = useRef({ ...input });+ const previous = current.current;+ if (previous.source !== input.source || previous.running !== input.running ||+ previous.startedAt !== input.startedAt || previous.endedAt !== input.endedAt) {+ current.current = { ...input };+ }+ const invalidate = useCallback(() => {+ current.current = { ...current.current };+ }, []);+ useEffect(() => invalidate, [invalidate]);++ const isPending = useCallback(() => operationsRef.current.has(current.current.source), []);+ const begin = useCallback(() => {+ const source = current.current;+ if (source.running || operationsRef.current.has(source.source)) return null;+ const token = Symbol();+ const next = new Map(operationsRef.current);+ next.set(source.source, token);+ operationsRef.current = next;+ setOperations(next);+ return {+ isCurrent: () => current.current === source,+ release: () => {+ if (operationsRef.current.get(source.source) !== token) return;+ const remaining = new Map(operationsRef.current);+ remaining.delete(source.source);+ operationsRef.current = remaining;+ setOperations(remaining);+ },+ };+ }, []);+ return { begin, invalidate, isPending, pending: operations.has(input.source) };+}diff --git a/docs/dev-rules/maker-core-and-agent-behavior.md b/docs/dev-rules/maker-core-and-agent-behavior.mdindex 18391d1abd..c11dadc320 100644--- a/docs/dev-rules/maker-core-and-agent-behavior.md+++ b/docs/dev-rules/maker-core-and-agent-behavior.md@@ -174,6 +174,15 @@ vitest run src/agents/codex/app-server/external-auth.native.test.ts`,覆盖分管理员 requirements 可能覆盖 CLI 临时凭证设置:客户端可阻止后续任务,但启动后的配置检查不能证明原生初始化阶段从未读取历史根中的认证;不得声称具备这一保证,也不得自行复制上游策略加载器或改写用户认证文件规避策略。+原生线程的 `model_provider` 不能证明其 `agent_message` 密文的实际来源:+独立子 Agent 可以经代理使用其他供应商,而原生身份仍继承父线程。恢复到 GPT API 时,+不得仅凭父线程的订阅身份自动删除协作密文;普通提前闭流也不是解密失败的证据。+遇到 `stream closed before response.completed` 的终态错误时,两端可提供显式的+可读历史恢复入口,保留普通重试;复用 `fork-strip-encrypted`,保留原任务且不自动发消息。+Desktop 与 Mobile 恢复进行期间只禁用来源任务的重试,不阻塞其他任务;原任务出现新输入或重新运行后,+迟到的恢复结果不得自动跳转,旧操作完成时也不得释放其他任务或后续操作的等待状态。+Desktop 回包还须核对浏览器当前路由,覆盖地址已切换但 React 尚未渲染新任务的窗口。+旧格式包含加密 `agent_message` 时也走既有历史恢复标记,不由 legacy sanitizer 丢弃消息。普通加密推理失败继续使用现有 HTTP 透明重试;只有上游明确拒绝且请求里仅剩不可剥除的压缩块密文时,proxy 才标记`CINDY_ENCRYPTED_COMPACTION_INCOMPATIBLE`,交给既有 compact 失败恢复流程。diff --git a/packages/maker-core/src/agents/codex/index.test.ts b/packages/maker-core/src/agents/codex/index.test.tsindex 69d4b61dde..c7b8985543 100644--- a/packages/maker-core/src/agents/codex/index.test.ts+++ b/packages/maker-core/src/agents/codex/index.test.ts@@ -24534,7 +24534,7 @@ describe('CodexAgent.forkSdkSession', () => {else await expect(result).rejects.toBeInstanceOf(AgentNotAuthenticatedError);});- it.each([false, true])('requests Cindy recovery before forking indexed history (lazy=%s)', async (lazy) => {+ it.each(['indexed', 'lazy', 'legacy-agent-cipher'])('requests Cindy recovery before native forking (%s)', async (format) => {const codexHome = await fs.mkdtemp(path.join(os.tmpdir(), 'cindy-indexed-fork-'));try {const agent = new CodexAgent(createDeps());@@ -24542,9 +24542,13 @@ describe('CodexAgent.forkSdkSession', () => {const dir = path.join(codexHome, 'sessions', '2026', '09', '05');await fs.mkdir(dir, { recursive: true });const source = path.join(dir, 'rollout-source-thread-id.jsonl');- const original = JSON.stringify({ ordinal: 0, type: 'session_meta', payload: {- id: 'source-thread-id', ...(lazy ? { history_base: { thread_id: 'parent' } } : {}),- } }) + '\n';+ const original = format === 'legacy-agent-cipher'+ ? JSON.stringify({ type: 'response_item', payload: { type: 'agent_message', content: [+ { type: 'encrypted_content', encrypted_content: 'child-ciphertext' },+ ] } }) + '\n'+ : JSON.stringify({ ordinal: 0, type: 'session_meta', payload: {+ id: 'source-thread-id', ...(format === 'lazy' ? { history_base: { thread_id: 'parent' } } : {}),+ } }) + '\n';await fs.writeFile(source, original);const host = installFakeHost(agent);await expect(agent.forkSdkSession({diff --git a/packages/maker-core/src/agents/codex/rollout-sanitize.test.ts b/packages/maker-core/src/agents/codex/rollout-sanitize.test.tsindex 648e2261cb..24a81a4b8a 100644--- a/packages/maker-core/src/agents/codex/rollout-sanitize.test.ts+++ b/packages/maker-core/src/agents/codex/rollout-sanitize.test.ts@@ -8,6 +8,7 @@ import {CODEX_INLINE_IMAGE_STRIP_MIN_CHARS,CODEX_LIVE_TAIL_OVERSIZED_BYTES,CodexRolloutScanLimitError,+ assertCodexRolloutRewriteSupported,hasUnsafeForkRolloutPayload,isOversizedLiveTailStats,measureRolloutLiveTailBytesFromText,@@ -200,6 +201,26 @@ describe('sanitizeCodexForkRollout', () => {}});+ it('routes legacy encrypted agent messages to readable recovery without modifying history', async () => {+ const dir = await fs.mkdtemp(path.join(os.tmpdir(), 'cindy-legacy-agent-history-'));+ const file = path.join(dir, 'history.jsonl');+ const original = JSON.stringify({ type: 'response_item', payload: {+ type: 'agent_message', author: '/root/child', recipient: '/root', content: [+ { type: 'text', text: 'readable child result' },+ { type: 'encrypted_content', encrypted_content: 'opaque-child-content' },+ ],+ } }) + '\n';+ await fs.writeFile(file, original);+ try {+ await expect(assertCodexRolloutRewriteSupported(file)).rejects.toMatchObject({ name: 'CodexHistoryRecoveryRequiredError' });+ await expect(sanitizeCodexForkRolloutFileInPlace(file)).rejects.toMatchObject({ name: 'CodexHistoryRecoveryRequiredError' });+ expect(await fs.readFile(file, 'utf8')).toBe(original);+ expect(await fs.readdir(dir)).toEqual(['history.jsonl']);+ } finally {+ await fs.rm(dir, { recursive: true, force: true });+ }+ });+it('routes lazy indexed history to recovery without rewriting source or child', async () => {const dir = await fs.mkdtemp(path.join(os.tmpdir(), 'cindy-rollout-history-'));const source = path.join(dir, 'rollout-source-thread.jsonl');diff --git a/packages/maker-core/src/agents/codex/rollout-sanitize.ts b/packages/maker-core/src/agents/codex/rollout-sanitize.tsindex 50930ece53..2d5e92e364 100644--- a/packages/maker-core/src/agents/codex/rollout-sanitize.ts+++ b/packages/maker-core/src/agents/codex/rollout-sanitize.ts@@ -450,7 +450,14 @@ export async function assertCodexRolloutRewriteSupported(filePath: string): Prom}if (isRecord(record) && (Object.hasOwn(record, 'ordinal') ||- (isRecord(record.payload) && Object.hasOwn(record.payload, 'history_base'))+ (isRecord(record.payload) && (+ Object.hasOwn(record.payload, 'history_base') ||+ // Legacy sanitization cannot preserve the meaning of encrypted agent messages.+ // Explicit recovery must use Cindy's readable transcript instead.+ (record.type === 'response_item' && record.payload.type === 'agent_message' &&+ Array.isArray(record.payload.content) && record.payload.content.some((part) =>+ isRecord(part) && part.type === 'encrypted_content'))+ )))) {throw new CodexHistoryRecoveryRequiredError();}diff --git a/packages/maker-shared/src/deviceLinkContract.ts b/packages/maker-shared/src/deviceLinkContract.tsindex f43c48ea89..570fc39019 100644--- a/packages/maker-shared/src/deviceLinkContract.ts+++ b/packages/maker-shared/src/deviceLinkContract.ts@@ -349,6 +349,7 @@ export const MOBILE_REMOTE_INVOKE_CHANNELS = ['maker:goal:resume','maker:goal:update','maker:fork',+ 'maker:fork-strip-encrypted','maker:get-session-tree','maker:navigate-session-tree','maker:rewind:preview',diff --git a/packages/maker-shared/src/errorRedaction.test.ts b/packages/maker-shared/src/errorRedaction.test.tsindex 22960d319f..cd826123a0 100644--- a/packages/maker-shared/src/errorRedaction.test.ts+++ b/packages/maker-shared/src/errorRedaction.test.ts@@ -1,6 +1,7 @@import { describe, expect, it } from 'vitest';import {+ canOfferCodexHistoryRecovery,extractNonSecretErrorSignals,GATEWAY_PROXY_TOKEN_INVALID_REASON,isCindyGatewayProxyTokenInvalidError,@@ -11,6 +12,20 @@ import {parseAgentErrorCode,} from './errorRedaction.js';+describe('explicit Codex history recovery offer', () => {+ const message = 'stream disconnected before completion: stream closed before response.completed';+ it('offers recovery for the terminal close without classifying it as encryption failure', () => {+ expect(canOfferCodexHistoryRecovery({ message, agentKind: 'codex' })).toBe(true);+ });+ it.each([+ { running: true }, { remoteHostId: 'ssh' }, { agentDeviceId: 'worker' },+ { agentKind: 'cc' }, { message: 'Connection reset' },+ { message: 'stream disconnected before completion: timeout' },+ ])('does not offer unsupported or unrelated recovery: %s', overrides => {+ expect(canOfferCodexHistoryRecovery({ message, agentKind: 'codex', ...overrides })).toBe(false);+ });+});+describe('Responses Lite request error classification', () => {it('recognizes the upstream error inside a JSON envelope', () => {expect(isResponsesLiteParallelToolCallsError(JSON.stringify({ error: {diff --git a/packages/maker-shared/src/errorRedaction.ts b/packages/maker-shared/src/errorRedaction.tsindex 8efac54c9e..82a0262c55 100644--- a/packages/maker-shared/src/errorRedaction.ts+++ b/packages/maker-shared/src/errorRedaction.ts@@ -202,6 +202,18 @@ export function isResponsesLiteParallelToolCallsError(message: string): booleanreturn /X-OpenAI-Internal-Codex-Responses-Lite requires `?parallel_tool_calls`? to be false\./i.test(message);}+/** UI-only recovery offer. A premature close does not establish an encryption failure. */+export function canOfferCodexHistoryRecovery(input: {+ message: string;+ agentKind?: string | null;+ remoteHostId?: string | null;+ agentDeviceId?: string | null;+ running?: boolean;+}): boolean {+ return input.agentKind === 'codex' && !input.remoteHostId && !input.agentDeviceId &&+ !input.running && /stream disconnected before completion:\s*stream closed before response\.completed\b/i.test(input.message);+}+const AGENT_CHAT_ERROR_CODES: ReadonlySet<string> = new Set(['DEVICE_LINK_BUSY','DEVICE_LINK_CONTROL_DISABLED',