Consider it done. The open-source AI agent that works out of the box · 想到,就能做到。开源、开箱即用的 AI Agent。
TypeScript agentai-agentai-assistantandroidclaude-codecodexelectroniosllmmacosreact-nativetypescriptwindows
fix(bots): distinguish linked project devices and explain removal
Chrisfe04692da8ea
diff --git a/apps/desktop/scripts/fixtures/bot-projects/projects-fixture.tsx b/apps/desktop/scripts/fixtures/bot-projects/projects-fixture.tsxindex a0a1ed8155..b1f79112e0 100644--- a/apps/desktop/scripts/fixtures/bot-projects/projects-fixture.tsx+++ b/apps/desktop/scripts/fixtures/bot-projects/projects-fixture.tsx@@ -13,10 +13,15 @@ mountPage({] : []),];let fail = ctx.case === 'error';+ let holdSave = ctx.case === 'saving';return {localDb: { bots: { projects: {list: async () => { if (fail) { fail = false; throw new Error('offline'); } return projects; },set: async (_botId: string, id: string, linked: boolean) => {+ if (holdSave) {+ holdSave = false;+ await new Promise<void>(resolve => window.addEventListener('bot-project-save-complete', () => resolve(), { once: true }));+ }projects = projects.map(project => project.id === id ? { ...project, linked } : project);return projects;},diff --git a/apps/desktop/scripts/fixtures/bot-projects/ui-page.mjs b/apps/desktop/scripts/fixtures/bot-projects/ui-page.mjsindex ae87f95dda..1ffac3bc56 100644--- a/apps/desktop/scripts/fixtures/bot-projects/ui-page.mjs+++ b/apps/desktop/scripts/fixtures/bot-projects/ui-page.mjs@@ -8,6 +8,7 @@ export default {empty: { about: 'Start with no links; selection and add are separate actions' },legacy: { about: 'Preserve foreign computer and missing project associations' },error: { about: 'Recover from an unavailable list without treating it as empty' },+ saving: { about: 'Explain the disabled remove action while a save is pending' },},async ready(page) { await page.getByRole('combobox').or(page.getByRole('alert')).first().waitFor(); },async check(page, ui) {@@ -18,8 +19,18 @@ export default {await page.getByRole('combobox').click();await page.getByRole('option', { name: 'Filo · 移动端与协作体验', exact: true }).click();await page.getByRole('button', { name: await ui.t('bots.projects.add'), exact: true }).click();+ if (ui.case === 'saving') {+ const disabled = page.getByRole('button', { name: await ui.t('bots.projects.remove', { name: 'Cindy' }), exact: true });+ assert.equal(await disabled.isDisabled(), true);+ await disabled.locator('..').hover();+ await page.getByRole('tooltip').filter({ hasText: await ui.t('bots.autosave.saving') }).waitFor();+ await ui.capture('saving-tip');+ await page.evaluate(() => window.dispatchEvent(new Event('bot-project-save-complete')));+ }const remove = page.getByRole('button', { name: await ui.t('bots.projects.remove', { name: 'Filo · 移动端与协作体验' }), exact: true });await remove.waitFor();+ await remove.hover();+ await page.getByRole('tooltip').filter({ hasText: await ui.t('bots.projects.remove', { name: 'Filo · 移动端与协作体验' }) }).waitFor();await ui.capture('added');await remove.click();await remove.waitFor({ state: 'detached' });diff --git a/apps/desktop/src/main/localDb/ipc/__tests__/botRemoteEditors.test.ts b/apps/desktop/src/main/localDb/ipc/__tests__/botRemoteEditors.test.tsindex 6face1e9b4..8ff00c9860 100644--- a/apps/desktop/src/main/localDb/ipc/__tests__/botRemoteEditors.test.ts+++ b/apps/desktop/src/main/localDb/ipc/__tests__/botRemoteEditors.test.ts@@ -270,3 +270,25 @@ it('links multiple projects through settings while keeping paths private and rejawait f.send(await f.resource(id), { linked: false });expect(projects.map(p => p.linked)).toEqual([true, false, true]);});++// PR #6813: equal carried paths on different devices previously had identical phone labels.+// Unit: real resource/action projection, two device-specific links; existing path privacy retained.+it('distinguishes equal project paths on different devices in the list and toggle detail', async () => {+ const f = fixture();+ const projects = ['desk-a', 'desk-b'].map((deviceId, index) => ({+ id: String(index).repeat(64), name: 'app', path: '/PRIVATE/app', deviceId, linked: true, available: false,+ }));+ f.deps.projects = {+ list: async () => projects.map(project => ({ ...project })),+ set: async (_bot, id, linked) => { projects.find(project => project.id === id)!.linked = linked; },+ };+ const list = await f.resource('settings:bot-a/projects');+ expect(f.entries(list)).toMatchObject([+ { title: expect.stringContaining('desk-a') }, { title: expect.stringContaining('desk-b') },+ ]);+ const detail = await f.resource(f.entries(list)[0].resourceId);+ expect(detail.display.title).toContain('desk-a');+ expect(JSON.stringify([list, detail])).not.toContain('/PRIVATE');+ await f.send(detail, { linked: false });+ expect(projects.map(project => project.linked)).toEqual([false, true]);+});diff --git a/apps/desktop/src/main/localDb/ipc/botRemoteEditors.ts b/apps/desktop/src/main/localDb/ipc/botRemoteEditors.tsindex e9eeb85f8b..bae0b377b9 100644--- a/apps/desktop/src/main/localDb/ipc/botRemoteEditors.ts+++ b/apps/desktop/src/main/localDb/ipc/botRemoteEditors.ts@@ -83,15 +83,16 @@ export function createBotRemoteEditors(deps: BotRemoteEditorDeps, bind: ReturnTyconst [, botId, projectId] = projectMatch;const settings = await deps.read(botId); deps.assertOwner(owner);const projects = await deps.projects.list(botId); deps.assertOwner(owner);+ const title = (project: BotProjectOption) => `${project.name}${project.deviceId ? ` · ${resolveRemoteText(editorCopy.projectRemote, locale)} (${project.deviceId})` : ''}`;const resource: RemoteResource = { ref: ref(id), revision: hash(projects), display: { title: editorCopy.projects }, links: [], blocks: [] };if (!projectId) {resource.blocks = [{ id: 'projects', primitive: 'list', fallbackMarkdown: projects.length ? resolveRemoteText(editorCopy.projectHelp, locale) : resolveRemoteText(editorCopy.projectEmpty, locale),- data: { entries: projects.map(project => ({ id: project.id, title: `${project.linked ? '✓ ' : ''}${project.name}${project.deviceId ? ` · ${resolveRemoteText(editorCopy.projectRemote, locale)}` : ''}`, resourceId: `${id}/${project.id}` })) } }];+ data: { entries: projects.map(project => ({ id: project.id, title: `${project.linked ? '✓ ' : ''}${title(project)}`, resourceId: `${id}/${project.id}` })) } }];return resource;}const project = projects.find(project => project.id === projectId);if (!project) throwIpcError('NOT_FOUND', 'Project unavailable');- resource.display.title = project.name;+ resource.display.title = title(project);const panel = form('project', editorCopy.projects, [{ id: 'linked', label: editorCopy.projectLinked, kind: 'toggle' }], { linked: project.linked });resource.blocks = [{ ...panel.block, fallbackMarkdown: [resolveRemoteText(editorCopy.projectHelp, locale), project.deviceId ? resolveRemoteText(editorCopy.projectRemote, locale) : !project.available ? resolveRemoteText(editorCopy.projectUnavailable, locale) : ''].filter(Boolean).join('\n\n') }];resource.actions = [{ ...panel.action, disabled: settings.source.status !== 'active' }];diff --git a/apps/desktop/src/renderer/features/bots/BotProjectsSettings.tsx b/apps/desktop/src/renderer/features/bots/BotProjectsSettings.tsxindex d1e5d7f1f6..483ea80c9a 100644--- a/apps/desktop/src/renderer/features/bots/BotProjectsSettings.tsx+++ b/apps/desktop/src/renderer/features/bots/BotProjectsSettings.tsx@@ -3,6 +3,7 @@ import { FolderOpen, Plus, X } from 'lucide-react';import { Button } from '@/components/ui/button';import { Select } from '@/components/ui/select';import { Spinner } from '@/components/ui/spinner';+import { Tip } from '@/components/ui/tooltip';import { useBotTranslation } from './botPronounContext';import type { BotProjectOption } from '../../../shared/botWorkbench';@@ -58,8 +59,12 @@ export function BotProjectsSettings({ botId }: { botId: string }) {{project.deviceId ? t('bots.projects.otherComputer', { device: project.deviceId }) : t('bots.projects.unavailable')}</p>}</div>- <Button variant="secondary" tone="quiet" compact disabled={busy} aria-label={t('bots.projects.remove', { name: project.name })}- onClick={() => void set(project.id, false)}><X size={16} /></Button>+ <Tip text={busy ? t('bots.autosave.saving') : t('bots.projects.remove', { name: project.name })}>+ <span className="inline-flex shrink-0">+ <Button variant="secondary" tone="quiet" compact disabled={busy} aria-label={t('bots.projects.remove', { name: project.name })}+ onClick={() => void set(project.id, false)}><X size={16} /></Button>+ </span>+ </Tip></li>)}</ul> : projects ? <p className="py-3 text-13 text-[var(--text-tertiary)]">{t('bots.projects.empty')}</p> : null}{projects && <div className="flex flex-wrap items-center gap-2">