Consider it done. The open-source AI agent that works out of the box · 想到,就能做到。开源、开箱即用的 AI Agent。
TypeScript agentai-agentai-assistantandroidclaude-codecodexelectroniosllmmacosreact-nativetypescriptwindows
fix(skillhub): 保留本地技能详情返回时的目录状态 (#4740)
bobo750ee60e6f00
diff --git a/apps/desktop/src/renderer/features/skillhub/SkillhubDetailView.tsx b/apps/desktop/src/renderer/features/skillhub/SkillhubDetailView.tsxindex ff87a852b8..435ad913d5 100644--- a/apps/desktop/src/renderer/features/skillhub/SkillhubDetailView.tsx+++ b/apps/desktop/src/renderer/features/skillhub/SkillhubDetailView.tsx@@ -39,6 +39,7 @@ import { getDataOwnerGeneration, isDataOwnerIdCurrent } from '@/contexts/dataOwnimport { cn } from '@/lib/utils';import { getDraft, getFastModeForModel } from '@/state/newMakerDraft';import { useMetaColumnResize } from './hooks/useMetaColumnResize';+import { useSkillhubHomeNavigation } from './hooks/useSkillhubHomeNavigation';import { invalidateHash, useSkillFolderHash } from './hooks/useSkillFolderHash';import {clearHistory,@@ -50,7 +51,6 @@ import {import { triggerIncrementalSync } from './hooks/useSkillSync';import { type DetailState, deriveDetailActionState, deriveDetailState } from './lib/detailButtons';import {- buildLocalSkillRoute,findLocalSkillByPath,findLocalSkillRouteEntry,} from './lib/localRoutes';@@ -986,6 +986,7 @@ export function SkillhubDetailView() {const [searchParams] = useSearchParams();const navigate = useNavigate();const location = useLocation();+ const { backToCatalog, replaceLocalSkill } = useSkillhubHomeNavigation();const { skills, bootstrapped, loading: skillsLoading } = useSkillhub();const commandPath = searchParams.get('path');useEffect(() => {@@ -997,7 +998,6 @@ export function SkillhubDetailView() {// 而是退出到 SkillHub 一级页:market 来源回 market,其它入口回 local 欢迎页。const navState = location.state as { from?: string; resetHistory?: boolean } | null;const fromRoute = navState?.from ?? '/skillhub';- const backTargetRoute = fromRoute === '/skillhub/market' ? '/skillhub/market' : '/skillhub/local';// 兼容旧 sessionStorage 栈:从外部入口进入时先清掉,避免老版本留下的// detail 链影响后续返回语义。const shouldResetHistory = navState?.resetHistory === true;@@ -1045,7 +1045,7 @@ export function SkillhubDetailView() {}clearLastEntryId();clearHistory();- navigate(backTargetRoute);+ backToCatalog();};// ── v0.2.1: 4-state detection for kind === 'skill' ────────────────────────@@ -1811,7 +1811,7 @@ export function SkillhubDetailView() {onClick={() => {clearLastEntryId();clearHistory();- navigate('/skillhub');+ backToCatalog();}}className="text-[var(--msg-assistant-text)] underline-offset-2 hover:underline">@@ -2021,7 +2021,7 @@ export function SkillhubDetailView() {onUninstalled={() => {clearLastEntryId();clearHistory();- navigate('/skillhub/local');+ backToCatalog();}} />}{/* 编辑入口 */}{!editButtonState.hidden && (@@ -2574,7 +2574,7 @@ export function SkillhubDetailView() {const renamed = findLocalSkillByPath(scannedSkills, newAbsolutePath);if (!renamed) return;setLastEntryId(renamed.id);- navigate(buildLocalSkillRoute(renamed), { replace: true });+ replaceLocalSkill(renamed);});}}onScanResult={setScanResult}diff --git a/apps/desktop/src/renderer/features/skillhub/SkillhubHomeView.tsx b/apps/desktop/src/renderer/features/skillhub/SkillhubHomeView.tsxindex 1de4074f06..322e52f8e9 100644--- a/apps/desktop/src/renderer/features/skillhub/SkillhubHomeView.tsx+++ b/apps/desktop/src/renderer/features/skillhub/SkillhubHomeView.tsx@@ -7,7 +7,7 @@*/import { useCallback, useEffect, useMemo, useState } from 'react';-import { useNavigate } from 'react-router-dom';+import { useNavigate, type Location } from 'react-router-dom';import { useTranslation } from 'react-i18next';import { skillhubCatalogKey } from '../../../shared/skillhubCatalog';import { CATEGORY_ALL } from '../../../shared/skillhubCategory';@@ -30,12 +30,13 @@ import {PluginManagementLayout,PluginManagementPage,} from '@/features/plugin/PluginManagementLayout';-import { buildLocalSkillRoute, findLocalSkillByPath } from './lib/localRoutes';+import { findLocalSkillByPath } from './lib/localRoutes';import {builtInSkillDescriptionKey,prioritizeCindyBuiltInSkills,} from './lib/builtInSkillPresentation';import { refresh as refreshSkillhub, useSkillhub } from './hooks/useSkillhub';+import { useSkillhubHomeNavigation } from './hooks/useSkillhubHomeNavigation';import {MARKET_PAGE_SIZE,useCategoryList,@@ -50,7 +51,6 @@ import {homeMarketQuery,isHomeMarketResponseCurrent,visibleHomeCatalogTabs,- type HomeCatalogTab,type HomeMarketFilter,} from './lib/homeMarketFilter';import { deriveSkillSource } from './lib/skillSource';@@ -75,22 +75,25 @@ function includesSkillQuery(values: ReadonlyArray<string | undefined>, query: stexport function SkillhubHomeView({embedded = false,+ active = true,+ navigationLocation,onSelectCatalogTab,}: {embedded?: boolean;+ active?: boolean;+ navigationLocation?: Location;onSelectCatalogTab?: (tab: 'plugins' | 'skills') => void;} = {}) {const { t } = useTranslation();const navigate = useNavigate();const { skills, projects, bootstrapped, learnSkillEnabled, syncResults } = useSkillhub();- const [query, setQuery] = useState('');+ const { catalogTab, query, setCatalogTab, setQuery, openLocalSkill } = useSkillhubHomeNavigation(navigationLocation);const normalizedQuery = query.trim().toLocaleLowerCase();// 未登录也请求公开 Skill 目录;登录身份只扩大服务端可见范围。const { user } = useAuth();const identityPolicy = useSkillhubIdentityPolicy(user);const showOrganization = user?.membershipKind === 'org';- const [catalogTab, setCatalogTab] = useState<HomeCatalogTab>('public');const marketFilter: HomeMarketFilter = catalogTab === 'organization' ? 'organization' : 'public';const marketRequest = useMemo(() => homeMarketQuery(marketFilter), [marketFilter]);@@ -127,8 +130,8 @@ export function SkillhubHomeView({setSearchQuery(query);}, [query, setSearchQuery]);useEffect(() => {- if (!showOrganization && catalogTab === 'organization') setCatalogTab('public');- }, [catalogTab, showOrganization]);+ if (active && !showOrganization && catalogTab === 'organization') setCatalogTab('public');+ }, [active, catalogTab, setCatalogTab, showOrganization]);const marketResponseCurrent = isHomeMarketResponseCurrent(marketRequest, {scope: resolvedScope,mine: resolvedMine,@@ -213,14 +216,6 @@ export function SkillhubHomeView({const [importPickerOpen, setImportPickerOpen] = useState(false);const [importBusy, setImportBusy] = useState(false);- const openLocal = (s: SkillhubSkill) => {- // 从首页进入 = 一次全新入口:清掉旧的技能历史栈(resetHistory),并把回退落点- // 设为首页(from)。这样详情页「返回」回到首页这一步,而不是会话内残留的上一个技能。- // 详情→详情的链式跳转不带 resetHistory,链路仍能逐级回退。- navigate(buildLocalSkillRoute(s), {- state: { from: '/skillhub/local', resetHistory: true },- });- };const openMarket = () => navigate('/skillhub/market');const openCatalogSkill = (skill: MarketSkill) => setPreviewSkill(skill);const handleClone = (skill: MarketSkill) => {@@ -268,6 +263,14 @@ export function SkillhubHomeView({setImportTarget(null);}, []);+ useEffect(() => {+ if (active) return;+ setPreviewSkill(null);+ setPickerSkill(null);+ setPickerOpen(false);+ closeImportPicker();+ }, [active, closeImportPicker]);+return (<PluginManagementLayoutactiveTab="skills"@@ -432,7 +435,7 @@ export function SkillhubHomeView({<LocalGroupskills={globalSkills}syncResults={syncResults}- onOpen={openLocal}+ onOpen={openLocalSkill}/>)}{projectGroups.map((g) => (@@ -441,7 +444,7 @@ export function SkillhubHomeView({label={g.label}skills={g.skills}syncResults={syncResults}- onOpen={openLocal}+ onOpen={openLocalSkill}/>))}</div>@@ -458,92 +461,92 @@ export function SkillhubHomeView({</main>{/* Keep the preview outside the list scroller so it stays anchored to the viewport. */}- <SkillhubMarketPreviewPanel- open={previewSkill !== null}- skill={previewSkill}- onClose={() => setPreviewSkill(null)}- primaryAction={- previewSkill && user- ? (() => {- const action = marketCardPrimaryAction({- isMine: previewSkill.isMine,- listVisibility: 'all',- cardState: previewSkill.cardState,- });- return action === 'manage' && !identityPolicy.canWrite ? 'clone' : action;- })()- : 'none'- }- onClone={handleClone}- onManageAction={management.handleManageAction}- learnSkillEnabled={learnSkillEnabled}- />- <MarketManagementDialogs controller={management} />- <InstallTargetPicker- open={pickerOpen}- skill={pickerSkill}- onClose={() => setPickerOpen(false)}- onInstallComplete={() => {- void refreshSkillhub();- setPickerOpen(false);- // 安装后关掉预览浮层:否则它仍持有 stale previewSkill、CTA 继续显示「安装/克隆」,- // 可被重复点安装(PR #246 review)。- setPreviewSkill(null);- }}- />- <InstallTargetPicker- open={importPickerOpen}- skill={importTarget}- onClose={closeImportPicker}- titleKey="skillhub.home.importPickerTitle"- subtitleKey="skillhub.home.importPickerSubtitle"- successToastKey="skillhub.home.importSuccess"- failedToastKey="skillhub.home.importFailed"- runAction={async ({ installPath, force }) => {- if (!importGrantToken) {- return {- success: false,- errorCode: 'INVALID_FILE',- message: t('skillhub.home.importFailed'),- };- }- return window.electronAPI.skillhub.importLocal({- grantToken: importGrantToken,- installPath,- force,- });- }}- onInstallComplete={(result) => {- closeImportPicker();- if (!result?.name) return;- void refreshSkillhub().then((scannedSkills) => {- const imported = result.absolutePath- ? findLocalSkillByPath(scannedSkills, result.absolutePath)- : undefined;- if (imported) {- navigate(buildLocalSkillRoute(imported), {- state: { from: '/skillhub/local', resetHistory: true },- });- return;+ {active && (+ <>+ <SkillhubMarketPreviewPanel+ open={previewSkill !== null}+ skill={previewSkill}+ onClose={() => setPreviewSkill(null)}+ primaryAction={+ previewSkill && user+ ? (() => {+ const action = marketCardPrimaryAction({+ isMine: previewSkill.isMine,+ listVisibility: 'all',+ cardState: previewSkill.cardState,+ });+ return action === 'manage' && !identityPolicy.canWrite ? 'clone' : action;+ })()+ : 'none'}- const projectRoot = result.absolutePath- ? deriveProjectWorkingDir(result.absolutePath)- : null;- const fallback = {- id: '',- absolutePath: result.absolutePath ?? '',- engine: 'claude-code' as const,- kind: 'skill' as const,- scope: projectRoot ? ('project' as const) : ('global' as const),- projectHash: projectRoot ? projectHash(projectRoot) : undefined,- name: result.name,- };- navigate(buildLocalSkillRoute(fallback), {- state: { from: '/skillhub/local', resetHistory: true },- });- });- }}- />+ onClone={handleClone}+ onManageAction={management.handleManageAction}+ learnSkillEnabled={learnSkillEnabled}+ />+ <MarketManagementDialogs controller={management} />+ <InstallTargetPicker+ open={pickerOpen}+ skill={pickerSkill}+ onClose={() => setPickerOpen(false)}+ onInstallComplete={() => {+ void refreshSkillhub();+ setPickerOpen(false);+ // 安装后关掉预览浮层:否则它仍持有 stale previewSkill、CTA 继续显示「安装/克隆」,+ // 可被重复点安装(PR #246 review)。+ setPreviewSkill(null);+ }}+ />+ <InstallTargetPicker+ open={importPickerOpen}+ skill={importTarget}+ onClose={closeImportPicker}+ titleKey="skillhub.home.importPickerTitle"+ subtitleKey="skillhub.home.importPickerSubtitle"+ successToastKey="skillhub.home.importSuccess"+ failedToastKey="skillhub.home.importFailed"+ runAction={async ({ installPath, force }) => {+ if (!importGrantToken) {+ return {+ success: false,+ errorCode: 'INVALID_FILE',+ message: t('skillhub.home.importFailed'),+ };+ }+ return window.electronAPI.skillhub.importLocal({+ grantToken: importGrantToken,+ installPath,+ force,+ });+ }}+ onInstallComplete={(result) => {+ closeImportPicker();+ if (!result?.name) return;+ void refreshSkillhub().then((scannedSkills) => {+ const imported = result.absolutePath+ ? findLocalSkillByPath(scannedSkills, result.absolutePath)+ : undefined;+ if (imported) {+ openLocalSkill(imported);+ return;+ }+ const projectRoot = result.absolutePath+ ? deriveProjectWorkingDir(result.absolutePath)+ : null;+ const fallback = {+ id: '',+ absolutePath: result.absolutePath ?? '',+ engine: 'claude-code' as const,+ kind: 'skill' as const,+ scope: projectRoot ? ('project' as const) : ('global' as const),+ projectHash: projectRoot ? projectHash(projectRoot) : undefined,+ name: result.name,+ };+ openLocalSkill(fallback);+ });+ }}+ />+ </>+ )}</div></PluginManagementLayout>);diff --git a/apps/desktop/src/renderer/features/skillhub/SkillhubLocalLayout.tsx b/apps/desktop/src/renderer/features/skillhub/SkillhubLocalLayout.tsxnew file mode 100644index 0000000000..4d88139483--- /dev/null+++ b/apps/desktop/src/renderer/features/skillhub/SkillhubLocalLayout.tsx@@ -0,0 +1,41 @@+import { useState } from 'react';+import { Outlet, useLocation, useMatch, type Location } from 'react-router-dom';++import { useAuth } from '@/contexts/AuthContext';+import { SkillhubHomeView } from './SkillhubHomeView';++/** Keep the visited catalog alive only within this owner's local skill routes. */+export function SkillhubLocalLayout() {+ const { dataOwnerId, mode } = useAuth();+ return <LocalSkillPages key={JSON.stringify([mode, dataOwnerId])} />;+}++function LocalSkillPages() {+ const location = useLocation();+ const showingCatalog = useMatch({ path: '/skillhub/local', end: true }) !== null;+ const [catalogLocation, setCatalogLocation] = useState<Location | null>(+ showingCatalog ? location : null,+ );++ if (showingCatalog && catalogLocation !== location) {+ setCatalogLocation(location);+ }++ return (+ <div className="relative h-full min-h-0 w-full">+ {catalogLocation && (+ <div+ className="absolute inset-0"+ style={{ visibility: showingCatalog ? 'visible' : 'hidden' }}+ aria-hidden={!showingCatalog}+ inert={!showingCatalog}+ >+ {/* Keep the scroll container's geometry as well as its DOM identity.+ A detail URL must not change the hidden catalog's filters. */}+ <SkillhubHomeView active={showingCatalog} navigationLocation={catalogLocation} />+ </div>+ )}+ {!showingCatalog && <Outlet />}+ </div>+ );+}diff --git a/apps/desktop/src/renderer/features/skillhub/__tests__/SkillhubHomeNavigation.test.tsx b/apps/desktop/src/renderer/features/skillhub/__tests__/SkillhubHomeNavigation.test.tsxnew file mode 100644index 0000000000..4a36c2e67c--- /dev/null+++ b/apps/desktop/src/renderer/features/skillhub/__tests__/SkillhubHomeNavigation.test.tsx@@ -0,0 +1,314 @@+// @vitest-environment jsdom+import { cleanup, fireEvent, render, screen, waitFor } from '@testing-library/react';+import { MemoryRouter, Route, Routes, useLocation, useNavigate } from 'react-router-dom';+import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest';++const mocks = vi.hoisted(() => ({+ user: null as { membershipKind: 'org' } | null,+ dataOwnerId: 'owner-a',+ t: (key: string) => key,+ store: {+ skills: [] as SkillhubSkill[],+ projects: [],+ bootstrapped: true,+ learnSkillEnabled: false,+ syncResults: new Map(),+ },+ market: {+ items: [], loading: false, loadingMore: false, hasMore: false,+ resolvedScope: 'market', resolvedMine: false, categoryFilter: 'all',+ setSearchQuery: vi.fn(), setSortBy: vi.fn(), setCatalogScope: vi.fn(),+ setCategoryFilter: vi.fn(), setVisibility: vi.fn(), loadMore: vi.fn(), reload: vi.fn(),+ },+}));++vi.mock('react-i18next', () => ({ useTranslation: () => ({ t: mocks.t }) }));+vi.mock('@/contexts/AuthContext', () => ({+ useAuth: () => ({ user: mocks.user, dataOwnerId: mocks.dataOwnerId, mode: 'cloud' }),+}));+vi.mock('../hooks/useSkillhub', () => ({ useSkillhub: () => mocks.store, refresh: vi.fn() }));+vi.mock('../hooks/useMarketList', () => ({+ MARKET_PAGE_SIZE: 24,+ useMarketList: () => mocks.market,+ useCategoryList: () => ({ categories: [] }),+}));+vi.mock('../hooks/useMarketManagement', () => ({+ useMarketManagement: () => ({}), MarketManagementDialogs: () => null,+}));+vi.mock('../components/InstallTargetPicker', () => ({ InstallTargetPicker: () => null }));+vi.mock('../SkillhubMarketPreviewPanel', () => ({ SkillhubMarketPreviewPanel: () => null }));++import { SkillhubHomeView } from '../SkillhubHomeView';+import { SkillhubLocalLayout } from '../SkillhubLocalLayout';+import { useSkillhubHomeNavigation } from '../hooks/useSkillhubHomeNavigation';++function NavigationControls() {+ const location = useLocation();+ const navigate = useNavigate();+ return (+ <>+ <output data-testid="location">{location.pathname}{location.search}{location.hash}</output>+ <output data-testid="navigation-state">{JSON.stringify(location.state)}</output>+ <button onClick={() => navigate(-1)}>Browser Back</button>+ <button onClick={() => navigate(1)}>Browser Forward</button>+ <button onClick={() => navigate('/away')}>Leave catalog</button>+ </>+ );+}++// Exercise production rename/return navigation after a simulated scanner refresh, without file IPC.+function DetailNavigation() {+ const navigate = useNavigate();+ const { backToCatalog, replaceLocalSkill } = useSkillhubHomeNavigation();+ const rename = () => {+ const renamed = {+ ...mocks.store.skills[0],+ name: 'calendar-renamed',+ absolutePath: '/skills/calendar-renamed',+ mdPath: '/skills/calendar-renamed/SKILL.md',+ sourceKey: 'renamed-source',+ };+ mocks.store.skills = [renamed, ...mocks.store.skills.slice(1)];+ replaceLocalSkill(renamed);+ };+ return (+ <>+ <button onClick={rename}>Rename skill</button>+ <button onClick={() => navigate('/skillhub/local/skill/global/design-tools')}>Another detail</button>+ <button onClick={backToCatalog}>Detail Back</button>+ </>+ );+}++function CatalogHarness({ entry = '/skillhub/local' }: {+ entry?: string | { pathname: string; state: unknown };+}) {+ return (+ <MemoryRouter initialEntries={['/before', entry]}>+ <NavigationControls />+ <Routes>+ <Route path="/skillhub/local" element={<SkillhubLocalLayout />}>+ <Route index element={null} />+ <Route path="by-path" element={<DetailNavigation />} />+ <Route path=":kind/global/:name" element={<DetailNavigation />} />+ <Route path=":kind/project/:hash/:name" element={<DetailNavigation />} />+ </Route>+ <Route path="/settings" element={<SkillhubHomeView embedded />} />+ <Route path="*" element={null} />+ </Routes>+ </MemoryRouter>+ );+}++function renderCatalog(entry: string | { pathname: string; state: unknown } = '/skillhub/local') {+ return render(<CatalogHarness entry={entry} />);+}++function expectTab(tab: 'local' | 'public' | 'organization') {+ const name = tab === 'local' ? 'skillhub.home.local' : `skillhub.home.catalogFilter.${tab}`;+ expect(screen.getByRole('radio', { name }).getAttribute('aria-checked')).toBe('true');+}++function selectLocalAndSearch() {+ fireEvent.click(screen.getByRole('radio', { name: 'skillhub.home.local' }));+ fireEvent.change(screen.getByRole('textbox', { name: 'skillhub.home.search' }), {+ target: { value: 'calendar' },+ });+}++beforeEach(() => {+ mocks.user = null;+ mocks.dataOwnerId = 'owner-a';+ mocks.store.skills = ['calendar-tools', 'design-tools'].map((name) => ({+ id: name, urlKey: `skill/global/${name}`, name, engine: 'claude-code',+ kind: 'skill', scope: 'global', linkedEngines: [],+ absolutePath: `/skills/${name}`, mdPath: `/skills/${name}/SKILL.md`, files: [],+ registryEntry: null,+ }));+});+afterEach(cleanup);++describe('Skill home navigation', () => {+ it('still opens a fresh catalog on Public', () => {+ renderCatalog();+ expectTab('public');+ });++ it.each([+ ['global', 'Detail Back'], ['global', 'Browser Back'],+ ['project', 'Detail Back'], ['project', 'Browser Back'],+ ] as const)('restores Local and search after opening a %s skill and using %s', async (scope, back) => {+ if (scope === 'project') {+ Object.assign(mocks.store.skills[0], { scope, projectRoot: '/repo', projectHash: 'repo-hash' });+ }+ renderCatalog();+ selectLocalAndSearch();+ const list = screen.getByRole('main');+ const card = screen.getByRole('button', { name: /calendar-tools/ });+ list.scrollTop = 720;+ fireEvent.click(screen.getByRole('button', { name: /calendar-tools/ }));+ expect(screen.queryByRole('radio', { name: 'skillhub.home.local' })).toBeNull();+ expect(screen.getByTestId('location').textContent).toContain(`/skill/${scope}/`);+ expect(list.isConnected).toBe(true);+ expect(list.closest('[inert]')?.getAttribute('aria-hidden')).toBe('true');+ expect(screen.queryByRole('main')).toBeNull();++ fireEvent.click(screen.getByRole('button', { name: back }));+ await waitFor(() => expectTab('local'));+ expect(screen.getByRole('main')).toBe(list);+ expect(list.scrollTop).toBe(720);+ expect(screen.getByRole('button', { name: /calendar-tools/ })).toBe(card);+ expect(list.closest('[inert]')).toBeNull();+ expect((screen.getByRole('textbox', { name: 'skillhub.home.search' }) as HTMLInputElement).value)+ .toBe('calendar');+ expect(screen.getByRole('button', { name: /calendar-tools/ })).toBeTruthy();+ expect(screen.queryByRole('button', { name: /design-tools/ })).toBeNull();+ });++ it('does not add browser history entries while changing filters or typing', () => {+ renderCatalog();+ selectLocalAndSearch();+ fireEvent.change(screen.getByRole('textbox', { name: 'skillhub.home.search' }), {+ target: { value: 'calendar-tools' },+ });+ fireEvent.click(screen.getByRole('button', { name: 'Browser Back' }));+ expect(screen.getByTestId('location').textContent).toBe('/before');+ });++ it.each([+ ['global', 'Detail Back'], ['global', 'Browser Back'],+ ['project', 'Detail Back'], ['project', 'Browser Back'],+ ] as const)('preserves filters and replaces the %s detail history entry on rename before %s', async (scope, back) => {+ if (scope === 'project') {+ Object.assign(mocks.store.skills[0], { scope, projectRoot: '/repo', projectHash: 'repo-hash' });+ }+ renderCatalog();+ selectLocalAndSearch();+ const list = screen.getByRole('main');+ list.scrollTop = 480;+ fireEvent.click(screen.getByRole('button', { name: /calendar-tools/ }));+ const detailState = screen.getByTestId('navigation-state').textContent;++ fireEvent.click(screen.getByRole('button', { name: 'Rename skill' }));+ const location = screen.getByTestId('location').textContent;+ expect(location).toContain(`/skill/${scope}/`);+ expect(location).toContain('/calendar-renamed?engine=claude-code&source=renamed-source');+ expect(screen.getByTestId('navigation-state').textContent).toBe(detailState);+ expect(list.isConnected).toBe(true);++ fireEvent.click(screen.getByRole('button', { name: back }));+ await waitFor(() => expectTab('local'));+ expect(screen.getByRole('main')).toBe(list);+ expect(list.scrollTop).toBe(480);+ expect((screen.getByRole('textbox', { name: 'skillhub.home.search' }) as HTMLInputElement).value)+ .toBe('calendar');+ expect(screen.getByRole('button', { name: /calendar-renamed/ })).toBeTruthy();+ expect(screen.queryByRole('button', { name: /calendar-tools|design-tools/ })).toBeNull();+ });++ it('keeps the Settings URL while changing embedded catalog filters', () => {+ renderCatalog('/settings?tab=ghosts#catalog');+ selectLocalAndSearch();+ expect(screen.getByTestId('location').textContent).toBe('/settings?tab=ghosts#catalog');+ });++ it('returns from an embedded Settings skill detail to the main catalog with saved filters', async () => {+ renderCatalog('/settings?tab=ghosts#catalog');+ selectLocalAndSearch();+ fireEvent.click(screen.getByRole('button', { name: /calendar-tools/ }));+ fireEvent.click(screen.getByRole('button', { name: 'Detail Back' }));+ await waitFor(() => expectTab('local'));+ expect(screen.getByTestId('location').textContent).toBe('/skillhub/local');+ expect((screen.getByRole('textbox', { name: 'skillhub.home.search' }) as HTMLInputElement).value)+ .toBe('calendar');+ });++ it.each([true, false])('restores an organization tab only while it is available (%s)', async (stillMember) => {+ mocks.user = { membershipKind: 'org' };+ renderCatalog();+ fireEvent.click(screen.getByRole('radio', { name: 'skillhub.home.catalogFilter.organization' }));+ fireEvent.click(screen.getByRole('button', { name: 'Leave catalog' }));+ if (!stillMember) mocks.user = null;+ fireEvent.click(screen.getByRole('button', { name: 'Browser Back' }));+ await waitFor(() => expectTab(stillMember ? 'organization' : 'public'));+ });++ it('keeps the market return destination across a local skill rename', () => {+ renderCatalog({+ pathname: '/skillhub/local/skill/global/calendar-tools',+ state: { from: '/skillhub/market', resetHistory: true },+ });+ fireEvent.click(screen.getByRole('button', { name: 'Rename skill' }));+ expect(screen.getByTestId('location').textContent).toContain('/calendar-renamed?');+ fireEvent.click(screen.getByRole('button', { name: 'Detail Back' }));+ expect(screen.getByTestId('location').textContent).toBe('/skillhub/market');+ });++ it('keeps the same catalog through browser Back and Forward, including its latest scroll offset', () => {+ renderCatalog();+ selectLocalAndSearch();+ const list = screen.getByRole('main');+ list.scrollTop = 720;+ fireEvent.click(screen.getByRole('button', { name: /calendar-tools/ }));+ fireEvent.click(screen.getByRole('button', { name: 'Browser Back' }));+ expect(screen.getByRole('main')).toBe(list);+ expect(list.scrollTop).toBe(720);+ list.scrollTop = 980;+ fireEvent.click(screen.getByRole('button', { name: 'Browser Forward' }));+ expect(list.isConnected).toBe(true);+ fireEvent.click(screen.getByRole('button', { name: 'Detail Back' }));+ expect(screen.getByRole('main')).toBe(list);+ expect(list.scrollTop).toBe(980);+ });++ it('does not let another detail URL reset the hidden catalog filters', () => {+ renderCatalog();+ selectLocalAndSearch();+ const search = screen.getByRole('textbox', { name: 'skillhub.home.search' }) as HTMLInputElement;+ fireEvent.click(screen.getByRole('button', { name: /calendar-tools/ }));+ fireEvent.click(screen.getByRole('button', { name: 'Another detail' }));+ expect(screen.getByTestId('navigation-state').textContent).toBe('null');+ expect(search.isConnected).toBe(true);+ expect(search.value).toBe('calendar');+ expect(document.querySelector('[role="radio"][aria-checked="true"]')?.textContent)+ .toBe('skillhub.home.local');+ });++ it.each([+ '/skillhub/local/skill/global/calendar-tools',+ '/skillhub/local/skill/project/repo-hash/calendar-tools',+ '/skillhub/local/by-path?path=%2Fskills%2Fcalendar-tools',+ ])('does not mount a hidden catalog for a direct detail URL: %s', (entry) => {+ renderCatalog(entry);+ expect(document.querySelector('main')).toBeNull();+ fireEvent.click(screen.getByRole('button', { name: 'Detail Back' }));+ expectTab('public');+ expect(screen.getByRole('main').scrollTop).toBe(0);+ });++ it('releases the catalog after leaving its routes', () => {+ renderCatalog();+ selectLocalAndSearch();+ const list = screen.getByRole('main');+ fireEvent.click(screen.getByRole('button', { name: /calendar-tools/ }));+ fireEvent.click(screen.getByRole('button', { name: 'Leave catalog' }));+ expect(list.isConnected).toBe(false);+ fireEvent.click(screen.getByRole('button', { name: 'Browser Back' }));+ expect(document.querySelector('main')).toBeNull();+ fireEvent.click(screen.getByRole('button', { name: 'Detail Back' }));+ expect(screen.getByRole('main')).not.toBe(list);+ });++ it('releases the hidden catalog when the data owner changes', () => {+ const view = renderCatalog();+ selectLocalAndSearch();+ const list = screen.getByRole('main');+ fireEvent.click(screen.getByRole('button', { name: /calendar-tools/ }));+ mocks.dataOwnerId = 'owner-b';+ view.rerender(<CatalogHarness />);+ expect(list.isConnected).toBe(false);+ expect(document.querySelector('main')).toBeNull();+ fireEvent.click(screen.getByRole('button', { name: 'Detail Back' }));+ expect(screen.getByRole('main')).not.toBe(list);+ });+});diff --git a/apps/desktop/src/renderer/features/skillhub/hooks/useSkillhubHomeNavigation.ts b/apps/desktop/src/renderer/features/skillhub/hooks/useSkillhubHomeNavigation.tsnew file mode 100644index 0000000000..82019d1246--- /dev/null+++ b/apps/desktop/src/renderer/features/skillhub/hooks/useSkillhubHomeNavigation.ts@@ -0,0 +1,66 @@+import { useCallback } from 'react';+import { useLocation, useNavigate, type Location } from 'react-router-dom';++import type { HomeCatalogTab } from '../lib/homeMarketFilter';+import { buildLocalSkillRoute } from '../lib/localRoutes';++interface HomeViewState {+ catalogTab: HomeCatalogTab;+ query: string;+}++interface SkillhubNavigationState {+ from?: string;+ resetHistory?: boolean;+ skillhubHome?: HomeViewState;+}++/** Keep list state on the history entry so both detail Back and browser Back restore it. */+export function useSkillhubHomeNavigation(navigationLocation?: Location) {+ const currentLocation = useLocation();+ const location = navigationLocation ?? currentLocation;+ const navigate = useNavigate();+ const navState = location.state as SkillhubNavigationState | null;+ const savedTab = navState?.skillhubHome?.catalogTab;+ const catalogTab: HomeCatalogTab = savedTab === 'local' || savedTab === 'organization'+ ? savedTab+ : 'public';+ const query = typeof navState?.skillhubHome?.query === 'string' ? navState.skillhubHome.query : '';++ const updateHomeState = useCallback((patch: Partial<HomeViewState>) => {+ // Replace the current entry: typing or changing tabs must not add Back steps.+ navigate(`${location.pathname}${location.search}${location.hash}`, {+ replace: true,+ state: { ...location.state, skillhubHome: { catalogTab, query, ...patch } },+ });+ }, [catalogTab, location, navigate, query]);++ const setCatalogTab = useCallback((tab: HomeCatalogTab) => {+ updateHomeState({ catalogTab: tab });+ }, [updateHomeState]);+ const setQuery = useCallback((value: string) => {+ updateHomeState({ query: value });+ }, [updateHomeState]);++ const openLocalSkill = (skill: Parameters<typeof buildLocalSkillRoute>[0]) => {+ navigate(buildLocalSkillRoute(skill), {+ state: {+ from: '/skillhub/local',+ resetHistory: true,+ skillhubHome: { catalogTab, query },+ } satisfies SkillhubNavigationState,+ });+ };++ const replaceLocalSkill = (skill: Parameters<typeof buildLocalSkillRoute>[0]) => {+ // A rename replaces the current detail, retaining both its source and list filters.+ navigate(buildLocalSkillRoute(skill), { replace: true, state: location.state });+ };++ const backToCatalog = () => {+ const target = navState?.from === '/skillhub/market' ? '/skillhub/market' : '/skillhub/local';+ navigate(target, { state: { skillhubHome: navState?.skillhubHome } });+ };++ return { catalogTab, query, setCatalogTab, setQuery, openLocalSkill, replaceLocalSkill, backToCatalog };+}diff --git a/apps/desktop/src/renderer/router.tsx b/apps/desktop/src/renderer/router.tsxindex 15c50fe713..73d536e81d 100644--- a/apps/desktop/src/renderer/router.tsx+++ b/apps/desktop/src/renderer/router.tsx@@ -21,7 +21,7 @@ import { OrcaWorkflowRoute } from '@/features/cc-agent/OrcaWorkflowRoute';import { WorkdirBrowseRoute } from '@/features/cc-agent/workdir-browse/WorkdirBrowseRoute';import { IssueTrackerFeatureLayout } from '@/features/issue-tracker/IssueTrackerFeatureLayout';import { SkillhubFeatureLayout } from '@/features/skillhub/SkillhubFeatureLayout';-import { SkillhubHomeView } from '@/features/skillhub/SkillhubHomeView';+import { SkillhubLocalLayout } from '@/features/skillhub/SkillhubLocalLayout';import { SkillhubDetailView } from '@/features/skillhub/SkillhubDetailView';import { SkillhubMarketListView } from '@/features/skillhub/SkillhubMarketListView';import { MakerExperimentalView } from '@/features/maker-experimental/MakerExperimentalView';@@ -154,10 +154,11 @@ export const router = createHashRouter([{ index: true, element: <Navigate to="/skillhub/local" replace /> },{path: 'local',+ element: <SkillhubLocalLayout />,children: [{index: true,- element: <SkillhubHomeView />,+ element: null,},{ path: 'by-path', element: <SkillhubDetailView /> },{ path: ':kind/global/:name', element: <SkillhubDetailView /> },diff --git a/docs/design-rules/design-inventory.md b/docs/design-rules/design-inventory.mdindex e5add01d55..6d9742d6dc 100644--- a/docs/design-rules/design-inventory.md+++ b/docs/design-rules/design-inventory.md@@ -40,7 +40,7 @@| `desktop.plugins.installed` | desktop | 已装插件 | hash `/plugins`(GhostPluginPage) | AddMarketplaceDialog, GhostPluginDetailView, GhostPluginPage, MarketPluginDetailView, MyPublishesSection, PluginManagementLayout, PluginScopePicker, UpdateAllDialog | apps/desktop/src/renderer/features/plugin/AddMarketplaceDialog.tsx, apps/desktop/src/renderer/features/plugin/GhostPluginDetailView.tsx, apps/desktop/src/renderer/features/plugin/GhostPluginPage.tsx, apps/desktop/src/renderer/features/plugin/MarketPluginDetailView.tsx, apps/desktop/src/renderer/features/plugin/MyPublishesSection.tsx, apps/desktop/src/renderer/features/plugin/PluginManagementLayout.tsx, apps/desktop/src/renderer/features/plugin/PluginScopePicker.tsx, apps/desktop/src/renderer/features/plugin/UpdateAllDialog.tsx, apps/desktop/src/renderer/features/plugin/plugin-motion.css | 47 | 0 | 79 || `desktop.settings` | desktop | 设置 | hash `/settings`(SettingsView;tab 含 general / personalization / providers / billing / usage / voice-input / im-bot / shortcuts / agent-island / import / remote-control / ghosts / builtin-tools / computer-use / help / about) | SettingsView | apps/desktop/src/renderer/components/settings/AboutSection.tsx, apps/desktop/src/renderer/components/settings/AccountDeletionSection.tsx, apps/desktop/src/renderer/components/settings/AddProviderWizard.tsx, apps/desktop/src/renderer/components/settings/AgentIslandSection.tsx, apps/desktop/src/renderer/components/settings/AgentResourceSection.tsx, apps/desktop/src/renderer/components/settings/AppearanceSection.tsx, apps/desktop/src/renderer/components/settings/AuxiliaryModelSection.tsx, apps/desktop/src/renderer/components/settings/BetaChannelCell.tsx, apps/desktop/src/renderer/components/settings/BrowserBackendSubsection.tsx, apps/desktop/src/renderer/components/settings/BrowserRealProfileSubsection.tsx, apps/desktop/src/renderer/components/settings/BuiltinToolsSection.tsx, apps/desktop/src/renderer/components/settings/ChatEmbeddingCell.tsx, apps/desktop/src/renderer/components/settings/ChipMetricsSection.tsx, apps/desktop/src/renderer/components/settings/CindyMakeSection.tsx, apps/desktop/src/renderer/components/settings/CollaborationSection.tsx, apps/desktop/src/renderer/components/settings/CompactionSection.tsx, apps/desktop/src/renderer/components/settings/ComposerSendShortcutSection.tsx, apps/desktop/src/renderer/components/settings/ComputerPermissionGuideWindow.tsx, apps/desktop/src/renderer/components/settings/ComputerPermissionRow.tsx, apps/desktop/src/renderer/components/settings/ComputerUseSection.tsx, apps/desktop/src/renderer/components/settings/CustomProviderRuntimeFillOverlay.tsx, apps/desktop/src/renderer/components/settings/DefaultOverrideControls.tsx, apps/desktop/src/renderer/components/settings/DialogueDirectorySection.tsx, apps/desktop/src/renderer/components/settings/DingTalkBotSection.tsx, apps/desktop/src/renderer/components/settings/DiscordBotSection.tsx, apps/desktop/src/renderer/components/settings/DownloadMeter.tsx, apps/desktop/src/renderer/components/settings/ExperimentalSection.tsx, apps/desktop/src/renderer/components/settings/FeishuBotNotificationSection.tsx, apps/desktop/src/renderer/components/settings/FeishuBotSection.tsx, apps/desktop/src/renderer/components/settings/FontFamilyPicker.tsx, apps/desktop/src/renderer/components/settings/GenericGamepadLayout.tsx, apps/desktop/src/renderer/components/settings/GitSafetySection.tsx, apps/desktop/src/renderer/components/settings/HelpAssistantPanel.tsx, apps/desktop/src/renderer/components/settings/HelpSection.tsx, apps/desktop/src/renderer/components/settings/HelpThreadView.tsx, apps/desktop/src/renderer/components/settings/HookConnectionsSection.tsx, apps/desktop/src/renderer/components/settings/HookWorkspacePrefsEditor.tsx, apps/desktop/src/renderer/components/settings/ImBotSection.tsx, apps/desktop/src/renderer/components/settings/ImChannelSettingsCard.tsx, apps/desktop/src/renderer/components/settings/ImDefaultSettingsSection.tsx, apps/desktop/src/renderer/components/settings/ImLifecycleAnnouncementSection.tsx, apps/desktop/src/renderer/components/settings/InputDeviceConnectionStatus.tsx, apps/desktop/src/renderer/components/settings/JoyConGamepadLayout.tsx, apps/desktop/src/renderer/components/settings/KeyboardShortcutsSection.tsx, apps/desktop/src/renderer/components/settings/LanguageSection.tsx, apps/desktop/src/renderer/components/settings/LayoutResetControl.tsx, apps/desktop/src/renderer/components/settings/LinkOpenSection.tsx, apps/desktop/src/renderer/components/settings/LocalOllamaInstall.tsx, apps/desktop/src/renderer/components/settings/LocalPackagingTag.tsx, apps/desktop/src/renderer/components/settings/LogoutSection.tsx, apps/desktop/src/renderer/components/settings/LspBetaCell.tsx, apps/desktop/src/renderer/components/settings/McpServerDialog.tsx, apps/desktop/src/renderer/components/settings/McpServersSection.tsx, apps/desktop/src/renderer/components/settings/MemorySection.tsx, apps/desktop/src/renderer/components/settings/MessageNavRailCell.tsx, apps/desktop/src/renderer/components/settings/ModelAdvancedDrawer.tsx, apps/desktop/src/renderer/components/settings/ModelPriceOverrideDialog.tsx, apps/desktop/src/renderer/components/settings/MyDevicesPanel.tsx, apps/desktop/src/renderer/components/settings/NotificationSection.tsx, apps/desktop/src/renderer/components/settings/OAuthDeviceCodeCard.tsx, apps/desktop/src/renderer/components/settings/OllamaProviderDetail.tsx, apps/desktop/src/renderer/components/settings/PiPackagesSection.tsx, apps/desktop/src/renderer/components/settings/PlayStationGamepadLayout.tsx, apps/desktop/src/renderer/components/settings/ProfileEditDialog.tsx, apps/desktop/src/renderer/components/settings/ProviderConnectionDialog.tsx, apps/desktop/src/renderer/components/settings/ProviderImportDialog.tsx, apps/desktop/src/renderer/components/settings/ProvidersSection.tsx, apps/desktop/src/renderer/components/settings/RemoteControlSection.tsx, apps/desktop/src/renderer/components/settings/RemoteDesktopPermissions.tsx, apps/desktop/src/renderer/components/settings/RemoteDesktopSetting.tsx, apps/desktop/src/renderer/components/settings/RemoteHostDetail.tsx, apps/desktop/src/renderer/components/settings/RemoteSection.tsx, apps/desktop/src/renderer/components/settings/SessionImportSection.tsx, apps/desktop/src/renderer/components/settings/SessionRuntimeFallbackCell.tsx, apps/desktop/src/renderer/components/settings/SessionShareImportWizard.tsx, apps/desktop/src/renderer/components/settings/SettingsCatalogPanel.tsx, apps/desktop/src/renderer/components/settings/SettingsSidebarNav.tsx, apps/desktop/src/renderer/components/settings/SettingsTextInput.tsx, apps/desktop/src/renderer/components/settings/SettingsView.tsx, apps/desktop/src/renderer/components/settings/SilentEncryptedRetryCell.tsx, apps/desktop/src/renderer/components/settings/SshKeySetupDialog.tsx, apps/desktop/src/renderer/components/settings/StorageManagementCard.tsx, apps/desktop/src/renderer/components/settings/StreamFadeSection.tsx, apps/desktop/src/renderer/components/settings/SubagentModelSection.tsx, apps/desktop/src/renderer/components/settings/SwitchProGamepadLayout.tsx, apps/desktop/src/renderer/components/settings/TelegramBehaviorSettings.tsx, apps/desktop/src/renderer/components/settings/TelegramBotSection.tsx, apps/desktop/src/renderer/components/settings/TelegramRemoteDevices.tsx, apps/desktop/src/renderer/components/settings/TerminalShellSection.tsx, apps/desktop/src/renderer/components/settings/TipsSection.tsx, apps/desktop/src/renderer/components/settings/UnifiedModelList.tsx, apps/desktop/src/renderer/components/settings/UserProfileCard.tsx, apps/desktop/src/renderer/components/settings/UserPromptSection.tsx, apps/desktop/src/renderer/components/settings/VisionBridgeSection.tsx, apps/desktop/src/renderer/components/settings/VoiceInputSection.tsx, apps/desktop/src/renderer/components/settings/WechatBotSection.tsx, apps/desktop/src/renderer/components/settings/WecomBotSection.tsx, apps/desktop/src/renderer/components/settings/WindowBehaviorSection.tsx, apps/desktop/src/renderer/components/settings/WorkLouderCodexKeyboardLayout.tsx, apps/desktop/src/renderer/components/settings/WorkLouderCodexKeycapGlyphs.tsx, apps/desktop/src/renderer/components/settings/WorkLouderCodexSettings.tsx, apps/desktop/src/renderer/components/settings/WorktreeRecycleCard.tsx, apps/desktop/src/renderer/components/settings/XUsageGuide.tsx, apps/desktop/src/renderer/components/settings/XboxGamepadLayout.tsx, apps/desktop/src/renderer/components/settings/XboxGamepadSettings.tsx, apps/desktop/src/renderer/components/settings/androidStatusPresentation.ts, apps/desktop/src/renderer/components/settings/billingVisibility.ts, apps/desktop/src/renderer/components/settings/browserOpenForLoginError.ts, apps/desktop/src/renderer/components/settings/cindyMakeVisibility.ts, apps/desktop/src/renderer/components/settings/computerPermissionFlow.ts, apps/desktop/src/renderer/components/settings/contacts/ContactDetailPane.tsx, apps/desktop/src/renderer/components/settings/contacts/ContactsImportDialog.tsx, apps/desktop/src/renderer/components/settings/contacts/ContactsListPane.tsx, apps/desktop/src/renderer/components/settings/contacts/ContactsManagerDialog.tsx, apps/desktop/src/renderer/components/settings/contacts/ContactsSection.tsx, apps/desktop/src/renderer/components/settings/contacts/startContactsAiSession.ts, apps/desktop/src/renderer/components/settings/dialogueDirectoryDisplay.ts, apps/desktop/src/renderer/components/settings/dualSenseSilhouette.ts, apps/desktop/src/renderer/components/settings/feishuBotPresentation.ts, apps/desktop/src/renderer/components/settings/fontFamilyValue.ts, apps/desktop/src/renderer/components/settings/gamepadLayoutPrimitives.tsx, apps/desktop/src/renderer/components/settings/gamepadSilhouetteGeom.ts, apps/desktop/src/renderer/components/settings/hookWorkspacePrefsLogic.ts, apps/desktop/src/renderer/components/settings/imBotVisibility.ts, apps/desktop/src/renderer/components/settings/imDefaultSettingsLogic.ts, apps/desktop/src/renderer/components/settings/joyConSilhouette.ts, apps/desktop/src/renderer/components/settings/modelManagementPresentation.ts, apps/desktop/src/renderer/components/settings/modelManagementState.ts, apps/desktop/src/renderer/components/settings/myDevicesModel.ts, apps/desktop/src/renderer/components/settings/providerAssetModule.ts, apps/desktop/src/renderer/components/settings/realProfilePermissionGuide.ts, apps/desktop/src/renderer/components/settings/switchProSilhouette.ts, apps/desktop/src/renderer/components/settings/ultimateC1Silhouette.ts, apps/desktop/src/renderer/components/settings/usage/UsageBreakdownTables.tsx, apps/desktop/src/renderer/components/settings/usage/UsageHistorySection.tsx, apps/desktop/src/renderer/components/settings/usage/UsageStatRow.tsx, apps/desktop/src/renderer/components/settings/usage/UsageTaskTable.tsx, apps/desktop/src/renderer/components/settings/usage/UsageTokenBars.tsx, apps/desktop/src/renderer/components/settings/usage/formatUsagePercent.ts, apps/desktop/src/renderer/components/settings/usage/usageCharts.css, apps/desktop/src/renderer/components/settings/usage/usageHistoryColors.ts, apps/desktop/src/renderer/components/settings/usage/usageHistoryStats.ts, apps/desktop/src/renderer/components/settings/usageVisibility.ts, apps/desktop/src/renderer/components/settings/useProviderSubscriptionCard.ts, apps/desktop/src/renderer/components/settings/wizardRecommend.ts, apps/desktop/src/renderer/components/settings/workLouderCodexCommandCopy.ts, apps/desktop/src/renderer/components/settings/xboxSeriesSilhouette.ts, apps/desktop/src/renderer/styles/sortable.css | 154 | 109 | 716 || `desktop.shell.main-layout` | desktop | 主窗口壳(标题栏 / 左右栏 / 内容区) | main BrowserWindow → renderer/index.tsx → main-entry.tsx → App → MainLayout (`#/` 受保护壳) | ChromeActions, DeviceSectionHeader, FeishuConflictDialogHost, GhostMediaLightboxHost, MainLayout, ProjectsSection, RightSidebar, RightSidebarShell, SessionShareImportWizard, Sidebar, UpdateNoticeDialog, WindowControls | apps/desktop/src/renderer/cindy-brain/GhostMediaLightboxHost.tsx, apps/desktop/src/renderer/components/UpdateNoticeDialog.tsx, apps/desktop/src/renderer/components/feishuBot/FeishuConflictDialog.tsx, apps/desktop/src/renderer/components/feishuBot/FeishuConflictDialogHost.tsx, apps/desktop/src/renderer/components/layout/AppBadgeAttentionSync.tsx, apps/desktop/src/renderer/components/layout/BrowserWebviewPool.tsx, apps/desktop/src/renderer/components/layout/ChromeActions.tsx, apps/desktop/src/renderer/components/layout/ContentHeader.tsx, apps/desktop/src/renderer/components/layout/CredentialStoreBanner.tsx, apps/desktop/src/renderer/components/layout/FadeSwitcher.tsx, apps/desktop/src/renderer/components/layout/GhostPanelWindowLayout.tsx, apps/desktop/src/renderer/components/layout/GlobalDropImportListener.tsx, apps/desktop/src/renderer/components/layout/MainEntryRedirect.tsx, apps/desktop/src/renderer/components/layout/MainLayout.tsx, apps/desktop/src/renderer/components/layout/RightSidebar.tsx, apps/desktop/src/renderer/components/layout/RightSidebarDetach.tsx, apps/desktop/src/renderer/components/layout/RightSidebarMaximize.tsx, apps/desktop/src/renderer/components/layout/RightSidebarToggle.tsx, apps/desktop/src/renderer/components/layout/SidebarWindowLayout.tsx, apps/desktop/src/renderer/components/layout/chromeActionsGeometry.ts, apps/desktop/src/renderer/components/layout/chromeActionsLayout.ts, apps/desktop/src/renderer/components/layout/railChromeActions.ts, apps/desktop/src/renderer/components/layout/windowDrag.tsx, apps/desktop/src/renderer/components/settings/SessionShareImportWizard.tsx, apps/desktop/src/renderer/components/sidebar/AccountSwitcherDialog.tsx, apps/desktop/src/renderer/components/sidebar/AttentionDot.tsx, apps/desktop/src/renderer/components/sidebar/DatabaseSizeWarningBanner.tsx, apps/desktop/src/renderer/components/sidebar/GhostMainViewNavEntries.tsx, apps/desktop/src/renderer/components/sidebar/MobileDownloadDialog.tsx, apps/desktop/src/renderer/components/sidebar/Sidebar.tsx, apps/desktop/src/renderer/components/sidebar/SidebarIconButton.tsx, apps/desktop/src/renderer/components/sidebar/SidebarTopNav.tsx, apps/desktop/src/renderer/components/sidebar/SortableList.tsx, apps/desktop/src/renderer/components/sidebar/UpdateBanner.tsx, apps/desktop/src/renderer/components/sidebar/UserInfoSection.tsx, apps/desktop/src/renderer/components/sidebar/VendorIcon.tsx, apps/desktop/src/renderer/components/sidebar/VendorReadinessBadge.tsx, apps/desktop/src/renderer/components/sidebar/WorktreeBadge.tsx, apps/desktop/src/renderer/components/title-bar/ChromeIconButton.tsx, apps/desktop/src/renderer/components/title-bar/MenuButton.tsx, apps/desktop/src/renderer/components/title-bar/WindowControls.tsx, apps/desktop/src/renderer/features/cc-agent/sidebar/DeviceSectionHeader.tsx, apps/desktop/src/renderer/features/cc-agent/sidebar/sections/ProjectsSection.tsx, apps/desktop/src/renderer/features/right-sidebar/AddTabDropdown.tsx, apps/desktop/src/renderer/features/right-sidebar/EmptyState.tsx, apps/desktop/src/renderer/features/right-sidebar/RightSidebarShell.tsx, apps/desktop/src/renderer/features/right-sidebar/TabBar.tsx, apps/desktop/src/renderer/features/right-sidebar/TabBodyErrorBoundary.tsx, apps/desktop/src/renderer/features/right-sidebar/hooks/useBrowserWebview.ts, apps/desktop/src/renderer/features/right-sidebar/hooks/useNativePopupSurface.ts, apps/desktop/src/renderer/features/right-sidebar/iosSimulatorPluginAvailability.ts, apps/desktop/src/renderer/features/right-sidebar/lib/browserPartition.ts, apps/desktop/src/renderer/features/right-sidebar/lib/browserWebviewPool.ts, apps/desktop/src/renderer/features/right-sidebar/lib/detachedSidebarRouting.ts, apps/desktop/src/renderer/features/right-sidebar/lib/executeSidebarCommand.ts, apps/desktop/src/renderer/features/right-sidebar/lib/iosSimulatorFocusBridge.ts, apps/desktop/src/renderer/features/right-sidebar/lib/lastTurnChangedFiles.ts, apps/desktop/src/renderer/features/right-sidebar/lib/nativePopupTabs.ts, apps/desktop/src/renderer/features/right-sidebar/lib/openBackgroundTasksTab.ts, apps/desktop/src/renderer/features/right-sidebar/lib/openInSidebarBrowser.ts, apps/desktop/src/renderer/features/right-sidebar/lib/openInSidebarFileBrowser.ts, apps/desktop/src/renderer/features/right-sidebar/lib/openRoutinesTab.ts, apps/desktop/src/renderer/features/right-sidebar/lib/openSubagentsTab.ts, apps/desktop/src/renderer/features/right-sidebar/lib/openTerminalShortcut.ts, apps/desktop/src/renderer/features/right-sidebar/lib/openTurnReview.ts, apps/desktop/src/renderer/features/right-sidebar/lib/popupRouter.ts, apps/desktop/src/renderer/features/right-sidebar/lib/popupTabs.ts, apps/desktop/src/renderer/features/right-sidebar/lib/rsbBrowserBridge.ts, apps/desktop/src/renderer/features/right-sidebar/lib/sidebarCommands.ts, apps/desktop/src/renderer/features/right-sidebar/lib/sidebarHostSession.tsx, apps/desktop/src/renderer/features/right-sidebar/plugins/background-tasks/BackgroundTasksBody.tsx, apps/desktop/src/renderer/features/right-sidebar/plugins/background-tasks/WorkflowAgentStrip.tsx, apps/desktop/src/renderer/features/right-sidebar/plugins/background-tasks/WorkflowProgressTree.tsx, apps/desktop/src/renderer/features/right-sidebar/plugins/background-tasks/chatTaskFocusIntent.ts, apps/desktop/src/renderer/features/right-sidebar/plugins/background-tasks/index.tsx, apps/desktop/src/renderer/features/right-sidebar/plugins/background-tasks/listSessionTasks.ts, apps/desktop/src/renderer/features/right-sidebar/plugins/background-tasks/workflowProgressModel.ts, apps/desktop/src/renderer/features/right-sidebar/plugins/cindy-make/CindyMakeTabBody.tsx, apps/desktop/src/renderer/features/right-sidebar/plugins/cindy-make/index.tsx, apps/desktop/src/renderer/features/right-sidebar/plugins/file-browser/FileBrowserBody.css, apps/desktop/src/renderer/features/right-sidebar/plugins/file-browser/FileBrowserBody.tsx, apps/desktop/src/renderer/features/right-sidebar/plugins/file-browser/dropExternalFile.ts, apps/desktop/src/renderer/features/right-sidebar/plugins/file-browser/fileTreeImagePreview.ts, apps/desktop/src/renderer/features/right-sidebar/plugins/file-browser/index.tsx, apps/desktop/src/renderer/features/right-sidebar/plugins/file-browser/useSessionScopedTreeWidth.ts, apps/desktop/src/renderer/features/right-sidebar/plugins/index.ts, apps/desktop/src/renderer/features/right-sidebar/plugins/ios-simulator/IOSSimulatorInstanceGrid.tsx, apps/desktop/src/renderer/features/right-sidebar/plugins/ios-simulator/IOSSimulatorTabBody.tsx, apps/desktop/src/renderer/features/right-sidebar/plugins/ios-simulator/index.tsx, apps/desktop/src/renderer/features/right-sidebar/plugins/ios-simulator/iosSimulatorH264Decoder.ts, apps/desktop/src/renderer/features/right-sidebar/plugins/orca-workers/OrcaWorkersAttentionIcon.tsx, apps/desktop/src/renderer/features/right-sidebar/plugins/orca-workers/OrcaWorkersTabBody.tsx, apps/desktop/src/renderer/features/right-sidebar/plugins/orca-workers/actions.ts, apps/desktop/src/renderer/features/right-sidebar/plugins/orca-workers/closeDecision.ts, apps/desktop/src/renderer/features/right-sidebar/plugins/orca-workers/index.tsx, apps/desktop/src/renderer/features/right-sidebar/plugins/resource-usage/ResourceUsageBody.tsx, apps/desktop/src/renderer/features/right-sidebar/plugins/resource-usage/index.tsx, apps/desktop/src/renderer/features/right-sidebar/plugins/resource-usage/resource-usage.css, apps/desktop/src/renderer/features/right-sidebar/plugins/resource-usage/subscription.ts, apps/desktop/src/renderer/features/right-sidebar/plugins/review/DiffViewer/ImageDiffPreview.tsx, apps/desktop/src/renderer/features/right-sidebar/plugins/review/DiffViewer/MarkdownDiffPreview.tsx, apps/desktop/src/renderer/features/right-sidebar/plugins/review/DiffViewer/PlainUnifiedDiff.tsx, apps/desktop/src/renderer/features/right-sidebar/plugins/review/DiffViewer/diffRows.ts, apps/desktop/src/renderer/features/right-sidebar/plugins/review/DiffViewer/highlight.ts, apps/desktop/src/renderer/features/right-sidebar/plugins/review/DiffViewer/inlineDiff.ts, apps/desktop/src/renderer/features/right-sidebar/plugins/review/DiffViewer/useDiffHighlights.ts, apps/desktop/src/renderer/features/right-sidebar/plugins/review/ReviewTabBody.tsx, apps/desktop/src/renderer/features/right-sidebar/plugins/review/diffExpansionPreference.ts, apps/desktop/src/renderer/features/right-sidebar/plugins/review/fileTree.ts, apps/desktop/src/renderer/features/right-sidebar/plugins/review/gitApplyCommand.ts, apps/desktop/src/renderer/features/right-sidebar/plugins/review/index.tsx, apps/desktop/src/renderer/features/right-sidebar/plugins/review/markdownPreview.ts, apps/desktop/src/renderer/features/right-sidebar/plugins/review/useLastTurnFilter.ts, apps/desktop/src/renderer/features/right-sidebar/plugins/review/useReviewGitState.ts, apps/desktop/src/renderer/features/right-sidebar/plugins/review/useReviewSource.ts, apps/desktop/src/renderer/features/right-sidebar/plugins/routines/index.tsx, apps/desktop/src/renderer/features/right-sidebar/plugins/subagents/ConversationStream.tsx, apps/desktop/src/renderer/features/right-sidebar/plugins/subagents/DetailView.tsx, apps/desktop/src/renderer/features/right-sidebar/plugins/subagents/RunList.tsx, apps/desktop/src/renderer/features/right-sidebar/plugins/subagents/SubagentChrome.tsx, apps/desktop/src/renderer/features/right-sidebar/plugins/subagents/SubagentToolCard.tsx, apps/desktop/src/renderer/features/right-sidebar/plugins/subagents/SubagentsBody.tsx, apps/desktop/src/renderer/features/right-sidebar/plugins/subagents/index.tsx, apps/desktop/src/renderer/features/right-sidebar/plugins/subagents/subagentChangeFence.ts, apps/desktop/src/renderer/features/right-sidebar/plugins/subagents/subagentConversation.ts, apps/desktop/src/renderer/features/right-sidebar/plugins/subagents/subagentFormat.ts, apps/desktop/src/renderer/features/right-sidebar/plugins/terminal/TerminalTabBody.tsx, apps/desktop/src/renderer/features/right-sidebar/plugins/terminal/index.tsx, apps/desktop/src/renderer/features/right-sidebar/plugins/terminal/lib/xtermPool.ts, apps/desktop/src/renderer/features/right-sidebar/plugins/web-browser/BrowserChrome.tsx, apps/desktop/src/renderer/features/right-sidebar/plugins/web-browser/BrowserCommentPopover.tsx, apps/desktop/src/renderer/features/right-sidebar/plugins/web-browser/BrowserTabBody.tsx, apps/desktop/src/renderer/features/right-sidebar/plugins/web-browser/browserCommentEditorDraft.ts, apps/desktop/src/renderer/features/right-sidebar/plugins/web-browser/index.tsx, apps/desktop/src/renderer/features/right-sidebar/plugins/web-browser/lib/parseOmnibox.ts, apps/desktop/src/renderer/features/right-sidebar/plugins/web-browser/useBrowserComment.ts, apps/desktop/src/renderer/features/right-sidebar/plugins/web-browser/useLocalHtmlAutoReload.ts, apps/desktop/src/renderer/features/right-sidebar/registry.ts, apps/desktop/src/renderer/features/right-sidebar/store.ts, apps/desktop/src/renderer/features/right-sidebar/types.ts, apps/desktop/src/renderer/layout/LayoutRoot.tsx, apps/desktop/src/renderer/layout/PanelDragController.tsx, apps/desktop/src/renderer/layout/PanelDragPrototype.tsx, apps/desktop/src/renderer/layout/collapsePrefs.ts, apps/desktop/src/renderer/layout/layoutDevTools.ts, apps/desktop/src/renderer/layout/panePlacement.tsx, apps/desktop/src/renderer/layout/paneWidths.tsx, apps/desktop/src/renderer/layout/panelMaximize.tsx, apps/desktop/src/renderer/styles/generated/tokens.css, apps/desktop/src/renderer/styles/globals.css | 153 | 46 | 295 |-| `desktop.skillhub.local` | desktop | SkillHub 本地技能 | hash `/skillhub/local` 及详情 `/skillhub/local/:kind/global/:name`、`/skillhub/local/:kind/project/:projectHash/:name` | InstallTargetPicker, PluginManagementLayout, SkillhubDetailView, SkillhubFeatureLayout, SkillhubHomeView, SkillhubMarketPreviewPanel | apps/desktop/src/renderer/features/plugin/PluginManagementLayout.tsx, apps/desktop/src/renderer/features/skillhub/SkillhubDetailView.tsx, apps/desktop/src/renderer/features/skillhub/SkillhubFeatureLayout.tsx, apps/desktop/src/renderer/features/skillhub/SkillhubHomeView.tsx, apps/desktop/src/renderer/features/skillhub/SkillhubMarketPreviewPanel.tsx, apps/desktop/src/renderer/features/skillhub/components/InstallTargetPicker.tsx | 46 | 0 | 63 |+| `desktop.skillhub.local` | desktop | SkillHub 本地技能 | hash `/skillhub/local`(SkillhubLocalLayout 保留列表)及详情 `/skillhub/local/:kind/global/:name`、`/skillhub/local/:kind/project/:projectHash/:name`、`/skillhub/local/by-path` | InstallTargetPicker, PluginManagementLayout, SkillhubDetailView, SkillhubFeatureLayout, SkillhubHomeView, SkillhubLocalLayout, SkillhubMarketPreviewPanel | apps/desktop/src/renderer/features/plugin/PluginManagementLayout.tsx, apps/desktop/src/renderer/features/skillhub/SkillhubDetailView.tsx, apps/desktop/src/renderer/features/skillhub/SkillhubFeatureLayout.tsx, apps/desktop/src/renderer/features/skillhub/SkillhubHomeView.tsx, apps/desktop/src/renderer/features/skillhub/SkillhubLocalLayout.tsx, apps/desktop/src/renderer/features/skillhub/SkillhubMarketPreviewPanel.tsx, apps/desktop/src/renderer/features/skillhub/components/InstallTargetPicker.tsx | 46 | 0 | 63 || `desktop.skillhub.market` | desktop | SkillHub 市场 | hash `/skillhub/market`(SkillhubMarketListView) | InstallTargetPicker, MarketCard, MarketInfoEditDialog, SkillhubMarketListView, SkillhubMarketPreviewPanel, VisibilityEditorDialog | apps/desktop/src/renderer/features/skillhub/SkillhubMarketListView.tsx, apps/desktop/src/renderer/features/skillhub/SkillhubMarketPreviewPanel.tsx, apps/desktop/src/renderer/features/skillhub/components/HomeMarketCard.tsx, apps/desktop/src/renderer/features/skillhub/components/InstallTargetPicker.tsx, apps/desktop/src/renderer/features/skillhub/components/LocalSkillControls.tsx, apps/desktop/src/renderer/features/skillhub/components/MarketCard.tsx, apps/desktop/src/renderer/features/skillhub/components/MarketInfoEditDialog.tsx, apps/desktop/src/renderer/features/skillhub/components/MarketLocalSkills.tsx, apps/desktop/src/renderer/features/skillhub/components/MarketPreviewTree.tsx, apps/desktop/src/renderer/features/skillhub/components/OfficialSkillBadge.tsx, apps/desktop/src/renderer/features/skillhub/components/PlatformTagSelector.tsx, apps/desktop/src/renderer/features/skillhub/components/SkillCategoryFilterBar.tsx, apps/desktop/src/renderer/features/skillhub/components/SkillIcon.tsx, apps/desktop/src/renderer/features/skillhub/components/SkillTagList.tsx, apps/desktop/src/renderer/features/skillhub/components/TeamScopePicker.tsx, apps/desktop/src/renderer/features/skillhub/components/VisibilityEditorDialog.tsx | 53 | 0 | 62 || `desktop.window.computer-permission-guide` | desktop | 电脑使用权限引导 | `?view=computer-permission-guide` → ComputerPermissionGuideWindow;backdrop 同文件 | ComputerPermissionBackdrop, ComputerPermissionGuideWindow | apps/desktop/src/main/computer-permission-guide/MacComputerPermissionGuideNativeHost.ts, apps/desktop/src/main/computer-permission-guide/placement.ts, apps/desktop/src/main/computer-permission-guide/request.ts, apps/desktop/src/main/computer-permission-guide/switch-target.ts, apps/desktop/src/main/computer-permission-guide/window.ts, apps/desktop/src/renderer/components/settings/ComputerPermissionGuideWindow.tsx | 7 | 2 | 9 || `desktop.window.ghost-panel` | desktop | 插件面板独立窗口 | `?ghostPanelWindow=<id>` → renderer/ghost-panel-window-entry.tsx;hash `/ghost-panel-window` | GhostPanelWindowLayout | apps/desktop/src/main/ghost-panel-window/controller.ts, apps/desktop/src/main/ghost-panel-window/ipc.ts, apps/desktop/src/main/ghost-panel-window/registry.ts, apps/desktop/src/main/ghost-panel-window/settings-store.ts, apps/desktop/src/main/ghost-panel-window/window.ts, apps/desktop/src/renderer/components/layout/GhostPanelWindowLayout.tsx, apps/desktop/src/renderer/ghost-panel-window-entry.tsx, apps/desktop/src/renderer/styles/generated/tokens.css, apps/desktop/src/renderer/styles/globals.css | 63 | 38 | 14 |@@ -95,7 +95,7 @@| `/plugins` | GhostPluginPage | `desktop.plugins.installed` || `/settings` | SettingsView | `desktop.settings` || `/sidebar-window` | SidebarWindowLayout | `desktop.window.sidebar` |-| `/skillhub/local` | SkillhubHomeView | `desktop.skillhub.local` |+| `/skillhub/local` | SkillhubLocalLayout | `desktop.skillhub.local` || `/skillhub/local/:kind/global/:name` | SkillhubDetailView | `desktop.skillhub.local` || `/skillhub/local/:kind/project/:projectHash/:name` | SkillhubDetailView | `desktop.skillhub.local` || `/skillhub/local/by-path` | SkillhubDetailView | `desktop.skillhub.local` |diff --git a/scripts/__tests__/design-inventory.test.mjs b/scripts/__tests__/design-inventory.test.mjsindex 9fa6b710fc..2ed4a9d4e9 100644--- a/scripts/__tests__/design-inventory.test.mjs+++ b/scripts/__tests__/design-inventory.test.mjs@@ -134,7 +134,7 @@ test('extractRouterFacts: 真实 router.tsx 的三类去向逐条钉死', () =>'/plugins GhostPluginPage','/settings SettingsView','/sidebar-window SidebarWindowLayout',- '/skillhub/local SkillhubHomeView',+ '/skillhub/local SkillhubLocalLayout','/skillhub/local/:kind/global/:name SkillhubDetailView','/skillhub/local/:kind/project/:projectHash/:name SkillhubDetailView','/skillhub/local/by-path SkillhubDetailView',@@ -799,11 +799,11 @@ test('CSS 文件同样剥块注释后统计,globals.css 注释色值不进基线assert.ok(shell.bareColors > 0, '真实规则色值仍应计入');});-test('skillhub.local 纳入直接渲染子组件的样式事实', () => {+test('skillhub.local 纳入保留列表布局及直接渲染子组件的样式事实', () => {const catalog = catalogSurfaces();const local = catalog.find((surface) => surface.id === 'desktop.skillhub.local');assert.ok(local);- for (const component of ['PluginManagementLayout', 'SkillhubMarketPreviewPanel', 'InstallTargetPicker']) {+ for (const component of ['SkillhubLocalLayout', 'SkillhubHomeView', 'PluginManagementLayout', 'SkillhubMarketPreviewPanel', 'InstallTargetPicker']) {assert.ok(local.reachableComponents.includes(component),`${component} 必须列入 skillhub.local 可达组件`,@@ -814,6 +814,8 @@ test('skillhub.local 纳入直接渲染子组件的样式事实', () => {);const { surfaces } = buildGeneratedSurfaces(ROOT, {});const generated = surfaces.find((surface) => surface.id === 'desktop.skillhub.local');+ assert.ok(generated.styleSources.some((file) => file.endsWith('SkillhubLocalLayout.tsx')));+ assert.ok(generated.styleSources.some((file) => file.endsWith('SkillhubHomeView.tsx')));assert.ok(generated.styleSources.some((file) => file.endsWith('PluginManagementLayout.tsx')));assert.ok(generated.tokenCount > 33, `子组件并入后 token 数应高于只扫路由组件(实际 ${generated.tokenCount})`);});diff --git a/scripts/shared/design-inventory.mjs b/scripts/shared/design-inventory.mjsindex b7cf98ede0..c47ae6bfdd 100644--- a/scripts/shared/design-inventory.mjs+++ b/scripts/shared/design-inventory.mjs@@ -595,11 +595,13 @@ export function catalogSurfaces() {platform: 'desktop',title: 'SkillHub 本地技能',productionEntry:- 'hash `/skillhub/local` 及详情 `/skillhub/local/:kind/global/:name`、`/skillhub/local/:kind/project/:projectHash/:name`',- // SkillhubHomeView 直接渲染 PluginManagementLayout(features/plugin 共享布局)、- // SkillhubMarketPreviewPanel 与 InstallTargetPicker——只扫三个路由组件文件+ 'hash `/skillhub/local`(SkillhubLocalLayout 保留列表)及详情 `/skillhub/local/:kind/global/:name`、`/skillhub/local/:kind/project/:projectHash/:name`、`/skillhub/local/by-path`',+ // SkillhubLocalLayout 保留 SkillhubHomeView;首页直接渲染+ // PluginManagementLayout(features/plugin 共享布局)、+ // SkillhubMarketPreviewPanel 与 InstallTargetPicker——只扫路由入口文件// 会漏掉这些子组件的样式事实。reachableComponents: [+ 'SkillhubLocalLayout','SkillhubHomeView','SkillhubDetailView','SkillhubFeatureLayout',@@ -608,6 +610,7 @@ export function catalogSurfaces() {'InstallTargetPicker',],styleRoots: [+ 'apps/desktop/src/renderer/features/skillhub/SkillhubLocalLayout.tsx','apps/desktop/src/renderer/features/skillhub/SkillhubHomeView.tsx','apps/desktop/src/renderer/features/skillhub/SkillhubDetailView.tsx','apps/desktop/src/renderer/features/skillhub/SkillhubFeatureLayout.tsx',@@ -621,7 +624,7 @@ export function catalogSurfaces() {'/skillhub/local/:kind/project/:projectHash/:name','/skillhub/local/by-path',],- routeEntryComponents: { '/skillhub/local': 'SkillhubHomeView', '/skillhub/local/:kind/global/:name': 'SkillhubDetailView', '/skillhub/local/:kind/project/:projectHash/:name': 'SkillhubDetailView', '/skillhub/local/by-path': 'SkillhubDetailView' },+ routeEntryComponents: { '/skillhub/local': 'SkillhubLocalLayout', '/skillhub/local/:kind/global/:name': 'SkillhubDetailView', '/skillhub/local/:kind/project/:projectHash/:name': 'SkillhubDetailView', '/skillhub/local/by-path': 'SkillhubDetailView' },},{id: 'desktop.skillhub.market',