Consider it done. The open-source AI agent that works out of the box · 想到,就能做到。开源、开箱即用的 AI Agent。
TypeScript agentai-agentai-assistantandroidclaude-codecodexelectroniosllmmacosreact-nativetypescriptwindows
fix(bots): 伙伴通知路由、设置抽屉与自动保存的交互修复
Claude64533fa2cba6
diff --git a/apps/desktop/src/renderer/components/layout/MainLayout.tsx b/apps/desktop/src/renderer/components/layout/MainLayout.tsxindex eb68468408..144a27a2b1 100644--- a/apps/desktop/src/renderer/components/layout/MainLayout.tsx+++ b/apps/desktop/src/renderer/components/layout/MainLayout.tsx@@ -100,8 +100,9 @@ import { requestSessionSwitch } from '@/features/cc-agent/lib/sessionSwitchCommaimport { makeFolderPickerNewMakerRouteState } from '@/features/cc-agent/lib/newMakerRouteState';import { makeGenericNewMakerRouteState } from '@/features/cc-agent/lib/genericNewMakerRouteState';import { resolveSessionRoute } from '@/lib/orcaSessionIdentity';-import { getBotProfiles } from '@/features/bots/botStore';-import { botRouteForOwnedSession } from '@/features/bots/botSessionOwners';+import { ensureBotProfilesLoaded, getBotProfiles } from '@/features/bots/botStore';+import { resolveBotRouteForSessionEntry } from '@/features/bots/botSessionOwners';+import * as sessionService from '@/lib/sessionService';import { remoteProjectsStore } from '@/features/device-link/remoteProjectsStore';import {isAgentIslandVisibleSessionOwnedByWorkdirBrowseRoute,@@ -491,14 +492,8 @@ export function MainLayout() {// 防止 HMR listener 累积或 Electron click 异常多次触发时反复 navigate。const currentPathRef = useRef(`${location.pathname}${location.search}`);currentPathRef.current = `${location.pathname}${location.search}`;- const navigateToSession = useCallback(+ const navigateToOrdinarySession = useCallback((sessionId: string, messageClientId?: string) => {- const botRoute = botRouteForOwnedSession(getBotProfiles(), sessionId);- if (botRoute) {- const target = botRoute;- if (currentPathRef.current !== target) navigate(target);- return;- }// device-link 远程会话本地无 row:resolveSessionRoute 内部的 sessionService.get// 会 miss → 远程 Orca lead/worker 被当普通会话路由,CCAgentSessionView 再// redirect 到 orca 路由时会丢 searchJump 锚点。传入远程镜像的 session 对象,@@ -539,6 +534,22 @@ export function MainLayout() {},[navigate],);+ const navigateToSession = useCallback(+ (sessionId: string, messageClientId?: string) => {+ void resolveBotRouteForSessionEntry(sessionId, {+ readProfiles: getBotProfiles,+ readSessionSource: async (id) => (await sessionService.get(id)).source,+ loadProfiles: ensureBotProfilesLoaded,+ }).then((botRoute) => {+ if (!botRoute) {+ navigateToOrdinarySession(sessionId, messageClientId);+ return;+ }+ if (currentPathRef.current !== botRoute) navigate(botRoute);+ });+ },+ [navigate, navigateToOrdinarySession],+ );navigateToSessionRef.current = navigateToSession;useEffect(() => {const unsubscribe = window.electronAPI.onNotificationFocusSession((sessionId) => {diff --git a/apps/desktop/src/renderer/features/bots/BotSettingsDrawer.tsx b/apps/desktop/src/renderer/features/bots/BotSettingsDrawer.tsxindex 96b4989921..a819e00642 100644--- a/apps/desktop/src/renderer/features/bots/BotSettingsDrawer.tsx+++ b/apps/desktop/src/renderer/features/bots/BotSettingsDrawer.tsx@@ -76,6 +76,12 @@ export function BotSettingsDrawer() {navigate('/bots', { replace: true });return;}+ // A paused or failed teammate has no chat behind the drawer: its page reopens+ // settings, so dropping the query alone would bounce straight back. Close to the list.+ if (bot && bot.status !== 'active') {+ navigate('/bots/list', { replace: true });+ return;+ }setSearchParams((current) => {const next = new URLSearchParams(current);diff --git a/apps/desktop/src/renderer/features/bots/BotsHomeView.tsx b/apps/desktop/src/renderer/features/bots/BotsHomeView.tsxindex abe5e06592..19040a4d4f 100644--- a/apps/desktop/src/renderer/features/bots/BotsHomeView.tsx+++ b/apps/desktop/src/renderer/features/bots/BotsHomeView.tsx@@ -47,6 +47,7 @@ import {import { BotRosterView } from './BotRosterView';import { BotAvatar } from './BotAvatar';import { BotBasicProfileFields } from './BotBasicProfileFields';+import { normalizeBotName } from '../../../shared/botCreation';import {botEntryTarget,createBotCanonicalSessionWithRetry,@@ -106,6 +107,10 @@ export function BotSettings({const navigate = useNavigate();const [name, setName] = useState(bot.name);const [description, setDescription] = useState(bot.description);+ const profiles = useBotProfiles();+ // Same identity rule as creation and the host: NFKC, trimmed, case-insensitive.+ const nameTaken = !!name.trim() && profiles.some((other) => other.id !== bot.id && other.status !== 'archived'+ && normalizeBotName(other.name) === normalizeBotName(name));const [portraitRetryFailed, setPortraitRetryFailed] = useState(false);const [identitySource, setIdentitySource] = useState(bot.identitySource ?? '');const [userContextSource, setUserContextSource] = useState(bot.userContextSource ?? '');@@ -435,7 +440,12 @@ export function BotSettings({) : (<span />)}- {autosave.status === 'saving' ? (+ {nameTaken ? (+ // The host rejects the rename; say why instead of a generic save failure and a futile retry.+ <p className="text-11 text-[var(--text-danger)]" role="alert">+ {t('bots.guided.duplicateName')}+ </p>+ ) : autosave.status === 'saving' ? (<spanrole="status"className="inline-flex items-center gap-1 text-11 text-[var(--text-tertiary)]"diff --git a/apps/desktop/src/renderer/features/bots/__tests__/botSessionOwners.test.ts b/apps/desktop/src/renderer/features/bots/__tests__/botSessionOwners.test.tsindex 5469617252..1fb6d9d8e8 100644--- a/apps/desktop/src/renderer/features/bots/__tests__/botSessionOwners.test.ts+++ b/apps/desktop/src/renderer/features/bots/__tests__/botSessionOwners.test.ts@@ -8,7 +8,7 @@* 档案知道;档案迟到的那一瞬间宁可落到未分类,也不能整个不见。*/-import { describe, expect, it } from 'vitest';+import { describe, expect, it, vi } from 'vitest';import { groupSessions } from '@/features/cc-agent/lib/projectGrouping';import type { Session } from '@/lib/ccAgent.types';@@ -16,6 +16,7 @@ import {botRouteForOwnedSession,buildBotSessionOwners,findBotProfileForSession,+ resolveBotRouteForSessionEntry,} from '../botSessionOwners';import type { BotProfile } from '../botStore';@@ -86,6 +87,52 @@ describe('伙伴归属表', () => {});});+describe('通知入口在伙伴投影未加载时的路由', () => {+ function deps(over: {+ current?: BotProfile[];+ loaded?: BotProfile[];+ source?: string | null;+ }) {+ const loadProfiles = vi.fn<(refresh: boolean) => Promise<BotProfile[]>>(async () => over.loaded ?? []);+ return {+ loadProfiles,+ deps: {+ readProfiles: () => over.current ?? [],+ readSessionSource: vi.fn(async () => over.source ?? null),+ loadProfiles,+ },+ };+ }++ it('投影已含该任务时直接回伙伴页,不读任务也不重载', async () => {+ const { deps: d, loadProfiles } = deps({ current: [profile()] });+ await expect(resolveBotRouteForSessionEntry('s-main', d)).resolves.toBe('/bots/bot-a');+ expect(d.readSessionSource).not.toHaveBeenCalled();+ expect(loadProfiles).not.toHaveBeenCalled();+ });++ it('启动后从未进过伙伴页时先加载投影,再回伙伴页', async () => {+ const { deps: d, loadProfiles } = deps({ loaded: [profile()], source: 'bot' });+ await expect(resolveBotRouteForSessionEntry('s-old', d)).resolves.toBe('/bots/bot-a/session/s-old');+ expect(loadProfiles).toHaveBeenCalledWith(true);+ });++ it('普通任务只按需加载一次,不强制重读投影', async () => {+ const { deps: d, loadProfiles } = deps({ source: 'desktop' });+ await expect(resolveBotRouteForSessionEntry('plain', d)).resolves.toBeNull();+ expect(loadProfiles).toHaveBeenCalledWith(false);+ });++ it('读任务或加载投影失败时退回普通任务路由,不吞掉这次点击', async () => {+ const d = {+ readProfiles: () => [],+ readSessionSource: vi.fn(async () => { throw new Error('offline'); }),+ loadProfiles: vi.fn(async () => { throw new Error('not ready'); }),+ };+ await expect(resolveBotRouteForSessionEntry('s-main', d)).resolves.toBeNull();+ });+});+describe('侧栏按伙伴分组', () => {it('同一个伙伴在不同项目里的任务聚在一组,不按目录切碎', () => {const owners = buildBotSessionOwners([profile()]);diff --git a/apps/desktop/src/renderer/features/bots/__tests__/botSettings.test.tsx b/apps/desktop/src/renderer/features/bots/__tests__/botSettings.test.tsxindex 5296b4a4d6..35edc56013 100644--- a/apps/desktop/src/renderer/features/bots/__tests__/botSettings.test.tsx+++ b/apps/desktop/src/renderer/features/bots/__tests__/botSettings.test.tsx@@ -998,6 +998,30 @@ describe('same-Bot capability updates while editing settings', () => {expect(mocks.updateBotProfile).toHaveBeenLastCalledWith('bot-1', { name: 'Local name', capabilities: { toolsets: ['docs', 'scheduler'] }, capabilityBaseline: { toolsets: ['docs'] } });});+ it('explains a rename that collides with another teammate instead of a generic save failure', async () => {+ mocks.profiles = [bot(), bot({ id: 'bot-2', name: 'Release Buddy' })];+ renderSettings();+ fireEvent.change(screen.getByLabelText('bots.nameLabel'), { target: { value: ' release buddy ' } });+ expect(screen.getByRole('alert').textContent).toBe('bots.guided.duplicateName');+ expect(screen.queryByText('bots.autosave.retry')).toBeNull();+ fireEvent.change(screen.getByLabelText('bots.nameLabel'), { target: { value: 'Release buddy 2' } });+ expect(screen.queryByText('bots.guided.duplicateName')).toBeNull();+ });++ it('keeps a trailing line break typed before the debounced save lands', async () => {+ vi.useFakeTimers();+ const view = renderSettings();+ fireEvent.change(screen.getByLabelText('bots.profile.summary'), { target: { value: 'Own releases\n' } });+ await act(async () => { await vi.advanceTimersByTimeAsync(1600); });+ expect(mocks.updateBotProfile).toHaveBeenLastCalledWith('bot-1', { description: 'Own releases' });+ // The host stores the trimmed text; the field must not snap the caret back a line.+ view.rerender(<BotSettings bot={bot({ description: 'Own releases' })} onBack={view.onBack} onOpenSession={view.onOpenSession} />);+ await act(async () => {});+ expect((screen.getByLabelText('bots.profile.summary') as HTMLTextAreaElement).value).toBe('Own releases\n');+ await act(async () => { await vi.advanceTimersByTimeAsync(1600); });+ expect(mocks.updateBotProfile).toHaveBeenCalledOnce();+ });+it('keeps edits made during a successful save and adopts concurrent capability updates', async () => {vi.useFakeTimers();let finishSave!: (value: { id: string; currentVersion: number; name: string }) => void;diff --git a/apps/desktop/src/renderer/features/bots/__tests__/botSettingsAutosave.test.ts b/apps/desktop/src/renderer/features/bots/__tests__/botSettingsAutosave.test.tsindex 0e5a6afece..e0e3d49e49 100644--- a/apps/desktop/src/renderer/features/bots/__tests__/botSettingsAutosave.test.ts+++ b/apps/desktop/src/renderer/features/bots/__tests__/botSettingsAutosave.test.ts@@ -6,6 +6,7 @@ import {botSettingsPayloadEqual,createBotSettingsAutosave,normalizeBotSettingsPayload,+ reconcileBotSettingsDraft,type BotAutosaveStatus,type BotSettingsPayload,} from '../botSettingsAutosave';@@ -131,9 +132,29 @@ describe('normalizeBotSettingsPayload', () => {expect(result.name).toBe('PR steward');expect(result.description).toBe('spaced');- // Long-form prompt text is stored verbatim: trimming it would silently edit- // the user's system prompt.- expect(result.identitySource).toBe(' kept as typed ');+ // The host trims every profile text (`readText`); comparing the same way keeps+ // surrounding whitespace from reading as an unsaved change.+ expect(result.identitySource).toBe('kept as typed');+ });++ it('keeps whitespace still being typed when a save settles', () => {+ const saved = payload({ name: 'Filo', description: 'Own releases', identitySource: 'You ship.' });+ const draft = {+ ...saved,+ name: 'Filo ',+ description: 'Own releases\n',+ identitySource: 'You ship.\n\n',+ };+ const next = reconcileBotSettingsDraft(saved, draft, saved);+ expect(next.name).toBe('Filo ');+ expect(next.description).toBe('Own releases\n');+ expect(next.identitySource).toBe('You ship.\n\n');+ // Nothing unsaved: the whitespace alone does not trigger another save.+ expect(botSettingsPayloadEqual(normalizeBotSettingsPayload(next, 'Filo'), saved)).toBe(true);+ // A cleared name still snaps back to the saved one rather than staying blank.+ expect(reconcileBotSettingsDraft(saved, { ...draft, name: '' }, saved).name).toBe(saved.name);+ // A newer value from elsewhere still replaces an untouched field.+ expect(reconcileBotSettingsDraft(saved, saved, { ...saved, description: 'From phone' }).description).toBe('From phone');});it('produces an equal snapshot for the baseline and the untouched draft', () => {diff --git a/apps/desktop/src/renderer/features/bots/__tests__/botSettingsDrawer.test.tsx b/apps/desktop/src/renderer/features/bots/__tests__/botSettingsDrawer.test.tsxindex c4783b3c7c..08597dc755 100644--- a/apps/desktop/src/renderer/features/bots/__tests__/botSettingsDrawer.test.tsx+++ b/apps/desktop/src/renderer/features/bots/__tests__/botSettingsDrawer.test.tsx@@ -36,6 +36,7 @@ vi.mock('../RemoteBotSettings', () => ({ RemoteBotSettings: ({ bot }: { bot: { dvi.mock('../botStore', () => ({useBotProfiles: () => [{ id: 'bot-1', name: 'Filo', status: 'active', sessions: [], capabilities: {}, skills: [] },+ { id: 'bot-paused', name: 'Paused', status: 'paused', sessions: [], capabilities: {}, skills: [] },],}));vi.mock('../BotsHomeView', async () => {@@ -217,6 +218,18 @@ it('keeps the drawer open while Escape only cancels an IME candidate', async ()expect(guard).toHaveBeenCalledOnce();});+it.each(['close button', 'Escape'])('closes a paused teammate\'s settings to the list via %s instead of bouncing back', async (kind) => {+ const router = createMemoryRouter([{ path: '*', element: <><LocationProbe /><BotSettingsDrawer /></> }], {+ initialEntries: ['/bots/bot-paused?settings=1'],+ });+ render(<RouterProvider router={router} />);+ if (kind === 'Escape') fireEvent.keyDown(screen.getByRole('dialog'), { key: 'Escape' });+ else fireEvent.click(screen.getByRole('button', { name: 'bots.close' }));+ await waitFor(() => expect(screen.getByTestId('location').textContent).toBe('/bots/list'));+ // The save / routine-draft guard still runs before leaving.+ expect(guard).toHaveBeenCalledOnce();+});+it('opens remote settings for the route device instead of searching the local bot store', () => {render(<RouterProvider router={createMemoryRouter([{ path: '*', element: <BotSettingsDrawer /> }], { initialEntries: ['/bots/remote/other-mac/remote-bot?settings=1'] })} />);expect(screen.getByTestId('remote-settings').textContent).toBe('other-mac');diff --git a/apps/desktop/src/renderer/features/bots/__tests__/botStore.lifecycle.test.ts b/apps/desktop/src/renderer/features/bots/__tests__/botStore.lifecycle.test.tsindex 70158ef3b4..ecc8245324 100644--- a/apps/desktop/src/renderer/features/bots/__tests__/botStore.lifecycle.test.ts+++ b/apps/desktop/src/renderer/features/bots/__tests__/botStore.lifecycle.test.ts@@ -160,6 +160,30 @@ describe('Bot profile snapshot ownership', () => {expect(store.getBotProfiles().map((row) => row.id)).toEqual(['bot-b']);});+ it('loads the signed-in owner projection on demand after the startup hydration missed it', async () => {+ const owner = await import('@/contexts/dataOwnerGeneration');+ owner.setDataOwnerGeneration(null);+ const list = vi.fn()+ .mockRejectedValueOnce(new Error('database not ready'))+ .mockResolvedValue([bot]);+ Object.defineProperty(window, 'electronAPI', {+ configurable: true,+ value: { localDb: { bots: { list } } },+ });+ const store = await import('../botStore');+ await vi.waitFor(() => expect(list).toHaveBeenCalledOnce());+ owner.setDataOwnerGeneration('owner-a');+ // Sign-in clears the projection without reloading it; nothing is listening outside Bots views.+ expect(store.getBotProfiles()).toEqual([]);+ await expect(store.ensureBotProfilesLoaded()).resolves.toMatchObject([{ id: 'bot-1' }]);+ expect(list).toHaveBeenCalledTimes(2);+ // Already loaded: a plain entry does not re-read, an explicit refresh does.+ await store.ensureBotProfilesLoaded();+ expect(list).toHaveBeenCalledTimes(2);+ await store.ensureBotProfilesLoaded(true);+ expect(list).toHaveBeenCalledTimes(3);+ });+it('rejects a prior-owner update without changing the new owner projection', async () => {const owner = await import('@/contexts/dataOwnerGeneration');owner.setDataOwnerGeneration('owner-a');diff --git a/apps/desktop/src/renderer/features/bots/botSessionOwners.ts b/apps/desktop/src/renderer/features/bots/botSessionOwners.tsindex 98d04eace5..31590dcd3f 100644--- a/apps/desktop/src/renderer/features/bots/botSessionOwners.ts+++ b/apps/desktop/src/renderer/features/bots/botSessionOwners.ts@@ -46,6 +46,30 @@ export function botRouteForOwnedSession(: `/bots/${encodeURIComponent(bot.id)}/session/${encodeURIComponent(sessionId)}`;}+export interface BotSessionEntryRouteDeps {+ readProfiles: () => readonly BotProfile[];+ readSessionSource: (sessionId: string) => Promise<string | null | undefined>;+ /** Loads the current owner's profiles; `refresh` re-reads an already loaded projection. */+ loadProfiles: (refresh: boolean) => Promise<readonly BotProfile[]>;+}++/**+ * Resolve a session-only entry such as a notification click. The in-memory+ * projection is only kept fresh while a Bots view is mounted, so a click can+ * arrive before it was ever loaded for this account, or after a new Bot session+ * was linked. Load it once, and re-read it when the row itself is a Bot session.+ */+export async function resolveBotRouteForSessionEntry(+ sessionId: string,+ deps: BotSessionEntryRouteDeps,+): Promise<string | null> {+ const known = botRouteForOwnedSession(deps.readProfiles(), sessionId);+ if (known) return known;+ const source = await deps.readSessionSource(sessionId).catch(() => null);+ const profiles = await deps.loadProfiles(source === 'bot').catch(() => []);+ return botRouteForOwnedSession(profiles, sessionId);+}+export function buildBotSessionOwners(profiles: readonly BotProfile[],): Map<string, BotSessionOwner> {diff --git a/apps/desktop/src/renderer/features/bots/botSettingsAutosave.ts b/apps/desktop/src/renderer/features/bots/botSettingsAutosave.tsindex b10879c4f1..d573135118 100644--- a/apps/desktop/src/renderer/features/bots/botSettingsAutosave.ts+++ b/apps/desktop/src/renderer/features/bots/botSettingsAutosave.ts@@ -60,11 +60,13 @@ export function normalizeBotSettingsPayload(draft: BotSettingsDraft,fallbackName: string,): BotSettingsPayload {+ // The host trims every profile text; compare the same way so a space or line+ // break still being typed is neither a change nor a reason to save again.return {name: draft.name.trim() || fallbackName,description: draft.description.trim(),- identitySource: draft.identitySource,- userContextSource: draft.userContextSource,+ identitySource: draft.identitySource.trim(),+ userContextSource: draft.userContextSource.trim(),avatar: draft.avatar,avatarColor: draft.avatarColor,capabilities: draft.capabilities,@@ -150,6 +152,8 @@ export function botSettingsChanges(previous: BotSettingsPayload, next: BotSettin};}+const BOT_SETTINGS_TEXT_FIELDS = ['name', 'description', 'identitySource', 'userContextSource'] as const;+/** Advance untouched fields to a live profile without discarding pending local edits. */export function reconcileBotSettingsDraft(baseline: BotSettingsPayload,@@ -158,8 +162,14 @@ export function reconcileBotSettingsDraft(): BotSettingsDraft {const normalized = normalizeBotSettingsPayload(draft, baseline.name);const changes = botSettingsChanges(baseline, normalized);+ // Text that only differs from the saved copy by surrounding whitespace is the+ // user mid-typing (a trailing space or new line); keep it instead of the trimmed copy.+ const typedWhitespace = Object.fromEntries(BOT_SETTINGS_TEXT_FIELDS+ .filter((key) => draft[key] !== incoming[key] && draft[key].trim() === incoming[key])+ .map((key) => [key, draft[key]]));return {...incoming,+ ...typedWhitespace,...Object.fromEntries(Object.keys(changes).filter((key) => key !== 'capabilities').map((key) => [key, draft[key as keyof BotSettingsDraft]])),diff --git a/apps/desktop/src/renderer/features/bots/botStore.ts b/apps/desktop/src/renderer/features/bots/botStore.tsindex 623ef4475e..b5e7b26798 100644--- a/apps/desktop/src/renderer/features/bots/botStore.ts+++ b/apps/desktop/src/renderer/features/bots/botStore.ts@@ -787,6 +787,19 @@ export function refreshBotProfiles(): void {trackHydration();}+/**+ * Wait for the current owner's profiles outside the Bots views. The module-level+ * hydration can run before sign-in, and an owner change clears the projection+ * without reloading it; `refresh` also re-reads a projection that is already loaded.+ */+export async function ensureBotProfilesLoaded(refresh = false): Promise<BotProfile[]> {+ ensureProfileOwner();+ if (refresh) refreshBotProfiles();+ else if (!profileListLoaded && !hydrated) trackHydration();+ await waitForHydration();+ return getBotProfiles();+}+/** Replaces an avatar using gallery bytes, or the host file chooser when omitted. */export async function chooseBotAvatar(botId: string, avatarImageBase64?: string): Promise<BotProfile | null> {const api = botsApi();