Consider it done. The open-source AI agent that works out of the box · 想到,就能做到。开源、开箱即用的 AI Agent。
TypeScript agentai-agentai-assistantandroidclaude-codecodexelectroniosllmmacosreact-nativetypescriptwindows
fix(desktop): 把重启确认写成完整句子,并排除委派任务
shenjiachengab1d04112756
diff --git a/apps/desktop/src/main/__tests__/relaunchBusyActivityIpcBoundary.test.ts b/apps/desktop/src/main/__tests__/relaunchBusyActivityIpcBoundary.test.tsindex bf26d15656..e62124fa92 100644--- a/apps/desktop/src/main/__tests__/relaunchBusyActivityIpcBoundary.test.ts+++ b/apps/desktop/src/main/__tests__/relaunchBusyActivityIpcBoundary.test.ts@@ -330,6 +330,54 @@ describe('readRelaunchTurnFacts', () => {expect(h.selects).toBe(1);});+ it('does not call a delegated background task a teammate reply', async () => {+ h.dbRows = [+ {+ id: 'delegated',+ source: 'desktop',+ displayName: 'Cindy',+ botStatus: 'active',+ hiddenAt: null,+ linkRole: 'delegation',+ },+ ];+ await expect(readRelaunchTurnFacts(['delegated'])).resolves.toEqual({+ companions: [],+ conversation: true,+ });+ h.dbRows = [+ {+ id: 'delegated-bot',+ source: 'bot',+ displayName: 'Cindy',+ botStatus: 'active',+ hiddenAt: null,+ linkRole: 'delegation',+ },+ ];+ await expect(readRelaunchTurnFacts(['delegated-bot'])).resolves.toEqual({+ companions: [],+ conversation: true,+ });+ });++ it('keeps a canonical welcome as a visible teammate reply', async () => {+ h.dbRows = [+ {+ id: 'welcome',+ source: 'bot',+ displayName: 'Cindy',+ botStatus: 'active',+ hiddenAt: null,+ linkRole: 'canonical',+ },+ ];+ await expect(readRelaunchTurnFacts(['welcome'])).resolves.toEqual({+ companions: [{ name: 'Cindy' }],+ conversation: false,+ });+ });+it('does not expose a hidden teammate name', async () => {h.dbRows = [{ id: 'bot-session', source: 'bot', displayName: 'Cindy', botStatus: 'active', hiddenAt: 1 },diff --git a/apps/desktop/src/main/relaunchTurnFacts.ts b/apps/desktop/src/main/relaunchTurnFacts.tsindex b70b7a270e..450ba25ef0 100644--- a/apps/desktop/src/main/relaunchTurnFacts.ts+++ b/apps/desktop/src/main/relaunchTurnFacts.ts@@ -2,7 +2,7 @@* relaunchTurnFacts.ts — 把正在跑的 turn 收成「伙伴 / 对话」,只为更新重启确认的摘要。** 不改变 busy 判定。查不到、超限或数据库失败都返回 null,确认句退回通用警告。- * 查询列只有来源和伙伴显示名,不读标题、路径、欢迎语或会话正文。+ * 查询列只有来源、链接角色和伙伴显示名,不读标题、路径、欢迎语或会话正文。*/import { and, eq, inArray, isNull } from 'drizzle-orm';@@ -36,6 +36,7 @@ export async function readRelaunchTurnFacts(displayName: botProfiles.displayName,botStatus: botProfiles.status,hiddenAt: botProfiles.hiddenAt,+ linkRole: botSessionLinks.role,}).from(sessions).leftJoin(@@ -50,6 +51,7 @@ export async function readRelaunchTurnFacts(displayName: row.displayName ?? null,botStatus: row.botStatus ?? null,hiddenAt: row.hiddenAt ?? null,+ linkRole: row.linkRole ?? null,}));return classifyRelaunchTurnRows(ids, facts);} catch {diff --git a/apps/desktop/src/renderer/__tests__/updateBannerRelaunchEntry.test.tsx b/apps/desktop/src/renderer/__tests__/updateBannerRelaunchEntry.test.tsxindex 7c54adc180..cf9f4affd9 100644--- a/apps/desktop/src/renderer/__tests__/updateBannerRelaunchEntry.test.tsx+++ b/apps/desktop/src/renderer/__tests__/updateBannerRelaunchEntry.test.tsx@@ -38,7 +38,29 @@ const {vi.mock('react-i18next', () => ({useTranslation: () => ({- t: (key: string) => key,+ t: (key: string, vars?: Record<string, unknown>) => {+ const templates: Record<string, string> = {+ 'update.banner.confirmBusyActivities': 'Restarting will interrupt {{activities}}.',+ 'update.banner.activityJoiner': ', ',+ 'update.banner.activityJoinerPair': ' and ',+ 'update.banner.activityJoinerLast': ', and ',+ 'update.banner.activityNameJoiner': ', ',+ 'update.banner.activityNameJoinerPair': ' and ',+ 'update.banner.activityNameJoinerLast': ', and ',+ 'update.banner.activity.companion': "a teammate's reply",+ 'update.banner.activity.companionOne': "{{names}}'s reply",+ 'update.banner.activity.companionOther': "{{names}}'s replies",+ 'update.banner.activity.conversation': 'a chat in progress',+ 'update.banner.activity.backgroundCommand': 'a background command',+ 'update.banner.activity.scheduledTask': 'a scheduled task',+ 'update.banner.activity.generation': 'a generation',+ 'update.banner.activity.subtask': 'a subtask',+ };+ const template = templates[key];+ if (!template) return key;+ if (!vars) return template;+ return template.replace(/\{\{(\w+)\}\}/g, (_, name: string) => String(vars[name] ?? ''));+ },}),}));@@ -75,6 +97,7 @@ vi.mock('@/components/ui/tooltip', () => ({}));import { UpdateBanner } from '@/components/sidebar/UpdateBanner';+import { formatRelaunchActivityHint } from '../../shared/relaunchActivitySummary';/** 返回一个手动 settle 的探针,用于把「点击后、resolve 前」这段窗口撑开。 */function deferredProbe(): (busy: boolean) => void {@@ -402,16 +425,7 @@ describe('UpdateBanner relaunch activity summary', () => {return (value) => settle(value);}- const namedHint = [- 'update.banner.confirmBusyLead',- 'update.banner.activity.companionNamedLead',- 'Cindy',- 'update.banner.activityNameJoiner',- 'Mika',- 'update.banner.activity.companionNamedTail',- 'update.banner.activityJoinerPair',- 'update.banner.activity.backgroundCommand',- ].join('');+ const namedHint = "Restarting will interrupt Cindy and Mika's replies and a background command.";it('names every interrupting activity and can still be cancelled', async () => {withDescribe(async () => ({@@ -439,10 +453,7 @@ describe('UpdateBanner relaunch activity summary', () => {}));render(<UpdateBanner isCollapsed={false} />);fireEvent.click(screen.getByRole('button', { name: 'update.banner.ariaExpanded' }));- const hint = [- 'update.banner.confirmBusyLead',- 'update.banner.activity.companion',- ].join('');+ const hint = "Restarting will interrupt a teammate's reply.";expect(await screen.findByText(hint)).toBeTruthy();expect(screen.queryByText('3c4c962a-1111-4111-8111-111111111111')).toBeNull();expect(relaunchToUpdate).not.toHaveBeenCalled();@@ -505,3 +516,104 @@ describe('UpdateBanner relaunch activity summary', () => {expect(screen.getByText('update.banner.preparingButton')).toBeTruthy();});});++/**+ * 测试价值+ * - 生产入口与可观察结果:formatRelaunchActivityHint。用户看到的是完整警告句,不是残句。+ * - Bug/规则依据:#5265 的评审。日语任意类别和英语具名伙伴原先拼不成句子。+ * - 现有覆盖缺口:组件测试以前只断言翻译键顺序,发现不了残句。+ * - 最小失败输入:只有后台命令的日语句,以及一个或两个英语伙伴名。+ * - tier:unit。直接调用生产函数,翻译模板与 locale 文案相同。+ */+describe('formatRelaunchActivityHint builds a complete sentence', () => {+ function translate(dict: Record<string, string>) {+ return (key: string, vars?: Record<string, string>) => {+ const template = dict[key] ?? key;+ if (!vars) return template;+ return template.replace(/\{\{(\w+)\}\}/g, (_, name: string) => vars[name] ?? '');+ };+ }++ const shared = {+ 'update.banner.activityJoiner': ', ',+ 'update.banner.activityJoinerPair': ' and ',+ 'update.banner.activityJoinerLast': ', and ',+ 'update.banner.activityNameJoiner': ', ',+ 'update.banner.activityNameJoinerPair': ' and ',+ 'update.banner.activityNameJoinerLast': ', and ',+ };++ it('uses a full English sentence and pluralizes teammate names', () => {+ const t = translate({+ ...shared,+ 'update.banner.confirmBusyActivities': 'Restarting will interrupt {{activities}}.',+ 'update.banner.activity.companion': "a teammate's reply",+ 'update.banner.activity.companionOne': "{{names}}'s reply",+ 'update.banner.activity.companionOther': "{{names}}'s replies",+ 'update.banner.activity.backgroundCommand': 'a background command',+ 'update.banner.activity.conversation': 'a chat in progress',+ });+ expect(formatRelaunchActivityHint(t, {+ categories: ['background-command'],+ companionNames: [],+ })).toBe('Restarting will interrupt a background command.');+ expect(formatRelaunchActivityHint(t, {+ categories: ['companion'],+ companionNames: ['Cindy'],+ })).toBe("Restarting will interrupt Cindy's reply.");+ expect(formatRelaunchActivityHint(t, {+ categories: ['companion', 'background-command'],+ companionNames: ['Cindy', 'Mika'],+ })).toBe("Restarting will interrupt Cindy and Mika's replies and a background command.");+ expect(formatRelaunchActivityHint(t, {+ categories: ['companion', 'conversation', 'background-command'],+ companionNames: [],+ })).toBe("Restarting will interrupt a teammate's reply, a chat in progress, and a background command.");+ });++ it('says in Japanese that the restart will interrupt the activity', () => {+ const t = translate({+ 'update.banner.confirmBusyActivities': '再起動すると、{{activities}}が中断されます。',+ 'update.banner.activityJoiner': '、',+ 'update.banner.activityJoinerPair': '、',+ 'update.banner.activityJoinerLast': '、',+ 'update.banner.activityNameJoiner': '、',+ 'update.banner.activityNameJoinerPair': 'と',+ 'update.banner.activityNameJoinerLast': '、',+ 'update.banner.activity.companionOne': '仲間 {{names}}の返信',+ 'update.banner.activity.companionOther': '仲間 {{names}}の返信',+ 'update.banner.activity.backgroundCommand': 'バックグラウンドコマンド',+ });+ expect(formatRelaunchActivityHint(t, {+ categories: ['background-command'],+ companionNames: [],+ })).toBe('再起動すると、バックグラウンドコマンドが中断されます。');+ expect(formatRelaunchActivityHint(t, {+ categories: ['companion'],+ companionNames: ['Cindy'],+ })).toBe('再起動すると、仲間 Cindyの返信が中断されます。');+ expect(formatRelaunchActivityHint(t, {+ categories: ['companion'],+ companionNames: ['Cindy', 'Mika'],+ })).toBe('再起動すると、仲間 CindyとMikaの返信が中断されます。');+ });++ it('keeps the Chinese warning readable for one or more teammates', () => {+ const t = translate({+ 'update.banner.confirmBusyActivities': '重启会中断{{activities}}。',+ 'update.banner.activityJoiner': '、',+ 'update.banner.activityJoinerPair': '、',+ 'update.banner.activityJoinerLast': '、',+ 'update.banner.activityNameJoiner': '、',+ 'update.banner.activityNameJoinerPair': '、',+ 'update.banner.activityNameJoinerLast': '、',+ 'update.banner.activity.companionOne': '伙伴 {{names}} 正在回复',+ 'update.banner.activity.companionOther': '伙伴 {{names}} 正在回复',+ 'update.banner.activity.backgroundCommand': '后台命令',+ });+ expect(formatRelaunchActivityHint(t, {+ categories: ['companion', 'background-command'],+ companionNames: ['Cindy', 'Mika'],+ })).toBe('重启会中断伙伴 Cindy、Mika 正在回复、后台命令。');+ });+});diff --git a/apps/desktop/src/renderer/components/sidebar/UpdateBanner.tsx b/apps/desktop/src/renderer/components/sidebar/UpdateBanner.tsxindex 1bc303a26a..5ed586f7af 100644--- a/apps/desktop/src/renderer/components/sidebar/UpdateBanner.tsx+++ b/apps/desktop/src/renderer/components/sidebar/UpdateBanner.tsx@@ -457,7 +457,7 @@ export function UpdateBanner({ isCollapsed, onOpenVersionNotice }: UpdateBannerPif (confirming && !isPreparing) {return withPrerequisiteDialogs(<div className="flex flex-col items-center gap-0.5 border-t border-sidebar-border py-1.5">- <Tip text={formatRelaunchActivityHint((key) => t(key), activitySummary) ?? t('update.banner.confirmTooltip')} side="right">+ <Tip text={formatRelaunchActivityHint((key, vars) => t(key, vars), activitySummary) ?? t('update.banner.confirmTooltip')} side="right"><buttononClick={handleRelaunch}aria-label={t('update.banner.confirmAria')}@@ -573,7 +573,7 @@ export function UpdateBanner({ isCollapsed, onOpenVersionNotice }: UpdateBannerP{isPreparing? t('update.banner.preparingSubtitle'): confirming- ? (formatRelaunchActivityHint((key) => t(key), activitySummary) ?? t('update.banner.confirmBusyHint'))+ ? (formatRelaunchActivityHint((key, vars) => t(key, vars), activitySummary) ?? t('update.banner.confirmBusyHint')): t('update.banner.subtitle')}</p>{notesVersion && (diff --git a/apps/desktop/src/renderer/i18n/locales/en/common.json b/apps/desktop/src/renderer/i18n/locales/en/common.jsonindex 85ae0a03e1..4dd7c8398b 100644--- a/apps/desktop/src/renderer/i18n/locales/en/common.json+++ b/apps/desktop/src/renderer/i18n/locales/en/common.json@@ -8794,15 +8794,17 @@"preparingAria": "Preparing newer version, please wait","confirmTitle": "A task is still running","confirmBusyHint": "Restarting will interrupt it",- "confirmBusyLead": "Restarting will interrupt ",+ "confirmBusyActivities": "Restarting will interrupt {{activities}}.","activityJoiner": ", ","activityJoinerPair": " and ","activityJoinerLast": ", and ","activityNameJoiner": ", ",+ "activityNameJoinerPair": " and ",+ "activityNameJoinerLast": ", and ","activity": {- "companion": "a teammate replying",- "companionNamedLead": "teammate ",- "companionNamedTail": " is replying",+ "companion": "a teammate's reply",+ "companionOne": "{{names}}'s reply",+ "companionOther": "{{names}}'s replies","conversation": "a chat in progress","backgroundCommand": "a background command","scheduledTask": "a scheduled task",diff --git a/apps/desktop/src/renderer/i18n/locales/ja/common.json b/apps/desktop/src/renderer/i18n/locales/ja/common.jsonindex 795992bec5..a1cf9bfccd 100644--- a/apps/desktop/src/renderer/i18n/locales/ja/common.json+++ b/apps/desktop/src/renderer/i18n/locales/ja/common.json@@ -8762,16 +8762,18 @@"preparingAria": "新しいバージョンを準備中、お待ちください","confirmTitle": "実行中のタスクがあります","confirmBusyHint": "再起動すると中断されます",- "confirmBusyLead": "再起動すると",+ "confirmBusyActivities": "再起動すると、{{activities}}が中断されます。","activityJoiner": "、","activityJoinerPair": "、","activityJoinerLast": "、","activityNameJoiner": "、",+ "activityNameJoinerPair": "と",+ "activityNameJoinerLast": "、","activity": {- "companion": "仲間が返信しています",- "companionNamedLead": "仲間 ",- "companionNamedTail": " が返信しています",- "conversation": "チャットが進行中です",+ "companion": "仲間の返信",+ "companionOne": "仲間 {{names}}の返信",+ "companionOther": "仲間 {{names}}の返信",+ "conversation": "進行中のチャット","backgroundCommand": "バックグラウンドコマンド","scheduledTask": "スケジュールタスク","generation": "生成タスク",diff --git a/apps/desktop/src/renderer/i18n/locales/ko/common.json b/apps/desktop/src/renderer/i18n/locales/ko/common.jsonindex 628ef425ca..c1b5504d9f 100644--- a/apps/desktop/src/renderer/i18n/locales/ko/common.json+++ b/apps/desktop/src/renderer/i18n/locales/ko/common.json@@ -8762,20 +8762,22 @@"preparingAria": "새 버전 준비 중입니다. 잠시만 기다려 주세요","confirmTitle": "아직 실행 중인 작업이 있습니다","confirmBusyHint": "재시작하면 작업이 중단됩니다",- "confirmBusyLead": "다시 시작하면 중단됩니다: ",+ "confirmBusyActivities": "다시 시작하면 {{activities}} 중단됩니다.","activityJoiner": ", ","activityJoinerPair": ", ","activityJoinerLast": ", ","activityNameJoiner": ", ",+ "activityNameJoinerPair": ", ",+ "activityNameJoinerLast": ", ","activity": {- "companion": "동료가 답장하는 중",- "companionNamedLead": "동료 ",- "companionNamedTail": " 답장 중",- "conversation": "채팅이 진행 중",- "backgroundCommand": "백그라운드 명령",- "scheduledTask": "예약 작업",- "generation": "생성 작업",- "subtask": "하위 작업"+ "companion": "동료의 답장이",+ "companionOne": "동료 {{names}}의 답장이",+ "companionOther": "동료 {{names}}의 답장이",+ "conversation": "진행 중인 채팅이",+ "backgroundCommand": "백그라운드 명령이",+ "scheduledTask": "예약 작업이",+ "generation": "생성 작업이",+ "subtask": "하위 작업이"},"confirmButton": "그래도 앱 재시작","cancel": "취소",diff --git a/apps/desktop/src/renderer/i18n/locales/zh-CN/common.json b/apps/desktop/src/renderer/i18n/locales/zh-CN/common.jsonindex b7824a0ab7..30eb6fad40 100644--- a/apps/desktop/src/renderer/i18n/locales/zh-CN/common.json+++ b/apps/desktop/src/renderer/i18n/locales/zh-CN/common.json@@ -8762,15 +8762,17 @@"preparingAria": "正在准备新版本,请稍候","confirmTitle": "仍有任务在运行中","confirmBusyHint": "重启会中断运行中的任务",- "confirmBusyLead": "重启会中断",+ "confirmBusyActivities": "重启会中断{{activities}}。","activityJoiner": "、","activityJoinerPair": "、","activityJoinerLast": "、","activityNameJoiner": "、",+ "activityNameJoinerPair": "、",+ "activityNameJoinerLast": "、","activity": {"companion": "伙伴正在回复",- "companionNamedLead": "伙伴 ",- "companionNamedTail": " 正在回复",+ "companionOne": "伙伴 {{names}} 正在回复",+ "companionOther": "伙伴 {{names}} 正在回复","conversation": "对话进行中","backgroundCommand": "后台命令","scheduledTask": "定时任务",diff --git a/apps/desktop/src/renderer/i18n/locales/zh-TW/common.json b/apps/desktop/src/renderer/i18n/locales/zh-TW/common.jsonindex 1b74c10981..62b10b513c 100644--- a/apps/desktop/src/renderer/i18n/locales/zh-TW/common.json+++ b/apps/desktop/src/renderer/i18n/locales/zh-TW/common.json@@ -8762,15 +8762,17 @@"preparingAria": "正在準備新版本,請稍候","confirmTitle": "仍有任務在執行中","confirmBusyHint": "重啟會中斷執行中的任務",- "confirmBusyLead": "重啟會中斷",+ "confirmBusyActivities": "重啟會中斷{{activities}}。","activityJoiner": "、","activityJoinerPair": "、","activityJoinerLast": "、","activityNameJoiner": "、",+ "activityNameJoinerPair": "、",+ "activityNameJoinerLast": "、","activity": {"companion": "夥伴正在回覆",- "companionNamedLead": "夥伴 ",- "companionNamedTail": " 正在回覆",+ "companionOne": "夥伴 {{names}} 正在回覆",+ "companionOther": "夥伴 {{names}} 正在回覆","conversation": "對話進行中","backgroundCommand": "背景命令","scheduledTask": "定時任務",diff --git a/apps/desktop/src/shared/relaunchActivitySummary.ts b/apps/desktop/src/shared/relaunchActivitySummary.tsindex 08fe06957b..a5ff40bcf5 100644--- a/apps/desktop/src/shared/relaunchActivitySummary.ts+++ b/apps/desktop/src/shared/relaunchActivitySummary.ts@@ -111,6 +111,8 @@ export interface RelaunchTurnRow {displayName: string | null;botStatus: string | null;hiddenAt: number | null;+ /** bot_session_links.role。delegation 是普通任务,不是伙伴对话。 */+ linkRole?: string | null;}/** 把 turn 会话行收成伙伴 / 对话。缺行、超限或来源读不出时返回 null,不猜类别。 */@@ -145,7 +147,11 @@ export function classifyRelaunchTurnRows(const source = group.find((row) => row.source)?.source ?? null;const bot = group.find((row) =>row.displayName != null || row.botStatus != null || row.hiddenAt != null);- const isCompanion = source === 'bot' || bot != null;+ const role = group.find((row) => row.linkRole != null)?.linkRole ?? null;+ // delegation 走普通任务入口,不能因为 join 到伙伴资料就说「伙伴正在回复」。+ const isCompanion = role !== 'delegation' && (+ source === 'bot' || role === 'canonical' || role === 'history' || role === 'group' || role === 'channel'+ );if (!source && !isCompanion) return null;if (isCompanion) {const name = safeCompanionDisplayName(bot?.displayName, {@@ -177,30 +183,45 @@ const CATEGORY_KEYS: Record<RelaunchActivityCategory, string> = {subtask: 'update.banner.activity.subtask',};-/** 有具体类别时返回整句;没有时返回 null,调用方继续用原来的通用警告。 */-export function formatRelaunchActivityHint(+function joinLocalized(+ parts: readonly string[],translate: (key: string) => string,+ keys: { joiner: string; pair: string; last: string },+): string {+ if (parts.length <= 1) return parts[0] ?? '';+ if (parts.length === 2) return parts[0] + translate(keys.pair) + parts[1];+ return parts.slice(0, -1).join(translate(keys.joiner)) + translate(keys.last) + parts[parts.length - 1];+}++/**+ * 有具体类别时返回各语言的完整警告句;没有时返回 null,调用方继续用通用警告。+ * translate 必须自己替换 {{activities}} / {{names}}。名字数量决定单复数模板。+ */+export function formatRelaunchActivityHint(+ translate: (key: string, vars?: Record<string, string>) => string,summary: RelaunchActivitySummary | null,): string | null {if (!summary || summary.categories.length === 0) return null;const parts = summary.categories.map((category) => {- if (category === 'companion' && summary.companionNames.length > 0) {- return translate('update.banner.activity.companionNamedLead')- + summary.companionNames.join(translate('update.banner.activityNameJoiner'))- + translate('update.banner.activity.companionNamedTail');+ if (category !== 'companion' || summary.companionNames.length === 0) {+ return translate(CATEGORY_KEYS[category]);}- return translate(CATEGORY_KEYS[category]);+ const names = joinLocalized(summary.companionNames, (key) => translate(key), {+ joiner: 'update.banner.activityNameJoiner',+ pair: 'update.banner.activityNameJoinerPair',+ last: 'update.banner.activityNameJoinerLast',+ });+ const key = summary.companionNames.length === 1+ ? 'update.banner.activity.companionOne'+ : 'update.banner.activity.companionOther';+ return translate(key, { names });+ });+ const activities = joinLocalized(parts, (key) => translate(key), {+ joiner: 'update.banner.activityJoiner',+ pair: 'update.banner.activityJoinerPair',+ last: 'update.banner.activityJoinerLast',});- const body = parts.map((part, index) => {- if (index === 0) return part;- const key = parts.length === 2- ? 'update.banner.activityJoinerPair'- : index === parts.length - 1- ? 'update.banner.activityJoinerLast'- : 'update.banner.activityJoiner';- return translate(key) + part;- }).join('');- return translate('update.banner.confirmBusyLead') + body;+ return translate('update.banner.confirmBusyActivities', { activities });}/** Renderer 不信任 IPC 形状。缺 busy 布尔时返回 null,由调用方 fail closed。 */