@lesliechan721/aw 0.1.0-beta.8 → 0.1.0-beta.9

package/dist/src/tui/console-app-v4.js

@@ -34,7 +34,11 @@ export const CONSOLE_V4_SCREEN_IDS = [
 function pluginMenuActionId(action) {
     return action.id === 'platform' || action.id === 'scopeConflict'
         ? `${action.id}:${action.platform}`
-        : action.id;
+        : action.id === 'addScope'
+            ? `${action.id}:${action.platform}:${action.scope}`
+            : action.id === 'resolveScopeConflict'
+                ? `${action.id}:${action.pluginId}:${action.platform}:${action.scope}`
+                : action.id;
 }
 function isCharacterInputMode(route, searchMode) {
     return searchMode
@@ -122,11 +126,22 @@ function pluginPlacementSummary(plugin) {
         const placement = plugin.installedPlacements.find((entry) => entry.platform === platform);
         if (!placement || placement.state === 'notInstalled')
             return `${label} · 未添加`;
+        if (placement.state === 'blocked')
+            return `${label} · 无法添加 · 输出冲突`;
         if (placement.state === 'scopeConflict')
             return `${label} · 位置冲突`;
-        const health = placement.health === 'ready' ? '可用'
-            : placement.health === 'incomplete' ? '需要处理' : '不可用';
-        return `${label} · ${scopeLabel(placement.scope)} · ${health}`;
+        if (placement.blockingReason === 'artifactCollision') {
+            return `${label} · ${scopeLabel(placement.scope)} · 输出冲突`;
+        }
+        const health = placement.actualState === 'needsSync' ? '需要同步'
+            : placement.actualState === 'drifted' ? '已漂移'
+                : placement.actualState === 'conflict' ? '位置冲突'
+                    : placement.health === 'ready' ? '可用'
+                        : placement.health === 'incomplete' ? '需要处理' : '不可用';
+        const desired = placement.desiredScopes?.length
+            ? placement.desiredScopes.map(scopeLabel).join('+')
+            : scopeLabel(placement.scope);
+        return `${label} · ${desired} · ${health}`;
     }).join('  |  ') || '没有可用平台';
 }
 function issueGroupLabel(group) {
@@ -321,38 +336,38 @@ function configUnavailableDiagnostic(route) {
         },
     };
 }
