Consider it done. The open-source AI agent that works out of the box · 想到,就能做到。开源、开箱即用的 AI Agent。
TypeScript agentai-agentai-assistantandroidclaude-codecodexelectroniosllmmacosreact-nativetypescriptwindows
fix(desktop): 补齐离页语音清理与项目列表归属
Dashc28297510b7b
diff --git a/apps/desktop/src/renderer/__tests__/sidebarProjectRestore.test.ts b/apps/desktop/src/renderer/__tests__/sidebarProjectRestore.test.tsindex bd88a51291..3430f7502b 100644--- a/apps/desktop/src/renderer/__tests__/sidebarProjectRestore.test.ts+++ b/apps/desktop/src/renderer/__tests__/sidebarProjectRestore.test.ts@@ -42,6 +42,22 @@ function projectSession(overrides: Partial<Session> = {}): Session {}describe('collectRestorableProjectKeys', () => {+ // PR #6956: project restore must use the same provisional identity as the+ // sidebar, even when its only row has not been sent yet (unit).+ it('includes the current draft project without including unrelated empty drafts', () => {+ const keys = collectRestorableProjectKeys({+ sessions: [+ projectSession({ userSendAt: null, _count: { messages: 0 } }),+ projectSession({ id: 'other', workingDir: '/workspace/other', userSendAt: null, _count: { messages: 0 } }),+ ],+ provisionalDraftTaskId: 'session-1',+ lastActivityCutoff: null,+ pinnedProjectKeys: new Set(),+ vendorPredicate: null,+ });+ expect(Array.from(keys)).toEqual([PROJECT_KEY]);+ });+it('excludes projects filtered out by vendor', () => {const keys = collectRestorableProjectKeys({sessions: [projectSession()],diff --git a/apps/desktop/src/renderer/components/new-chat/ChatInput.tsx b/apps/desktop/src/renderer/components/new-chat/ChatInput.tsxindex f8371ff1d0..c228dc9a18 100644--- a/apps/desktop/src/renderer/components/new-chat/ChatInput.tsx+++ b/apps/desktop/src/renderer/components/new-chat/ChatInput.tsx@@ -534,6 +534,8 @@ interface ChatInputProps {onComposerTyping?: () => void;/** Includes recording, transcription and refinement, before preview text becomes a saved draft. */onComposerVoiceBusyChange?: (busy: boolean) => void;+ /** Capture source ownership before unmount; returned callback runs after detached ASR settles. */+ onComposerVoiceDetached?: () => (() => void) | undefined;/** Session ID for binding workingDir. When absent, folder picker is hidden. */sessionId?: string;/**@@ -1227,6 +1229,7 @@ export function ChatInput({onSend,onComposerTyping,onComposerVoiceBusyChange,+ onComposerVoiceDetached,sessionId,runtimeAgentKind,runtimeEffective,@@ -3307,6 +3310,8 @@ export function ChatInput({const voiceInputBusyRef = useRef(false);const voiceInputStopAndSendPromiseRef = useRef<Promise<void> | null>(null);+ const onComposerVoiceDetachedRef = useRef(onComposerVoiceDetached);+ onComposerVoiceDetachedRef.current = onComposerVoiceDetached;// Declared before useVoiceInput so React 19 runs this cleanup first// (declaration order). Arm must be visible before the voice hook decides@@ -3351,7 +3356,11 @@ export function ChatInput({persistKey &&persistKey === editorStorageKey) {- armDetachedVoiceDraftPersist(persistKey, voiceDraftTextRef.current.trim());+ armDetachedVoiceDraftPersist(+ persistKey,+ voiceDraftTextRef.current.trim(),+ onComposerVoiceDetachedRef.current?.(),+ );}};}, [editor]);diff --git a/apps/desktop/src/renderer/components/new-chat/composerSendOwnership.ts b/apps/desktop/src/renderer/components/new-chat/composerSendOwnership.tsindex 1277631f37..6cb57f3558 100644--- a/apps/desktop/src/renderer/components/new-chat/composerSendOwnership.ts+++ b/apps/desktop/src/renderer/components/new-chat/composerSendOwnership.ts@@ -142,6 +142,7 @@ type ArmedDetachedVoiceDraft = {storageKey: string;previousVoiceText: string;token: ComposerDraftDiscardToken;+ onSettled?: () => void;};let armedDetachedVoiceDraft: ArmedDetachedVoiceDraft | null = null;@@ -173,11 +174,13 @@ export function persistDetachedVoiceToDraft(export function armDetachedVoiceDraftPersist(storageKey: string,previousVoiceText: string,+ onSettled?: () => void,): void {armedDetachedVoiceDraft = {storageKey,previousVoiceText,token: captureDraftDiscardToken(storageKey),+ onSettled,};if (previousVoiceText) {persistDetachedVoiceToDraft(@@ -197,7 +200,7 @@ export function hasArmedDetachedVoiceDraft(storageKey?: string): boolean {export function settleArmedDetachedVoiceDraft(nextVoiceText: string): void {if (!armedDetachedVoiceDraft) return;- const { storageKey, previousVoiceText, token } = armedDetachedVoiceDraft;+ const { storageKey, previousVoiceText, token, onSettled } = armedDetachedVoiceDraft;armedDetachedVoiceDraft = null;persistDetachedVoiceToDraft(storageKey,@@ -205,6 +208,9 @@ export function settleArmedDetachedVoiceDraft(nextVoiceText: string): void {nextVoiceText,token,);+ // Empty recognition does not write a draft, but still ends its owning task's+ // voice protection. Notify only after persistence and only for this draft.+ if (isDraftDiscardTokenCurrent(token)) onSettled?.();}export function clearArmedDetachedVoiceDraft(): void {diff --git a/apps/desktop/src/renderer/features/cc-agent/CCAgentSidebarUpper.tsx b/apps/desktop/src/renderer/features/cc-agent/CCAgentSidebarUpper.tsxindex 62affef293..d4f915dd21 100644--- a/apps/desktop/src/renderer/features/cc-agent/CCAgentSidebarUpper.tsx+++ b/apps/desktop/src/renderer/features/cc-agent/CCAgentSidebarUpper.tsx@@ -50,6 +50,7 @@ import { CINDY_MAKE_ENABLED, isCindyMakeSource } from '@cindy/maker-shared/cindyimport { cn } from '@/lib/utils';import { provisionalDraftTaskId, subscribeProvisionalDraftTask } from './provisionalDraftTask';+import { useProvisionalDraftProjectTaskId } from './hooks/useProvisionalDraftProjectTaskId';import { toast } from '@/lib/toast';import { isDataOwnerPushCurrent } from '@/contexts/dataOwnerGeneration';import { useCCSessions } from '@/hooks/useCCSessions';@@ -1794,10 +1795,12 @@ function ExpandedView({[pinnedProjectKeys, localPlatform],);+ const provisionalProjectTaskId = useProvisionalDraftProjectTaskId();const restorableProjectKeys = useMemo(() =>collectRestorableProjectKeys({sessions: scopedSidebarSessions,+ provisionalDraftTaskId: provisionalProjectTaskId,persistentLocalProjects: visiblePersistentLocalProjects,lastActivityCutoff: cutoffForLastActivity(filter.lastActivity),pinnedProjectKeys,@@ -1806,6 +1809,7 @@ function ExpandedView({}),[filter.lastActivity,+ provisionalProjectTaskId,localPlatform,pinnedProjectKeys,scopedSidebarSessions,diff --git a/apps/desktop/src/renderer/features/cc-agent/NewMakerDraftRoute.tsx b/apps/desktop/src/renderer/features/cc-agent/NewMakerDraftRoute.tsxindex ef55aef4bf..1c57743283 100644--- a/apps/desktop/src/renderer/features/cc-agent/NewMakerDraftRoute.tsx+++ b/apps/desktop/src/renderer/features/cc-agent/NewMakerDraftRoute.tsx@@ -2132,6 +2132,7 @@ export function NewMakerDraftRoute() {const {armEmptyCheck: armProvisionalEmptyCheck,onVoiceBusyChange: onProvisionalVoiceBusyChange,+ onVoiceDetached: onProvisionalVoiceDetached,} = useProvisionalDraftEmptyCleanup(NEW_MAKER_DRAFT_KEY, refreshProvisionalTitle);/** 已为哪一次建出来的未发送任务做过一次性的初始化(按 key 区分重建)。 */const provisionalSeededKeyRef = useRef<string | null>(null);@@ -5866,6 +5867,7 @@ export function NewMakerDraftRoute() {onSend={handleSend}onComposerTyping={openProvisionalDraftTask}onComposerVoiceBusyChange={onProvisionalVoiceBusyChange}+ onComposerVoiceDetached={onProvisionalVoiceDetached}// 创建在途期间锁住输入框:handleSend 立刻返回、真正的创建在后台跑,远程要经// 几次隧道往返。锁定态即时告诉用户「已发出、处理中」,也免得这段时间补写的// 内容在交接成功清空草稿时被一并丢掉;失败解锁后原文仍在。diff --git a/apps/desktop/src/renderer/features/cc-agent/hooks/__tests__/useProvisionalDraftEmptyCleanup.test.tsx b/apps/desktop/src/renderer/features/cc-agent/hooks/__tests__/useProvisionalDraftEmptyCleanup.test.tsxindex fd7d2b28df..0bf8e78f78 100644--- a/apps/desktop/src/renderer/features/cc-agent/hooks/__tests__/useProvisionalDraftEmptyCleanup.test.tsx+++ b/apps/desktop/src/renderer/features/cc-agent/hooks/__tests__/useProvisionalDraftEmptyCleanup.test.tsx@@ -11,6 +11,11 @@ vi.mock('../../provisionalDraftTask', () => ({}));import { clearDraft, plainTextToTiptapDoc, saveDraft } from '@/lib/composerDraftStore';+import {+ armDetachedVoiceDraftPersist,+ clearArmedDetachedVoiceDraft,+ settleArmedDetachedVoiceDraft,+} from '@/components/new-chat/composerSendOwnership';import { useProvisionalDraftEmptyCleanup } from '../useProvisionalDraftEmptyCleanup';const draftKey = 'provisional-cleanup-test';@@ -35,6 +40,7 @@ describe('provisional draft empty cleanup', () => {});afterEach(() => {cleanup();+ clearArmedDetachedVoiceDraft();clearDraft(draftKey);vi.useRealTimers();});@@ -92,4 +98,22 @@ describe('provisional draft empty cleanup', () => {unmount();expect(mocks.discard).toHaveBeenCalledTimes(busy ? 0 : 1);});++ // PR #6956 review: unmount stops the React subscriber, so exercise the real+ // detached persistence completion too. Empty ASR must remove only its source+ // task; text or a replacement task must survive (unit, fake timers).+ it.each([+ { text: '', replacement: false, discarded: 1 },+ { text: 'Recognized words', replacement: false, discarded: 0 },+ { text: '', replacement: true, discarded: 0 },+ ])('settles detached voice: $text, replacement=$replacement', ({ text, replacement, discarded }) => {+ const { result, unmount } = mount();+ act(() => result.current.onVoiceBusyChange(true));+ armDetachedVoiceDraftPersist(draftKey, '', result.current.onVoiceDetached());+ unmount();+ expect(mocks.discard).not.toHaveBeenCalled();+ if (replacement) mocks.currentId = 'draft-2';+ settleArmedDetachedVoiceDraft(text);+ expect(mocks.discard).toHaveBeenCalledTimes(discarded);+ });});diff --git a/apps/desktop/src/renderer/features/cc-agent/hooks/useProjectGroups.ts b/apps/desktop/src/renderer/features/cc-agent/hooks/useProjectGroups.tsindex ee2986cf7c..8fc5e08f1b 100644--- a/apps/desktop/src/renderer/features/cc-agent/hooks/useProjectGroups.ts+++ b/apps/desktop/src/renderer/features/cc-agent/hooks/useProjectGroups.ts@@ -6,12 +6,9 @@* Row-only patches reuse membership and ordering, keeping unrelated nodes stable.*/-import { useMemo, useSyncExternalStore } from 'react';+import { useMemo } from 'react';import { createProjectGroupsSelector } from '../lib/projectGroupsSelector';-import {- getProvisionalDraftProjectTaskId,- subscribeProvisionalDraftTaskId,-} from '../lib/provisionalDraftTaskId';+import { useProvisionalDraftProjectTaskId } from './useProvisionalDraftProjectTaskId';import type { Session } from '@/lib/ccAgent.types';import { useRemoteSshHosts } from '@/hooks/useRemoteSshHosts';@@ -38,10 +35,7 @@ export function useProjectGroups(): ProjectGroupsResult {const sshHosts = useRemoteSshHosts();const selectGroups = useMemo(() => createProjectGroupsSelector(), []);- const provisionalDraftTaskId = useSyncExternalStore(- subscribeProvisionalDraftTaskId,- getProvisionalDraftProjectTaskId,- );+ const provisionalDraftTaskId = useProvisionalDraftProjectTaskId();/*伙伴归属表。会话行本身不带 botId,归属只有伙伴档案知道 —— 档案还没加载完的那一瞬间这张表是空的,伙伴任务就走原来的分组落到别处,**不会消失**。diff --git a/apps/desktop/src/renderer/features/cc-agent/hooks/useProvisionalDraftEmptyCleanup.ts b/apps/desktop/src/renderer/features/cc-agent/hooks/useProvisionalDraftEmptyCleanup.tsindex b9e3166303..3e55394133 100644--- a/apps/desktop/src/renderer/features/cc-agent/hooks/useProvisionalDraftEmptyCleanup.ts+++ b/apps/desktop/src/renderer/features/cc-agent/hooks/useProvisionalDraftEmptyCleanup.ts@@ -35,6 +35,17 @@ export function useProvisionalDraftEmptyCleanup(draftKey: string, refreshTitle:},[armEmptyCheck, cancel],);+ const onVoiceDetached = useCallback(() => {+ const id = provisionalDraftTaskId();+ if (!id) return undefined;+ // The component will be gone when ASR settles. Bind cleanup to its source+ // task, then recheck after the existing detached-persist path has finished.+ return () => {+ void discardProvisionalDraftTask(+ () => provisionalDraftTaskId() === id && !getDraftPresence(draftKey),+ );+ };+ }, [draftKey]);useEffect(() => {const unsubscribe = subscribeDraftContent(draftKey, () => {@@ -53,5 +64,5 @@ export function useProvisionalDraftEmptyCleanup(draftKey: string, refreshTitle:};}, [armEmptyCheck, cancel, discardIfEmpty, draftKey, isEmpty, refreshTitle]);- return { armEmptyCheck, onVoiceBusyChange };+ return { armEmptyCheck, onVoiceBusyChange, onVoiceDetached };}diff --git a/apps/desktop/src/renderer/features/cc-agent/hooks/useProvisionalDraftProjectTaskId.ts b/apps/desktop/src/renderer/features/cc-agent/hooks/useProvisionalDraftProjectTaskId.tsnew file mode 100644index 0000000000..b912fe0894--- /dev/null+++ b/apps/desktop/src/renderer/features/cc-agent/hooks/useProvisionalDraftProjectTaskId.ts@@ -0,0 +1,10 @@+import { useSyncExternalStore } from 'react';+import {+ getProvisionalDraftProjectTaskId,+ subscribeProvisionalDraftTaskId,+} from '../lib/provisionalDraftTaskId';++/** Keep all project catalogues aligned with the sidebar during draft handoff. */+export function useProvisionalDraftProjectTaskId(): string | null {+ return useSyncExternalStore(subscribeProvisionalDraftTaskId, getProvisionalDraftProjectTaskId);+}diff --git a/apps/desktop/src/renderer/features/cc-agent/lib/sidebarProjectRestore.ts b/apps/desktop/src/renderer/features/cc-agent/lib/sidebarProjectRestore.tsindex c757460e87..54725c8116 100644--- a/apps/desktop/src/renderer/features/cc-agent/lib/sidebarProjectRestore.ts+++ b/apps/desktop/src/renderer/features/cc-agent/lib/sidebarProjectRestore.ts@@ -51,6 +51,7 @@ type RestoreVendorPredicate = (session: { agentKind?: string | null }) => booleainterface CollectRestorableProjectKeysOptions {sessions: readonly Session[];+ provisionalDraftTaskId?: string | null;persistentLocalProjects?: readonly PersistentLocalProject[];lastActivityCutoff: number | null;pinnedProjectKeys: ReadonlySet<string>;@@ -69,6 +70,7 @@ interface CollectRestorableProjectKeysOptions {*/export function collectRestorableProjectKeys({sessions,+ provisionalDraftTaskId,persistentLocalProjects = [],lastActivityCutoff,pinnedProjectKeys,@@ -92,11 +94,13 @@ export function collectRestorableProjectKeys({lastActivityCutoff,);const activityGroups = groupSessions(activitySessions, {+ provisionalDraftTaskId,includePinnedInProjects: true,persistentLocalProjects: activityProjects,localPlatform,});const allGroups = groupSessions(sessions, {+ provisionalDraftTaskId,includePinnedInProjects: true,persistentLocalProjects,localPlatform,diff --git a/apps/desktop/src/renderer/features/skillhub/hooks/__tests__/useProjectsForPicker.test.tsx b/apps/desktop/src/renderer/features/skillhub/hooks/__tests__/useProjectsForPicker.test.tsxnew file mode 100644index 0000000000..5558565591--- /dev/null+++ b/apps/desktop/src/renderer/features/skillhub/hooks/__tests__/useProjectsForPicker.test.tsx@@ -0,0 +1,56 @@+// @vitest-environment jsdom+import { act, cleanup, renderHook } from '@testing-library/react';+import { afterEach, expect, it, vi } from 'vitest';+import type { Session } from '@/lib/ccAgent.types';+import type { SkillhubTarget } from '../../SkillhubTargetContext';+import { setProvisionalDraftTaskId } from '@/features/cc-agent/lib/provisionalDraftTaskId';+import { useProjectsForPicker } from '../useProjectsForPicker';++const source = vi.hoisted(() => ({ sessions: [] as Session[], target: null as SkillhubTarget | null }));+vi.mock('@/hooks/useCCSessions', () => ({ useCCSessions: () => ({ sessions: source.sessions, isLoading: false }) }));+vi.mock('../../SkillhubTargetContext', () => ({ useSkillhubTarget: () => source.target }));++afterEach(() => {+ cleanup();+ setProvisionalDraftTaskId(null);+ source.target = null;+});++function draftRows() {+ source.sessions = [{+ id: 'draft', workingDir: '/workspace/new-project', workspaceKind: 'project',+ status: 'active', userSendAt: null, pinnedAt: null, _count: { messages: 0 },+ createdAt: '2026-10-23T10:00:00Z', updatedAt: '2026-10-23T10:00:00Z',+ } as Session];+}++// PR #6956 review: InstallTargetPicker's existing tests replace this hook, and+// pure grouping tests cannot observe a mounted picker updating with unchanged+// session rows. This jsdom unit file exercises that subscription and the remote+// target override, keeping the node grouping suite independent of React.+it('updates install projects when only the provisional identity changes', () => {+ draftRows();+ const { result } = renderHook(useProjectsForPicker);+ expect(result.current.projects).toEqual([]);+ act(() => setProvisionalDraftTaskId('draft'));+ expect(result.current.projects.map((p) => p.projectRoot)).toEqual(['/workspace/new-project']);+ act(() => setProvisionalDraftTaskId(null));+ expect(result.current.projects).toEqual([]);+});++it('keeps the first-send project when the picker mounts with a late draft snapshot', () => {+ draftRows();+ setProvisionalDraftTaskId('draft');+ setProvisionalDraftTaskId(null, true);+ const { result } = renderHook(useProjectsForPicker);+ expect(result.current.projects.map((p) => p.projectRoot)).toEqual(['/workspace/new-project']);+});++it('continues using the selected remote computer project catalogue', () => {+ draftRows();+ const projects = [{ projectRoot: '/remote/project', displayName: 'remote' }];+ source.target = { projects, state: { bootstrapped: true } } as SkillhubTarget;+ const { result } = renderHook(useProjectsForPicker);+ act(() => setProvisionalDraftTaskId('draft'));+ expect(result.current).toEqual({ projects, loading: false });+});diff --git a/apps/desktop/src/renderer/features/skillhub/hooks/useProjectsForPicker.ts b/apps/desktop/src/renderer/features/skillhub/hooks/useProjectsForPicker.tsindex 91d67659bd..30fe2bbef6 100644--- a/apps/desktop/src/renderer/features/skillhub/hooks/useProjectsForPicker.ts+++ b/apps/desktop/src/renderer/features/skillhub/hooks/useProjectsForPicker.ts@@ -12,6 +12,7 @@ import { useMemo } from 'react';import { useCCSessions } from '@/hooks/useCCSessions';import { groupSessions } from '@/features/cc-agent/lib/projectGrouping';+import { useProvisionalDraftProjectTaskId } from '@/features/cc-agent/hooks/useProvisionalDraftProjectTaskId';import { useSkillhubTarget } from '../SkillhubTargetContext';export interface PickerProject {@@ -22,15 +23,16 @@ export interface PickerProject {export function useProjectsForPicker(): { projects: PickerProject[]; loading: boolean } {const target = useSkillhubTarget();const { sessions, isLoading } = useCCSessions();+ const provisionalDraftTaskId = useProvisionalDraftProjectTaskId();const projects = useMemo<PickerProject[]>(() => {if (isLoading) return [];- const { projects: grouped } = groupSessions(sessions);+ const { projects: grouped } = groupSessions(sessions, { provisionalDraftTaskId });return grouped.map((p) => ({projectRoot: p.workingDir,displayName: p.displayName,}));- }, [sessions, isLoading]);+ }, [sessions, isLoading, provisionalDraftTaskId]);return target ? { projects: target.projects, loading: !target.state.bootstrapped } : { projects, loading: isLoading };}