Skip to content

armgit / cindy

Public Imported from GitHub
0

Consider it done. The open-source AI agent that works out of the box · 想到,就能做到。开源、开箱即用的 AI Agent。

fix(bots): 后台任务页的所属伙伴标按逐任务责任显示

Chrisb35a14ebc8d7
diff --git a/apps/desktop/src/renderer/features/bots/BotCollaborationCard.tsx b/apps/desktop/src/renderer/features/bots/BotCollaborationCard.tsx
index 460bc7fbd7..97d39a735b 100644
--- a/apps/desktop/src/renderer/features/bots/BotCollaborationCard.tsx
+++ b/apps/desktop/src/renderer/features/bots/BotCollaborationCard.tsx
@@ -407,7 +407,8 @@ export function BotTaskCard({
>
{title}
</button>
- <span className="shrink-0 text-11 text-[var(--text-tertiary)]">{meta}</span>
+ {/* The title keeps its room in a narrow column (Thread open); the meta line gives way first. */}
+ <span className="min-w-0 max-w-[55%] shrink truncate text-11 text-[var(--text-tertiary)]">{meta}</span>
</div>
{line2 ? (
<div className="mt-1 flex min-w-0 items-center gap-1.5 text-12 text-[var(--text-secondary)]">
diff --git a/apps/desktop/src/renderer/features/bots/BotTaskOwnerChip.tsx b/apps/desktop/src/renderer/features/bots/BotTaskOwnerChip.tsx
index 262563aab1..a461b36e1f 100644
--- a/apps/desktop/src/renderer/features/bots/BotTaskOwnerChip.tsx
+++ b/apps/desktop/src/renderer/features/bots/BotTaskOwnerChip.tsx
@@ -3,25 +3,25 @@ import { useTranslation } from 'react-i18next';
import { useNavigate } from 'react-router-dom';
import { WINDOW_NO_DRAG_STYLE } from '@/components/layout/windowDrag';
+import type { Session } from '@/lib/ccAgent.types';
import { BotAvatar } from './BotAvatar';
-import { findBotProfileForSession } from './botSessionOwners';
-import { ensureBotProfilesLoaded, useBotProfiles } from './botStore';
+import { useSessionFollowers } from './botFollowScopes';
+import { ensureBotProfilesLoaded } from './botStore';
/**
* A Bot's background task opens in the ordinary task view; this quiet chip in
- * its header says whose task it is and leads back to that Bot. Ownership comes
- * only from the `bot_session_links` projection, never from the session row.
+ * its header says whose task it is and leads back to that Bot. Ownership is the
+ * same verifiable per-task responsibility the sidebar mark uses (the Bot that
+ * created the task, or explicitly took it over), never a guess from the session row.
*/
-export function BotTaskOwnerChip({ sessionId }: { sessionId: string }) {
+export function BotTaskOwnerChip({ session }: { session: Session }) {
const { t } = useTranslation();
const navigate = useNavigate();
- const profiles = useBotProfiles();
useEffect(() => {
void ensureBotProfilesLoaded().catch(() => {});
}, []);
- const bot = findBotProfileForSession(profiles, sessionId);
- const projection = bot?.sessions.find((session) => session.id === sessionId);
- if (!bot || (projection?.role !== 'delegation' && projection?.kind !== 'worker')) return null;
+ const bot = useSessionFollowers(session)[0];
+ if (!bot) return null;
return (
<button
type="button"
diff --git a/apps/desktop/src/renderer/features/bots/__tests__/BotTaskOwnerChip.test.tsx b/apps/desktop/src/renderer/features/bots/__tests__/BotTaskOwnerChip.test.tsx
index 53f9eb7f60..29b7588598 100644
--- a/apps/desktop/src/renderer/features/bots/__tests__/BotTaskOwnerChip.test.tsx
+++ b/apps/desktop/src/renderer/features/bots/__tests__/BotTaskOwnerChip.test.tsx
@@ -6,47 +6,41 @@ import { afterEach, beforeEach, expect, it, vi } from 'vitest';
import { BotTaskOwnerChip } from '../BotTaskOwnerChip';
-const mocks = vi.hoisted(() => ({ navigate: vi.fn(), ensure: vi.fn(), profiles: [] as unknown[] }));
+const mocks = vi.hoisted(() => ({ navigate: vi.fn(), ensure: vi.fn(), followers: new Map<string, unknown[]>() }));
vi.mock('react-i18next', () => ({
useTranslation: () => ({ t: (key: string, options?: Record<string, unknown>) => `${key}:${JSON.stringify(options)}` }),
}));
vi.mock('react-router-dom', () => ({ useNavigate: () => mocks.navigate }));
vi.mock('../BotAvatar', () => ({ BotAvatar: ({ bot }: any) => <span data-avatar={bot.name} /> }));
-vi.mock('../botStore', () => ({
- useBotProfiles: () => mocks.profiles,
- ensureBotProfilesLoaded: mocks.ensure,
+vi.mock('../botStore', () => ({ ensureBotProfilesLoaded: mocks.ensure }));
+// The same per-task responsibility the sidebar mark reads; the chip adds no second ownership rule.
+vi.mock('../botFollowScopes', () => ({
+ useSessionFollowers: (session: { id: string }) => mocks.followers.get(session.id) ?? [],
}));
-const profile = {
- id: 'bot/a',
- name: 'LiZi',
- sessions: [
- { id: 'main', role: 'canonical', kind: 'chat' },
- { id: 'task', role: 'delegation', kind: 'worker' },
- { id: 'old', role: 'history', kind: 'history' },
- ],
-};
+const lizi = { id: 'bot/a', name: 'LiZi' };
+const session = (id: string) => ({ id, status: 'active', source: 'desktop' }) as any;
beforeEach(() => {
- mocks.profiles = [profile];
+ mocks.followers = new Map([['task', [lizi]]]);
mocks.ensure.mockReset().mockResolvedValue([]);
mocks.navigate.mockReset();
});
afterEach(cleanup);
it("names a Bot's background task in its ordinary header and leads back to that Bot", () => {
- render(<BotTaskOwnerChip sessionId="task" />);
+ render(<BotTaskOwnerChip session={session('task')} />);
expect(mocks.ensure).toHaveBeenCalledTimes(1);
expect(screen.getByText('bots.session.ownedByBot:{"name":"LiZi"}')).toBeTruthy();
fireEvent.click(screen.getByRole('button', { name: 'bots.session.backToBot:{"name":"LiZi"}' }));
expect(mocks.navigate).toHaveBeenCalledWith('/bots/bot%2Fa');
});
-it.each(['main', 'old', 'plain'])('stays out of the way for %s', (sessionId) => {
- const { container } = render(<BotTaskOwnerChip sessionId={sessionId} />);
+it('stays out of the way for a task no Bot is responsible for', () => {
+ const { container } = render(<BotTaskOwnerChip session={session('plain')} />);
expect(container.firstChild).toBeNull();
});
it('is mounted next to the ordinary task title', () => {
const header = readFileSync(resolve(__dirname, '../../cc-agent/SessionContentHeader.tsx'), 'utf8');
- expect(header).toContain('{!isEditing && <BotTaskOwnerChip sessionId={session.id} />}');
+ expect(header).toContain('{!isEditing && <BotTaskOwnerChip session={session} />}');
});
diff --git a/apps/desktop/src/renderer/features/cc-agent/SessionContentHeader.tsx b/apps/desktop/src/renderer/features/cc-agent/SessionContentHeader.tsx
index 7bca5be8a1..58b39a3e5d 100644
--- a/apps/desktop/src/renderer/features/cc-agent/SessionContentHeader.tsx
+++ b/apps/desktop/src/renderer/features/cc-agent/SessionContentHeader.tsx
@@ -656,7 +656,7 @@ export function SessionContentHeader({
{!isEditing && <OrcaRemoteLeadBadge session={session} />}
- {!isEditing && <BotTaskOwnerChip sessionId={session.id} />}
+ {!isEditing && <BotTaskOwnerChip session={session} />}
{!isEditing && !readOnly && (!sharedGuest || session.status === 'active') && (
// 菜单打开就把归档/删除的 dirty 预检发出去:用户从展开菜单到点条目至少