+
{props.projection.items.map((plugin) => (
- {selected.state === 'identity_required' ?
: null}
- {selected.state === 'authentication_required' ?
: null}
+ {selected.state === 'identity_required' ?
: null}
+ {selected.state === 'authentication_required' ?
: null}
能力与权限
{selected.capabilities.map((capability) =>
{capability.id}
{capability.operations.map((operation) =>
{operation.id}{operation.tool ? <>{MUTATION_TEXT[operation.tool.mutation]}{operation.tool.name} : SDK}
{operation.tool ? <>
{operation.tool.description}
{operation.tool.permissions.map((permission) => PERMISSION_TEXT[permission] ?? permission).join('、')}
:
由生成的 Data Service SDK 使用，不作为 Pi 工具暴露。
}
{billingText(operation.billing)}
)}
)}
-
伙伴分配
+ 伙伴分配
{selected.skills.flatMap(({ assignedAgentIds }) => assignedAgentIds).length ? selected.skills.flatMap(({ assignedAgentIds }) => assignedAgentIds).map((id) =>
{props.agentNames[id] ?? '未知伙伴'}) :
尚未分配给任何伙伴。
}
用量与计费
各操作的计费模式已在上方能力列表中逐项显示；平台计量操作的流水仍由权益所有者查看。
@@ -115,11 +127,18 @@ export function ProjectPluginsView(props: ViewProps) {
{props.projection.unknownPluginIds.length ?
配置保留、当前不可用
这些插件 ID 仍保存在项目配置中，但当前账号或设备没有可验证的插件定义。不会自动获取、下载、启用或分配。
{props.projection.unknownPluginIds.map((pluginId) => {pluginId}
: null}
-
+
);
}
-export function ProjectPlugins() {
+export type ProjectPluginsProps = {
+ embedded?: boolean;
+ onManageAgents?(): void;
+ onResolveIdentity?(): void;
+ onChanged?(): void;
+};
+
+export function ProjectPlugins({ embedded = false, onManageAgents, onResolveIdentity, onChanged }: ProjectPluginsProps = {}) {
const user = useAuthStore((state) => state.user);
const accountKey = user?.userId ?? user?.username ?? null;
const activeProject = useCodingWorkspaceStore((state) => state.activeProject);
@@ -144,5 +163,13 @@ export function ProjectPlugins() {
const safe = (promise: Promise
) => promise.catch((reason) => {
toast.error(reason instanceof Error ? reason.message : String(reason));
});
- return safe(codingPluginsStore.getState().load(activeProject.id))} onSetEnabled={(pluginId, enabled) => safe(codingPluginsStore.getState().setEnabled(activeProject.id, pluginId, enabled))} onConfigure={(collections) => safe(codingPluginsStore.getState().configure(collections))} onReset={() => safe(codingPluginsStore.getState().reset())} onRemoveCollection={(collection) => safe(codingPluginsStore.getState().removeCollection(collection))} onRemoveProject={() => safe(codingPluginsStore.getState().removeProject())} />;
+ const setEnabled = async (pluginId: string, enabled: boolean) => {
+ try {
+ await codingPluginsStore.getState().setEnabled(activeProject.id, pluginId, enabled);
+ onChanged?.();
+ } catch (reason) {
+ toast.error(reason instanceof Error ? reason.message : String(reason));
+ }
+ };
+ return safe(codingPluginsStore.getState().load(activeProject.id))} onSetEnabled={setEnabled} onConfigure={(collections) => safe(codingPluginsStore.getState().configure(collections))} onReset={() => safe(codingPluginsStore.getState().reset())} onRemoveCollection={(collection) => safe(codingPluginsStore.getState().removeCollection(collection))} onRemoveProject={() => safe(codingPluginsStore.getState().removeProject())} onManageAgents={onManageAgents} onResolveIdentity={onResolveIdentity} />;
}
diff --git a/tests/e2e/plugin-marketplace.spec.ts b/tests/e2e/plugin-marketplace.spec.ts
index d91fb142..ef9e31e5 100644
--- a/tests/e2e/plugin-marketplace.spec.ts
+++ b/tests/e2e/plugin-marketplace.spec.ts
@@ -1,11 +1,23 @@
+import { mkdtemp, rm } from 'node:fs/promises';
+import { tmpdir } from 'node:os';
+import path from 'node:path';
import { closeElectronApp, expect, getStableWindow, test } from './fixtures/electron';
-test.describe('Plugin Marketplace', () => {
- test('opens the global catalog, searches, and reads detail through fixed Main routes', async ({ launchElectronApp }) => {
+test.describe('Project Plugin Services marketplace tabs', () => {
+ test('opens discovery inside project configuration, searches, and reads detail through fixed Main routes', async ({ launchElectronApp }) => {
+ const projectPath = await mkdtemp(path.join(tmpdir(), 'makelore-plugin-marketplace-e2e-'));
const app = await launchElectronApp({ skipSetup: true });
try {
+ await app.evaluate(({ ipcMain }, selectedPath) => {
+ ipcMain.removeHandler('dialog:open');
+ ipcMain.handle('dialog:open', async () => ({ canceled: false, filePaths: [selectedPath] }));
+ }, projectPath);
const page = await getStableWindow(app);
await page.getByTestId('ai-module-option-programming').click();
+ await page.getByTestId('sidebar-create-project').click();
+ await page.getByRole('button', { name: '选择路径' }).click();
+ await page.getByRole('button', { name: '确认创建' }).click();
+ await expect(page.getByTestId('project-configuration-page')).toBeVisible();
await app.evaluate(({ ipcMain }) => {
const requests: string[] = [];
(globalThis as typeof globalThis & { __marketplaceE2E?: { requests: string[] } }).__marketplaceE2E = { requests };
@@ -31,12 +43,25 @@ test.describe('Plugin Marketplace', () => {
etag: '"plugins-1-tp-none"', pricingVersionId: null, stale: false, fetchedAt: 1,
} } };
}
+ if (requestPath.startsWith('/api/coding/plugins')) {
+ const localProjectId = new URL(requestPath, 'https://makelore.local').searchParams.get('projectId') ?? '';
+ return { ok: true, data: { status: 200, ok: true, json: {
+ schemaVersion: 1,
+ project: { localProjectId, durableProjectId: '11111111-1111-4111-8111-111111111111' },
+ policyStatus: 'current', unknownPluginIds: [], items: [],
+ } } };
+ }
return { ok: false, error: { message: `Unexpected Host API request: ${requestPath}` } };
});
});
- await page.getByTestId('sidebar-nav-plugin-marketplace').click();
- await expect(page.getByTestId('plugin-marketplace-page')).toBeVisible();
+ await page.getByTestId('resource-card-plugins').click();
+ await page.getByRole('tab', { name: '发现插件' }).click();
+ await expect(page.getByRole('dialog', { name: '插件服务' })).toBeVisible();
+ await expect(page.getByTestId('sidebar-nav-plugin-marketplace')).toHaveCount(0);
+ await expect(page.getByTestId('sidebar-nav-my-plugins')).toHaveCount(0);
+ await expect(page.getByTestId('sidebar-nav-project-plugins')).toHaveCount(0);
+ await expect(page.getByTestId('plugin-marketplace-discover')).toBeVisible();
await expect(page.getByRole('heading', { name: '灵感笔记' })).toBeVisible();
await page.getByRole('searchbox', { name: '搜索插件' }).fill('笔记');
await page.getByRole('button', { name: '搜索', exact: true }).click();
@@ -54,15 +79,39 @@ test.describe('Plugin Marketplace', () => {
expect(JSON.stringify(marketplaceRequests)).not.toMatch(/account|admission|release_id|path=/i);
} finally {
await closeElectronApp(app);
+ await rm(projectPath, { recursive: true, force: true });
}
});
test('keeps Beta explicit and exposes bounded unavailable, disabled, and device-delete states', async ({ launchElectronApp }) => {
+ const projectPath = await mkdtemp(path.join(tmpdir(), 'makelore-my-plugins-e2e-'));
const app = await launchElectronApp({ skipSetup: true });
try {
+ await app.evaluate(({ ipcMain }, selectedPath) => {
+ ipcMain.removeHandler('dialog:open');
+ ipcMain.handle('dialog:open', async () => ({ canceled: false, filePaths: [selectedPath] }));
+ }, projectPath);
const page = await getStableWindow(app);
await expect(page.getByTestId('ai-module-option-programming')).toBeVisible();
- await app.evaluate(({ ipcMain }) => {
+ await page.getByTestId('ai-module-option-programming').click();
+ await page.getByTestId('sidebar-create-project').click();
+ await page.getByRole('button', { name: '选择路径' }).click();
+ await page.getByRole('button', { name: '确认创建' }).click();
+ await expect(page.getByTestId('project-configuration-page')).toBeVisible();
+ const cachedProjectResponses = await page.evaluate(async () => {
+ const list = await window.electron.ipcRenderer.invoke('hostapi:fetch', {
+ path: '/api/coding/projects', method: 'GET',
+ });
+ const activeProjectId = (list as { data?: { json?: { activeProjectId?: string } } }).data?.json?.activeProjectId ?? '';
+ const config = await window.electron.ipcRenderer.invoke('hostapi:fetch', {
+ path: `/api/coding/projects/config?projectId=${encodeURIComponent(activeProjectId)}`, method: 'GET',
+ });
+ const conversations = await window.electron.ipcRenderer.invoke('hostapi:fetch', {
+ path: `/api/coding/projects/conversations?projectId=${encodeURIComponent(activeProjectId)}`, method: 'GET',
+ });
+ return { list, config, conversations };
+ });
+ await app.evaluate(({ ipcMain }, projectResponses: { list: unknown; config: unknown; conversations: unknown }) => {
let installedChannel: 'stable' | 'beta' | null = 'stable';
const installedVersion = '1.0.0';
const requests: string[] = [];
@@ -116,6 +165,21 @@ test.describe('Plugin Marketplace', () => {
return response;
}
if (requestPath === '/api/auth/me') return result({ success: true, moduleAccess: { programming: true } });
+ if (requestPath === '/api/coding/projects') return projectResponses.list;
+ if (requestPath.startsWith('/api/coding/projects/config')) return projectResponses.config;
+ if (requestPath.startsWith('/api/coding/projects/conversations')) return projectResponses.conversations;
+ if (requestPath.startsWith('/api/coding/plugin-marketplace/catalog')) return result({
+ items: [], nextCursor: null, total: 0, catalogGeneration: 1,
+ etag: '"plugins-1-tp-none"', pricingVersionId: null, stale: false, fetchedAt: 1,
+ });
+ if (requestPath.startsWith('/api/coding/plugins')) {
+ const localProjectId = new URL(requestPath, 'https://makelore.local').searchParams.get('projectId') ?? '';
+ return result({
+ schemaVersion: 1,
+ project: { localProjectId, durableProjectId: '11111111-1111-4111-8111-111111111111' },
+ policyStatus: 'current', unknownPluginIds: [], items: [],
+ });
+ }
if (requestPath === '/api/coding/plugin-marketplace/library') return result(projection());
if (requestPath === '/api/coding/plugin-marketplace/install/makelore.notes/beta' && method === 'POST') {
installedChannel = 'beta';
@@ -127,7 +191,7 @@ test.describe('Plugin Marketplace', () => {
}
return { ok: false, error: { message: `Unexpected Host API request: ${method} ${requestPath}` } };
});
- });
+ }, cachedProjectResponses);
await page.addInitScript(({ key, value }) => {
localStorage.setItem(key, value);
}, {
@@ -144,12 +208,13 @@ test.describe('Plugin Marketplace', () => {
}),
});
await page.reload({ waitUntil: 'domcontentloaded' });
- await expect(page.getByTestId('ai-module-option-programming')).toBeVisible();
- const programmingOption = page.getByTestId('ai-module-option-programming');
- await programmingOption.click();
await expect(page.getByTestId('main-layout')).toBeVisible();
await page.keyboard.press('Escape');
- await page.getByTestId('sidebar-nav-my-plugins').click();
+ await expect(page.getByTestId('project-configuration-page')).toBeVisible();
+ await page.getByTestId('resource-card-plugins').click();
+ await page.getByRole('tab', { name: '我的插件' }).click();
+ await expect(page.getByRole('dialog', { name: '插件服务' })).toBeVisible();
+ await expect(page.getByTestId('sidebar-nav-plugin-marketplace')).toHaveCount(0);
await expect(page.getByTestId('my-plugins-page')).toBeVisible();
await expect.poll(async () => app.evaluate(() => (
((globalThis as typeof globalThis & { __marketplaceE2E?: { requests: string[] } }).__marketplaceE2E?.requests ?? [])
@@ -177,6 +242,7 @@ test.describe('Plugin Marketplace', () => {
expect(requests).toContain('DELETE /api/coding/plugin-marketplace/install/makelore.notes');
} finally {
await closeElectronApp(app);
+ await rm(projectPath, { recursive: true, force: true });
}
});
});
diff --git a/tests/e2e/project-plugins.spec.ts b/tests/e2e/project-plugins.spec.ts
index 1f8d2335..800e4dd8 100644
--- a/tests/e2e/project-plugins.spec.ts
+++ b/tests/e2e/project-plugins.spec.ts
@@ -3,7 +3,7 @@ import { tmpdir } from 'node:os';
import path from 'node:path';
import { closeElectronApp, expect, getStableWindow, test } from './fixtures/electron';
-test.describe('Project Plugin Center', () => {
+test.describe('Project Plugin Services', () => {
test('enables selection without configuring Data Service or duplicating project IDs', async ({ launchElectronApp }) => {
const projectPath = await mkdtemp(path.join(tmpdir(), 'makelore-project-plugins-e2e-'));
const app = await launchElectronApp({ skipSetup: true });
@@ -51,8 +51,17 @@ test.describe('Project Plugin Center', () => {
});
});
- await page.getByTestId('sidebar-nav-project-plugins').click();
+ await page.getByTestId('resource-card-plugins').click();
+ await expect(page.getByRole('dialog', { name: '插件服务' })).toBeVisible();
+ await expect(page.getByRole('tab', { name: '发现插件' })).toBeVisible();
+ await expect(page.getByRole('tab', { name: '我的插件' })).toBeVisible();
+ await expect(page.getByRole('tab', { name: '项目启用' })).toHaveAttribute('aria-selected', 'true');
+ await expect(page.getByTestId('sidebar-nav-plugin-marketplace')).toHaveCount(0);
await expect(page.getByTestId('project-plugins-page')).toBeVisible();
+ await page.getByTestId('project-plugins-page').getByRole('button', { name: '刷新' }).click();
+ await expect.poll(async () => app.evaluate(() => (
+ (globalThis as typeof globalThis & { __projectPluginE2E?: { localProjectId: string } }).__projectPluginE2E?.localProjectId
+ ))).toBeTruthy();
await expect(page.getByText('当前包含，不按单次调用扣点')).toBeVisible();
const localProjectId = await app.evaluate(() => (
(globalThis as typeof globalThis & { __projectPluginE2E?: { localProjectId: string } }).__projectPluginE2E?.localProjectId
diff --git a/tests/unit/plugin-marketplace-pages.test.tsx b/tests/unit/plugin-marketplace-pages.test.tsx
index 02313d3f..f03d4b52 100644
--- a/tests/unit/plugin-marketplace-pages.test.tsx
+++ b/tests/unit/plugin-marketplace-pages.test.tsx
@@ -36,7 +36,7 @@ describe('Plugin Marketplace pages', () => {
onSearch={onSearch} onSelect={vi.fn()} onAcquire={onAcquire}
/>);
- expect(screen.getByRole('heading', { name: '插件中心' })).toHaveClass('text-balance');
+ expect(screen.getByRole('heading', { name: '发现插件' })).toHaveClass('text-balance');
expect(screen.getByText('部分能力包含，部分按 Token Point 用量计费')).toBeVisible();
expect(screen.getByText('1')).toHaveClass('tabular-nums');
fireEvent.change(screen.getByRole('searchbox', { name: '搜索插件' }), { target: { value: '笔记' } });
@@ -92,7 +92,9 @@ describe('My Plugins', () => {
expect(onRemove).toHaveBeenCalledWith('makelore.notes');
fireEvent.click(screen.getByRole('button', { name: '重新免费获取旧插件' }));
expect(onReacquire).toHaveBeenCalledWith('makelore.removed');
- expect(screen.getAllByRole('link', { name: '启用到项目' }).length).toBeGreaterThan(0);
+ const projectLinks = screen.getAllByRole('link', { name: '启用到项目' });
+ expect(projectLinks.length).toBeGreaterThan(0);
+ expect(projectLinks[0]).toHaveAttribute('href', '/project-config?resource=plugins&pluginTab=project');
expect(screen.getAllByRole('link', { name: '分配给伙伴' }).length).toBeGreaterThan(0);
expect(screen.getByText('运行已暂停')).toBeVisible();
expect(screen.getByText('已退役，移除后不可重新获取')).toBeVisible();
@@ -129,6 +131,18 @@ describe('My Plugins', () => {
expect(screen.getByRole('link', { name: '分配给伙伴' })).toBeVisible();
});
+ it('renders as the account/device tab inside project plugin services', () => {
+ render();
+
+ expect(screen.getByRole('heading', { name: '我的插件', level: 2 })).toBeVisible();
+ expect(screen.getByTestId('my-plugins-page').tagName).toBe('SECTION');
+ expect(screen.getByRole('link', { name: '浏览插件' })).toHaveAttribute('href', '/project-config?resource=plugins&pluginTab=discover');
+ });
+
it('updates an installed Beta package only through the explicit Beta action', () => {
const onUpdate = vi.fn();
const onInstallBeta = vi.fn();
diff --git a/tests/unit/plugin-services.test.tsx b/tests/unit/plugin-services.test.tsx
new file mode 100644
index 00000000..76e0f623
--- /dev/null
+++ b/tests/unit/plugin-services.test.tsx
@@ -0,0 +1,47 @@
+import { useState } from 'react';
+import { fireEvent, render, screen } from '@testing-library/react';
+import { MemoryRouter } from 'react-router-dom';
+import { describe, expect, it, vi } from 'vitest';
+import { PluginServices } from '@/components/plugins/PluginServices';
+import { getPluginServiceTab, type PluginServiceTab } from '@/lib/plugin-services';
+
+vi.mock('@/pages/PluginMarketplace', () => ({
+ PluginMarketplaceCatalog: () => 发现插件内容
,
+}));
+vi.mock('@/pages/MyPlugins', () => ({
+ MyPlugins: () => 我的插件内容
,
+}));
+vi.mock('@/pages/ProjectPlugins', () => ({
+ ProjectPlugins: () => 项目启用内容
,
+}));
+
+function Harness() {
+ const [value, setValue] = useState('project');
+ return ;
+}
+
+describe('PluginServices', () => {
+ it('keeps discovery, account/device management, and project enablement in one surface', () => {
+ render();
+
+ expect(screen.getByRole('tab', { name: '项目启用' })).toHaveAttribute('aria-selected', 'true');
+ expect(screen.getByText('项目启用内容')).toBeVisible();
+ fireEvent.mouseDown(screen.getByRole('tab', { name: '发现插件' }), { button: 0, ctrlKey: false });
+ expect(screen.getByText('发现插件内容')).toBeVisible();
+ fireEvent.mouseDown(screen.getByRole('tab', { name: '我的插件' }), { button: 0, ctrlKey: false });
+ expect(screen.getByText('我的插件内容')).toBeVisible();
+ });
+
+ it('defaults invalid and missing deep-link values to project enablement', () => {
+ expect(getPluginServiceTab(null)).toBe('project');
+ expect(getPluginServiceTab('unknown')).toBe('project');
+ expect(getPluginServiceTab('discover')).toBe('discover');
+ expect(getPluginServiceTab('mine')).toBe('mine');
+ });
+});
diff --git a/tests/unit/project-plugins-page.test.tsx b/tests/unit/project-plugins-page.test.tsx
index d6ebeff0..f5200208 100644
--- a/tests/unit/project-plugins-page.test.tsx
+++ b/tests/unit/project-plugins-page.test.tsx
@@ -92,4 +92,14 @@ describe('Project Plugin Center', () => {
fireEvent.click(screen.getByRole('button', { name: '从项目禁用保留插件 makelore.removed' }));
expect(onSetEnabled).toHaveBeenCalledWith('makelore.removed', false);
});
+
+ it('embeds project enablement in configuration and returns to Agent assignment explicitly', () => {
+ const onManageAgents = vi.fn();
+ render();
+
+ expect(screen.getByTestId('project-plugins-page').tagName).toBe('SECTION');
+ expect(screen.queryByRole('heading', { name: '项目插件' })).not.toBeInTheDocument();
+ fireEvent.click(screen.getByRole('button', { name: '分配给伙伴' }));
+ expect(onManageAgents).toHaveBeenCalledTimes(1);
+ });
});