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(desktop): 统一任务菜单并收起共享入口 (#4909)

Dashcd0574251fc2
diff --git a/apps/desktop/src/renderer/__tests__/remoteSessionSyncInvariants.test.ts b/apps/desktop/src/renderer/__tests__/remoteSessionSyncInvariants.test.ts
index 1a4feef34f..f67c3980f9 100644
--- a/apps/desktop/src/renderer/__tests__/remoteSessionSyncInvariants.test.ts
+++ b/apps/desktop/src/renderer/__tests__/remoteSessionSyncInvariants.test.ts
@@ -141,15 +141,16 @@ describe('CCAgentSessionView 接线不变式', () => {
expect(sessionViewSrc).toContain('const handleStopSession = useCallback');
expect(sessionViewSrc).toContain('if (remoteSessionUnavailable)');
expect(sessionViewSrc).toContain('onStop={handleStopSession}');
- expect(sessionHeaderSrc).toMatch(
- /<DropdownMenuItem[\s\S]*?disabled=\{remoteWritesBlocked\}[\s\S]*?onSelect=\{handleOpenInNewWindow\}[\s\S]*?openInNewWindow/,
- );
- expect(sessionItemSrc).toMatch(
- /<DropdownMenuItem[\s\S]*?disabled=\{remoteWritesBlocked\}[\s\S]*?onSelect=\{handleOpenInNewWindowSelect\}[\s\S]*?openInNewWindow/,
- );
- expect(sessionCardSrc).toMatch(
- /<DropdownMenuItem[\s\S]*?disabled=\{remoteWritesBlocked\}[\s\S]*?onSelect=\{handleOpenInNewWindowSelect\}[\s\S]*?openInNewWindow/,
- );
+ for (const source of [sessionHeaderSrc, sessionItemSrc, sessionCardSrc]) {
+ expect(source).toMatch(/<SessionTaskMenu[\s\S]*?writeBlocked=\{remoteWritesBlocked\}/);
+ expect(source).toMatch(/onOpenInNewWindow=\{handleOpenInNewWindow(?:Select)?\}/);
+ }
+ const menuSource = readFileSync(
+ resolve(__dirname, '..', 'features', 'cc-agent', 'sidebar', 'SessionTaskMenu.tsx'),
+ 'utf8',
+ );
+ expect(menuSource).toContain("item('openInNewWindow', onOpenInNewWindow, writeBlocked)");
+ expect(menuSource).toContain('disabled={disabled}');
});
it('live / 历史错误横幅都携带 SSH 与 device-link 执行端归属', () => {
expect(sessionViewSrc).toMatch(
diff --git a/apps/desktop/src/renderer/__tests__/sessionContentHeaderDragRegion.test.ts b/apps/desktop/src/renderer/__tests__/sessionContentHeaderDragRegion.test.ts
index babdca1604..29b1f90e5a 100644
--- a/apps/desktop/src/renderer/__tests__/sessionContentHeaderDragRegion.test.ts
+++ b/apps/desktop/src/renderer/__tests__/sessionContentHeaderDragRegion.test.ts
@@ -10,10 +10,10 @@ const gitContextBadgeSource = readFileSync(resolve(ccAgentDir, 'GitContextBadge.
describe('SessionContentHeader window drag region', () => {
it('does not mark the whole injected session header as no-drag', () => {
expect(sessionHeaderSource).toContain(
- '<div className="flex w-full min-w-0 items-center gap-0.5 pl-1">',
+ '<div className="flex min-w-0 items-center gap-0.5 pl-1">',
);
expect(sessionHeaderSource).not.toMatch(
- /<div\s+className="flex w-full min-w-0 items-center gap-0\.5 pl-1"[\s\S]{0,160}WebkitAppRegion: 'no-drag'/,
+ /<div\s+className="flex min-w-0 items-center gap-0\.5 pl-1"[\s\S]{0,160}WebkitAppRegion: 'no-drag'/,
);
});
diff --git a/apps/desktop/src/renderer/__tests__/sessionHeaderMenuParity.test.ts b/apps/desktop/src/renderer/__tests__/sessionHeaderMenuParity.test.ts
index 1ee4946171..eb734514c9 100644
--- a/apps/desktop/src/renderer/__tests__/sessionHeaderMenuParity.test.ts
+++ b/apps/desktop/src/renderer/__tests__/sessionHeaderMenuParity.test.ts
@@ -10,68 +10,29 @@ import { describe, expect, it } from 'vitest';
*/
const ccAgentDir = resolve(__dirname, '..', 'features', 'cc-agent');
const headerSource = readFileSync(resolve(ccAgentDir, 'SessionContentHeader.tsx'), 'utf8');
-const sessionItemSource = readFileSync(
- resolve(ccAgentDir, 'sidebar', 'SessionItem.tsx'),
- 'utf8',
-);
-const sessionCardSource = readFileSync(
- resolve(ccAgentDir, 'sidebar', 'SessionCard.tsx'),
+const sessionItemSource = readFileSync(resolve(ccAgentDir, 'sidebar', 'SessionItem.tsx'), 'utf8');
+const sessionCardSource = readFileSync(resolve(ccAgentDir, 'sidebar', 'SessionCard.tsx'), 'utf8');
+
+const sharedMenuSource = readFileSync(
+ resolve(ccAgentDir, 'sidebar', 'SessionTaskMenu.tsx'),
'utf8',
);
-// 非菜单条目的 sessionMenu.* 用法,各处都排除后再比较:
-// - moreActions:SessionItem 行内 ··· 按钮的 aria-label(header 用自己的
-// ccAgent.sessionHeader.moreActions)
-// - *Done / *Failed / *Blocked / *Unsupported / *Nothing:动作的 toast 反馈文案
-// (header 的 move/export handler 内联在组件里,非菜单项)
-const NON_MENU_KEY_PATTERN = /(?:Done|Failed|Blocked|Unsupported|Nothing)$/;
-const NON_MENU_KEYS = new Set(['moreActions']);
-
-// Pi 专属入口暂不进 overflow 菜单(导出 HTML / 压缩上下文)。压缩仍走对话区
-// context ring。任务分支只在存在 Cindy 分叉家族时显示,仍是头部专属项。
-// 用精确 label 调用守卫,避免 compactSuccess 这类 toast key 被前缀误伤。
-const HIDDEN_PI_MENU_LABELS = [
- "t('ccAgent.sidebar.sessionMenu.exportHtml')",
- "t('ccAgent.sidebar.sessionMenu.compact')",
- "t('ccAgent.sidebar.sessionMenu.compacting')",
-] as const;
-const HEADER_ONLY_KEYS = new Set(['sessionBranches']);
-
-function collectSessionMenuKeys(source: string): Set<string> {
- const keys = new Set<string>();
- for (const match of source.matchAll(/ccAgent\.sidebar\.sessionMenu\.(\w+)/g)) {
- const key = match[1];
- if (NON_MENU_KEYS.has(key) || HEADER_ONLY_KEYS.has(key) || NON_MENU_KEY_PATTERN.test(key)) continue;
- keys.add(key);
- }
- return keys;
-}
-
describe('session menu parity across header and sidebar variants', () => {
- it('uses the same sessionMenu action keys across all menu variants', () => {
- const headerKeys = collectSessionMenuKeys(headerSource);
- const sidebarKeys = collectSessionMenuKeys(sessionItemSource);
- const cardKeys = collectSessionMenuKeys(sessionCardSource);
- expect([...headerKeys].sort()).toEqual([...sidebarKeys].sort());
- expect([...headerKeys].sort()).toEqual([...cardKeys].sort());
- });
-
- it('keeps Pi-only extras out of header and sidebar overflow menus', () => {
+ it('routes every surface through the same menu implementation', () => {
for (const source of [headerSource, sessionItemSource, sessionCardSource]) {
- for (const label of HIDDEN_PI_MENU_LABELS) {
- expect(source).not.toContain(label);
- }
+ expect(source).toContain('<SessionTaskMenu');
+ expect(source).not.toContain('<DropdownMenuContent');
}
});
- it('keeps the Cindy fork-family branch entry in the header only', () => {
- expect(headerSource).toContain("t('ccAgent.sidebar.sessionMenu.sessionBranches')");
- expect(headerSource).toContain("useCCSessions({ includeArchived: 'all' })");
- expect(headerSource).toContain('Boolean(session.parentSessionId)');
- expect(headerSource).toContain('canShowBranchTree = !isEmpty && hasSessionFamily');
- expect(headerSource).not.toContain("agentKind === 'pi' || hasSessionFamily");
- expect(sessionItemSource).not.toContain("t('ccAgent.sidebar.sessionMenu.sessionBranches')");
- expect(sessionCardSource).not.toContain("t('ccAgent.sidebar.sessionMenu.sessionBranches')");
+ it('keeps removed extras out of all task menus', () => {
+ for (const source of [headerSource, sessionItemSource, sessionCardSource, sharedMenuSource]) {
+ for (const key of ['exportHtml', 'compact', 'compacting', 'sessionBranches']) {
+ expect(source).not.toContain(`sessionMenu.${key}')`);
+ expect(source).not.toContain(`item('${key}'`);
+ }
+ }
});
it('reuses the shared submenu / export dialog / menu style modules', () => {
diff --git a/apps/desktop/src/renderer/features/cc-agent/SessionContentHeader.tsx b/apps/desktop/src/renderer/features/cc-agent/SessionContentHeader.tsx
index 9f1e3ecb47..debfe697c9 100644
--- a/apps/desktop/src/renderer/features/cc-agent/SessionContentHeader.tsx
+++ b/apps/desktop/src/renderer/features/cc-agent/SessionContentHeader.tsx
@@ -1,3 +1,4 @@
+import { SessionTaskMenu } from './sidebar/SessionTaskMenu';
/**
* SessionContentHeader — 会话视图注入 ContentHeader 的中部内容
* ---------------------------------------------------------------------------
@@ -40,9 +41,7 @@ import { useSessionRunningStatus } from '@/hooks/useSessionRunningStatus';
import { useConfirmDialog } from '@/components/ui/confirm-dialog-provider';
import {
DropdownMenu,
- DropdownMenuContent,
DropdownMenuItem,
- DropdownMenuSeparator,
DropdownMenuSub,
DropdownMenuSubContent,
DropdownMenuSubTrigger,
@@ -68,22 +67,14 @@ import { SessionRenameInput } from './SessionRenameInput';
import { useSessionBoundSchedules } from '@/features/scheduler/lib/scheduleSessionBinding';
import { ScheduleBindingBadge } from './sidebar/ScheduleBindingBadge';
import { RemoteProjectIcon } from './sidebar/RemoteProjectIcon';
-import {
- MENU_CONTENT_CLASS,
- MENU_ITEM_CLASS,
- MENU_ROW_CLASS,
- MENU_SEPARATOR_CLASS,
- MENU_SUB_CONTENT_CLASS,
-} from './sidebar/menuStyles';
+import { MENU_ITEM_CLASS, MENU_ROW_CLASS, MENU_SUB_CONTENT_CLASS } from './sidebar/menuStyles';
import { SessionProjectMoveSubmenu } from './sidebar/SessionProjectMoveSubmenu';
import type { SessionMoveTarget } from './sidebar/sessionMoveTarget';
import { SessionShareExportDialog } from './sidebar/SessionShareExportDialog';
-import { SessionBranchTreeDialog } from './SessionBranchTreeDialog';
import { useRemoteProjectSessions } from '@/features/device-link/remoteProjectsStore';
import { isRemoteSessionWriteBlocked } from './lib/remoteSessionWriteGuard';
import { Tip } from '@/components/ui/tooltip';
import { TaskTagDots, TaskTagMenuSection, TaskTagEditor } from '@/features/task-tags/TaskTags';
-import { SharedTaskButton } from '@/features/device-link/SharedTaskButton';
import { isSharedTaskPeer } from '@cindy/device-link';
const log = createLogger('SessionContentHeader');
@@ -135,9 +126,6 @@ export function SessionContentHeader({
}: SessionContentHeaderProps) {
const { t } = useTranslation();
const { sessions, patchLocal } = useCCSessions();
- // 分叉家族要看见已归档的父/子任务,不能只扫 active 桶。与 sidebar attention
- // / SplitGroup 同一口径,复用已有 includeArchived:'all',不另造加载通道。
- const { sessions: familySessions } = useCCSessions({ includeArchived: 'all' });
const remoteProjectSessions = useRemoteProjectSessions();
const routeSessionById = useMemo(
() => new Map([...sessions, ...remoteProjectSessions].map((s) => [s.id, s])),
@@ -189,6 +177,7 @@ export function SessionContentHeader({
输入框本体 + Magic AI 改名按钮统一在 SessionRenameInput) ---- */
const [isEditing, setIsEditing] = useState(false);
const [menuOpen, setMenuOpen] = useState(false);
+ const menuTriggerRef = useRef<HTMLButtonElement>(null);
const [tagEditorOpen, setTagEditorOpen] = useState(false);
useEffect(() => {
setMenuOpen(false);
@@ -411,24 +400,6 @@ export function SessionContentHeader({
/* ---- 导出会话(.cshare)---- 弹窗仅打开时挂载,与 SessionItem 同款。 */
const [shareExportOpen, setShareExportOpen] = useState(false);
- const [branchTreeOpen, setBranchTreeOpen] = useState(false);
- const allKnownSessions = useMemo(
- () => [...familySessions, ...remoteProjectSessions],
- [familySessions, remoteProjectSessions],
- );
- const hasSessionFamily = useMemo(
- () =>
- Boolean(session.parentSessionId) ||
- allKnownSessions.some(
- (item) => item.parentSessionId === session.id || item.id === session.parentSessionId,
- ),
- [allKnownSessions, session.id, session.parentSessionId],
- );
- // 只给 Cindy 任务分叉家族保留入口。Pi 原生 branch tree 不再单凭 agentKind=pi 露出,
- // 避免普通 Pi 任务把 overflow 撑长。当前任务带 parentSessionId,或 all 桶里能扫到
- // 父/子(含归档),都算家族成员。
- const canShowBranchTree = !isEmpty && hasSessionFamily;
-
/* ---- Archive / Delete / Unarchive ----
* 执行序列共用 useSessionLifecycleActions(与 CCAgentSidebarUpper 同一实现);
* 本组件只保留前置检查与确认弹窗。header 操作的恒为当前打开的会话,
@@ -541,7 +512,7 @@ export function SessionContentHeader({
]);
return (
- <div className="flex w-full min-w-0 items-center gap-0.5 pl-1">
+ <div className="flex min-w-0 items-center gap-0.5 pl-1">
{isPinned && (
<Pin
size={13}
@@ -610,26 +581,21 @@ export function SessionContentHeader({
</span>
)}
- {/* Task identity stays left; shared-task actions belong to the trailing toolbar. */}
- {!readOnly && session.status === 'active' && <>
- <GitContextBadge session={session} />
- <div className="min-w-0 flex-1" aria-hidden />
- <SharedTaskButton key={session.id} session={session} />
- </>}
-
- {!isEditing && !readOnly && !sharedGuest && (
+ {!isEditing && !readOnly && (!sharedGuest || session.status === 'active') && (
// 菜单打开就把归档/删除的 dirty 预检发出去:用户从展开菜单到点条目至少
// 一次反应时间,足够这次 git status 跑完,点下去时命中缓存、零等待。
<DropdownMenu
open={menuOpen}
onOpenChange={(open) => {
setMenuOpen(open);
- if (open) prefetchDirtyWorktreeForRemoval(session.id, session.deviceLinkDeviceId);
+ if (open && !sharedGuest)
+ prefetchDirtyWorktreeForRemoval(session.id, session.deviceLinkDeviceId);
}}
>
<DropdownMenuTrigger asChild>
<Tip text={t('ccAgent.sessionHeader.moreActions')} side="bottom">
<button
+ ref={menuTriggerRef}
className={cn(
'flex h-7 w-7 shrink-0 items-center justify-center rounded-md',
'text-[var(--cmd-palette-item-meta)] transition-colors',
@@ -643,193 +609,73 @@ export function SessionContentHeader({
</button>
</Tip>
</DropdownMenuTrigger>
- <DropdownMenuContent
- align="start"
- sideOffset={4}
- className={cn(MENU_CONTENT_CLASS, 'min-w-32 overflow-hidden')}
- >
- {/* 菜单变体、条目与分组顺序对齐 SessionItem 右键菜单:
- - Archived:Rename / Unarchive / [导出会话] / Copy ‖ Delete
- - Draft:Rename / Copy ‖ Delete
- - 标准:Pin↔Unpin / Rename / [移动到项目 ▸] ‖ Copy / 新窗口打开 /
- [导出会话] ‖ Archive / Delete
- Pi 专属入口(导出 HTML / 压缩上下文)暂不进 overflow 菜单。
- 压缩仍走对话区 context ring。任务分支只在存在 Cindy 分叉家族时显示。 */}
- {isArchived ? (
- <>
- <DropdownMenuItem
- disabled={remoteWritesBlocked}
- onSelect={startEdit}
- className={MENU_ITEM_CLASS}
- >
- {t('ccAgent.sidebar.sessionMenu.rename')}
- </DropdownMenuItem>
- <DropdownMenuItem
- disabled={remoteWritesBlocked}
- onSelect={() => void handleUnarchive()}
- className={MENU_ITEM_CLASS}
- >
- {t('ccAgent.sidebar.sessionMenu.unarchive')}
- </DropdownMenuItem>
- {canExportShare && (
- <DropdownMenuItem
- onSelect={() => setShareExportOpen(true)}
- className={MENU_ITEM_CLASS}
- >
- {t('ccAgent.sidebar.sessionMenu.exportShare')}
- </DropdownMenuItem>
- )}
- <DropdownMenuItem
- onSelect={() => void handleCopyDeepLink()}
- className={MENU_ITEM_CLASS}
- >
- {t('ccAgent.sidebar.sessionMenu.copySessionLink')}
- </DropdownMenuItem>
- {canShowBranchTree && (
- <DropdownMenuItem
- onSelect={() => setBranchTreeOpen(true)}
- className={MENU_ITEM_CLASS}
- >
- {t('ccAgent.sidebar.sessionMenu.sessionBranches')}
- </DropdownMenuItem>
- )}
- {tagMenu}
- <DropdownMenuSeparator className={MENU_SEPARATOR_CLASS} />
- <DropdownMenuItem
- disabled={remoteWritesBlocked}
- onSelect={() => void handleDelete()}
- className={MENU_ITEM_CLASS}
- >
- {t('ccAgent.sidebar.sessionMenu.delete')}
- </DropdownMenuItem>
- </>
- ) : isEmpty ? (
- <>
- <DropdownMenuItem
- disabled={remoteWritesBlocked}
- onSelect={startEdit}
- className={MENU_ITEM_CLASS}
- >
- {t('ccAgent.sidebar.sessionMenu.rename')}
- </DropdownMenuItem>
- <DropdownMenuItem
- onSelect={() => void handleCopyDeepLink()}
- className={MENU_ITEM_CLASS}
- >
- {t('ccAgent.sidebar.sessionMenu.copySessionLink')}
- </DropdownMenuItem>
- {tagMenu}
- <DropdownMenuSeparator className={MENU_SEPARATOR_CLASS} />
- <DropdownMenuItem
- disabled={remoteWritesBlocked}
- onSelect={() => void handleDelete()}
- className={MENU_ITEM_CLASS}
- >
- {t('ccAgent.sidebar.sessionMenu.delete')}
- </DropdownMenuItem>
- </>
- ) : (
- <>
- <DropdownMenuItem
- disabled={remoteWritesBlocked}
- onSelect={() => void handleTogglePin()}
- className={MENU_ITEM_CLASS}
- >
- {isPinned
- ? t('ccAgent.sidebar.sessionMenu.unpin')
- : t('ccAgent.sidebar.sessionMenu.pin')}
- </DropdownMenuItem>
- <DropdownMenuItem
- disabled={remoteWritesBlocked}
- onSelect={startEdit}
- className={MENU_ITEM_CLASS}
- >
- {t('ccAgent.sidebar.sessionMenu.rename')}
- </DropdownMenuItem>
- {canMoveToProject && (
- <DropdownMenuSub>
- <DropdownMenuSubTrigger className={MENU_ROW_CLASS}>
- <span className="flex-1">
- {t('ccAgent.sidebar.sessionMenu.moveToProject')}
- </span>
- <ChevronRight
- size={14}
- className="ml-2 shrink-0 text-[var(--cmd-palette-item-meta)]"
- />
- </DropdownMenuSubTrigger>
- <DropdownMenuSubContent
- sideOffset={4}
- className={cn(MENU_SUB_CONTENT_CLASS, 'w-[320px] overflow-hidden')}
- >
- <SessionProjectMoveSubmenu
- projectOptions={projectOptions}
- currentWorkingDir={
- session.workspaceKind === 'project' ? session.workingDir : null
- }
- isDialogue={session.workspaceKind === 'dialogue'}
- onSelectProject={(workingDir) =>
- void handleMoveSession({ kind: 'project', workingDir })
- }
- onBrowseProject={() => void handleMoveSession({ kind: 'browseProject' })}
- onMoveToDialogue={() => void handleMoveSession({ kind: 'dialogue' })}
- />
- </DropdownMenuSubContent>
- </DropdownMenuSub>
- )}
- <DropdownMenuSeparator className={MENU_SEPARATOR_CLASS} />
- <DropdownMenuItem
- onSelect={() => void handleCopyDeepLink()}
- className={MENU_ITEM_CLASS}
- >
- {t('ccAgent.sidebar.sessionMenu.copySessionLink')}
- </DropdownMenuItem>
+ <SessionTaskMenu
+ key={`${session.deviceLinkDeviceId ?? ''}:${session.id}`}
+ session={session}
+ open={menuOpen}
+ writeBlocked={remoteWritesBlocked}
+ returnFocus={() => menuTriggerRef.current?.focus()}
+ onRename={startEdit}
+ onPin={() => void handleTogglePin()}
+ onArchive={() => void handleArchive()}
+ onUnarchive={() => void handleUnarchive()}
+ onDelete={() => void handleDelete()}
+ onOpenInNewWindow={handleOpenInNewWindow}
+ tags={tagMenu}
+ copy={
+ <DropdownMenuItem
+ onSelect={() => void handleCopyDeepLink()}
+ className={MENU_ITEM_CLASS}
+ >
+ {t('ccAgent.sidebar.sessionMenu.copySessionLink')}
+ </DropdownMenuItem>
+ }
+ exportShare={
+ canExportShare && (
<DropdownMenuItem
- disabled={remoteWritesBlocked}
- onSelect={handleOpenInNewWindow}
+ onSelect={() => setShareExportOpen(true)}
className={MENU_ITEM_CLASS}
>
- {t('ccAgent.sidebar.sessionMenu.openInNewWindow')}
+ {t('ccAgent.sidebar.sessionMenu.exportShare')}
</DropdownMenuItem>
- {canShowBranchTree && (
- <DropdownMenuItem
- onSelect={() => setBranchTreeOpen(true)}
- className={MENU_ITEM_CLASS}
- >
- {t('ccAgent.sidebar.sessionMenu.sessionBranches')}
- </DropdownMenuItem>
- )}
- {canExportShare && (
- <DropdownMenuItem
- onSelect={() => setShareExportOpen(true)}
- className={MENU_ITEM_CLASS}
+ )
+ }
+ move={
+ canMoveToProject && (
+ <DropdownMenuSub>
+ <DropdownMenuSubTrigger className={MENU_ROW_CLASS}>
+ <span className="flex-1">{t('ccAgent.sidebar.sessionMenu.moveToProject')}</span>
+ <ChevronRight
+ size={14}
+ className="ml-2 shrink-0 text-[var(--cmd-palette-item-meta)]"
+ />
+ </DropdownMenuSubTrigger>
+ <DropdownMenuSubContent
+ sideOffset={4}
+ className={cn(MENU_SUB_CONTENT_CLASS, 'w-[320px] overflow-hidden')}
>
- {t('ccAgent.sidebar.sessionMenu.exportShare')}
- </DropdownMenuItem>
- )}
- {tagMenu}
- <DropdownMenuSeparator className={MENU_SEPARATOR_CLASS} />
- <DropdownMenuItem
- disabled={remoteWritesBlocked}
- onSelect={() => void handleArchive()}
- className={MENU_ITEM_CLASS}
- >
- {t('ccAgent.sidebar.sessionMenu.archived')}
- </DropdownMenuItem>
- <DropdownMenuItem
- disabled={remoteWritesBlocked}
- onSelect={() => void handleDelete()}
- className={MENU_ITEM_CLASS}
- >
- {t('ccAgent.sidebar.sessionMenu.delete')}
- </DropdownMenuItem>
- </>
- )}
- </DropdownMenuContent>
+ <SessionProjectMoveSubmenu
+ projectOptions={projectOptions}
+ currentWorkingDir={
+ session.workspaceKind === 'project' ? session.workingDir : null
+ }
+ isDialogue={session.workspaceKind === 'dialogue'}
+ onSelectProject={(workingDir) =>
+ void handleMoveSession({ kind: 'project', workingDir })
+ }
+ onBrowseProject={() => void handleMoveSession({ kind: 'browseProject' })}
+ onMoveToDialogue={() => void handleMoveSession({ kind: 'dialogue' })}
+ />
+ </DropdownMenuSubContent>
+ </DropdownMenuSub>
+ )
+ }
+ />
</DropdownMenu>
)}
{/* session-git-pr-context:当前分支 + 关联 PR 徽标(非 git 目录 / dialogue 会话自动隐藏) */}
- {(readOnly || session.status !== 'active') && <GitContextBadge session={session} />}
+ <GitContextBadge session={session} />
{tagEditorOpen && <TaskTagEditor session={session} onClose={() => setTagEditorOpen(false)} />}
@@ -841,16 +687,6 @@ export function SessionContentHeader({
onOpenChange={setShareExportOpen}
/>
)}
- {branchTreeOpen && (
- <SessionBranchTreeDialog
- open={branchTreeOpen}
- onOpenChange={setBranchTreeOpen}
- session={session}
- sessions={allKnownSessions}
- running={runningSessionIds.has(session.id)}
- writeBlocked={remoteWritesBlocked}
- />
- )}
</div>
);
}
diff --git a/apps/desktop/src/renderer/features/cc-agent/sidebar/SessionCard.tsx b/apps/desktop/src/renderer/features/cc-agent/sidebar/SessionCard.tsx
index d225d9865e..5b51bfcec1 100644
--- a/apps/desktop/src/renderer/features/cc-agent/sidebar/SessionCard.tsx
+++ b/apps/desktop/src/renderer/features/cc-agent/sidebar/SessionCard.tsx
@@ -1,3 +1,4 @@
+import { SessionTaskMenu } from './SessionTaskMenu';
import { TaskTagMenuSection, TaskTagEditor, TaskTagDots } from '@/features/task-tags/TaskTags';
import { Button } from '@/components/ui/button';
/**
@@ -43,19 +44,15 @@ import { useAgentIslandActivity } from '@/state/agentIslandActivity';
import { makerChatStore } from '@/lib/makerChatStore';
import {
DropdownMenu,
- DropdownMenuContent,
DropdownMenuItem,
- DropdownMenuSeparator,
DropdownMenuSub,
DropdownMenuSubContent,
DropdownMenuSubTrigger,
DropdownMenuTrigger,
} from '@/components/ui/dropdown-menu';
import {
- MENU_CONTENT_CLASS,
MENU_ITEM_CLASS,
MENU_ROW_CLASS,
- MENU_SEPARATOR_CLASS,
MENU_SUB_CONTENT_CLASS,
} from './menuStyles';
import { toast } from '@/lib/toast';
@@ -1101,108 +1098,14 @@ export const SessionCard = withSidebarNavigation<SessionCardProps>(function Sess
}}
/>
</DropdownMenuTrigger>
- <DropdownMenuContent
- align="start"
- sideOffset={2}
- onClick={(e) => e.stopPropagation()}
- className={cn(MENU_CONTENT_CLASS, 'min-w-32 overflow-hidden')}
- >
- {isArchived ? (
- <>
- <DropdownMenuItem
- disabled={remoteWritesBlocked}
- onSelect={handleRenameSelect}
- className={MENU_ITEM_CLASS}
- >
- {t('ccAgent.sidebar.sessionMenu.rename')}
- </DropdownMenuItem>
- <DropdownMenuItem
- disabled={remoteWritesBlocked}
- onSelect={handleUnarchiveSelect}
- className={MENU_ITEM_CLASS}
- >
- {t('ccAgent.sidebar.sessionMenu.unarchive')}
- </DropdownMenuItem>
- {exportShareMenuItem}
- {copySessionIdSubmenu}
- {tagMenu}
- <DropdownMenuSeparator className={MENU_SEPARATOR_CLASS} />
- <DropdownMenuItem
- disabled={remoteWritesBlocked}
- onSelect={handleDeleteSelect}
- className={MENU_ITEM_CLASS}
- >
- {t('ccAgent.sidebar.sessionMenu.delete')}
- </DropdownMenuItem>
- </>
- ) : isEmpty ? (
- <>
- <DropdownMenuItem
- disabled={remoteWritesBlocked}
- onSelect={handleRenameSelect}
- className={MENU_ITEM_CLASS}
- >
- {t('ccAgent.sidebar.sessionMenu.rename')}
- </DropdownMenuItem>
- {copySessionIdSubmenu}
- {tagMenu}
- <DropdownMenuSeparator className={MENU_SEPARATOR_CLASS} />
- <DropdownMenuItem
- disabled={remoteWritesBlocked}
- onSelect={handleDeleteSelect}
- className={MENU_ITEM_CLASS}
- >
- {t('ccAgent.sidebar.sessionMenu.delete')}
- </DropdownMenuItem>
- </>
- ) : (
- <>
- <DropdownMenuItem
- disabled={remoteWritesBlocked}
- onSelect={handlePinSelect}
- className={MENU_ITEM_CLASS}
- >
- {isPinned
- ? t('ccAgent.sidebar.sessionMenu.unpin')
- : t('ccAgent.sidebar.sessionMenu.pin')}
- </DropdownMenuItem>
- <DropdownMenuItem
- disabled={remoteWritesBlocked}
- onSelect={handleRenameSelect}
- className={MENU_ITEM_CLASS}
- >
- {t('ccAgent.sidebar.sessionMenu.rename')}
- </DropdownMenuItem>
- {moveToProjectSubmenu}
- <DropdownMenuSeparator className={MENU_SEPARATOR_CLASS} />
- {copySessionIdSubmenu}
- <DropdownMenuItem
- disabled={remoteWritesBlocked}
- onSelect={handleOpenInNewWindowSelect}
- className={MENU_ITEM_CLASS}
- >
- {t('ccAgent.sidebar.sessionMenu.openInNewWindow')}
- </DropdownMenuItem>
- {exportShareMenuItem}
- {tagMenu}
- <DropdownMenuSeparator className={MENU_SEPARATOR_CLASS} />
- <DropdownMenuItem
- disabled={remoteWritesBlocked}
- onSelect={handleArchiveSelect}
- className={MENU_ITEM_CLASS}
- >
- {t('ccAgent.sidebar.sessionMenu.archived')}
- </DropdownMenuItem>
- <DropdownMenuItem
- disabled={remoteWritesBlocked}
- onSelect={handleDeleteSelect}
- className={MENU_ITEM_CLASS}
- >
- {t('ccAgent.sidebar.sessionMenu.delete')}
- </DropdownMenuItem>
- </>
- )}
- </DropdownMenuContent>
+ <SessionTaskMenu key={`${session.deviceLinkDeviceId ?? ''}:${session.id}`}
+ session={session} open={menuPos !== null} sideOffset={2} writeBlocked={remoteWritesBlocked}
+ returnFocus={() => cardRef.current?.focus()}
+ onRename={handleRenameSelect} onPin={handlePinSelect}
+ onArchive={handleArchiveSelect} onUnarchive={handleUnarchiveSelect} onDelete={handleDeleteSelect}
+ onOpenInNewWindow={handleOpenInNewWindowSelect}
+ move={moveToProjectSubmenu} tags={tagMenu} copy={copySessionIdSubmenu} exportShare={exportShareMenuItem}
+ />
</DropdownMenu>
)}
diff --git a/apps/desktop/src/renderer/features/cc-agent/sidebar/SessionItem.tsx b/apps/desktop/src/renderer/features/cc-agent/sidebar/SessionItem.tsx
index 34f0f609d7..6fcf39c5bf 100644
--- a/apps/desktop/src/renderer/features/cc-agent/sidebar/SessionItem.tsx
+++ b/apps/desktop/src/renderer/features/cc-agent/sidebar/SessionItem.tsx
@@ -1,3 +1,4 @@
+import { SessionTaskMenu } from './SessionTaskMenu';
import { TaskTagMenuSection, TaskTagEditor, TaskTagDots } from '@/features/task-tags/TaskTags';
import { Button } from '@/components/ui/button';
/**
@@ -46,19 +47,15 @@ import { usePrActions, usePrRefsForSession } from '@/contexts/PrRefsContext';
import { SessionTooltip } from './SessionTooltip';
import {
DropdownMenu,
- DropdownMenuContent,
DropdownMenuItem,
- DropdownMenuSeparator,
DropdownMenuSub,
DropdownMenuSubContent,
DropdownMenuSubTrigger,
DropdownMenuTrigger,
} from '@/components/ui/dropdown-menu';
import {
- MENU_CONTENT_CLASS,
MENU_ITEM_CLASS,
MENU_ROW_CLASS,
- MENU_SEPARATOR_CLASS,
MENU_SUB_CONTENT_CLASS,
} from './menuStyles';
import { toast } from '@/lib/toast';
@@ -1282,113 +1279,14 @@ export const SessionItem = withSidebarNavigation<SessionItemProps>(function Sess
}}
/>
</DropdownMenuTrigger>
- <DropdownMenuContent
- align="start"
- sideOffset={2}
- onClick={(e) => e.stopPropagation()}
- // 统一菜单 surface(menuStyles)。min-w-32:基线 128px,长 label
- // (如「复制 SDK Session ID」)按 Radix 内容自适应,避免被截断。
- className={cn(MENU_CONTENT_CLASS, 'min-w-32 overflow-hidden')}
- >
- {isArchived ? (
- <>
- {/* Archived 变体:Rename / Unarchive / [Copy Session ID submenu] / Delete */}
- <DropdownMenuItem
- disabled={remoteWritesBlocked}
- onSelect={handleRenameSelect}
- className={MENU_ITEM_CLASS}
- >
- {t('ccAgent.sidebar.sessionMenu.rename')}
- </DropdownMenuItem>
- <DropdownMenuItem
- disabled={remoteWritesBlocked}
- onSelect={handleUnarchiveSelect}
- className={MENU_ITEM_CLASS}
- >
- {t('ccAgent.sidebar.sessionMenu.unarchive')}
- </DropdownMenuItem>
- {exportShareMenuItem}
- {copySessionIdSubmenu}
- {tagMenu}
- <DropdownMenuSeparator className={MENU_SEPARATOR_CLASS} />
- <DropdownMenuItem
- disabled={remoteWritesBlocked}
- onSelect={handleDeleteSelect}
- className={MENU_ITEM_CLASS}
- >
- {t('ccAgent.sidebar.sessionMenu.delete')}
- </DropdownMenuItem>
- </>
- ) : isEmpty ? (
- <>
- {/* Draft 变体:Rename / [Copy Session ID submenu] / Delete */}
- <DropdownMenuItem
- disabled={remoteWritesBlocked}
- onSelect={handleRenameSelect}
- className={MENU_ITEM_CLASS}
- >
- {t('ccAgent.sidebar.sessionMenu.rename')}
- </DropdownMenuItem>
- {copySessionIdSubmenu}
- {tagMenu}
- <DropdownMenuSeparator className={MENU_SEPARATOR_CLASS} />
- <DropdownMenuItem
- disabled={remoteWritesBlocked}
- onSelect={handleDeleteSelect}
- className={MENU_ITEM_CLASS}
- >
- {t('ccAgent.sidebar.sessionMenu.delete')}
- </DropdownMenuItem>
- </>
- ) : (
- <>
- {/* 标准 / Pinned 变体:Pin↔Unpin / Rename / [Copy Session ID submenu] / Archived / Delete */}
- <DropdownMenuItem
- disabled={remoteWritesBlocked}
- onSelect={handlePinSelect}
- className={MENU_ITEM_CLASS}
- >
- {isPinned
- ? t('ccAgent.sidebar.sessionMenu.unpin')
- : t('ccAgent.sidebar.sessionMenu.pin')}
- </DropdownMenuItem>
- <DropdownMenuItem
- disabled={remoteWritesBlocked}
- onSelect={handleRenameSelect}
- className={MENU_ITEM_CLASS}
- >
- {t('ccAgent.sidebar.sessionMenu.rename')}
- </DropdownMenuItem>
- {moveToProjectSubmenu}
- <DropdownMenuSeparator className={MENU_SEPARATOR_CLASS} />
- {copySessionIdSubmenu}
- <DropdownMenuItem
- disabled={remoteWritesBlocked}
- onSelect={handleOpenInNewWindowSelect}
- className={MENU_ITEM_CLASS}
- >
- {t('ccAgent.sidebar.sessionMenu.openInNewWindow')}
- </DropdownMenuItem>
- {exportShareMenuItem}
- {tagMenu}
- <DropdownMenuSeparator className={MENU_SEPARATOR_CLASS} />
- <DropdownMenuItem
- disabled={remoteWritesBlocked}
- onSelect={handleArchiveSelect}
- className={MENU_ITEM_CLASS}
- >
- {t('ccAgent.sidebar.sessionMenu.archived')}
- </DropdownMenuItem>
- <DropdownMenuItem
- disabled={remoteWritesBlocked}
- onSelect={handleDeleteSelect}
- className={MENU_ITEM_CLASS}
- >
- {t('ccAgent.sidebar.sessionMenu.delete')}
- </DropdownMenuItem>
- </>
- )}
- </DropdownMenuContent>
+ <SessionTaskMenu key={`${session.deviceLinkDeviceId ?? ''}:${session.id}`}
+ session={session} open={menuPos !== null} sideOffset={2} writeBlocked={remoteWritesBlocked}
+ returnFocus={() => rowRef.current?.focus()}
+ onRename={handleRenameSelect} onPin={handlePinSelect}
+ onArchive={handleArchiveSelect} onUnarchive={handleUnarchiveSelect} onDelete={handleDeleteSelect}
+ onOpenInNewWindow={handleOpenInNewWindowSelect}
+ move={moveToProjectSubmenu} tags={tagMenu} copy={copySessionIdSubmenu} exportShare={exportShareMenuItem}
+ />
</DropdownMenu>
)}
diff --git a/apps/desktop/src/renderer/features/cc-agent/sidebar/SessionTaskMenu.tsx b/apps/desktop/src/renderer/features/cc-agent/sidebar/SessionTaskMenu.tsx
new file mode 100644
index 0000000000..af7b571cf7
--- /dev/null
+++ b/apps/desktop/src/renderer/features/cc-agent/sidebar/SessionTaskMenu.tsx
@@ -0,0 +1,132 @@
+import { useState, type ReactNode } from 'react';
+import { useTranslation } from 'react-i18next';
+import { isSharedTaskPeer } from '@cindy/device-link';
+import type { Session } from '@/lib/ccAgent.types';
+import { SharedTaskButton } from '@/features/device-link/SharedTaskButton';
+import {
+ DropdownMenuContent,
+ DropdownMenuItem,
+ DropdownMenuSeparator,
+} from '@/components/ui/dropdown-menu';
+import { isEmptyDraftSession } from '../lib/sessionDisplayTitle';
+import { MENU_CONTENT_CLASS, MENU_ITEM_CLASS, MENU_SEPARATOR_CLASS } from './menuStyles';
+
+interface Props {
+ session: Session;
+ open: boolean;
+ writeBlocked: boolean;
+ sideOffset?: number;
+ returnFocus: () => void;
+ onRename: () => void;
+ onPin: () => void;
+ onArchive: () => void;
+ onUnarchive: () => void;
+ onDelete: () => void;
+ onOpenInNewWindow: () => void;
+ move: ReactNode;
+ tags: ReactNode;
+ copy: ReactNode;
+ exportShare: ReactNode;
+}
+
+/** One menu order for the header, text rows and cards. Keep row-specific action handlers. */
+export function SessionTaskMenu(props: Props) {
+ const [dialog, setDialog] = useState<'shared' | null>(null);
+ // Do not mount sharing controls for every idle sidebar row.
+ if (!props.open && !dialog) return null;
+ return <ActiveSessionTaskMenu {...props} dialog={dialog} setDialog={setDialog} />;
+}
+
+function ActiveSessionTaskMenu({
+ session,
+ writeBlocked,
+ sideOffset = 4,
+ returnFocus,
+ onRename,
+ onPin,
+ onArchive,
+ onUnarchive,
+ onDelete,
+ onOpenInNewWindow,
+ move,
+ tags,
+ copy,
+ exportShare,
+ dialog,
+ setDialog,
+}: Props & {
+ dialog: 'shared' | null;
+ setDialog: (dialog: 'shared' | null) => void;
+}) {
+ const { t } = useTranslation();
+ const guest = isSharedTaskPeer(session.deviceLinkDeviceId ?? '');
+ const archived = session.status === 'archived';
+ const empty = isEmptyDraftSession(session);
+ const item = (key: string, action: () => void, disabled = false) => (
+ <DropdownMenuItem className={MENU_ITEM_CLASS} disabled={disabled} onSelect={action}>
+ {t(`ccAgent.sidebar.sessionMenu.${key}`)}
+ </DropdownMenuItem>
+ );
+ const separator = <DropdownMenuSeparator className={MENU_SEPARATOR_CLASS} />;
+ return (
+ <div
+ className="contents"
+ onClick={(event) => event.stopPropagation()}
+ onDoubleClick={(event) => event.stopPropagation()}
+ onContextMenu={(event) => event.stopPropagation()}
+ >
+ <DropdownMenuContent
+ align="start"
+ sideOffset={sideOffset}
+ className={`${MENU_CONTENT_CLASS} min-w-32 overflow-hidden`}
+ onClick={(event) => event.stopPropagation()}
+ onCloseAutoFocus={(event) => {
+ if (dialog) event.preventDefault();
+ }}
+ >
+ {!guest && (
+ <>
+ {!archived &&
+ !empty &&
+ item(session.pinnedAt != null ? 'unpin' : 'pin', onPin, writeBlocked)}
+ {item('rename', onRename, writeBlocked)}
+ {move}
+ {tags}
+ {separator}
+ {copy}
+ </>
+ )}
+ {session.status === 'active' && (
+ <DropdownMenuItem className={MENU_ITEM_CLASS} onSelect={() => setDialog('shared')}>
+ {t('sharedTask.title')}
+ </DropdownMenuItem>
+ )}
+ {!guest && (
+ <>
+ {exportShare}
+ {!archived && !empty && (
+ <>
+ {separator}
+ {item('openInNewWindow', onOpenInNewWindow, writeBlocked)}
+ </>
+ )}
+ {separator}
+ {archived
+ ? item('unarchive', onUnarchive, writeBlocked)
+ : !empty && item('archived', onArchive, writeBlocked)}
+ {item('delete', onDelete, writeBlocked)}
+ </>
+ )}
+ </DropdownMenuContent>
+ {dialog === 'shared' && (
+ <SharedTaskButton
+ session={session}
+ dialogControl={{
+ onDismiss: () => setDialog(null),
+ returnFocus,
+ }}
+ />
+ )}
+ </div>
+ );
+}
diff --git a/apps/desktop/src/renderer/features/cc-agent/sidebar/__tests__/SessionTaskMenu.test.tsx b/apps/desktop/src/renderer/features/cc-agent/sidebar/__tests__/SessionTaskMenu.test.tsx
new file mode 100644
index 0000000000..06dd0b7f71
--- /dev/null
+++ b/apps/desktop/src/renderer/features/cc-agent/sidebar/__tests__/SessionTaskMenu.test.tsx
@@ -0,0 +1,172 @@
+// @vitest-environment jsdom
+import { useRef, useState } from 'react';
+import { cleanup, fireEvent, render, screen, waitFor, within } from '@testing-library/react';
+import { afterEach, beforeEach, expect, it, vi } from 'vitest';
+import { sharedTaskHostPeer } from '@cindy/device-link';
+import type { Session } from '@/lib/ccAgent.types';
+import { DropdownMenu, DropdownMenuItem, DropdownMenuTrigger } from '@/components/ui/dropdown-menu';
+import { SessionTaskMenu } from '../SessionTaskMenu';
+
+const state = vi.hoisted(() => ({
+ host: vi.fn(),
+ rowClick: vi.fn(),
+ rename: vi.fn(),
+}));
+vi.mock('react-i18next', () => ({
+ useTranslation: () => ({ t: (key: string) => key.split('.').at(-1) }),
+}));
+vi.mock('@/features/device-link/remoteProjectsStore', () => ({
+ remoteProjectsStore: { removeDevice: vi.fn() },
+}));
+vi.mock('@/contexts/AuthContext', () => ({ useAuth: () => ({ dataOwnerId: 'owner' }) }));
+vi.mock('@/lib/toast', () => ({ toast: { error: vi.fn(), success: vi.fn() } }));
+vi.mock('@/features/device-link/JoinSharedTaskDialog', () => ({
+ JoinSharedTaskDialog: ({ onOpenChange }: { onOpenChange: (open: boolean) => void }) => (
+ <div role="dialog" aria-label="join">
+ <button onClick={() => onOpenChange(false)}>Cancel join</button>
+ </div>
+ ),
+}));
+
+const session = { id: 'task', title: 'Task', status: 'active' } as Session;
+function Harness({ target = session, blocked = false }: { target?: Session; blocked?: boolean }) {
+ const [open, setOpen] = useState(false);
+ const trigger = useRef<HTMLButtonElement>(null);
+ const slot = (text: string) => <DropdownMenuItem>{text}</DropdownMenuItem>;
+ return (
+ <div onClick={state.rowClick}>
+ <DropdownMenu open={open} onOpenChange={setOpen}>
+ <DropdownMenuTrigger ref={trigger}>More</DropdownMenuTrigger>
+ <SessionTaskMenu
+ session={target}
+ open={open}
+ writeBlocked={blocked}
+ returnFocus={() => trigger.current?.focus()}
+ onRename={state.rename}
+ onPin={vi.fn()}
+ onArchive={vi.fn()}
+ onUnarchive={vi.fn()}
+ onDelete={vi.fn()}
+ onOpenInNewWindow={vi.fn()}
+ move={target.status === 'active' ? slot('move') : null}
+ tags={slot('tags')}
+ copy={slot('copy')}
+ exportShare={slot('export')}
+ />
+ </DropdownMenu>
+ </div>
+ );
+}
+function openMenu() {
+ fireEvent.keyDown(screen.getByRole('button', { name: 'More' }), { key: 'Enter' });
+}
+function labels() {
+ return screen.getAllByRole('menuitem').map((item) => item.textContent);
+}
+beforeEach(() => {
+ vi.clearAllMocks();
+ state.host.mockResolvedValue({ available: false, detail: null });
+ Object.assign(window, {
+ electronAPI: { sharedTask: { host: state.host, account: vi.fn().mockResolvedValue([]) } },
+ });
+});
+afterEach(cleanup);
+
+it('loads only on open and groups task organization, sharing, viewing and removal in order', () => {
+ render(<Harness />);
+ expect(state.host).not.toHaveBeenCalled();
+ openMenu();
+ expect(labels()).toEqual([
+ 'pin',
+ 'rename',
+ 'move',
+ 'tags',
+ 'copy',
+ 'title',
+ 'export',
+ 'openInNewWindow',
+ 'archived',
+ 'delete',
+ ]);
+ expect(screen.getAllByRole('separator')).toHaveLength(3);
+ expect(state.host).not.toHaveBeenCalled();
+ fireEvent.click(screen.getByRole('menuitem', { name: 'rename' }));
+ expect(state.rename).toHaveBeenCalledTimes(1);
+ expect(state.rowClick).not.toHaveBeenCalled();
+});
+
+it('shows unpin without a branch entry even for a forked Pi task', () => {
+ render(
+ <Harness
+ target={{ ...session, pinnedAt: '2026-09-23', agentKind: 'pi', parentSessionId: 'parent' }}
+ />,
+ );
+ openMenu();
+ expect(labels()).toEqual([
+ 'unpin',
+ 'rename',
+ 'move',
+ 'tags',
+ 'copy',
+ 'title',
+ 'export',
+ 'openInNewWindow',
+ 'archived',
+ 'delete',
+ ]);
+});
+
+it('keeps restore and delete last for archived tasks and does not expose sharing', () => {
+ render(<Harness target={{ ...session, status: 'archived' }} />);
+ openMenu();
+ expect(labels()).toEqual(['rename', 'tags', 'copy', 'export', 'unarchive', 'delete']);
+});
+
+it('keeps the guest menu limited to shared-task management', () => {
+ render(
+ <Harness target={{ ...session, deviceLinkDeviceId: sharedTaskHostPeer('share', 'device') }} />,
+ );
+ openMenu();
+ expect(labels()).toEqual(['title']);
+ expect(screen.queryByRole('separator')).toBeNull();
+});
+
+it('keeps the rejoin flow mounted when shared-task management closes', async () => {
+ render(
+ <Harness target={{ ...session, deviceLinkDeviceId: sharedTaskHostPeer('share', 'device') }} />,
+ );
+ const more = screen.getByRole('button', { name: 'More' });
+ openMenu();
+ fireEvent.click(screen.getByRole('menuitem', { name: 'title' }));
+ fireEvent.click(await screen.findByRole('button', { name: 'rejoin' }));
+ expect(screen.getByRole('dialog', { name: 'join' })).toBeTruthy();
+ fireEvent.click(screen.getByRole('button', { name: 'Cancel join' }));
+ await waitFor(() => expect(screen.queryByRole('dialog')).toBeNull());
+ await waitFor(() => expect(document.activeElement).toBe(more));
+ expect(state.rowClick).not.toHaveBeenCalled();
+});
+
+it('disables mutations while retaining read-only actions for an unavailable remote task', () => {
+ render(<Harness blocked />);
+ openMenu();
+ for (const name of ['pin', 'rename', 'openInNewWindow', 'archived', 'delete']) {
+ expect(screen.getByRole('menuitem', { name }).getAttribute('aria-disabled')).toBe('true');
+ }
+ expect(screen.getByRole('menuitem', { name: 'copy' }).getAttribute('aria-disabled')).not.toBe(
+ 'true',
+ );
+});
+
+it('keeps the shared dialog after closing the menu and isolates its clicks from the row', async () => {
+ render(<Harness />);
+ const more = screen.getByRole('button', { name: 'More' });
+ openMenu();
+ fireEvent.click(screen.getByRole('menuitem', { name: 'title' }));
+ await waitFor(() => expect(screen.queryByRole('menu')).toBeNull());
+ const dialog = screen.getByRole('dialog');
+ expect(dialog.contains(document.activeElement)).toBe(true);
+ fireEvent.click(within(dialog).getByRole('button', { name: 'dismiss' }));
+ await waitFor(() => expect(screen.queryByRole('dialog')).toBeNull());
+ await waitFor(() => expect(document.activeElement).toBe(more));
+ expect(state.rowClick).not.toHaveBeenCalled();
+});
diff --git a/apps/desktop/src/renderer/features/device-link/SharedTaskButton.tsx b/apps/desktop/src/renderer/features/device-link/SharedTaskButton.tsx
index 9bbff66852..79bfc65f6b 100644
--- a/apps/desktop/src/renderer/features/device-link/SharedTaskButton.tsx
+++ b/apps/desktop/src/renderer/features/device-link/SharedTaskButton.tsx
@@ -30,13 +30,16 @@ const tabButton = (active: boolean) => `rounded-full px-3 py-1 text-12 leading-5
active ? 'bg-[var(--surface-chip)] text-[var(--text-primary)]' : 'text-[var(--text-secondary)] hover:bg-[var(--surface-hover-soft)]'}`;
/** Owner controls use the same task host locally and through own-device control. */
-export function SharedTaskButton({ session }: { session: Session }) {
+export function SharedTaskButton({ session, dialogControl }: {
+ session: Session;
+ dialogControl?: { onDismiss: () => void; returnFocus: () => void };
+}) {
const { t } = useTranslation();
const { dataOwnerId } = useAuth();
const ownerGeneration = getDataOwnerGeneration().generation;
const peer = session.deviceLinkDeviceId ? parseSharedTaskPeer(session.deviceLinkDeviceId) : null;
const guestSharedTaskId = peer?.role === 'host' ? peer.sharedTaskId : undefined;
- const [open, setOpen] = useState(false);
+ const [open, setOpen] = useState(Boolean(dialogControl));
const [tab, setTab] = useState<SharedTaskTab>('current');
const [state, setState] = useState<SharedTaskHostState | null>(null);
const [loadError, setLoadError] = useState<string | null>(null);
@@ -44,6 +47,13 @@ export function SharedTaskButton({ session }: { session: Session }) {
const [confirm, setConfirm] = useState<ConfirmState | null>(null);
const [busy, setBusy] = useState(false);
const [joinOpen, setJoinOpen] = useState(false);
+ useEffect(() => {
+ // Rejoining hands off to a second dialog; keep the menu-owned flow mounted until both close.
+ if (!open && !joinOpen && dialogControl) {
+ dialogControl.onDismiss();
+ dialogControl.returnFocus();
+ }
+ }, [open, joinOpen, dialogControl]);
const pending = useRef(false);
const epoch = useRef(0);
const host = useCallback((command: SharedTaskHostCommand) => session.deviceLinkDeviceId
@@ -278,15 +288,16 @@ export function SharedTaskButton({ session }: { session: Session }) {
const confirmation = confirm ? confirmCopy(confirm) : null;
return <>
<Dialog.Root open={open} onOpenChange={(next) => { if (!pending.current) { setOpen(next); if (!next) setConfirm(null); } }}>
- <Dialog.Trigger asChild>
+ {!dialogControl && <Dialog.Trigger asChild>
<Button variant="secondary" size="lg" style={WINDOW_NO_DRAG_STYLE} className="ml-2 w-9 bg-transparent p-0" aria-label={t('sharedTask.title')} title={t('sharedTask.title')}>
<Users size={18} aria-hidden />
</Button>
- </Dialog.Trigger>
+ </Dialog.Trigger>}
<Dialog.Portal>
<Dialog.Overlay className="fixed inset-0 z-[10000] bg-[var(--overlay-modal)]" />
<Dialog.Content className="fixed left-1/2 top-1/2 z-[10001] max-h-[calc(100dvh-32px)] w-[min(440px,calc(100vw-32px))] -translate-x-1/2 -translate-y-1/2 overflow-y-auto rounded-xl border border-[var(--border-default)] bg-[var(--surface-elevated)] p-4 text-[var(--text-primary)]"
aria-describedby={undefined}
+ onCloseAutoFocus={dialogControl ? (event) => { event.preventDefault(); if (!joinOpen) dialogControl.returnFocus(); } : undefined}
onEscapeKeyDown={(event) => { if (pending.current || confirm) event.preventDefault(); }}
onInteractOutside={(event) => { if (pending.current || confirm) event.preventDefault(); }}>
<div className="mb-4 flex items-center justify-between gap-2">
diff --git a/apps/desktop/src/renderer/features/device-link/__tests__/SharedTaskButton.test.tsx b/apps/desktop/src/renderer/features/device-link/__tests__/SharedTaskButton.test.tsx
index fe98d879d8..f77d9aa81d 100644
--- a/apps/desktop/src/renderer/features/device-link/__tests__/SharedTaskButton.test.tsx
+++ b/apps/desktop/src/renderer/features/device-link/__tests__/SharedTaskButton.test.tsx
@@ -1,5 +1,6 @@
// @vitest-environment jsdom
-import { createElement } from 'react';
+import { createElement, useRef, useState } from 'react';
+import { DropdownMenu, DropdownMenuContent, DropdownMenuItem, DropdownMenuTrigger } from '@/components/ui/dropdown-menu';
import { act, fireEvent, waitFor, within } from '@testing-library/react';
import { createRoot, type Root } from 'react-dom/client';
import { afterEach, beforeEach, expect, it, vi } from 'vitest';
@@ -45,6 +46,33 @@ afterEach(async () => {
container.remove();
document.body.innerHTML = '';
});
+it('opens from an overflow menu and restores focus to that menu after closing', async () => {
+ function MenuHarness() {
+ const [open, setOpen] = useState(false);
+ const trigger = useRef<HTMLButtonElement>(null);
+ return <>
+ <DropdownMenu>
+ <DropdownMenuTrigger ref={trigger}>More</DropdownMenuTrigger>
+ <DropdownMenuContent onCloseAutoFocus={(event) => { if (open) event.preventDefault(); }}>
+ <DropdownMenuItem onSelect={() => setOpen(true)}>Share</DropdownMenuItem>
+ </DropdownMenuContent>
+ </DropdownMenu>
+ {open && <SharedTaskButton session={ownerSession} dialogControl={{ onDismiss: () => setOpen(false), returnFocus: () => trigger.current?.focus() }} />}
+ </>;
+ }
+ await act(async () => root.render(<MenuHarness />));
+ expect(container.querySelectorAll('button')).toHaveLength(1);
+ const more = within(document.body).getByRole('button', { name: 'More' });
+ await act(async () => { fireEvent.keyDown(more, { key: 'Enter' }); });
+ await act(async () => { fireEvent.click(within(document.body).getByRole('menuitem', { name: 'Share' })); });
+ await waitFor(() => expect(within(document.body).queryByRole('menu')).toBeNull());
+ const dialog = within(document.body).getByRole('dialog');
+ expect(dialog.contains(document.activeElement)).toBe(true);
+ await act(async () => { fireEvent.click(within(dialog).getByRole('button', { name: 'sharedTask.dismiss' })); });
+ await waitFor(() => expect(within(document.body).queryByRole('dialog')).toBeNull());
+ await waitFor(() => expect(document.activeElement).toBe(more));
+});
+
it('renders an upgrade instruction when an old host rejects the new channel', async () => {
state.host.mockRejectedValue(new Error('[DEVICE_LINK_CHANNEL_NOT_ALLOWED] unsupported'));
const body = await openWindow(ownerSession);
diff --git a/docs/product-rules/shared-task-mode.md b/docs/product-rules/shared-task-mode.md
index 990e60f4ef..21bbac9bda 100644
--- a/docs/product-rules/shared-task-mode.md
+++ b/docs/product-rules/shared-task-mode.md
@@ -89,6 +89,8 @@
### 桌面共享任务入口修订(2026-09-20,用户确认)
+- 任务顶部不单独显示共享图标;「共享任务」收进标题旁的「…」菜单,打开原有共享管理窗口。移除菜单前的弹性空白,恢复「标题 → 标签 → … → Git/PR 信息」顺序。访客菜单仅保留共享管理入口,不开放房主的改名、归档、删除等操作(2026-09-23,用户确认)。
+- 标题旁、左侧文字版与列表版共用菜单内容与顺序:置顶/重命名/移动/标签;复制链接/共享任务/导出;新窗口;归档(已归档时为取消归档)/删除。仍按任务状态隐藏不适用项;移除任务分支菜单入口,访客侧栏继续仅导航,不增加右键菜单(2026-09-23,用户确认统一两处菜单)。
- 采用单一「共享任务」列表内分组:房主与访客任务按最近活动时间混排,不使用 Tab 或角色子分组。仅房主任务在 Agent 图标与标题之间显示金色皇冠(Desktop `--warning-fg` / Mobile `warningFg`,Light / Dark 均为 `#F3A115`);访客任务不渲染身份槽,标题起点与普通任务一致。皇冠不占用右侧时间、状态、PR、工作区或悬停操作槽。Desktop 共享分组只跟随主列表的文字版/列表版,不适配仅向置顶区开放的三态展示;Mobile 使用同一身份语义。分组不显示计数,且不受下方设备筛选影响(2026-09-22,用户确认;同日由中性色调整为金色)。
- 共享不是常用功能:未开启且未加入共享任务时,整个分组隐藏,不保留空状态、加入按钮或分隔线;首次开启或加入后出现,最后一个共享关闭或退出后自动隐藏。首次加入继续使用原有菜单入口。
- 设备菜单仅保留真实设备,不显示共享任务或内部 peer 标识。访客任务不再重复混入下方普通项目/任务列表。房主任务仍保留原项目归属,共享分组作为快捷入口。