-function sourceDiagnostic(sourceId, state, detail) {
-    const degraded = state === 'degraded';
+function sourceDiagnostic(sourceId, state, detail, generation) {
     const unavailable = state === 'unavailable' || state === 'error';
-    if (!degraded && !unavailable)
+    if (!unavailable)
         return undefined;
+    const metadataInvalid = generation?.errorCode === 'catalogGenerationMetadataInvalid';
     return {
-        severity: degraded ? 'warning' : 'error',
-        title: degraded ? '远端 Catalog 检查失败，正在使用缓存' : 'Catalog 来源不可用',
-        userMessage: degraded
-            ? '远端读取没有成功。当前使用匹配且已验证的缓存数据。'
-            : '当前无法读取这个来源，并且没有可用缓存数据。',
-        impact: degraded
-            ? [
-                { state: 'degraded', message: '数据可能不是最新；匹配缓存中的插件仍可浏览和安装。' },
-                { state: 'preserved', message: '已安装插件和已保存设置不会被删除。' },
-            ]
-            : [
-                { state: 'blocked', message: '当前不能浏览或安装这个来源中的插件。' },
-                { state: 'preserved', message: '已安装插件和已保存设置不会被删除。' },
-            ],
-        nextStep: degraded
-            ? '重新检查来源；在修复前也可以继续使用匹配缓存。'
+        severity: 'error',
+        title: 'Catalog 来源不可用',
+        userMessage: '当前无法读取这个来源。',
+        impact: [
+            { state: 'blocked', message: '当前不能浏览或安装这个来源中的插件。' },
+            { state: 'preserved', message: '已安装插件和已保存设置不会被删除。' },
+        ],
+        nextStep: metadataInvalid && generation.recoveryEntryPath
+            ? `先安全删除 AW_HOME 下的精确条目 ${generation.recoveryEntryPath}，再运行 ${generation.syncInstruction}。`
             : '重新检查来源；如仍失败，请编辑来源 URL、路径或 ref。',
         technical: {
-            code: safeDiagnosticCode(detail?.errorCode, degraded ? 'catalogSourceDegraded' : 'catalogSourceUnavailable'),
+            code: safeDiagnosticCode(generation?.errorCode ?? detail?.errorCode, 'catalogSourceUnavailable'),
             stage: 'resolve-source',
             sourceId,
             ...(detail?.requestedRef ? { requestedRef: detail.requestedRef } : {}),
             ...(detail?.resolvedCommit ? { resolvedCommit: detail.resolvedCommit } : {}),
-            lastGood: degraded ? 'available' : 'unavailable',
-            ...(detail?.freshness ? { context: [{ key: 'freshness', value: detail.freshness }] } : {}),
-            checks: ['检查 Git URL、ref 或本地目录。', '确认当前终端具备来源授权。', '运行“重新检查来源”验证修复。'],
+            ...(metadataInvalid && generation.recoveryEntryPath
+                ? { context: [{ key: 'storeEntry', value: generation.recoveryEntryPath }] }
+                : {}),
+            checks: metadataInvalid && generation.recoveryEntryPath
+                ? [
+                    `确认损坏条目为 AW_HOME/${generation.recoveryEntryPath}。`,
+                    '只删除该精确条目，不删除 Catalog store 根或其它 digest。',
+                    `运行 ${generation.syncInstruction} 重建 Active。`,
+                ]
+                : ['检查 Git URL、ref 或本地目录。', '确认当前终端具备来源授权。', '运行“重新检查来源”验证修复。'],
         },
     };
 }
@@ -423,7 +438,7 @@ function SourceTabs(props) {
                 const state = 'state' in tab ? tab.state : 'ready';
                 return (_jsxs(Text, { bold: active, color: active ? tuiTheme.colors.accent
                         : state === 'error' ? tuiTheme.statusColors.error
-                            : state === 'cache' ? tuiTheme.statusColors.warning : tuiTheme.colors.muted, children: [active ? '[' : '', tab.label, state === 'error' ? ' !' : ` ${tab.count ?? ''}`, active ? ']' : '', '  '] }, tab.id));
+                            : tuiTheme.colors.muted, children: [active ? '[' : '', tab.label, state === 'error' ? ' !' : ` ${tab.count ?? ''}`, active ? ']' : '', '  '] }, tab.id));
             })] }));
 }
 function configTabs(page) {
@@ -455,13 +470,22 @@ function placementStatus(placement) {
     if (placement.state === 'notInstalled') {
         return { value: '未添加', status: 'muted', description: '选择使用位置后添加' };
     }
+    if (placement.state === 'blocked') {
+        return { value: '无法添加', status: 'error', description: '输出冲突；不会覆盖或删除占用内容' };
+    }
     if (placement.state === 'scopeConflict') {
         return { value: '位置冲突', status: 'warning', description: '需要先处理两个安装位置' };
     }
+    if (placement.blockingReason === 'artifactCollision') {
+        return { value: '输出冲突', status: 'error', description: '只允许查看或安全移除受管内容' };
+    }
     return {
-        value: `${scopeLabel(placement.scope)} · ${placement.health === 'ready' ? '可用' : placement.health === 'incomplete' ? '需要处理' : '不可用'}`,
-        status: placement.health === 'ready' ? 'success' : placement.health === 'incomplete' ? 'warning' : 'error',
-        description: placement.health === 'ready' ? '当前检查正常' : '查看影响和建议操作',
+        value: `${placement.desiredScopes?.map(scopeLabel).join('+') || scopeLabel(placement.scope)} · ${placement.actualState === 'needsSync' ? '需要同步' : placement.actualState === 'drifted' ? '已漂移' : placement.actualState === 'conflict' ? '位置冲突' : placement.health === 'ready' ? '可用' : placement.health === 'incomplete' ? '需要处理' : '不可用'}`,
+        status: placement.actualState === 'conflict' ? 'error' : placement.health === 'ready' ? 'success' : placement.health === 'incomplete' ? 'warning' : 'error',
+        description: placement.actualState === 'needsSync' ? 'desired intent 与现场不同；可安全同步'
+            : placement.actualState === 'drifted' ? '现场已漂移；查看同步计划'
+                : placement.actualState === 'conflict' ? 'mixed 或 AW-only 重叠；查看恢复路径'
+                    : placement.health === 'ready' ? '当前检查正常' : '查看影响和建议操作',
     };
 }
 function dependencyStatus(item) {
@@ -475,9 +499,29 @@ function dependencyStatus(item) {
 }
 function dependencyPlacementLabel(item) {
     const aggregate = dependencyStatus(item);
+    const installed = item.placements.filter((entry) => entry.state === 'installed');
+    const modern = installed.filter((entry) => entry.state === 'installed'
+        && (entry.desiredScopes !== undefined || entry.actualState !== undefined));
+    if (modern.length > 0) {
+        return modern.map((entry) => {
+            if (entry.state !== 'installed')
+                return '';
+            const desired = entry.desiredScopes?.map(scopeLabel).join('+') || scopeLabel(entry.scope);
+            const actualScopes = [
+                ...(entry.activation?.user ? ['所有项目'] : []),
+                ...(entry.activation?.project ? ['当前项目'] : []),
+            ];
+            const actual = actualScopes.join('+') || scopeLabel(entry.scope);
+            const state = entry.actualState === 'needsSync' ? '需同步'
+                : entry.actualState === 'drifted' ? '已漂移'
+                    : entry.actualState === 'conflict' ? '冲突'
+                        : entry.actualState === 'ready' ? '可用' : aggregate.value;
+            return `${platformLabel(entry.platform)} · desired ${desired} · actual ${actual} · ${state}`;
+        }).join(' | ');
+    }
     if (item.aggregateStatus !== 'ready')
         return aggregate.value;
-    const ready = item.placements.filter((entry) => entry.state === 'installed' && entry.health === 'ready');
+    const ready = installed.filter((entry) => entry.state === 'installed' && entry.health === 'ready');
     const scopes = new Set(ready.map((entry) => entry.state === 'installed' ? entry.scope : undefined));
     return scopes.size === 1 && ready[0]?.state === 'installed'
         ? `${scopeLabel(ready[0].scope)} · ${aggregate.value}`
@@ -524,7 +568,7 @@ export function resolveConsoleV4ScreenId(snapshot, controller, overlay, tooSmall
         return 'G01';
     const route = snapshot.router.current.route;
     if (route.name === 'home')
-        return controller.listCatalogCandidates().length > 0 ? 'K01' : 'G02';
+        return 'G02';
     if (route.name === 'pluginList') {
         const items = controller.listPlugins({ mode: route.mode, sourceId: route.sourceId });
         if (route.mode === 'installed' && items.length === 0)
@@ -567,6 +611,10 @@ export function resolveConsoleV4ScreenId(snapshot, controller, overlay, tooSmall
             return 'D16';
         return controller.getPluginOverview(route.pluginId)?.dependencySummary?.totalCount ? 'D04' : 'P06';
     }
+    if (route.name === 'dependencyPlacement')
+        return 'D03';
+    if (route.name === 'dependencyPlacementEditor')
+        return 'D04';
     if (route.name === 'pluginDetail') {
         return controller.getPluginOverview(route.pluginId)?.dependencySummary?.totalCount ? 'D09' : 'P13';
     }
@@ -582,9 +630,12 @@ export function resolveConsoleV4ScreenId(snapshot, controller, overlay, tooSmall
         return 'P16';
     }
     if (route.name === 'reviewPreparing')
-        return snapshot.reviewPreparation?.intent.kind === 'catalogActivate' ? 'K03' : 'P07';
+        return 'P07';
+    if (route.name === 'review' && snapshot.activeReview?.originIssue)
+        return 'I10';
     const dependencyOperation = snapshot.activeReview?.operationKind === 'pluginWrite'
-        && Boolean(snapshot.activeReview.changes.some((change) => change.group));
+        && Boolean(snapshot.activeReview.changes.some((change) => change.relation === 'direct' || change.relation === 'transitive'
+            || change.group === 'dependencies'));
     if (route.name === 'review' && dependencyOperation) {
         return snapshot.activeReview?.pluginAction === 'uninstall' || snapshot.activeReview?.pluginAction === 'cleanup'
             ? 'D11' : 'D05';
@@ -600,8 +651,6 @@ export function resolveConsoleV4ScreenId(snapshot, controller, overlay, tooSmall
             return snapshot.result.state === 'succeeded' ? 'D07' : 'D08';
         }
     }
-    if (route.name === 'review' && snapshot.activeReview?.originIssue)
-        return 'I10';
     if (route.name === 'progress' && snapshot.activeReview?.originIssue)
         return 'I11';
     if (route.name === 'result' && snapshot.result?.originIssue) {
@@ -617,30 +666,27 @@ export function resolveConsoleV4ScreenId(snapshot, controller, overlay, tooSmall
         return snapshot.result.state === 'succeeded' ? 'S12' : 'S13';
     }
     if (route.name === 'review')
-        return snapshot.activeReview?.operationKind === 'catalogActivate' ? 'K03'
-            : snapshot.activeReview?.operationKind === 'portableInstall' ? 'U06'
-                : snapshot.activeReview?.operationKind === 'configSave'
-                    ? 'C12'
-                    : snapshot.activeReview?.operationKind === 'configReset'
-                        ? 'C16'
+        return snapshot.activeReview?.operationKind === 'portableInstall' ? 'U06'
+            : snapshot.activeReview?.operationKind === 'configSave'
+                ? 'C12'
+                : snapshot.activeReview?.operationKind === 'configReset'
+                    ? 'C16'
+                    : snapshot.activeReview?.operationKind === 'pluginWrite'
+                        && (snapshot.activeReview.pluginAction === 'upgrade' || snapshot.activeReview.pluginAction === 'reinstall')
+                        ? 'P18'
                         : snapshot.activeReview?.operationKind === 'pluginWrite'
-                            && (snapshot.activeReview.pluginAction === 'upgrade' || snapshot.activeReview.pluginAction === 'reinstall')
-                            ? 'P18'
-                            : snapshot.activeReview?.operationKind === 'pluginWrite'
-                                && (snapshot.activeReview.pluginAction === 'uninstall' || snapshot.activeReview.pluginAction === 'cleanup')
-                                ? 'P19' : 'P07';
+                            && (snapshot.activeReview.pluginAction === 'uninstall' || snapshot.activeReview.pluginAction === 'cleanup')
+                            ? 'P19' : 'P07';
     if (route.name === 'progress')
-        return snapshot.activeReview?.operationKind === 'catalogActivate' ? 'K03'
-            : snapshot.activeReview?.operationKind === 'portableInstall' ? 'U07'
-                : snapshot.activeReview?.operationKind === 'configSave'
-                    || snapshot.activeReview?.operationKind === 'configReset' ? 'C13' : 'P08';
+        return snapshot.activeReview?.operationKind === 'portableInstall' ? 'U07'
+            : snapshot.activeReview?.operationKind === 'configSave'
+                || snapshot.activeReview?.operationKind === 'configReset' ? 'C13' : 'P08';
     if (route.name === 'result')
-        return snapshot.result?.operationKind === 'catalogActivate' ? 'K03'
-            : snapshot.result?.operationKind === 'portableInstall' ? 'U08'
-                : snapshot.result?.operationKind === 'configSave'
-                    || snapshot.result?.operationKind === 'configReset'
-                    ? snapshot.result.state === 'succeeded' ? 'C14' : 'C15'
-                    : snapshot.result?.state === 'partial' ? 'P10' : 'P09';
+        return snapshot.result?.operationKind === 'portableInstall' ? 'U08'
+            : snapshot.result?.operationKind === 'configSave'
+                || snapshot.result?.operationKind === 'configReset'
+                ? snapshot.result.state === 'succeeded' ? 'C14' : 'C15'
+                : snapshot.result?.state === 'partial' ? 'P10' : 'P09';
     if (route.name === 'pluginAbout')
         return 'P20';
     if (route.name === 'pluginTechnical')
@@ -659,18 +705,10 @@ export function resolveConsoleV4ScreenId(snapshot, controller, overlay, tooSmall
         return 'C17';
     if (route.name === 'sourceList')
         return 'S01';
-    if (route.name === 'sourceDetail' || route.name === 'catalogCandidate')
+    if (route.name === 'sourceDetail')
         return 'K02';
     if (route.name === 'sourceTechnical')
         return 'S03';
-    if (route.name === 'catalogRefreshPolicy')
-        return 'K04';
-    if (route.name === 'catalogRefresh')
-        return 'K05';
-    if (route.name === 'catalogImmutableViolation')
-        return 'K06';
-    if (route.name === 'catalogActivationBlocked')
-        return 'K07';
     if (route.name === 'sourceAdd')
         return {
             type: 'S04', id: 'S05', location: 'S06', refPolicy: 'S07', ref: 'S08', subdir: 'S09',
@@ -688,7 +726,6 @@ export function resolveConsoleV4ScreenId(snapshot, controller, overlay, tooSmall
         return {
             incompleteInstallation: 'I03',
             artifactCollision: 'I09',
-            sourceDegraded: 'I04',
             sourceUnavailable: 'I04',
             sourceMissing: 'I05',
             sourceIdentityChanged: 'I06',
@@ -729,7 +766,6 @@ export function ConsoleAppV4(props) {
     const [dirty, setDirty] = useState(false);
     const [configPage, setConfigPage] = useState();
     const [configLayerCounts, setConfigLayerCounts] = useState({});
-    const [configLoadKey, setConfigLoadKey] = useState(0);
     const [draftUpdates, setDraftUpdates] = useState({});
     const [draftRemoves, setDraftRemoves] = useState([]);
     const [inputValue, setInputValue] = useState('');
@@ -745,6 +781,7 @@ export function ConsoleAppV4(props) {
     const [draftOwner, setDraftOwner] = useState();
     const [pendingPresetId, setPendingPresetId] = useState();
     const [pendingLayerFieldKey, setPendingLayerFieldKey] = useState();
+    const [confirmedSharedReviewToken, setConfirmedSharedReviewToken] = useState();
     const dynamicMenuFocus = useRef(undefined);
     const exitSent = useRef(false);
     const operationBusy = useRef(false);
@@ -899,7 +936,7 @@ export function ConsoleAppV4(props) {
             }
         });
         return () => abort.abort();
-    }, [configLoadKey, configRoute?.pluginId, configRoute?.layer.scope, configRoute?.layer.projectLayer, props.controller]);
+    }, [configRoute?.pluginId, configRoute?.layer.scope, configRoute?.layer.projectLayer, props.controller]);
     useEffect(() => {
         if (route.name !== 'configFields' || !currentConfigPage)
             return;
@@ -1000,13 +1037,6 @@ export function ConsoleAppV4(props) {
         props.onScreenChange?.(screenId);
     }, [props.onScreenChange, screenId]);
     const dependencyOverview = (candidate) => candidate ? props.controller.getPluginDependencyOverview(candidate.pluginId) : undefined;
-    const installIntent = (candidate, targets = selectedTargets) => ({
-        kind: 'pluginWrite',
-        action: 'install',
-        pluginId: candidate.pluginId,
-        platform: targets.length === 2 ? 'both' : targets[0],
-        scope,
-    });
     let title = '管理你的 Agent 工作流插件';
     let description = '为 Codex 和 Claude Code 添加、设置或移除开发能力。';
     let breadcrumb = '首页';
@@ -1044,6 +1074,7 @@ export function ConsoleAppV4(props) {
         compact: policy.mode === 'compact',
         staticRows,
     });
+    const dependencyPlacementStaticRows = policy.mode === 'compact' ? 3 : 10;
     const responsiveBudget = (compactRows, standardRows) => {
         const baseline = policy.mode === 'compact' ? 18 : 24;
         const base = policy.mode === 'compact' ? compactRows : standardRows;
@@ -1074,8 +1105,6 @@ export function ConsoleAppV4(props) {
         setActionError(undefined);
     };
     const back = () => {
-        if (route.name === 'catalogRefresh')
-            props.controller.cancelCatalogRefresh(route.sourceId);
         if (route.name === 'result')
             props.controller.leaveResult();
         else
@@ -1114,6 +1143,18 @@ export function ConsoleAppV4(props) {
         setFocus(0);
         setScrollOffset(0);
     };
+    const continueInstallAfterTargets = async (candidate, targets) => {
+        if (props.controller.snapshot.installPlacementDraft?.pluginId !== candidate.pluginId) {
+            props.controller.beginInstallFlow(candidate.pluginId, scope);
+        }
+        props.controller.setInstallPlatforms(targets);
+        const hasConfigurableDependencies = await props.controller.prepareInstallDependencyPlacement();
+        if (hasConfigurableDependencies) {
+            go({ name: 'dependencyPlacement', pluginId: candidate.pluginId });
+            return;
+        }
+        beginReview(props.controller.installPlacementIntent());
+    };
     const beginPortable = async (pluginId) => {
         try {
             await props.controller.preparePortableInstall(pluginId, route.name === 'portableBlocker' ? 'replace' : 'push');
@@ -1182,6 +1223,24 @@ export function ConsoleAppV4(props) {
             scope: selectedScope,
         });
     };
+    const beginSecondScope = (candidate, platform, selectedScope) => {
+        setScope(selectedScope);
+        setSelectedTargets([]);
+        setTargetSelections({});
+        setPreferredTarget(platform);
+        props.controller.beginInstallFlow(candidate.pluginId, selectedScope);
+        go({ name: 'installPlacement', pluginId: candidate.pluginId });
+    };
+    const beginScopeConflictRecovery = (action) => {
+        void beginReview({
+            kind: 'pluginWrite',
+            action: 'uninstall',
+            pluginId: action.pluginId,
+            platform: action.platform,
+            scope: action.scope,
+            recoveryDescription: action.description,
+        });
+    };
     const beginAddSource = () => {
         const owner = `source-add:${Date.now()}`;
         setSourceDraft({ owner, mode: 'add', sourceId: '', type: 'git', location: '', refPolicy: 'cliChannel', ref: '', subdir: '' });
@@ -1217,6 +1276,9 @@ export function ConsoleAppV4(props) {
             pluginId,
             platform: selectedPlatform,
             scope: selectedScope,
+            ...(selectedIssue.category === 'scopeConflict' && action.description
+                ? { recoveryDescription: action.description }
+                : {}),
             originIssue: {
                 issueId: selectedIssue.issueId,
                 issueKey: userIssueKey(selectedIssue),
@@ -1529,27 +1591,14 @@ export function ConsoleAppV4(props) {
     }
     else if (route.name === 'home') {
         const home = snapshot.viewModel.home;
-        const candidates = props.controller.listCatalogCandidates();
-        const firstCandidate = candidates[0];
-        context = candidates.length > 0 ? 'Catalog 有更新' : '当前项目';
+        context = '当前项目';
         actions = [
             { label: '添加插件', description: '浏览多个来源中的 Agent 能力', meta: String(home.availablePlugins), run: () => go({ name: 'pluginList', mode: 'browse' }) },
-            ...(firstCandidate ? [{
-                    label: '查看 Catalog 更新…',
-                    meta: candidates.length > 1 ? `${candidates.length} 个来源`
-                        : firstCandidate.candidate.catalogVersion,
-                    status: 'warning',
-                    run: () => go({ name: 'catalogCandidate', sourceId: firstCandidate.sourceId }),
-                }] : []),
             { label: '我的插件', description: '查看状态、设置和移除已添加插件', meta: String(home.installedPlugins), run: () => go({ name: 'pluginList', mode: 'installed' }) },
             { label: '需要处理', description: '解决安装、来源或设置问题', meta: String(home.issueCount), status: 'warning', run: () => go({ name: 'issueList' }) },
             { label: '插件来源', description: '管理 Git 仓库和本地目录', meta: String(home.sourceCount), run: () => go({ name: 'sourceList' }) },
         ];
-        content = _jsxs(Box, { flexDirection: "column", children: [firstCandidate
-                    ? policy.mode === 'compact'
-                        ? _jsx(Text, { color: tuiTheme.colors.warning, wrap: "truncate-end", children: `${firstCandidate.sourceId}  ${firstCandidate.active?.catalogVersion ?? '未加载'} → ${firstCandidate.candidate.catalogVersion} · 当前操作仍使用 ${props.controller.getSessionCatalogVersion(firstCandidate.sourceId) ?? firstCandidate.active?.catalogVersion ?? '已加载版本'}${candidates.length > 1 ? ` · 另有 ${candidates.length - 1} 个来源` : ''}` })
-                        : _jsx(SectionCard, { title: `${firstCandidate.sourceId}  ${firstCandidate.active?.catalogVersion ?? '未加载'} → ${firstCandidate.candidate.catalogVersion} · 当前操作仍使用 ${props.controller.getSessionCatalogVersion(firstCandidate.sourceId) ?? firstCandidate.active?.catalogVersion ?? '已加载版本'}`, meta: candidates.length > 1 ? `另有 ${candidates.length - 1} 个来源` : undefined, status: "warning" })
-                    : null, _jsxs(StatusCard, { status: home.issueCount > 0 || home.unavailableSourceCount > 0 ? 'warning' : 'success', title: "\u5F53\u524D\u72B6\u6001", children: [_jsx(ResultRow, { title: `${home.installedPlugins} 个插件可用`, status: "success" }), _jsx(ResultRow, { title: `${home.issueCount} 项需要处理`, status: home.issueCount > 0 ? 'warning' : 'muted' }), home.cachedSourceCount > 0 ? _jsx(ResultRow, { title: `${home.cachedSourceCount} 个来源使用缓存`, status: "warning" }) : null, home.unavailableSourceCount > 0 ? _jsx(ResultRow, { title: `${home.unavailableSourceCount} 个来源不可用`, status: "error" }) : null] }), _jsx(SemanticRows, { actions: actions, focus: focus, kind: "task", compact: policy.mode === 'compact' })] });
+        content = _jsxs(Box, { flexDirection: "column", children: [_jsxs(StatusCard, { status: home.issueCount > 0 || home.unavailableSourceCount > 0 ? 'warning' : 'success', title: "\u5F53\u524D\u72B6\u6001", children: [_jsx(ResultRow, { title: `${home.installedPlugins} 个插件可用`, status: "success" }), _jsx(ResultRow, { title: `${home.issueCount} 项需要处理`, status: home.issueCount > 0 ? 'warning' : 'muted' }), home.unavailableSourceCount > 0 ? _jsx(ResultRow, { title: `${home.unavailableSourceCount} 个来源不可用`, status: "error" }) : null] }), _jsx(SemanticRows, { actions: actions, focus: focus, kind: "task", compact: policy.mode === 'compact' })] });
     }
     else if (route.name === 'pluginList') {
         const sourceId = route.sourceId ?? 'all';
@@ -1572,7 +1621,7 @@ export function ConsoleAppV4(props) {
         help = `↑↓ 移动 · Enter 查看 · ←→ 来源 · / 搜索${route.mode === 'browse' ? ' · f 未安装' : ''} · Esc 返回`;
         const sourceError = sourceId !== 'all' && props.controller.getSourceOverview(sourceId).source?.state === 'error';
         actions = sourceError
-            ? [{ label: '查看来源问题', description: '没有可用缓存；当前不能浏览这个来源', run: () => go({ name: 'issueDetail', issueId: `source:${sourceId}:unavailable` }) }]
+            ? [{ label: '查看来源问题', description: '当前不能浏览这个来源', run: () => go({ name: 'issueDetail', issueId: `source:${sourceId}:unavailable` }) }]
             : [];
         pluginRows = sourceError ? [] : items.map((item) => ({
             pluginId: item.pluginId,
@@ -1616,7 +1665,7 @@ export function ConsoleAppV4(props) {
                             : _jsxs(_Fragment, { children: [query || '搜索名称、用途或来源…', query ? '    / 编辑' : ''] })] }), route.mode === 'browse'
                     ? _jsxs(Text, { color: tuiTheme.colors.muted, children: ["\u72B6\u6001  ", _jsx(Text, { color: installFilter === 'all' ? tuiTheme.colors.accent : tuiTheme.colors.muted, children: installFilter === 'all' ? '[全部]' : '全部' }), "  ", _jsxs(Text, { color: installFilter === 'uninstalled' ? tuiTheme.colors.accent : tuiTheme.colors.muted, children: [installFilter === 'uninstalled' ? '[未安装]' : '未安装', " ", uninstalledCount] }), "                         f \u5207\u6362"] })
                     : null, sourceError
-                    ? _jsx(Callout, { status: "error", title: `${sourceId} 暂时无法提供插件`, description: "\u6CA1\u6709\u53EF\u7528\u7F13\u5B58\uFF0C\u56E0\u6B64\u5F53\u524D\u4E0D\u80FD\u6D4F\u89C8\u8FD9\u4E2A\u6765\u6E90\u3002" })
+                    ? _jsx(Callout, { status: "error", title: `${sourceId} 暂时无法提供插件`, description: "\u5F53\u524D\u4E0D\u80FD\u6D4F\u89C8\u8FD9\u4E2A\u6765\u6E90\u3002" })
                     : route.mode === 'installed' && items.length === 0
                         ? _jsx(Callout, { title: "\u5F00\u59CB\u6DFB\u52A0\u7B2C\u4E00\u4E2A\u63D2\u4EF6", description: "\u63D2\u4EF6\u53EF\u4EE5\u5B89\u88C5\u5230 Codex\u3001Claude Code \u6216\u4E24\u8005\u3002" })
                         : null, pluginRows.length > 0
@@ -1639,6 +1688,7 @@ export function ConsoleAppV4(props) {
             setSelectedTargets([]);
             setTargetSelections({});
             setPreferredTarget(undefined);
+            props.controller.beginInstallFlow(plugin.pluginId, initialScope);
             if (available.length > 0)
                 go({ name: 'installPlacement', pluginId: plugin.pluginId });
             else
@@ -1664,6 +1714,19 @@ export function ConsoleAppV4(props) {
                 return { label: '查看插件设置', description: `${plugin.configFieldCount} 个配置字段及当前来源`, run: () => beginConfigFlow(plugin.pluginId) };
             if (action.id === 'sourceProblem')
                 return { label: '查看来源问题', status: 'warning', run: () => go({ name: 'sourceDetail', sourceId: plugin.sourceId }) };
+            if (action.id === 'outputCollision') {
+                const collision = props.controller.listUserIssues().find((issue) => issue.pluginId === plugin.pluginId && issue.category === 'artifactCollision');
+                return {
+                    label: '查看输出冲突',
+                    description: '目标位置已有不属于当前插件的内容',
+                    status: 'error',
+                    run: () => collision
+                        ? go({ name: 'issueDetail', issueId: collision.issueId })
+                        : go({ name: 'pluginTechnical', pluginId: plugin.pluginId }),
+                };
+            }
+            if (action.id === 'about')
+                return { label: '关于', run: () => go({ name: 'pluginAbout', pluginId: plugin.pluginId }) };
             return { label: '查看来源', run: () => go({ name: 'sourceDetail', sourceId: plugin.sourceId }) };
         };
         const previewMenu = dynamicMenu;
@@ -1906,8 +1969,28 @@ export function ConsoleAppV4(props) {
             breadcrumb = `${plugin.displayName} / 依赖关系`;
             context = overview ? `${overview.summary.totalCount + 1} 个插件` : '只读';
             title = hasInstalledPlacement(plugin) ? '依赖与被使用情况' : '安装所需插件';
-            description = '依赖从同一个来源快照解析；关系页不会修改安装。';
+            description = '依赖由同一来源快照解析；调整前会进入 Review。';
+            const installedTargets = plugin.installedPlacements.filter((placement) => placement.state === 'installed');
             actions = [
+                ...(hasInstalledPlacement(plugin) && dependencyCount > 0 && installedTargets.length > 0 ? [{
+                        label: '调整依赖位置…',
+                        description: '按平台设置 project/user；不会自动清理所有项目内容',
+                        run: async () => {
+                            const rootScope = installedTargets.some((placement) => placement.desiredScopes?.includes('project') || placement.scope === 'project')
+                                ? 'project' : 'user';
+                            const platforms = [...new Set(installedTargets.map((placement) => placement.platform))];
+                            setScope(rootScope);
+                            setSelectedTargets(platforms);
+                            props.controller.beginInstallFlow(plugin.pluginId, rootScope, { adjustingExisting: true });
+                            props.controller.setInstallPlatforms(platforms);
+                            const configurable = await props.controller.prepareInstallDependencyPlacement();
+                            if (!configurable) {
+                                setActionError('当前依赖位置都由约束固定，没有可调整项。');
+                                return;
+                            }
+                            go({ name: 'dependencyPlacement', pluginId: plugin.pluginId });
+                        },
+                    }] : []),
                 { label: '技术详情', description: '显示 canonical pluginId 和安全错误代码', run: () => setShowTechnical((value) => !value) },
             ];
             const rootStatus = plugin.aggregateStatus === 'installed' ? 'success'
@@ -1959,23 +2042,19 @@ export function ConsoleAppV4(props) {
         breadcrumb = `${plugin.displayName} / 添加`;
         context = '第 1 步，共 2 步';
         title = `你希望在哪里使用 ${plugin.displayName}？`;
-        const overview = dependencyOverview(plugin);
         const hasDependencies = (plugin.dependencySummary?.totalCount ?? 0) > 0;
         description = hasDependencies
-            ? '根插件和缺失依赖使用同一个位置；健康的所有项目依赖可在当前项目复用。'
+            ? '这里只选择根插件位置。依赖可以在下一步单独调整；依赖不能比根插件位置更窄。'
             : '选择位置后，再选择一个或多个目标平台。';
         const availableScopes = ['user', 'project'].filter((candidateScope) => props.controller.listInstallTargets(plugin.pluginId, candidateScope)
             .some((entry) => entry.compatible));
-        const reusableDependencies = overview?.dependencies.filter((dependency) => dependency.placements.some((placement) => placement.state === 'installed' && placement.health === 'ready'
-            && (scope === 'project' || placement.scope === 'user'))).length ?? 0;
-        const missingDependencies = Math.max(0, (overview?.summary.totalCount ?? 0) - reusableDependencies);
         actions = [
             ...availableScopes.map((candidateScope) => ({
                 label: scopeLabel(candidateScope),
                 selected: candidateScope === scope,
                 description: candidateScope === 'user'
-                    ? hasDependencies ? '根插件和缺失依赖都可在任意项目中使用' : '在任意项目中可使用，适合个人常用能力'
-                    : hasDependencies ? '缺失依赖添加到当前项目；已有所有项目依赖会复用' : '仅在当前项目中使用，适合团队共享',
+                    ? hasDependencies ? '根插件在任意项目中可用；依赖位置下一步确认' : '在任意项目中可使用，适合个人常用能力'
+                    : hasDependencies ? '根插件只在当前项目使用；依赖可单独调整为所有项目' : '仅在当前项目中使用，适合团队共享',
                 meta: candidateScope === 'user' ? '推荐' : undefined,
                 run: () => {
                     const choices = props.controller.listInstallTargets(plugin.pluginId, candidateScope);
@@ -1989,6 +2068,7 @@ export function ConsoleAppV4(props) {
                     setScope(candidateScope);
                     setSelectedTargets(next);
                     setTargetSelections((current) => ({ ...current, [candidateScope]: next }));
+                    props.controller.setInstallRootScope(candidateScope);
                     go({
                         name: 'installTargets',
                         pluginId: plugin.pluginId,
@@ -1997,7 +2077,7 @@ export function ConsoleAppV4(props) {
                 },
             })),
         ];
-        content = _jsxs(Box, { flexDirection: "column", children: [_jsx(SemanticRows, { actions: actions, focus: focus, kind: "choice", compact: policy.mode === 'compact' }), hasDependencies ? _jsxs(SectionCard, { title: "\u4F9D\u8D56\u5904\u7406", children: [_jsx(StaticRow, { title: `${reusableDependencies} 个依赖会复用现有安装`, status: reusableDependencies > 0 ? 'success' : 'muted' }), _jsx(StaticRow, { title: `${missingDependencies} 个依赖将安装到所选位置`, status: missingDependencies > 0 ? 'info' : 'muted' })] }) : null] });
+        content = _jsxs(Box, { flexDirection: "column", children: [_jsx(SemanticRows, { actions: actions, focus: focus, kind: "choice", compact: policy.mode === 'compact' }), hasDependencies ? _jsx(SectionCard, { title: "\u4F9D\u8D56\u4F4D\u7F6E", children: _jsx(StaticRow, { title: `${plugin.dependencySummary?.totalCount ?? 0} 个依赖将在下一步单独确认`, status: "info" }) }) : null] });
     }
     else if (route.name === 'installTargets' && plugin) {
         breadcrumb = `${plugin.displayName} / 添加 / 目标平台`;
@@ -2005,8 +2085,8 @@ export function ConsoleAppV4(props) {
         title = '选择目标平台';
         const hasDependencies = (plugin.dependencySummary?.totalCount ?? 0) > 0;
         description = hasDependencies
-            ? '只有根插件和所有依赖都支持所选位置的目标平台才可选择。'
-            : '同一插件、同一平台只能安装到一个位置。';
+            ? '根插件必须支持所选位置；每个依赖必须至少有一个合法位置。'
+            : '目标平台按所选位置验证；仅含 Codex native 的插件可同时启用两个位置。';
         const choices = props.controller.listInstallTargets(plugin.pluginId, scope);
         const validSelectedTargets = selectedTargets.filter((platform) => choices.some((choice) => choice.platform === platform && choice.compatible));
         const allUnavailable = choices.length > 0 && choices.every((choice) => !choice.compatible);
@@ -2035,6 +2115,7 @@ export function ConsoleAppV4(props) {
                             ? current.filter((platform) => platform !== choice.platform)
                             : [...current, choice.platform];
                         setTargetSelections((selections) => ({ ...selections, [scope]: next }));
+                        props.controller.setInstallPlatforms(next);
                         return next;
                     });
                 },
@@ -2047,7 +2128,15 @@ export function ConsoleAppV4(props) {
                     disabled: validSelectedTargets.length === 0 ? '至少选择一个目标平台' : undefined,
                     run: () => {
                         setDirty(false);
-                        void beginReview(installIntent(plugin, validSelectedTargets));
+                        if (!hasDependencies) {
+                            if (props.controller.snapshot.installPlacementDraft?.pluginId !== plugin.pluginId) {
+                                props.controller.beginInstallFlow(plugin.pluginId, scope);
+                            }
+                            props.controller.setInstallPlatforms(validSelectedTargets);
+                            beginReview(props.controller.installPlacementIntent());
+                            return;
+                        }
+                        return continueInstallAfterTargets(plugin, validSelectedTargets);
                     },
                 },
                 { label: '返回选择位置', run: back },
@@ -2056,6 +2145,83 @@ export function ConsoleAppV4(props) {
             content = _jsxs(Box, { flexDirection: "column", children: [_jsx(SemanticRows, { actions: actions, focus: focus, kind: "toggle", compact: policy.mode === 'compact', limit: targetActions.length }), hasDependencies ? _jsx(Callout, { title: "\u76EE\u6807\u5E73\u53F0\u517C\u5BB9\u6027", description: "\u4E0D\u517C\u5BB9\u7684\u76EE\u6807\u5E73\u53F0\u4E0D\u80FD\u9009\u62E9\uFF1B\u8BF7\u67E5\u770B\u4F9D\u8D56\u5173\u7CFB\u4E86\u89E3\u539F\u56E0\u3002" }) : null, _jsx(SemanticRows, { actions: actions, focus: focus, kind: "action", compact: policy.mode === 'compact', offset: targetActions.length })] });
         }
     }
+    else if (route.name === 'dependencyPlacement' && plugin) {
+        const draft = snapshot.installPlacementDraft?.pluginId === plugin.pluginId
+            ? snapshot.installPlacementDraft : undefined;
+        breadcrumb = `${plugin.displayName} / 添加 / 依赖位置`;
+        context = '依赖位置';
+        title = '选择每个平台的依赖位置';
+        description = '每个直接或间接依赖都可独立设置。所有项目位置更宽，会影响其他项目和你的用户环境。';
+        const dependencyActions = (draft?.targets ?? []).map((target) => ({
+            label: `${target.displayName} · ${platformLabel(target.platform)}`,
+            description: `${target.relation === 'direct' ? '直接依赖' : '间接依赖'} · ${target.explanation}`,
+            meta: `${scopeLabel(target.scope)}${target.assignmentSource === 'consumerPromotion' ? ' · fixed-point 提升' : ''}`,
+            selected: true,
+            disabled: target.locked ? '位置由平台或上游约束固定' : undefined,
+            run: () => go({
+                name: 'dependencyPlacementEditor',
+                pluginId: plugin.pluginId,
+                dependencyPluginId: target.pluginId,
+                platform: target.platform,
+            }),
+        }));
+        actions = [
+            ...dependencyActions,
+            {
+                label: '继续到确认',
+                description: draft?.canContinue ? '使用这些最终位置准备 Review' : undefined,
+                disabled: !draft?.canContinue ? draft?.error?.message ?? '依赖位置尚未就绪' : undefined,
+                run: () => beginReview(props.controller.installPlacementIntent()),
+            },
+            {
+                label: '恢复推荐位置',
+                description: '恢复默认、健康 user 复用和 fixed-point 计算结果',
+                run: () => props.controller.resetDependencyScopes(),
+            },
+            { label: '返回目标平台', run: back },
+        ];
+        const placementViewport = actionViewport(actions, policy.mode === 'compact', focus, scrollOffset, pageActionBudget(dependencyPlacementStaticRows));
+        const userCount = draft?.targets.filter((target) => target.scope === 'user').length ?? 0;
+        const defaultCount = draft?.targets.filter((target) => target.assignmentSource === 'default').length ?? 0;
+        const reusedCount = draft?.targets.filter((target) => target.assignmentSource === 'existingWiderTarget').length ?? 0;
+        const promotedCount = draft?.targets.filter((target) => target.assignmentSource === 'consumerPromotion').length ?? 0;
+        const reasonSummary = [
+            ...(defaultCount > 0 ? [`默认 project ${defaultCount} 项`] : []),
+            ...(reusedCount > 0 ? [`复用健康的所有项目安装 ${reusedCount} 项`] : []),
+            ...(promotedCount > 0 ? [`fixed-point 提升 ${promotedCount} 项`] : []),
+        ].join('；');
+        content = _jsxs(Box, { flexDirection: "column", children: [policy.mode === 'compact'
+                    ? _jsxs(_Fragment, { children: [_jsx(StaticRow, { title: `根插件 · ${plugin.displayName}`, meta: draft ? scopeLabel(draft.rootScope) : '未就绪', compact: true }), _jsx(StaticRow, { title: `位置原因 · ${reasonSummary || '由平台或上游约束固定'}`, status: userCount > 0 ? 'warning' : 'info', compact: true }), _jsx(StaticRow, { title: "\u8303\u56F4\u63D0\u793A \u00B7 \u6240\u6709\u9879\u76EE\u4F4D\u7F6E\u4F1A\u5F71\u54CD\u5176\u4ED6\u9879\u76EE\u548C\u7528\u6237\u73AF\u5883", status: userCount > 0 ? 'warning' : 'muted', compact: true })] })
+                    : _jsxs(_Fragment, { children: [_jsx(SectionCard, { title: "\u6839\u63D2\u4EF6\u4F4D\u7F6E", children: _jsx(StaticRow, { title: plugin.displayName, meta: draft ? scopeLabel(draft.rootScope) : '未就绪', compact: true }) }), _jsx(Callout, { status: userCount > 0 ? 'warning' : 'info', title: userCount > 0 ? `${userCount} 个依赖平台目标使用所有项目位置` : '位置计算原因', description: `${reasonSummary || '依赖位置由平台或上游约束固定'}${userCount > 0 ? '；所有项目位置对其他项目也可见，并会改变你的用户环境' : ''}。` })] }), _jsx(SemanticRows, { actions: actions, focus: focus, kind: "action", compact: policy.mode === 'compact', offset: placementViewport.offset, limit: placementViewport.limit })] });
+        help = '↑↓ 移动 · Enter 打开/继续 · Esc 返回';
+    }
+    else if (route.name === 'dependencyPlacementEditor' && plugin) {
+        const target = snapshot.installPlacementDraft?.targets.find((entry) => entry.pluginId === route.dependencyPluginId && entry.platform === route.platform);
+        breadcrumb = `${plugin.displayName} / 依赖位置 / ${target?.displayName ?? route.dependencyPluginId}`;
+        context = platformLabel(route.platform);
+        title = `设置 ${target?.displayName ?? route.dependencyPluginId} 的位置`;
+        description = target?.explanation ?? '依赖位置已变化。请返回重新检查。';
+        actions = ['project', 'user'].map((candidateScope) => {
+            const unavailable = !target?.allowedScopes.includes(candidateScope)
+                || target.minimumScope === 'user' && candidateScope === 'project';
+            return {
+                label: scopeLabel(candidateScope),
+                selected: target?.scope === candidateScope,
+                description: candidateScope === 'user'
+                    ? '更宽：对其他项目可见，并会改变你的用户环境'
+                    : '仅供当前项目使用；适合项目共享 intent',
+                disabled: unavailable ? '这个依赖或上游约束不允许此位置' : undefined,
+                run: async () => {
+                    await props.controller.setDependencyScope(route.dependencyPluginId, route.platform, candidateScope);
+                    back();
+                },
+            };
+        });
+        content = _jsxs(Box, { flexDirection: "column", children: [target?.assignmentSource === 'consumerPromotion'
+                    ? _jsx(Callout, { status: "warning", title: "fixed-point \u4F4D\u7F6E\u63D0\u5347", description: `上游依赖需要至少使用${scopeLabel(target.minimumScope)}。` })
+                    : null, _jsx(SemanticRows, { actions: actions, focus: focus, kind: "choice", compact: policy.mode === 'compact' })] });
+        help = '↑↓ 移动 · Enter 选择 · Esc 返回';
+    }
     else if (route.name === 'pluginDetail' && plugin) {
         breadcrumb = `我的插件 / ${plugin.displayName}`;
         context = `${plugin.sourceLabel}${plugin.version ? ` · ${plugin.version}` : ''}`;
@@ -2064,6 +2230,13 @@ export function ConsoleAppV4(props) {
         const dependencySummary = plugin.dependencySummary;
         const detailMenu = dynamicMenu;
         actions = detailMenu.map((action) => {
+            if (action.id === 'resolveScopeConflict')
+                return {
+                    label: `保留${scopeLabel(action.keepScope)}，移除${scopeLabel(action.scope)} root…`,
+                    description: action.description,
+                    status: 'error',
+                    run: () => beginScopeConflictRecovery(action),
+                };
             if (action.id === 'platform' || action.id === 'scopeConflict') {
                 const placement = plugin.installedPlacements.find((entry) => entry.platform === action.platform);
                 const projected = placementStatus(placement);
@@ -2109,14 +2282,20 @@ export function ConsoleAppV4(props) {
                 && candidate.platform === route.platform
                 && candidate.scope === placement.scope)
             : undefined;
+        const collisionIssue = placement?.state === 'blocked'
+            || placement?.state === 'installed' && placement.blockingReason === 'artifactCollision'
+            ? props.controller.listUserIssues().find((candidate) => candidate.pluginId === plugin.pluginId
+                && candidate.platform === route.platform
+                && candidate.category === 'artifactCollision')
+            : undefined;
         const sourceIssue = plugin.aggregateStatus === 'unavailable'
             ? props.controller.listUserIssues().find((candidate) => candidate.entity.kind === 'source' && candidate.sourceId === plugin.sourceId)
             : undefined;
         const platformAction = (action) => {
             if (action.id === 'sourceProblem')
-                return { label: '查看来源问题', description: `${plugin.sourceId} 无可用缓存`, run: () => go({ name: 'issueDetail', issueId: `source:${plugin.sourceId}:unavailable` }) };
+                return { label: '查看来源问题', description: `${plugin.sourceId} 当前不可用`, run: () => go({ name: 'issueDetail', issueId: `source:${plugin.sourceId}:unavailable` }) };
             if (action.id === 'refreshSource')
-                return { label: '重新检查状态', description: '不会修改现场内容', run: () => props.controller.refreshSource(plugin.sourceId) };
+                return { label: '重新加载状态', description: `如需同步，先在终端运行 aw catalog source sync ${plugin.sourceId}`, run: async () => { await props.controller.reloadCatalog({ sourceId: plugin.sourceId }); } };
             if (action.id === 'add')
                 return { label: `添加到 ${platformLabel(route.platform)}…`, description: '选择使用位置', run: () => {
                         const initialScope = placement?.state === 'notInstalled'
@@ -2126,14 +2305,50 @@ export function ConsoleAppV4(props) {
                         setSelectedTargets([]);
                         setTargetSelections({});
                         setPreferredTarget(route.platform);
+                        props.controller.beginInstallFlow(plugin.pluginId, initialScope);
                         go({ name: 'installPlacement', pluginId: plugin.pluginId });
                     } };
+            if (action.id === 'addScope')
+                return {
+                    label: `在${scopeLabel(action.scope)}中启用…`,
+                    description: '只增加该 scope 的 activation；shared native 保持复用',
+                    run: () => beginSecondScope(plugin, action.platform, action.scope),
+                };
             if (action.id === 'about')
                 return { label: '查看支持信息', description: 'manifest 与平台能力', run: () => go({ name: 'pluginAbout', pluginId: plugin.pluginId }) };
+            if (action.id === 'source')
+                return { label: '查看来源', run: () => go({ name: 'sourceDetail', sourceId: plugin.sourceId }) };
+            if (action.id === 'outputCollision')
+                return {
+                    label: '查看输出冲突',
+                    description: '不会覆盖或删除占用内容',
+                    status: 'error',
+                    run: () => collisionIssue
+                        ? go({ name: 'issueDetail', issueId: collisionIssue.issueId })
+                        : go({ name: 'pluginTechnical', pluginId: plugin.pluginId }),
+                };
             if (action.id === 'scopeConflict')
                 return { label: '查看位置冲突问题', run: () => go({ name: 'issueDetail', issueId: `scope:${plugin.pluginId}:${route.platform}` }) };
+            if (action.id === 'resolveScopeConflict')
+                return {
+                    label: `保留${scopeLabel(action.keepScope)}，移除${scopeLabel(action.scope)} root…`,
+                    description: action.description,
+                    status: 'error',
+                    run: () => beginScopeConflictRecovery(action),
+                };
             if (action.id === 'upgrade')
                 return { label: `升级到 ${action.availableVersion}…`, description: '使用当前来源中的版本重建', run: () => beginReview({ kind: 'pluginWrite', action: 'upgrade', pluginId: plugin.pluginId, platform: action.platform, scope: action.scope }) };
+            if (action.id === 'sync')
+                return {
+                    label: '同步 desired intent…',
+                    description: placement?.state === 'installed'
+                        ? placement.recovery?.find((entry) => entry.command === 'sync')?.description
+                            ?? '进入现有 Review、进度和结果链修复 needsSync 或 drift'
+                        : undefined,
+                    run: () => placement?.state === 'installed'
+                        ? beginReview({ kind: 'pluginWrite', action: 'sync', pluginId: plugin.pluginId, platform: route.platform, scope: placement.scope })
+                        : undefined,
+                };
             if (action.id === 'reinstall')
                 return { label: placement?.state === 'installed' && placement.health === 'incomplete' ? '重新连接缺失内容…' : '重新安装…', description: '保留现有设置并重新生成受管内容', run: () => beginReview({ kind: 'pluginWrite', action: 'reinstall', pluginId: plugin.pluginId, platform: action.platform, scope: action.scope }) };
             if (action.id === 'remove')
@@ -2145,6 +2360,7 @@ export function ConsoleAppV4(props) {
             return { label: '返回插件', run: back };
         };
         breadcrumb = `${plugin.displayName} / ${platformLabel(route.platform)}`;
+        const installedPlacementRows = placement?.state === 'installed' ? _jsxs(_Fragment, { children: [_jsx(StaticRow, { title: "Desired placement", meta: placement.desiredScopes?.map(scopeLabel).join('、') || scopeLabel(placement.scope), compact: true }), _jsx(StaticRow, { title: "Actual scope \u72B6\u6001", meta: placement.actualState ?? placement.health, status: placement.actualState === 'ready' ? 'success' : placement.actualState === 'conflict' ? 'error' : 'warning', compact: true }), placement.sharedNative ? _jsx(StaticRow, { title: "Shared native", meta: placement.sharedNative.state, status: placement.sharedNative.state === 'present' ? 'success' : 'warning', compact: true }) : null, placement.activation ? _jsx(StaticRow, { title: "Activation", meta: `user ${placement.activation.user ? 'on' : 'off'} · project ${placement.activation.project ? 'on' : 'off'}`, compact: true }) : null, placement.extensions ? _jsx(StaticRow, { title: "AW-only extensions", meta: `${placement.extensions.state} · ${placement.extensions.kinds.join('、') || '无'}`, status: placement.extensions.state === 'ready' ? 'success' : placement.extensions.state === 'conflict' ? 'error' : 'warning', compact: true }) : null] }) : null;
         if (plugin.aggregateStatus === 'unavailable') {
             const sourceOverview = props.controller.getSourceOverview(plugin.sourceId);
             const diagnostic = sourceIssue?.diagnostic ?? sourceDiagnostic(plugin.sourceId, sourceOverview.health?.state ?? sourceOverview.source?.state, sourceOverview.detail);
@@ -2161,6 +2377,15 @@ export function ConsoleAppV4(props) {
             actions = platformMenu.map(platformAction);
             content = _jsxs(Box, { flexDirection: "column", children: [_jsx(StatusCard, { status: "muted", title: "\u672A\u6DFB\u52A0", description: "\u63D2\u4EF6\u8BBE\u7F6E\u4FDD\u6301\u4E0D\u53D8" }), _jsx(SemanticRows, { actions: actions, focus: effectiveFocus, kind: "action", compact: policy.mode === 'compact' })] });
         }
+        else if (placement.state === 'blocked'
+            || placement.state === 'installed' && placement.blockingReason === 'artifactCollision') {
+            title = `${platformLabel(route.platform)} 无法添加`;
+            description = placement.state === 'installed'
+                ? '受管内容仍可安全移除；输出位置同时存在冲突内容。'
+                : '输出位置已有不属于当前插件的内容。';
+            actions = platformMenu.map(platformAction);
+            content = _jsxs(Box, { flexDirection: "column", children: [_jsx(StatusCard, { status: "error", title: "\u8F93\u51FA\u51B2\u7A81", description: "AW \u4E0D\u4F1A\u8986\u76D6\u6216\u5220\u9664\u5360\u7528\u5185\u5BB9" }), _jsx(SemanticRows, { actions: actions, focus: effectiveFocus, kind: "action", compact: policy.mode === 'compact' })] });
+        }
         else if (placement.state === 'scopeConflict') {
             title = '安装位置冲突';
             description = '正常状态只能保留一个位置。';
@@ -2196,14 +2421,17 @@ export function ConsoleAppV4(props) {
             title = `${platformLabel(route.platform)} ${placement.health === 'incomplete' ? '安装不完整' : '暂时不可用'}`;
             description = '缺少一项必要内容，插件可能无法稳定启动。';
             actions = platformMenu.map(platformAction);
-            content = _jsxs(Box, { flexDirection: "column", children: [_jsx(StatusCard, { status: "warning", title: "\u9700\u8981\u5904\u7406", description: `${scopeLabel(placement.scope)} · ${plugin.sourceLabel}` }), _jsx(SemanticRows, { actions: actions, focus: effectiveFocus, kind: "action", compact: policy.mode === 'compact' })] });
+            const actualTitle = placement.actualState === 'needsSync' ? '需要同步'
+                : placement.actualState === 'drifted' ? '现场已漂移'
+                    : placement.actualState === 'conflict' ? '位置与扩展冲突' : '需要处理';
+            content = _jsxs(Box, { flexDirection: "column", children: [_jsx(StatusCard, { status: placement.actualState === 'conflict' ? 'error' : 'warning', title: actualTitle, description: `${scopeLabel(placement.scope)} · ${plugin.sourceLabel}`, children: installedPlacementRows }), _jsx(SemanticRows, { actions: actions, focus: effectiveFocus, kind: "action", compact: policy.mode === 'compact' })] });
         }
         else {
             title = `已安装到${scopeLabel(placement.scope)}`;
             const installedVersion = placement.revision.installedVersion;
             description = `当前检查正常${installedVersion ? `；已安装版本 ${installedVersion}` : ''}。`;
             actions = platformMenu.map(platformAction);
-            content = _jsxs(Box, { flexDirection: "column", children: [_jsx(StatusCard, { status: "success", title: "\u72B6\u6001\u6B63\u5E38", description: `${scopeLabel(placement.scope)}${installedVersion ? ` · 已安装版本 ${installedVersion}` : ''}` }), _jsx(SemanticRows, { actions: actions, focus: effectiveFocus, kind: "action", compact: policy.mode === 'compact' })] });
+            content = _jsxs(Box, { flexDirection: "column", children: [_jsx(StatusCard, { status: "success", title: "\u72B6\u6001\u6B63\u5E38", description: `${scopeLabel(placement.scope)}${installedVersion ? ` · 已安装版本 ${installedVersion}` : ''}`, children: installedPlacementRows }), _jsx(SemanticRows, { actions: actions, focus: effectiveFocus, kind: "action", compact: policy.mode === 'compact' })] });
         }
     }
     else if (route.name === 'configLayer' && plugin) {
@@ -2401,11 +2629,7 @@ export function ConsoleAppV4(props) {
         title = diagnostic.title;
         description = '';
         actions = [
-            { label: '重新检查来源', description: '刷新当前来源后重新读取可信定义', run: async () => {
-                    await props.controller.refreshSource(plugin.sourceId);
-                    setConfigLoadKey((value) => value + 1);
-                    props.controller.replace({ name: 'configFields', pluginId: plugin.pluginId, layer: route.layer ?? { scope: 'user', projectLayer: 'shared' } });
-                } },
+            { label: `在终端运行 aw catalog source sync ${plugin.sourceId}`, description: '同步成功后重新加载 TUI', run: back },
             { label: showTechnical ? '返回问题摘要' : '技术详情', description: '查看脱敏错误代码和阶段', run: () => setShowTechnical((value) => !value) },
             { label: '返回', run: back },
         ];
@@ -2416,29 +2640,21 @@ export function ConsoleAppV4(props) {
         title = '插件来源';
         description = '单个来源失败不会阻止其他来源继续工作。';
         context = `${props.controller.listSources().length} 个来源`;
-        help = '↑↓ 移动 · Enter 打开 · r 重新检查 · Esc 返回';
+        help = '↑↓ 移动 · Enter 打开 · Esc 返回';
         actions = [
             ...props.controller.listSources().map((source) => {
                 const overview = props.controller.getSourceOverview(source.id);
                 const generation = props.controller.getCatalogGeneration(source.id);
                 const health = overview.health?.state ?? source.state;
-                const status = generation?.refreshState === 'checking'
-                    || generation?.refreshState === 'downloading'
-                    || generation?.refreshState === 'validating' ? '正在检查'
-                    : generation?.refreshState === 'immutableViolation' ? '发布异常'
-                        : generation?.candidate ? `可用更新 ${generation.candidate.catalogVersion}`
-                            : health === 'ready' ? '已从远端加载'
-                                : health === 'path' ? '本地目录'
-                                    : health === 'checking' ? '正在检查'
-                                        : health === 'cache' || health === 'degraded' ? '使用缓存' : '无法读取';
+                const status = generation?.active ? `Active ${generation.active.catalogVersion}`
+                    : health === 'ready' ? '当前使用'
+                        : '无法读取';
                 return {
                     label: `${source.id}${source.primary ? '  主来源' : ''}`,
                     description: `${overview.detail?.type === 'path' ? '本地目录' : 'Git 仓库'} · ${source.count ?? 0} 个插件`,
                     meta: status,
-                    status: generation?.refreshState === 'immutableViolation' || health === 'unavailable' ? 'error'
-                        : generation?.candidate ? 'warning'
-                            : health === 'cache' || health === 'degraded' ? 'warning'
-                                : source.primary ? 'success' : undefined,
+                    status: !generation?.active || health === 'unavailable' ? 'error'
+                        : source.primary ? 'success' : undefined,
                     run: () => go({ name: 'sourceDetail', sourceId: source.id }),
                 };
             }),
@@ -2451,155 +2667,35 @@ export function ConsoleAppV4(props) {
     else if (route.name === 'sourceDetail') {
         const overview = props.controller.getSourceOverview(route.sourceId);
         const detail = overview.detail;
-        const state = overview.health?.state ?? overview.source?.state;
-        const diagnostic = sourceDiagnostic(route.sourceId, state, detail);
         const generation = props.controller.getCatalogGeneration(route.sourceId);
-        const sessionCatalogVersion = props.controller.getSessionCatalogVersion(route.sourceId)
-            ?? generation?.active?.catalogVersion;
+        const activeVersion = generation?.active?.catalogVersion;
+        const metadataInvalid = generation?.errorCode === 'catalogGenerationMetadataInvalid';
+        const damagedEntry = generation?.recoveryEntryPath;
         breadcrumb = `插件来源 / ${route.sourceId}`;
-        context = detail?.type === 'path' ? '本地目录'
-            : detail?.freshness === 'remote' ? 'Git · 已连接'
-                : detail?.freshness === 'cache' ? 'Git · 使用缓存' : 'Git';
+        context = detail?.type === 'path' ? '本地目录' : 'Git';
         title = route.sourceId;
-        description = diagnostic || generation ? '' : '来源状态可用。';
-        help = '↑↓ 移动 · Enter 选择 · r 重新检查 · Esc 返回';
-        const openRefresh = () => {
-            go({ name: 'catalogRefresh', sourceId: route.sourceId });
-            void props.controller.refreshSource(route.sourceId);
-        };
-        const generationActions = [
-            ...(generation?.candidate ? [{
-                    label: `使用 ${generation.candidate.catalogVersion}…`,
-                    description: '先查看影响；不会自动升级已安装插件',
-                    run: () => go({ name: 'catalogCandidate', sourceId: route.sourceId }),
-                }] : []),
-            ...(generation?.refreshState === 'immutableViolation' ? [{
-                    label: '查看发布异常',
-                    description: '旧 Active 已安全保留',
-                    status: 'error',
-                    run: () => go({ name: 'catalogImmutableViolation', sourceId: route.sourceId }),
-                }] : []),
-        ];
-        actions = diagnostic
-            ? [
-                ...generationActions,
-                { label: '重新检查来源', description: '读取远端并验证可用 generation', run: openRefresh },
-                ...(state === 'degraded' ? [{
-                        label: '继续使用缓存',
-                        description: '浏览匹配且已验证的缓存数据',
-                        run: () => go({ name: 'pluginList', mode: 'browse', sourceId: route.sourceId }),
-                    }] : []),
-                { label: '编辑来源…', description: '检查 URL、路径或 ref', run: () => go({ name: 'sourceEdit', sourceId: route.sourceId }) },
-                { label: '设为主来源…', description: '只改变默认 marketplace', disabled: detail?.primary ? '当前已经是主来源' : undefined, run: () => beginReview({ kind: 'sourceMutation', action: 'setPrimary', sourceId: route.sourceId, changes: [{ title: '主来源', before: snapshot.viewModel?.sourceTabs.find((source) => source.primary)?.id, after: route.sourceId }] }) },
-                { label: '移除来源…', description: '移除来源配置', status: 'error', disabled: detail?.primary ? '主来源不能直接移除' : undefined, run: () => beginReview({ kind: 'sourceMutation', action: 'remove', sourceId: route.sourceId, changes: [{ title: `移除来源 ${route.sourceId}` }] }) },
-                { label: '技术详情', description: '查看脱敏错误代码和解析证据', run: () => go({ name: 'sourceTechnical', sourceId: route.sourceId }) },
-            ]
-            : [
-                ...generationActions,
-                { label: '重新检查来源', description: detail?.type === 'path' ? '显式读取本地目录' : '读取远端并准备 Candidate', run: openRefresh },
-                ...(generation?.sourceType === 'git' ? [{
-                        label: '自动刷新',
-                        description: generation.refreshPolicy === 'startup' ? '启动时自动检查' : '仅手动检查',
-                        meta: generation.refreshPolicy === 'startup' ? '开启' : '关闭',
-                        run: () => go({ name: 'catalogRefreshPolicy', sourceId: route.sourceId }),
-                    }] : []),
-                { label: '编辑来源…', description: 'ID 与类型创建后不可修改', run: () => go({ name: 'sourceEdit', sourceId: route.sourceId }) },
-                { label: '设为主来源…', description: '只改变默认 marketplace', disabled: detail?.primary ? '当前已经是主来源' : undefined, run: () => beginReview({ kind: 'sourceMutation', action: 'setPrimary', sourceId: route.sourceId, changes: [{ title: '主来源', before: snapshot.viewModel?.sourceTabs.find((source) => source.primary)?.id, after: route.sourceId }] }) },
-                { label: '移除来源…', description: '移除来源配置', status: 'error', disabled: detail?.primary ? '主来源不能直接移除' : undefined, run: () => beginReview({ kind: 'sourceMutation', action: 'remove', sourceId: route.sourceId, changes: [{ title: `移除来源 ${route.sourceId}` }] }) },
-                { label: '技术详情', description: '只读身份与解析证据', run: () => go({ name: 'sourceTechnical', sourceId: route.sourceId }) },
-            ];
-        const sourceActionViewport = actionViewport(actions, policy.mode === 'compact', focus, scrollOffset, responsiveBudget(2, 5));
-        content = _jsxs(Box, { flexDirection: "column", children: [diagnostic
-                    ? _jsx(DiagnosticSummary, { diagnostic: diagnostic, compact: policy.mode === 'compact' })
-                    : _jsxs(_Fragment, { children: [sessionCatalogVersion ? _jsx(SectionCard, { title: "\u5F53\u524D\u4F7F\u7528", compact: policy.mode === 'compact', children: _jsx(StaticRow, { title: `Catalog ${sessionCatalogVersion}`, meta: `${generation?.active?.channel === 'beta' ? 'Beta' : 'Release'} · 本次会话固定使用`, compact: true }) }) : null, generation?.candidate ? _jsx(SectionCard, { title: "\u53EF\u7528\u66F4\u65B0", status: "warning", compact: policy.mode === 'compact', children: _jsx(StaticRow, { title: `Catalog ${generation.candidate.catalogVersion}`, meta: `已下载并验证 · +${generation.candidate.pluginChanges.added} ~${generation.candidate.pluginChanges.updated} −${generation.candidate.pluginChanges.removed}`, compact: true }) }) : null, policy.mode === 'compact' ? _jsxs(_Fragment, { children: [_jsx(StaticRow, { title: "\u5F15\u7528", meta: generation?.active?.requestedRef ?? detail?.explicitRef ?? detail?.requestedRef ?? '本地目录', compact: true }), _jsx(StaticRow, { title: "\u68C0\u67E5", meta: `${generation?.sourceType === 'git' && generation.refreshPolicy === 'startup' ? '启动时' : '仅手动'} · ${generation?.lastCheckedAt ? '已有记录' : '尚未检查'}`, compact: true })] }) : _jsxs(SectionCard, { title: "\u6765\u6E90\u4E0E\u68C0\u67E5", children: [_jsx(StaticRow, { title: "\u4F4D\u7F6E", meta: detail?.locationSummary ?? '不可用' }), _jsx(StaticRow, { title: "\u5F15\u7528", meta: generation?.active?.requestedRef ?? detail?.explicitRef ?? detail?.requestedRef ?? '本地目录' }), _jsx(StaticRow, { title: "\u81EA\u52A8\u5237\u65B0", meta: generation?.sourceType === 'git' ? generation.refreshPolicy === 'startup' ? '启动时检查' : '仅手动' : '仅手动' }), _jsx(StaticRow, { title: "\u4E0A\u6B21\u68C0\u67E5", meta: generation?.lastCheckedAt ?? '尚未检查' })] })] }), _jsx(SemanticRows, { actions: actions, focus: focus, kind: "action", compact: policy.mode === 'compact', offset: sourceActionViewport.offset, limit: sourceActionViewport.limit })] });
-    }
-    else if (route.name === 'catalogCandidate') {
-        const generation = props.controller.getCatalogGeneration(route.sourceId);
-        const candidate = generation?.candidate;
-        breadcrumb = `插件来源 / ${route.sourceId} / Catalog 更新`;
-        context = '已下载并验证';
-        title = candidate ? `使用 ${route.sourceId} Catalog ${candidate.catalogVersion}` : 'Catalog 更新不再可用';
-        description = '切换 generation；不会自动升级已安装插件，也不会修改设置。';
-        actions = candidate ? [
-            { label: `使用 ${candidate.catalogVersion}…`, description: '进入激活 Review', run: () => {
-                    props.controller.beginCatalogActivation({
-                        sourceId: route.sourceId,
-                        ...(dirty ? { dirtyDraft: { kind: 'config', label: '当前设置草稿' } }
-                            : sourceDraft ? { dirtyDraft: { kind: 'source', label: '当前来源草稿' } } : {}),
-                    });
-                    setFocus(0);
-                    setScrollOffset(0);
-                } },
-            { label: `继续使用 ${generation?.active?.catalogVersion ?? '当前版本'}`, run: back },
-        ] : [{ label: '返回来源', run: back }];
-        content = candidate ? _jsxs(Box, { flexDirection: "column", children: [_jsxs(SectionCard, { title: "Catalog \u53D8\u5316", children: [_jsx(StaticRow, { title: "\u7248\u672C", meta: `${generation?.active?.catalogVersion ?? '未加载'} → ${candidate.catalogVersion}` }), _jsx(StaticRow, { title: "\u901A\u9053 / \u5F15\u7528", meta: `${candidate.channel === 'beta' ? 'Beta' : 'Release'} · ${candidate.requestedRef}` }), _jsx(StaticRow, { title: "\u63D2\u4EF6\u53D8\u5316", meta: `+${candidate.pluginChanges.added}  ~${candidate.pluginChanges.updated}  −${candidate.pluginChanges.removed}` })] }), _jsxs(SectionCard, { title: "\u6FC0\u6D3B\u540E", children: [_jsx(StaticRow, { title: "\u91CD\u65B0\u52A0\u8F7D\u63D2\u4EF6\u5217\u8868\u548C\u4F9D\u8D56\u5173\u7CFB", status: "warning" }), _jsx(StaticRow, { title: "\u5DF2\u5B89\u88C5\u63D2\u4EF6\u4E0D\u4F1A\u81EA\u52A8\u5347\u7EA7", status: "success" }), _jsx(StaticRow, { title: "\u5F53\u524D\u8BBE\u7F6E\u4E0D\u4F1A\u6539\u53D8", status: "success" })] }), _jsx(SemanticRows, { actions: actions, focus: focus, kind: "action", compact: true })] }) : _jsx(SemanticRows, { actions: actions, focus: focus, kind: "action", compact: true });
-    }
-    else if (route.name === 'catalogRefreshPolicy') {
-        const generation = props.controller.getCatalogGeneration(route.sourceId);
-        breadcrumb = `插件来源 / ${route.sourceId} / 自动刷新`;
-        title = 'Catalog 自动刷新';
-        description = `决定何时检查 ${route.sourceId} 的远端更新。更新不会自动激活。`;
-        actions = [
-            { label: '启动时自动检查', description: '首屏出现后在后台检查；不会自动切换版本', selected: generation?.refreshPolicy === 'startup', run: async () => props.controller.setCatalogRefreshPolicy(route.sourceId, 'startup') },
-            { label: '仅手动检查', description: '只有选择“重新检查来源”时访问远端', selected: generation?.refreshPolicy === 'manual', run: async () => props.controller.setCatalogRefreshPolicy(route.sourceId, 'manual') },
-        ];
-        content = _jsx(SemanticRows, { actions: actions, focus: focus, kind: "choice", compact: policy.mode === 'compact' });
-    }
-    else if (route.name === 'catalogRefresh') {
-        const generation = props.controller.getCatalogGeneration(route.sourceId);
-        const state = generation?.refreshState ?? 'idle';
-        const activeVersion = props.controller.getSessionCatalogVersion(route.sourceId)
-            ?? generation?.active?.catalogVersion ?? '已加载版本';
-        const stage = state === 'checking' || state === 'downloading' ? 1
-            : state === 'validating' ? 2 : 3;
-        const stageState = (index) => state === 'failed' || state === 'immutableViolation'
-            ? index === stage ? 'error' : index < stage ? 'complete' : 'pending'
-            : index < stage ? 'complete' : index === stage && stage < 3 ? 'active' : index <= stage ? 'complete' : 'pending';
-        breadcrumb = `插件来源 / ${route.sourceId} / 检查更新`;
-        context = '只读';
-        title = state === 'candidateReady' ? 'Catalog 更新已准备好'
-            : state === 'upToDate' ? 'Catalog 已是最新'
-                : state === 'immutableViolation' ? 'Catalog 发布异常'
-                    : state === 'failed' ? 'Catalog 检查失败' : '正在检查 Catalog 更新';
-        description = `当前操作继续使用 Catalog ${activeVersion}。`;
-        help = state === 'checking' || state === 'downloading' || state === 'validating'
-            ? 'Esc 取消检查' : 'Enter 返回 · Esc 返回';
-        actions = state === 'immutableViolation'
-            ? [{ label: '查看发布异常', run: () => props.controller.replace({ name: 'catalogImmutableViolation', sourceId: route.sourceId }) }, { label: '返回来源', run: back }]
-            : state === 'checking' || state === 'downloading' || state === 'validating'
-                ? [] : [{ label: '返回来源', run: back }];
-        content = _jsxs(Box, { flexDirection: "column", children: [_jsxs(SectionCard, { title: "\u68C0\u67E5\u6B65\u9AA4", children: [_jsx(ProgressRow, { title: "\u8BFB\u53D6\u5F53\u524D Active generation", state: "complete", compact: true }), _jsx(ProgressRow, { title: "\u68C0\u67E5\u5E76\u83B7\u53D6\u8FDC\u7AEF generation", state: stageState(1), compact: true }), _jsx(ProgressRow, { title: "\u9A8C\u8BC1 Catalog", state: stageState(2), compact: true }), _jsx(ProgressRow, { title: "\u51C6\u5907 Candidate", state: stageState(3), compact: true })] }), actions.length > 0 ? _jsx(SemanticRows, { actions: actions, focus: focus, kind: "action", compact: true }) : null] });
-    }
-    else if (route.name === 'catalogImmutableViolation') {
-        const generation = props.controller.getCatalogGeneration(route.sourceId);
-        breadcrumb = `插件来源 / ${route.sourceId} / 发布异常`;
-        context = '发布异常';
-        title = 'Catalog 版本内容发生变化';
-        description = `远端重新发布了已经存在的 Catalog ${generation?.active?.catalogVersion ?? '版本'}。`;
+        description = activeVersion ? `当前使用 Active Catalog ${activeVersion}。`
+            : metadataInvalid && damagedEntry
+                ? `Active Catalog 条目已损坏。先安全删除 AW_HOME 下的精确条目 ${damagedEntry}，再运行 ${generation.syncInstruction}，然后重新加载 TUI。`
+                : `来源没有可用 Active。请在终端运行 ${generation?.syncInstruction ?? `aw catalog source sync ${route.sourceId}`}，然后重新加载 TUI。`;
+        help = '↑↓ 移动 · Enter 选择 · Esc 返回';
         actions = [
-            { label: '重新检查', description: '不可变性规则仍会生效', run: () => { props.controller.replace({ name: 'catalogRefresh', sourceId: route.sourceId }); void props.controller.refreshSource(route.sourceId); } },
-            { label: showTechnical ? '隐藏技术详情' : '技术详情', run: () => setShowTechnical((value) => !value) },
-            { label: '返回来源', run: back },
+            { label: metadataInvalid ? '修复后重新加载 TUI' : '重新加载 TUI', description: metadataInvalid && damagedEntry
+                    ? `先删除精确条目 ${damagedEntry}，再运行 ${generation.syncInstruction}`
+                    : `先在终端运行 aw catalog source sync ${route.sourceId}，再重新加载 Active`, run: () => props.controller.reloadCatalog({ sourceId: route.sourceId }) },
+            ...(!metadataInvalid ? [{ label: '编辑来源…', description: '只修改来源配置；不会访问网络', run: () => go({ name: 'sourceEdit', sourceId: route.sourceId }) }] : []),
+            { label: '设为主来源…', description: '只改变默认 marketplace', disabled: detail?.primary ? '当前已经是主来源' : undefined, run: () => beginReview({ kind: 'sourceMutation', action: 'setPrimary', sourceId: route.sourceId, changes: [{ title: '主来源', before: snapshot.viewModel?.sourceTabs.find((source) => source.primary)?.id, after: route.sourceId }] }) },
+            { label: '移除来源…', description: '移除来源配置', status: 'error', disabled: detail?.primary ? '主来源不能直接移除' : undefined, run: () => beginReview({ kind: 'sourceMutation', action: 'remove', sourceId: route.sourceId, changes: [{ title: `移除来源 ${route.sourceId}` }] }) },
+            { label: '技术详情', description: '查看脱敏错误代码和 Active 证据', run: () => go({ name: 'sourceTechnical', sourceId: route.sourceId }) },
         ];
-        content = _jsxs(Box, { flexDirection: "column", children: [_jsxs(SectionCard, { title: "\u5F53\u524D\u5904\u7406", children: [_jsx(StaticRow, { title: `继续使用本地已验证的 ${generation?.active?.catalogVersion ?? 'Active'}`, status: "success" }), _jsx(StaticRow, { title: "\u4E0D\u52A0\u8F7D\u8FDC\u7AEF\u53D8\u5316", status: "error" }), _jsx(StaticRow, { title: "\u5DF2\u5B89\u88C5\u63D2\u4EF6\u548C\u8BBE\u7F6E\u4FDD\u6301\u4E0D\u53D8", status: "success" })] }), showTechnical ? _jsxs(TechnicalDetails, { children: [_jsx(StaticRow, { title: "code", meta: generation?.lastCheckCode ?? 'catalogImmutableVersionViolation' }), _jsx(StaticRow, { title: "source", meta: route.sourceId }), _jsx(StaticRow, { title: "digest", meta: generation?.active?.digestShort ?? '不可用' })] }) : null, _jsx(SemanticRows, { actions: actions, focus: focus, kind: "action", compact: true })] });
-    }
-    else if (route.name === 'catalogActivationBlocked') {
-        const generation = props.controller.getCatalogGeneration(route.sourceId);
-        const reason = {
-            configDraft: '当前有未完成的设置修改。', sourceDraft: '当前有未完成的来源修改。', portableDraft: '当前有未完成的 Portable Skills 选择。', activeReview: '当前有待确认的 Review。', reviewPreparation: '当前正在准备 Review。', writeProgress: '当前写操作尚未完成。', sourceMutationProgress: '当前来源修改尚未完成。', refreshProgress: '当前 Catalog 来源刷新尚未完成。',
-        }[route.reason];
-        breadcrumb = `插件来源 / ${route.sourceId} / 使用更新`;
-        context = '暂不可用';
-        title = '暂时不能切换 Catalog';
-        description = reason;
-        actions = [{ label: '返回完成或取消当前操作', run: back }, { label: `继续使用 ${props.controller.getSessionCatalogVersion(route.sourceId) ?? generation?.active?.catalogVersion ?? '当前版本'}`, run: back }];
-        content = _jsxs(Box, { flexDirection: "column", children: [_jsxs(SectionCard, { title: "\u4FDD\u7559\u7684\u5DE5\u4F5C", children: [_jsx(StaticRow, { title: route.preservedLabel ?? reason, status: "success" }), _jsx(StaticRow, { title: `Candidate ${generation?.candidate?.catalogVersion ?? '更新'} 保持已下载状态`, status: "success" })] }), _jsx(SemanticRows, { actions: actions, focus: focus, kind: "action", compact: policy.mode === 'compact' })] });
+        const sourceActionViewport = actionViewport(actions, policy.mode === 'compact', focus, scrollOffset, responsiveBudget(2, 5));
+        content = _jsxs(Box, { flexDirection: "column", children: [_jsx(SectionCard, { title: "Active Catalog", status: activeVersion ? 'success' : 'warning', compact: policy.mode === 'compact', children: _jsx(StaticRow, { title: activeVersion ? `Catalog ${activeVersion}` : '未同步', meta: activeVersion ? generation?.active?.digestShort : generation?.syncInstruction, compact: true }) }), _jsxs(SectionCard, { title: "\u6765\u6E90\u914D\u7F6E", compact: policy.mode === 'compact', children: [_jsx(StaticRow, { title: "\u4F4D\u7F6E", meta: detail?.locationSummary ?? '不可用', compact: true }), _jsx(StaticRow, { title: "\u5F15\u7528", meta: generation?.active?.requestedRef ?? detail?.explicitRef ?? detail?.requestedRef ?? '本地目录', compact: true })] }), _jsx(SemanticRows, { actions: actions, focus: focus, kind: "action", compact: policy.mode === 'compact', offset: sourceActionViewport.offset, limit: sourceActionViewport.limit })] });
     }
     else if (route.name === 'sourceTechnical') {
         const overview = props.controller.getSourceOverview(route.sourceId);
         const detail = overview.detail;
         const state = overview.health?.state ?? overview.source?.state;
-        const diagnostic = sourceDiagnostic(route.sourceId, state, detail) ?? {
+        const diagnostic = sourceDiagnostic(route.sourceId, state, detail, props.controller.getCatalogGeneration(route.sourceId)) ?? {
             severity: 'warning',
             title: '来源解析详情',
             userMessage: '来源当前可用。',
@@ -2611,7 +2707,6 @@ export function ConsoleAppV4(props) {
                 sourceId: route.sourceId,
                 ...(detail?.requestedRef ? { requestedRef: detail.requestedRef } : {}),
                 ...(detail?.resolvedCommit ? { resolvedCommit: detail.resolvedCommit } : {}),
-                ...(detail?.freshness ? { context: [{ key: 'freshness', value: detail.freshness }] } : {}),
             },
         };
         breadcrumb = `插件来源 / ${route.sourceId} / 技术详情`;
@@ -2737,10 +2832,10 @@ export function ConsoleAppV4(props) {
                 label: entry.category.startsWith('dependency')
                     ? `${props.controller.getPluginOverview(entry.pluginId ?? '')?.displayName ?? entry.pluginId ?? entry.title}${entry.platform ? ` · ${platformLabel(entry.platform)}` : ''}`
                     : entry.title,
-                description: `${issueGroupLabel(entry.group)} · ${entry.category.startsWith('dependency')
+                description: entry.category.startsWith('dependency')
                     ? `${props.controller.getPluginOverview(entry.dependencyPluginId ?? '')?.displayName ?? entry.dependencyPluginId ?? entry.explanation} · ${entry.impact[0] ?? ''}`
-                    : `${entry.explanation} · ${entry.impact[0] ?? ''}`}`,
-                status: entry.category === 'sourceDegraded' ? 'warning' : 'error',
+                    : `${entry.explanation} · ${entry.impact[0] ?? ''}`,
+                status: 'error',
                 run: () => entry.category === 'dependencyStillRequired' && entry.pluginId
                     ? go({ name: 'pluginDependencies', pluginId: entry.pluginId, view: 'removeBlocked',
                         ...(entry.platform ? { platform: entry.platform } : {}),
@@ -2749,7 +2844,27 @@ export function ConsoleAppV4(props) {
             }));
         }
         const viewport = actionViewport(actions, policy.mode === 'compact', focus, scrollOffset, responsiveBudget(8, 12));
-        content = _jsx(SemanticRows, { actions: actions, focus: focus, kind: issues.length > 0 ? 'task' : 'action', compact: policy.mode === 'compact', offset: viewport.offset, limit: viewport.limit });
+        if (issues.length === 0) {
+            content = _jsx(SemanticRows, { actions: actions, focus: focus, kind: "action", compact: policy.mode === 'compact', offset: viewport.offset, limit: viewport.limit });
+        }
+        else {
+            const groupCounts = new Map();
+            for (const issueEntry of issues) {
+                groupCounts.set(issueEntry.group, (groupCounts.get(issueEntry.group) ?? 0) + 1);
+            }
+            const visibleGroups = [];
+            const visibleEnd = Math.min(actions.length, viewport.offset + viewport.limit);
+            for (let index = viewport.offset; index < visibleEnd; index += 1) {
+                const group = issues[index].group;
+                const currentGroup = visibleGroups.at(-1);
+                if (!currentGroup || currentGroup.group !== group) {
+                    visibleGroups.push({ group, startIndex: index, actions: [actions[index]] });
+                }
+                else
+                    currentGroup.actions.push(actions[index]);
+            }
+            content = _jsx(Box, { flexDirection: "column", children: visibleGroups.map((group) => _jsx(SectionCard, { title: issueGroupLabel(group.group), meta: `${groupCounts.get(group.group) ?? group.actions.length} 项`, compact: policy.mode === 'compact', children: _jsx(SemanticRows, { actions: group.actions, focus: focus - group.startIndex, kind: "task", compact: policy.mode === 'compact' }) }, `${group.group}:${group.startIndex}`)) });
+        }
     }
     else if (route.name === 'issueDetail' && issue) {
         breadcrumb = `需要处理 / ${issue.pluginId ?? issue.sourceId ?? issue.entity.id}`;
@@ -2763,8 +2878,8 @@ export function ConsoleAppV4(props) {
                 return;
             }
             if (entry.id === 'refreshSource' && issue.sourceId)
-                await props.controller.refreshSource(issue.sourceId);
-            else if (entry.id === 'continueWithCache' || entry.id === 'retryLater')
+                await props.controller.reloadCatalog({ sourceId: issue.sourceId });
+            else if (entry.id === 'retryLater')
                 go({ name: 'issueList' });
             else if (entry.id === 'editSource' && issue.sourceId)
                 go(issue.entity.kind === 'source'
@@ -2803,7 +2918,8 @@ export function ConsoleAppV4(props) {
         }));
         const issuePlugin = issue.pluginId ? props.controller.getPluginOverview(issue.pluginId) : undefined;
         const issueOverview = issue.pluginId ? props.controller.getPluginDependencyOverview(issue.pluginId) : undefined;
-        const issueDiagnosticSummary = _jsx(DiagnosticSummary, { diagnostic: issue.diagnostic, technical: showTechnical, compact: policy.mode === 'compact' || issue.category.startsWith('dependency') });
+        const issueDiagnosticSummary = _jsx(DiagnosticSummary, { diagnostic: issue.diagnostic, technical: showTechnical, compact: policy.mode === 'compact' || issue.category.startsWith('dependency')
+                || issue.category === 'scopeConflict' });
         const issueActionViewport = actionViewport(actions, policy.mode === 'compact', focus, scrollOffset, pageActionBudget(6));
         const compactTechnicalActionViewport = policy.mode === 'compact' && showTechnical
             ? {
@@ -2850,12 +2966,15 @@ export function ConsoleAppV4(props) {
                         setScope(issueScope);
                         setSelectedTargets([entry.platform]);
                         setTargetSelections((current) => ({ ...current, [issueScope]: [entry.platform] }));
+                        props.controller.beginInstallFlow(issuePlugin.pluginId, issueScope);
+                        props.controller.setInstallPlatforms([entry.platform]);
                         go({ name: 'installTargets', pluginId: issuePlugin.pluginId });
                     } })),
                 { label: '返回调整目标平台', run: () => {
                         setScope(issueScope);
                         setSelectedTargets([]);
                         setTargetSelections((current) => ({ ...current, [issueScope]: [] }));
+                        props.controller.beginInstallFlow(issuePlugin.pluginId, issueScope);
                         go({ name: 'installTargets', pluginId: issuePlugin.pluginId });
                     } },
                 { label: '查看依赖关系', run: () => go({ name: 'pluginDependencies', pluginId: issuePlugin.pluginId }) },
@@ -2891,13 +3010,11 @@ export function ConsoleAppV4(props) {
         const preparation = snapshot.reviewPreparation;
         const labels = preparation.intent.kind === 'portableInstall'
             ? ['通用 Skills / 安装', '正在准备通用 Skills 安装确认']
-            : preparation.intent.kind === 'catalogActivate'
-                ? ['插件来源 / Catalog 更新', '正在准备 Catalog 激活确认']
-                : preparation.intent.kind === 'configSave' || preparation.intent.kind === 'configReset'
-                    ? ['设置', '正在准备设置确认']
-                    : preparation.intent.kind === 'sourceMutation'
-                        ? ['插件来源', '正在准备来源变更确认']
-                        : ['插件操作', '正在准备插件操作确认'];
+            : preparation.intent.kind === 'configSave' || preparation.intent.kind === 'configReset'
+                ? ['设置', '正在准备设置确认']
+                : preparation.intent.kind === 'sourceMutation'
+                    ? ['插件来源', '正在准备来源变更确认']
+                    : ['插件操作', '正在准备插件操作确认'];
         breadcrumb = `${labels[0]} / 准备确认`;
         context = '只读';
         title = preparation.state === 'failed' ? '无法准备确认信息' : labels[1];
@@ -2921,11 +3038,24 @@ export function ConsoleAppV4(props) {
     }
     else if (route.name === 'review' && snapshot.activeReview) {
         const review = snapshot.activeReview;
+        const sharedImpactConfirmed = !review.requiresConfirmation
+            || confirmedSharedReviewToken === review.reviewToken;
         breadcrumb = `${review.subject.name} / ${review.title}`;
         title = `${snapshot.result?.state === 'stale' ? '状态已变化 · ' : ''}${review.operationKind === 'portableInstall' ? review.title : `确认${review.title}`} ${review.subject.name}`;
-        description = snapshot.result?.state === 'stale' ? '当前状态已变化。请检查新的变化后再次确认。' : review.description;
+        description = snapshot.result?.state === 'stale'
+            ? '当前状态已变化。请检查新的变化后再次确认。'
+            : review.requiresConfirmation ? '' : review.description;
         actions = [
-            { label: review.primaryLabel, description: '执行前将再次检查当前状态', status: review.destructive ? 'error' : undefined, run: () => {
+            ...(review.requiresConfirmation ? [{
+                    label: sharedImpactConfirmed ? '已确认 shared impact' : '确认 shared impact',
+                    description: review.sharedImpact.warning ?? '此操作会修改多个插件共享的 Codex native 内容',
+                    selected: sharedImpactConfirmed,
+                    run: () => {
+                        setConfirmedSharedReviewToken(review.reviewToken);
+                        setFocus(1);
+                    },
+                }] : []),
+            { label: review.primaryLabel, description: '执行前将再次检查当前状态', status: review.destructive ? 'error' : undefined, disabled: sharedImpactConfirmed ? undefined : '请先显式确认 shared impact', run: () => {
                     if (operationBusy.current)
                         return;
                     operationBusy.current = true;
@@ -2944,9 +3074,16 @@ export function ConsoleAppV4(props) {
                     : back },
         ];
         const groupedChanges = review.changes.some((change) => change.group);
+        const compressedReview = policy.mode === 'compact' || review.requiresConfirmation;
         const groupTitle = {
             requested: review.operationKind === 'portableInstall' ? '已选择 Skills · 当前插件' : '你选择的插件',
             dependencies: review.operationKind === 'portableInstall' ? '已选择 Skills · 来自依赖插件' : '必需依赖',
+            projectIntent: 'Project intent',
+            userIntent: 'User intent',
+            sharedCodexNative: 'Shared Codex native',
+            userActivation: 'User activation',
+            projectActivation: 'Project activation',
+            awExtensions: 'AW extensions',
             runtime: 'Codex runtime',
             portableTarget: '安装目标',
             portableInputs: '准备内容',
@@ -2958,7 +3095,7 @@ export function ConsoleAppV4(props) {
         const changeStatus = (change) => change.kind === 'remove' ? 'error'
             : change.kind === 'warning' ? 'warning'
                 : change.kind === 'keep' || change.kind === 'add' ? 'success' : undefined;
-        const groupOrder = ['portableWarnings', 'portableTarget', 'configChanges', 'configImpact', 'requested', 'dependencies', 'runtime', 'preserved', 'portableInputs'];
+        const groupOrder = ['portableWarnings', 'portableTarget', 'configChanges', 'configImpact', 'requested', 'dependencies', 'projectIntent', 'userIntent', 'sharedCodexNative', 'userActivation', 'projectActivation', 'awExtensions', 'runtime', 'preserved', 'portableInputs'];
         const groupedSpecs = groupedChanges
             ? groupOrder.map((group) => ({
                 key: group,
@@ -2972,7 +3109,7 @@ export function ConsoleAppV4(props) {
                 { key: 'changes', label: undefined, protectedCount: false, changes: review.changes.filter((change) => change.kind !== 'warning' && change.kind !== 'keep') },
             ];
         const visibleSpecs = groupedSpecs.filter((group) => group.changes.length > 0);
-        const headingLines = policy.mode === 'compact' ? 0 : visibleSpecs.filter((group) => group.label).length;
+        const headingLines = compressedReview ? 0 : visibleSpecs.filter((group) => group.label).length;
         const staticRowBudget = Math.max(visibleSpecs.length, responsiveBudget(7, 12) - headingLines);
         const allocations = new Map(visibleSpecs.map((group) => [group.key, 1]));
         const targetGroup = visibleSpecs.find((group) => group.key === 'portableTarget');
@@ -2991,7 +3128,7 @@ export function ConsoleAppV4(props) {
         const changeGroups = visibleSpecs.map((group) => {
             const visibleCount = allocations.get(group.key) ?? 1;
             const hiddenCount = group.changes.length - visibleCount;
-            return _jsxs(Box, { flexDirection: "column", children: [policy.mode !== 'compact' && group.label ? _jsx(Text, { bold: true, color: tuiTheme.colors.muted, children: group.label }) : null, group.changes.slice(0, visibleCount).map((change, index) => {
+            return _jsxs(Box, { flexDirection: "column", children: [!compressedReview && group.label ? _jsx(Text, { bold: true, color: tuiTheme.colors.muted, children: group.label }) : null, group.changes.slice(0, visibleCount).map((change, index) => {
                         const retainDescription = change.kind === 'warning' || group.key === 'portableTarget'
                             || group.key === 'requested' || group.key === 'dependencies'
                             || group.key === 'configChanges' || group.key === 'configImpact';
@@ -2999,7 +3136,7 @@ export function ConsoleAppV4(props) {
                         const compactGroupLabel = group.key === 'requested' ? '根插件'
                             : group.key === 'dependencies' ? '依赖'
                                 : group.key === 'preserved' ? '保持' : group.label;
-                        const category = policy.mode === 'compact' && index === 0 && compactGroupLabel ? `${compactGroupLabel} · ` : '';
+                        const category = compressedReview && index === 0 && compactGroupLabel ? `${compactGroupLabel} · ` : '';
                         const count = index === visibleCount - 1 && (hiddenCount > 0 || group.protectedCount)
                             ? hiddenCount > 0 ? `另有 ${hiddenCount} 项` : `共 ${group.changes.length} 项`
                             : undefined;
@@ -3024,18 +3161,19 @@ export function ConsoleAppV4(props) {
             return _jsx(ReviewChangeRow, { title: `${category ? `${category} · ` : ''}${reviewSymbol(change)} ${change.title}${change.description ? ` · ${change.description}` : ''}`, meta: index === visibleTechnicalChanges.length - 1 && hiddenTechnicalChanges > 0
                     ? `另有 ${hiddenTechnicalChanges} 项` : undefined, status: changeStatus(change), compact: true }, `${change.title}:${index}`);
         });
-        content = _jsx(Box, { flexDirection: "column", children: _jsxs(ReviewCard, { title: review.subject.name, meta: `${review.subject.sourceLabel ?? ''} ${review.subject.version ?? ''}`, description: review.equivalentCommand ? review.description : undefined, children: [review.equivalentCommand ? _jsxs(Text, { children: ["\u7B49\u4EF7\u547D\u4EE4\uFF1A", review.equivalentCommand] }) : null, review.catalogBinding ? _jsxs(_Fragment, { children: [_jsx(StaticRow, { title: `Catalog：${review.catalogBinding.sourceId} ${review.catalogBinding.catalogVersion} · 当前使用`, meta: `generation ${review.catalogBinding.generationDigestShort}`, status: "success", compact: true }), _jsx(StaticRow, { title: "\u64CD\u4F5C\u671F\u95F4\u4E0D\u68C0\u67E5\u8FDC\u7AEF Catalog", status: "success", compact: true })] }) : null, showTechnical ? technicalChanges : changeGroups, _jsx(SemanticRows, { actions: actions, focus: focus, kind: "action", compact: true }), policy.mode === 'compact' || showTechnical ? null : _jsx(StaticRow, { title: "\u6280\u672F\u8BE6\u60C5\uFF08d\uFF09", status: "muted" }), showTechnical ? _jsx(TechnicalDetails, { children: visibleTechnicalDetails.map((detail, index) => _jsx(StaticRow, { title: detail, meta: index === visibleTechnicalDetails.length - 1 && hiddenTechnicalDetails > 0 ? `另有 ${hiddenTechnicalDetails} 项` : undefined, compact: true }, detail)) }) : null] }) });
+        const showEquivalentCommand = Boolean(review.equivalentCommand
+            && (!review.requiresConfirmation || showTechnical));
+        content = _jsx(Box, { flexDirection: "column", children: _jsxs(ReviewCard, { title: review.requiresConfirmation ? undefined : review.subject.name, meta: review.requiresConfirmation ? undefined : `${review.subject.sourceLabel ?? ''} ${review.subject.version ?? ''}`, description: showEquivalentCommand ? review.description : undefined, children: [showEquivalentCommand ? _jsxs(Text, { children: ["\u7B49\u4EF7\u547D\u4EE4\uFF1A", review.equivalentCommand] }) : null, review.catalogBinding ? _jsxs(_Fragment, { children: [_jsx(StaticRow, { title: `Catalog：${review.catalogBinding.sourceId} ${review.catalogBinding.catalogVersion} · 当前使用`, meta: `generation ${review.catalogBinding.generationDigestShort}`, status: "success", compact: true }), _jsx(StaticRow, { title: "\u64CD\u4F5C\u671F\u95F4\u4E0D\u68C0\u67E5\u8FDC\u7AEF Catalog", status: "success", compact: true })] }) : null, review.requiresConfirmation ? _jsx(StaticRow, { title: "! Shared impact \u9700\u8981\u663E\u5F0F\u786E\u8BA4", meta: review.sharedImpact.pluginIds.length > 0 ? `${review.sharedImpact.pluginIds.length} 个插件` : undefined, description: review.sharedImpact.warning, status: "warning", compact: true }) : null, showTechnical ? technicalChanges : changeGroups, _jsx(SemanticRows, { actions: actions, focus: focus, kind: "action", compact: true }), compressedReview || showTechnical ? null : _jsx(StaticRow, { title: "\u6280\u672F\u8BE6\u60C5\uFF08d\uFF09", status: "muted" }), showTechnical ? _jsx(TechnicalDetails, { children: visibleTechnicalDetails.map((detail, index) => _jsx(StaticRow, { title: detail, meta: index === visibleTechnicalDetails.length - 1 && hiddenTechnicalDetails > 0 ? `另有 ${hiddenTechnicalDetails} 项` : undefined, compact: true }, detail)) }) : null] }) });
     }
     else if (route.name === 'progress') {
-        const catalogActivation = snapshot.activeReview?.operationKind === 'catalogActivate';
         const portableOperation = snapshot.activeReview?.operationKind === 'portableInstall';
         const configOperation = snapshot.activeReview?.operationKind === 'configSave'
             || snapshot.activeReview?.operationKind === 'configReset';
         const sourceOperation = snapshot.activeReview?.operationKind === 'sourceMutation';
         const issueOperation = snapshot.activeReview?.originIssue;
-        breadcrumb = catalogActivation ? '插件来源 / Catalog 更新' : portableOperation ? '通用 Skills / 进度' : issueOperation ? '需要处理 / 进度' : sourceOperation ? '插件来源 / 保存' : configOperation ? '设置 / 进度' : '插件操作 / 进度';
-        title = catalogActivation ? '正在激活已验证的 Catalog generation' : portableOperation ? '正在安装通用 Skills' : issueOperation ? '正在处理问题' : sourceOperation ? '正在保存并刷新来源' : configOperation ? '正在保存并应用设置' : '正在执行插件操作';
-        description = catalogActivation ? '不会重新下载；完成后重新加载插件列表和依赖关系。' : issueOperation ? '完成后会使用新的状态 generation 重新检查问题。' : sourceOperation ? '先原子保存来源配置，再尽力刷新。刷新失败时配置仍保留并显示警告。' : configOperation ? '先保存所选层，再重新应用当前可见安装位置。' : '请勿关闭当前终端。';
+        breadcrumb = portableOperation ? '通用 Skills / 进度' : issueOperation ? '需要处理 / 进度' : sourceOperation ? '插件来源 / 保存' : configOperation ? '设置 / 进度' : '插件操作 / 进度';
+        title = portableOperation ? '正在安装通用 Skills' : issueOperation ? '正在处理问题' : sourceOperation ? '正在保存来源配置' : configOperation ? '正在保存并应用设置' : '正在执行插件操作';
+        description = issueOperation ? '完成后会使用新的状态 generation 重新检查问题。' : sourceOperation ? '只原子保存来源配置，不访问网络。' : configOperation ? '先保存所选层，再重新应用当前可见安装位置。' : '请勿关闭当前终端。';
         help = 'Ctrl-C 完成后退出';
         const progress = snapshot.progress;
         const elapsedSeconds = Math.max(0, Math.floor(((progress.elapsedMs
@@ -3135,7 +3273,7 @@ export function ConsoleAppV4(props) {
             return step === 2 ? '正在安装' : step === 3 ? '正在验证' : step === 1 ? '正在生成' : '正在检查';
         };
         const compactPortableProgress = policy.mode === 'compact' && showTechnical;
-        content = portableOperation ? _jsxs(StatusCard, { status: failedProgress ? 'error' : 'info', title: "Skills CLI", children: [_jsx(ProgressRow, { title: "\u68C0\u67E5\u63D2\u4EF6\u548C\u4F9D\u8D56", description: `${snapshot.activeReview?.subject.name ?? '当前插件'} · ${portableDraft?.dependencySummary?.directCount ?? 0} 个直接依赖`, meta: portableProgressMeta(0), state: portableProgressState(0), compact: compactPortableProgress }), _jsx(ProgressRow, { title: "\u751F\u6210\u5DF2\u9009\u5019\u9009 Skills", description: `${portableProviderCount} 个 provider 提供 ${portableSelectedCount} 个 Skills`, meta: portableProgressMeta(1), state: portableProgressState(1), compact: compactPortableProgress }), _jsx(ProgressRow, { title: `安装已选择的 ${portableSelectedCount} 个 Skills`, description: `Agent：${portableDraft?.agentMode === 'explicit' ? portableDraft.requestedAgents.join('、') : 'Skills CLI 默认选择'}`, meta: portableProgressMeta(2), state: portableProgressState(2), compact: compactPortableProgress }), _jsx(ProgressRow, { title: "\u9A8C\u8BC1\u7ED3\u679C", description: "\u9010\u9879\u786E\u8BA4\u6240\u9009 Skill \u7684\u5B89\u88C5\u76EE\u6807", meta: portableProgressMeta(3), state: portableProgressState(3), compact: compactPortableProgress }), showTechnical ? _jsxs(TechnicalDetails, { children: [technicalMessages.map((message, index) => _jsx(StaticRow, { title: message, compact: true }, `${index}:${message}`)), hiddenTechnicalMessages > 0 ? _jsx(StaticRow, { title: `另有 ${hiddenTechnicalMessages} 条技术消息`, status: "muted", compact: true }) : null] }) : null] }) : _jsxs(StatusCard, { status: "info", children: [dependencyProgress ? _jsxs(_Fragment, { children: [_jsx(ProgressRow, { title: "\u68C0\u67E5\u4F9D\u8D56\u5173\u7CFB", state: relationStep }), _jsx(ProgressRow, { title: "\u751F\u6210\u6267\u884C\u8BA1\u5212", state: planStep }), _jsx(ProgressRow, { title: "\u6267\u884C\u4F9D\u8D56\u95ED\u5305", description: progress.current?.target ? `当前：${progress.current.target}` : undefined, meta: `${elapsedSeconds}s`, state: closureStep, compact: policy.mode === 'compact' }), _jsx(ProgressRow, { title: "\u9A8C\u8BC1\u5B8C\u6574\u7ED3\u679C", state: verificationStep })] }) : _jsxs(_Fragment, { children: [_jsx(ProgressRow, { title: sourceOperation ? '检查来源操作输入' : configOperation ? '验证设置值' : '检查兼容性', state: !currentPhase ? 'pending' : preflightActive ? 'active' : 'complete' }), _jsx(ProgressRow, { title: progress.current?.phase || (sourceOperation ? '保存来源配置并刷新' : configOperation ? '保存设置层并重新应用' : '连接到所选目标平台'), description: progress.current?.target ? `当前：${progress.current.target}` : undefined, meta: `${elapsedSeconds}s`, state: failedProgress ? 'error' : executionActive ? 'active' : validationActive ? 'complete' : 'pending', compact: policy.mode === 'compact' }), _jsx(ProgressRow, { title: "\u9A8C\u8BC1\u7ED3\u679C", state: failedProgress ? 'error' : validationActive ? 'active' : 'pending' })] }), dependencyProgress ? _jsxs(SectionCard, { title: "\u6267\u884C\u76EE\u6807", meta: `${snapshot.progressTargets.length} 个目标`, children: [visibleProgressTargets.map((entry) => {
+        content = portableOperation ? _jsxs(StatusCard, { status: failedProgress ? 'error' : 'info', title: "Skills CLI", children: [_jsx(ProgressRow, { title: "\u68C0\u67E5\u63D2\u4EF6\u548C\u4F9D\u8D56", description: `${snapshot.activeReview?.subject.name ?? '当前插件'} · ${portableDraft?.dependencySummary?.directCount ?? 0} 个直接依赖`, meta: portableProgressMeta(0), state: portableProgressState(0), compact: compactPortableProgress }), _jsx(ProgressRow, { title: "\u751F\u6210\u5DF2\u9009\u5019\u9009 Skills", description: `${portableProviderCount} 个 provider 提供 ${portableSelectedCount} 个 Skills`, meta: portableProgressMeta(1), state: portableProgressState(1), compact: compactPortableProgress }), _jsx(ProgressRow, { title: `安装已选择的 ${portableSelectedCount} 个 Skills`, description: `Agent：${portableDraft?.agentMode === 'explicit' ? portableDraft.requestedAgents.join('、') : 'Skills CLI 默认选择'}`, meta: portableProgressMeta(2), state: portableProgressState(2), compact: compactPortableProgress }), _jsx(ProgressRow, { title: "\u9A8C\u8BC1\u7ED3\u679C", description: "\u9010\u9879\u786E\u8BA4\u6240\u9009 Skill \u7684\u5B89\u88C5\u76EE\u6807", meta: portableProgressMeta(3), state: portableProgressState(3), compact: compactPortableProgress }), showTechnical ? _jsxs(TechnicalDetails, { children: [technicalMessages.map((message, index) => _jsx(StaticRow, { title: message, compact: true }, `${index}:${message}`)), hiddenTechnicalMessages > 0 ? _jsx(StaticRow, { title: `另有 ${hiddenTechnicalMessages} 条技术消息`, status: "muted", compact: true }) : null] }) : null] }) : _jsxs(StatusCard, { status: "info", children: [dependencyProgress ? _jsxs(_Fragment, { children: [_jsx(ProgressRow, { title: "\u68C0\u67E5\u4F9D\u8D56\u5173\u7CFB", state: relationStep }), _jsx(ProgressRow, { title: "\u751F\u6210\u6267\u884C\u8BA1\u5212", state: planStep }), _jsx(ProgressRow, { title: "\u6267\u884C\u4F9D\u8D56\u95ED\u5305", description: progress.current?.target ? `当前：${progress.current.target}` : undefined, meta: `${elapsedSeconds}s`, state: closureStep, compact: policy.mode === 'compact' }), _jsx(ProgressRow, { title: "\u9A8C\u8BC1\u5B8C\u6574\u7ED3\u679C", state: verificationStep })] }) : _jsxs(_Fragment, { children: [_jsx(ProgressRow, { title: sourceOperation ? '检查来源操作输入' : configOperation ? '验证设置值' : '检查兼容性', state: !currentPhase ? 'pending' : preflightActive ? 'active' : 'complete' }), _jsx(ProgressRow, { title: progress.current?.phase || (sourceOperation ? '保存来源配置' : configOperation ? '保存设置层并重新应用' : '连接到所选目标平台'), description: progress.current?.target ? `当前：${progress.current.target}` : undefined, meta: `${elapsedSeconds}s`, state: failedProgress ? 'error' : executionActive ? 'active' : validationActive ? 'complete' : 'pending', compact: policy.mode === 'compact' }), _jsx(ProgressRow, { title: "\u9A8C\u8BC1\u7ED3\u679C", state: failedProgress ? 'error' : validationActive ? 'active' : 'pending' })] }), dependencyProgress ? _jsxs(SectionCard, { title: "\u6267\u884C\u76EE\u6807", meta: `${snapshot.progressTargets.length} 个目标`, children: [visibleProgressTargets.map((entry) => {
                             const state = progressLabel(entry);
                             const relation = entry.relation === 'requested' ? '你选择的插件' : entry.relation === 'direct' ? '直接依赖' : '间接依赖';
                             const title = props.controller.getPluginOverview(entry.pluginId)?.displayName
@@ -3155,7 +3293,6 @@ export function ConsoleAppV4(props) {
             : result.state === 'blocked' ? result.summary : undefined;
         const action = resultSummary?.action;
         const operationKind = 'operationKind' in result ? result.operationKind : undefined;
-        const catalogActivation = operationKind === 'catalogActivate';
         const portableOperation = operationKind === 'portableInstall';
         const portableReceipt = result.state === 'succeeded' || result.state === 'partial'
             ? result.summary.portable : undefined;
@@ -3166,8 +3303,6 @@ export function ConsoleAppV4(props) {
             ? operationKind : undefined;
         const successfulConfigOperation = configOperation !== undefined && !blocked && !partial;
         const sourceOperation = operationKind === 'sourceMutation';
-        const sourceRefreshWarning = sourceOperation && 'summary' in result
-            && result.summary?.messages?.some((message) => message.startsWith('警告：'));
         const issueOperation = result.originIssue;
         const completedTitle = {
             install: '✓ 插件添加完成',
@@ -3175,26 +3310,24 @@ export function ConsoleAppV4(props) {
             reinstall: '✓ 插件重新安装完成',
             uninstall: '✓ 插件移除完成',
             cleanup: '✓ 插件清理完成',
+            sync: '✓ 插件同步完成',
         }[action ?? 'install'];
-        breadcrumb = catalogActivation ? '插件来源 / Catalog 更新 / 结果' : breadcrumb;
-        title = catalogActivation
-            ? blocked ? '× Catalog 更新未启用' : '✓ Catalog 更新已启用'
-            : portableOperation
-                ? blocked ? '× 通用 Skills 安装被阻止'
-                    : partial ? '! 通用 Skills 结果未完全完成' : '✓ 通用 Skills 已安装'
-                : blocked && result.writeMayHaveCompleted
-                    ? '× 写入结果未确认'
-                    : issueOperation
-                        ? blocked || partial ? '× 问题仍未解决' : '✓ 问题已处理'
-                        : sourceOperation
-                            ? blocked ? '× 来源操作未完成' : sourceRefreshWarning ? '! 来源配置已保存，但刷新失败' : '✓ 来源操作完成'
-                            : configOperation
-                                ? blocked
-                                    ? '× 设置未确认保存'
-                                    : partial ? '! 设置已保存，但部分应用失败' : '✓ 设置已保存并应用'
-                                : partial ? '! 插件操作只完成了一部分'
-                                    : blocked ? result.code === 'operationFailed' ? '× 插件操作没有完成' : '× 插件操作未完成'
-                                        : completedTitle;
+        title = portableOperation
+            ? blocked ? '× 通用 Skills 安装被阻止'
+                : partial ? '! 通用 Skills 结果未完全完成' : '✓ 通用 Skills 已安装'
+            : blocked && result.writeMayHaveCompleted
+                ? '× 写入结果未确认'
+                : issueOperation
+                    ? blocked || partial ? '× 问题仍未解决' : '✓ 问题已处理'
+                    : sourceOperation
+                        ? blocked ? '× 来源操作未完成' : '✓ 来源配置已保存'
+                        : configOperation
+                            ? blocked
+                                ? '× 设置未确认保存'
+                                : partial ? '! 设置已保存，但部分应用失败' : '✓ 设置已保存并应用'
+                            : partial ? '! 插件操作只完成了一部分'
+                                : blocked ? result.code === 'operationFailed' ? '× 插件操作没有完成' : '× 插件操作未完成'
+                                    : completedTitle;
         description = portableOperation
             ? blocked
                 ? result.code === 'operationReviewExpired' || result.code === 'reviewTicketExpired'
@@ -3218,11 +3351,9 @@ export function ConsoleAppV4(props) {
                     : sourceOperation
                         ? blocked
                             ? result.writeMayHaveCompleted
-                                ? '来源配置可能已保存。请重新检查来源列表；刷新失败不会撤销配置。'
+                                ? '来源配置可能已保存。请重新检查来源列表。'
                                 : '来源操作未执行。草稿已保留，可返回修改。'
-                            : sourceRefreshWarning
-                                ? '来源配置已保留。请根据警告修复来源后重试刷新。'
-                                : '来源配置已保存，刷新已完成。'
+                            : '来源配置已保存。请在终端运行 aw catalog source sync，然后重新加载 TUI。'
                         : blocked ? result.message
                             : configOperation ? '设置层已经更新。' : '状态已刷新。';
         const pluginId = resultSummary?.pluginId
@@ -3504,7 +3635,9 @@ export function ConsoleAppV4(props) {
         try {
             const pending = action.run?.();
             if (pending)
-                void pending.catch(() => {
+                void pending.catch((error) => {
+                    if (error instanceof Error && error.name === 'AbortError')
+                        return;
                     setActionError('操作未完成。请重新检查后重试。');
                 });
         }
@@ -3860,14 +3993,12 @@ export function ConsoleAppV4(props) {
             setScrollOffset(0);
         }
         else if (input.toLowerCase() === 'r' && route.name === 'sourceDetail') {
-            go({ name: 'catalogRefresh', sourceId: route.sourceId });
-            void props.controller.refreshSource(route.sourceId);
+            void props.controller.reloadCatalog({ sourceId: route.sourceId });
         }
         else if (input.toLowerCase() === 'r' && route.name === 'sourceList') {
             const source = props.controller.listSources()[focus];
             if (source) {
-                go({ name: 'catalogRefresh', sourceId: source.id });
-                void props.controller.refreshSource(source.id);
+                void props.controller.reloadCatalog({ sourceId: source.id });
             }
         }
         else if (route.name === 'pluginList' && (key.leftArrow || key.rightArrow || input === '[' || input === ']')) {
@@ -3910,7 +4041,7 @@ export function ConsoleAppV4(props) {
                 const viewport = route.name === 'portableSkillSelect' && snapshot.portableDraft
                     ? portableSkillCandidateViewport(actions.slice(0, snapshot.portableDraft.candidates.length), snapshot.portableDraft.candidates, policy.mode === 'compact', next, scrollOffset, pageActionBudget(actions.length - snapshot.portableDraft.candidates.length
                         + (portableVariantCandidates.length > 0 ? 3 : 0)))
-                    : actionViewport(actions, policy.mode === 'compact', next, scrollOffset, pageActionBudget());
+                    : actionViewport(actions, policy.mode === 'compact', next, scrollOffset, pageActionBudget(route.name === 'dependencyPlacement' ? dependencyPlacementStaticRows : 0));
                 setScrollOffset(viewport.offset);
                 return next;
             });
@@ -3929,7 +4060,7 @@ export function ConsoleAppV4(props) {
                 const viewport = route.name === 'portableSkillSelect' && snapshot.portableDraft
                     ? portableSkillCandidateViewport(actions.slice(0, snapshot.portableDraft.candidates.length), snapshot.portableDraft.candidates, policy.mode === 'compact', next, scrollOffset, pageActionBudget(actions.length - snapshot.portableDraft.candidates.length
                         + (portableVariantCandidates.length > 0 ? 3 : 0)))
-                    : actionViewport(actions, policy.mode === 'compact', next, scrollOffset, pageActionBudget());
+                    : actionViewport(actions, policy.mode === 'compact', next, scrollOffset, pageActionBudget(route.name === 'dependencyPlacement' ? dependencyPlacementStaticRows : 0));
                 setScrollOffset(viewport.offset);
                 return next;
             });