@lesliechan721/aw 0.1.0-beta.4 → 0.1.0-beta.6

package/dist/src/tui/model.d.ts

@@ -1,6 +1,7 @@
 import type { PlatformName, PluginConfigFieldType, PluginConfigPresentationPreset, PluginConfigSchema, Scope } from '../types.js';
-import type { StatusV4Payload, StatusV4PluginSummary, StatusV4Target, StatusV4Component } from '../commands/status-v4.js';
+import type { StatusV4Payload, StatusV4PluginSummary, StatusV4Target, StatusV4Component, StatusTargetRevision, TargetRevisionState } from '../commands/status-v4.js';
 import type { ResolvedConfigRead } from '../utils/plugin-config.js';
+import { type DiagnosticSummaryViewModel } from './diagnostics.js';
 export type SourceHealthState = 'ready' | 'cache' | 'path' | 'checking' | 'degraded' | 'unavailable';
 export interface SourceHealthViewModel {
     sourceId: string;
@@ -17,14 +18,31 @@ export type PlatformPlacementSummary = {
     state: 'installed';
     scope: Scope;
     health: 'ready' | 'incomplete' | 'error';
+    revision: TargetRevisionState;
 } | {
     platform: PlatformName;
     state: 'scopeConflict';
     placements: Array<{
         scope: Scope;
         health: 'ready' | 'incomplete' | 'error';
+        revision: TargetRevisionState;
     }>;
 };
+export type PluginMenuAction = {
+    id: 'add' | 'manage' | 'repair' | 'portableSkills' | 'dependencies' | 'settings' | 'source' | 'sourceProblem' | 'about' | 'refreshSource' | 'technical' | 'back';
+} | {
+    id: 'platform' | 'scopeConflict';
+    platform: PlatformName;
+} | {
+    id: 'upgrade';
+    platform: PlatformName;
+    scope: Scope;
+    availableVersion: string;
+} | {
+    id: 'reinstall' | 'remove';
+    platform: PlatformName;
+    scope: Scope;
+};
 export interface PluginListItemViewModel {
     pluginId: string;
     sourceId: string;
@@ -114,6 +132,7 @@ export interface SourceDetailViewModel {
     catalogVersion?: string;
     channel?: string;
     freshness?: 'remote' | 'cache' | 'path';
+    errorCode?: string;
     configDigest: string;
 }
 export interface HomeSummaryViewModel {
@@ -136,7 +155,10 @@ export interface ConfigFieldViewModel {
     inherited: boolean;
     configured: boolean;
     sourceLabel: string;
+    effectiveDisplayValue: string;
+    effectiveSourceLabel: string;
     value?: string | number | boolean;
+    effectiveValue?: string | number | boolean;
     defaultValue?: string | number | boolean;
     enumValues?: string[];
     valueLabels?: Record<string, string>;
@@ -169,7 +191,7 @@ export interface ConfigPageViewModel {
     storedCount: number;
 }
 export type UserIssueCategory = 'incompleteInstallation' | 'sourceDegraded' | 'sourceUnavailable' | 'sourceMissing' | 'sourceIdentityChanged' | 'requiredConfigMissing' | 'scopeConflict' | 'dependencyMissing' | 'dependencyNotReady' | 'dependencyTargetUnsupported' | 'dependencyStillRequired' | 'dependencyGraphInvalid' | 'legacyState' | 'diagnostic';
-export type UserIssueActionId = 'reinstall' | 'remove' | 'refreshSource' | 'continueWithCache' | 'editSource' | 'retryLater' | 'reAddSource' | 'viewSourceChange' | 'openConfig' | 'keepUserScope' | 'keepProjectScope' | 'viewTechnical' | 'manualMigration' | 'installDependency' | 'reinstallDependency' | 'viewDependencyIssue' | 'viewDependencies';
+export type UserIssueActionId = 'reinstall' | 'cleanup' | 'remove' | 'refreshSource' | 'continueWithCache' | 'editSource' | 'retryLater' | 'reAddSource' | 'viewSourceChange' | 'openConfig' | 'keepUserScope' | 'keepProjectScope' | 'viewTechnical' | 'manualMigration' | 'installDependency' | 'reinstallDependency' | 'viewDependencyIssue' | 'viewDependencies';
 export interface UserIssueActionViewModel {
     id: UserIssueActionId;
     label: string;
@@ -178,7 +200,7 @@ export interface UserIssueActionViewModel {
     platform?: PlatformName;
     scope?: Scope;
     project?: 'current' | 'other' | null;
-    writeAction?: 'install' | 'upgrade' | 'reinstall';
+    writeAction?: 'install' | 'upgrade' | 'reinstall' | 'cleanup';
 }
 export type TargetIssueRootCode = 'partial' | 'sourceMissing' | 'sourceChanged' | 'catalogSourceUnavailable' | 'bundleUnavailable' | 'dependencyMissing' | 'dependencyNotReady' | 'dependencyTargetUnsupported' | 'dependencyStillRequired' | 'dependencyGraphInvalid' | 'targetDiagnostic';
 export interface UserIssueViewModel {
@@ -218,6 +240,7 @@ export interface UserIssueViewModel {
         code: string;
         message: string;
     }>;
+    diagnostic: DiagnosticSummaryViewModel;
 }
 export interface TuiViewModel {
     plugins: PluginListItemViewModel[];
@@ -257,11 +280,15 @@ export interface PortableSkillSelectionViewModel {
     };
     canContinue: boolean;
 }
-export declare function projectPlatformPlacement(platform: PlatformName, targets: StatusV4Target[]): PlatformPlacementSummary;
+export declare function projectPlatformPlacement(platform: PlatformName, targets: StatusV4Target[], revisions?: StatusTargetRevision[]): PlatformPlacementSummary;
+export declare function buildPluginPreviewActions(plugin: PluginListItemViewModel): PluginMenuAction[];
+export declare function buildPluginDetailActions(plugin: PluginListItemViewModel): PluginMenuAction[];
+export declare function buildPlatformActions(plugin: PluginListItemViewModel, platform: PlatformName): PluginMenuAction[];
 export declare function hasInstalledPlacement(plugin: PluginListItemViewModel): boolean;
 export declare function buildTuiViewModel(options: {
     status: StatusV4Payload;
     pluginSummaries: StatusV4PluginSummary[];
+    targetRevisions?: StatusTargetRevision[];
     sourceHealth?: ReadonlyMap<string, SourceHealthViewModel>;
     sourceDetails?: SourceDetailViewModel[];
     dependencyOverviews?: PluginDependencyOverviewViewModel[];
@@ -270,10 +297,12 @@ export declare function buildTuiViewModel(options: {
 export declare function buildConfigGroups(options: {
     schema: PluginConfigSchema;
     read: ResolvedConfigRead;
+    effectiveRead?: ResolvedConfigRead;
     dirtyKeys?: ReadonlySet<string>;
 }): ConfigGroupViewModel[];
 export declare function buildConfigPage(options: {
     pluginId: string;
     schema: PluginConfigSchema;
     read: ResolvedConfigRead;
+    effectiveRead?: ResolvedConfigRead;
 }): ConfigPageViewModel;

package/dist/src/tui/model.js

@@ -1,3 +1,4 @@
+import { safeDiagnosticCode, } from './diagnostics.js';
 function compareText(left, right) {
     return left.localeCompare(right, 'en');
 }
@@ -14,18 +15,34 @@ function isInstalledScopeEvidence(target) {
 function dependencyPluginIdFromMessage(message) {
     return message.match(/(?:[a-z0-9]+(?:-[a-z0-9]+)*)\/(?:[a-z0-9]+(?:-[a-z0-9]+)*)/u)?.[0];
 }
-export function projectPlatformPlacement(platform, targets) {
+export function projectPlatformPlacement(platform, targets, revisions = []) {
+    const revisionFor = (target) => revisions.find((entry) => entry.pluginId === target.pluginId
+        && entry.platform === target.platform
+        && entry.scope === target.scope)?.revision
+        ?? { state: 'unknown', ...(target.version ? { availableVersion: target.version } : {}) };
     const supportedScopes = [...new Set(targets.map((target) => target.scope))];
     const installed = targets.filter(isInstalledScopeEvidence);
     if (installed.length === 0) {
         const errorTarget = targets.find((target) => target.state === 'error');
         if (!errorTarget)
             return { platform, state: 'notInstalled', supportedScopes };
-        return { platform, state: 'installed', scope: errorTarget.scope, health: 'error' };
+        return {
+            platform,
+            state: 'installed',
+            scope: errorTarget.scope,
+            health: 'error',
+            revision: revisionFor(errorTarget),
+        };
     }
     if (installed.length === 1) {
         const target = installed[0];
-        return { platform, state: 'installed', scope: target.scope, health: targetHealth(target) };
+        return {
+            platform,
+            state: 'installed',
+            scope: target.scope,
+            health: targetHealth(target),
+            revision: revisionFor(target),
+        };
     }
     return {
         platform,
@@ -33,9 +50,89 @@ export function projectPlatformPlacement(platform, targets) {
         placements: installed.map((target) => ({
             scope: target.scope,
             health: targetHealth(target),
+            revision: revisionFor(target),
         })).sort((left, right) => compareText(left.scope, right.scope)),
     };
 }
+function hasIncompletePlacement(plugin) {
+    return plugin.installedPlacements.some((placement) => placement.state === 'scopeConflict'
+        || placement.state === 'installed' && placement.health !== 'ready');
+}
+function hasMissingPlatform(plugin) {
+    return plugin.supportedPlatforms.some((platform) => plugin.installedPlacements.find((placement) => placement.platform === platform)?.state === 'notInstalled');
+}
+function capabilityActions(plugin) {
+    return [
+        ...(plugin.portableSkills ? [{ id: 'portableSkills' }] : []),
+        ...((plugin.dependencySummary?.totalCount ?? 0) > 0 ? [{ id: 'dependencies' }] : []),
+        ...(plugin.configFieldCount > 0 ? [{ id: 'settings' }] : []),
+    ];
+}
+export function buildPluginPreviewActions(plugin) {
+    const installed = hasInstalledPlacement(plugin);
+    if (plugin.aggregateStatus === 'unavailable') {
+        return [{ id: 'sourceProblem' }, ...(installed ? [{ id: 'manage' }] : [])];
+    }
+    const primary = hasIncompletePlacement(plugin)
+        || (plugin.dependencySummary?.issueCount ?? 0) > 0
+        ? { id: 'repair' }
+        : installed && !hasMissingPlatform(plugin)
+            ? { id: 'manage' }
+            : { id: 'add' };
+    return [primary, ...capabilityActions(plugin), { id: 'source' }];
+}
+export function buildPluginDetailActions(plugin) {
+    if (plugin.aggregateStatus === 'unavailable') {
+        return [
+            ...plugin.installedPlacements.flatMap((placement) => placement.state === 'notInstalled'
+                ? []
+                : [{ id: 'platform', platform: placement.platform }]),
+            { id: 'sourceProblem' },
+            { id: 'about' },
+        ];
+    }
+    return [
+        ...plugin.installedPlacements.map((placement) => placement.state === 'scopeConflict'
+            ? { id: 'scopeConflict', platform: placement.platform }
+            : { id: 'platform', platform: placement.platform }),
+        ...((plugin.dependencySummary?.totalCount ?? 0) > 0 ? [{ id: 'dependencies' }] : []),
+        ...(plugin.portableSkills ? [{ id: 'portableSkills' }] : []),
+        ...(plugin.configFieldCount > 0 ? [{ id: 'settings' }] : []),
+        { id: 'about' },
+    ];
+}
+export function buildPlatformActions(plugin, platform) {
+    if (plugin.aggregateStatus === 'unavailable') {
+        return [{ id: 'sourceProblem' }, { id: 'refreshSource' }];
+    }
+    const placement = plugin.installedPlacements.find((entry) => entry.platform === platform);
+    if (!placement || placement.state === 'notInstalled')
+        return [{ id: 'add' }, { id: 'about' }];
+    if (placement.state === 'scopeConflict')
+        return [{ id: 'scopeConflict', platform }];
+    if (placement.health === 'error')
+        return [{ id: 'technical' }, { id: 'back' }];
+    if (placement.health === 'incomplete') {
+        return [
+            { id: 'reinstall', platform, scope: placement.scope },
+            { id: 'technical' },
+            { id: 'remove', platform, scope: placement.scope },
+        ];
+    }
+    return [
+        ...(placement.revision.state === 'upgradeAvailable'
+            ? [{
+                    id: 'upgrade',
+                    platform,
+                    scope: placement.scope,
+                    availableVersion: placement.revision.availableVersion,
+                }]
+            : []),
+        { id: 'reinstall', platform, scope: placement.scope },
+        { id: 'remove', platform, scope: placement.scope },
+        { id: 'technical' },
+    ];
+}
 export function hasInstalledPlacement(plugin) {
     return plugin.installedPlacements.some((placement) => placement.state !== 'notInstalled');
 }
@@ -55,9 +152,9 @@ function sourceState(source, health) {
     return source.freshness === 'cache' ? 'cache' : 'ready';
 }
 function sourceIssue(health, impactedTargets = 0) {
-    if (health.state !== 'cache' && health.state !== 'degraded' && health.state !== 'unavailable')
+    if (health.state !== 'degraded' && health.state !== 'unavailable')
         return undefined;
-    const cached = health.state === 'cache' || health.state === 'degraded';
+    const cached = health.state === 'degraded';
     const issueId = health.issueId ?? `source:${health.sourceId}:${cached ? 'cache' : 'unavailable'}`;
     return {
         issueId,
@@ -65,7 +162,7 @@ function sourceIssue(health, impactedTargets = 0) {
         title: `${health.sourceId} · ${cached ? '来源使用缓存' : '来源不可用'}`,
         explanation: cached
             ? '远端检查失败。当前仍使用已验证的缓存数据。'
-            : '远端检查失败，并且没有可用缓存数据。',
+            : '来源检查失败，并且没有可用缓存数据。',
         impact: [cached ? '插件仍可浏览，但数据可能不是最新。' : '当前不能浏览或安装这个来源的插件。',
             ...(impactedTargets > 0 ? [`${impactedTargets} 个安装位置受此来源根问题影响。`] : [])],
         entity: { kind: 'source', id: health.sourceId },
@@ -180,7 +277,13 @@ function targetIssues(payload) {
                                     ]
                                     : root.category === 'sourceUnavailable'
                                         ? [
-                                            { id: 'editSource', label: '查看来源', description: root.code === 'bundleUnavailable' ? '检查这个插件包或稍后重试' : '修复来源配置或稍后重试' },
+                                            ...(root.code === 'bundleUnavailable' ? [{
+                                                    id: 'cleanup',
+                                                    label: '清理已安装内容',
+                                                    description: '只清理 AW 管理的现场内容；保留插件设置',
+                                                    writeAction: 'cleanup',
+                                                }] : []),
+                                            { id: 'editSource', label: '查看来源', description: root.code === 'bundleUnavailable' ? '检查当前 Catalog 或稍后重试' : '修复来源配置或稍后重试' },
                                             { id: 'viewTechnical', label: '技术详情' },
                                         ]
                                         : [{ id: 'viewTechnical', label: '技术详情' }, { id: 'retryLater', label: '稍后重试' }];
@@ -197,7 +300,7 @@ function targetIssues(payload) {
                     dependencyTargetUnsupported: '依赖目标不兼容',
                     dependencyStillRequired: '依赖仍被使用',
                     dependencyGraphInvalid: '依赖关系无效',
-                }[root.category] : target.state === 'partial' ? '安装不完整' : bundleUnavailable ? '插件包不可用' : '检查失败'}`,
+                }[root.category] : target.state === 'partial' ? '安装不完整' : bundleUnavailable ? '当前 Catalog 不再包含此插件' : '检查失败'}`,
                 explanation: dependencyCategory
                     ? dependencyPluginId
                         ? `${dependencyPluginId} 导致当前依赖检查不能通过。`
@@ -205,10 +308,10 @@ function targetIssues(payload) {
                     : target.state === 'partial'
                         ? '必要内容缺失，插件可能不能稳定运行。'
                         : bundleUnavailable
-                            ? '当前来源中无法取得这个插件的可信 bundle。'
+                            ? '当前 Catalog 不再包含此插件，但仍发现 AW 管理的已安装内容。'
                             : '当前目标不能安全分类为正常安装。',
                 impact: [bundleUnavailable
-                        ? '当前目标不能使用这个插件包；这不表示来源缓存整体不可用。'
+                        ? '可以清理可信的 AW 现场；这不表示来源缓存整体不可用。'
                         : '写操作前需要重新检查这个目标。'],
                 entity: { kind: 'plugin', id: target.pluginId },
                 pluginId: target.pluginId,
@@ -313,7 +416,10 @@ function configIssues(pluginSummaries) {
                         { id: 'retryLater', label: '稍后重新检查' },
                         { id: 'viewTechnical', label: '查看技术详情' },
                     ],
-                    technicalDetails: [{ code: summary.configDiagnostic.code, message: summary.configDiagnostic.message }],
+                    technicalDetails: [{
+                            code: summary.configDiagnostic.code,
+                            message: '设置读取报告了这个安全错误代码。',
+                        }],
                 }];
         }
         if (!summary.configIssues?.length)
@@ -398,6 +504,104 @@ function enrichDependencyIssuePlacements(issues, overviews) {
         };
     });
 }
+function issueDiagnostic(issue, sourceDetails) {
+    const source = issue.sourceId ? sourceDetails.get(issue.sourceId) : undefined;
+    const sourceDegraded = issue.category === 'sourceDegraded';
+    const sourceUnavailable = issue.category === 'sourceUnavailable' && issue.entity.kind === 'source';
+    const configUnavailable = issue.category === 'diagnostic' && issue.issueId.startsWith('config:');
+    const configInvalid = issue.category === 'requiredConfigMissing';
+    const dependency = issue.category.startsWith('dependency');
+    const platformState = issue.issueId.startsWith('status:') || issue.rootCode === 'targetDiagnostic';
+    const preserved = sourceDegraded || sourceUnavailable
+        ? '已安装插件和已保存设置不会被删除。'
+        : configUnavailable
+            ? '已保存的设置保持不变。'
+            : '现有安装和已保存设置不会因本页自动改变。';
+    const impact = sourceDegraded
+        ? [
+            { state: 'degraded', message: '远端数据可能不是最新；匹配的已验证缓存仍可浏览和安装。' },
+            { state: 'preserved', message: preserved },
+        ]
+        : sourceUnavailable
+            ? [
+                { state: 'blocked', message: '没有可用缓存；当前不能浏览或安装这个来源中的插件。' },
+                { state: 'preserved', message: preserved },
+            ]
+            : [
+                ...issue.impact.map((message) => ({
+                    state: dependency || configUnavailable || configInvalid || platformState ? 'blocked' : 'degraded',
+                    message,
+                })),
+                { state: 'preserved', message: preserved },
+            ];
+    const primaryAction = issue.actions.find((action) => action.id !== 'viewTechnical');
+    const nextStep = primaryAction
+        ? `${primaryAction.label}，然后重新检查当前状态。`
+        : '打开技术详情，记录安全错误代码后重新检查。';
+    const sourceDiagnostic = sourceDegraded || sourceUnavailable;
+    const rawCode = sourceDiagnostic
+        ? source?.errorCode ?? issue.technicalDetails[0]?.code
+        : issue.technicalDetails[0]?.code;
+    const code = safeDiagnosticCode(rawCode, sourceDegraded
+        ? 'catalogSourceDegraded'
+        : sourceUnavailable ? 'catalogSourceUnavailable' : 'diagnosticUnavailable');
+    const stage = sourceDegraded || sourceUnavailable ? 'resolve-source'
+        : configUnavailable ? 'read-config'
+            : configInvalid ? 'validate-config'
+                : dependency ? 'resolve-dependencies'
+                    : platformState ? 'read-platform-state' : 'inspect-target';
+    const context = [
+        ...(issue.pluginId ? [{ key: 'pluginId', value: issue.pluginId }] : []),
+        ...(issue.dependencyPluginId
+            ? [{ key: 'dependencyPluginId', value: issue.dependencyPluginId }]
+            : []),
+        ...(issue.platform ? [{ key: 'platform', value: issue.platform }] : []),
+        ...(issue.scope ? [{ key: 'scope', value: issue.scope }] : []),
+        ...(sourceDiagnostic && source?.freshness
+            ? [{ key: 'freshness', value: source.freshness }]
+            : []),
+        ...(issue.requiredFields?.slice(0, 1).map((field) => ({
+            key: 'field',
+            value: field.title,
+        })) ?? []),
+    ];
+    const checks = issue.category === 'legacyState'
+        ? [
+            '不自动迁移旧版状态。',
+            '运行 aw status --json，记录公开错误 code。',
+            '备份相关 AW 配置。',
+            '按技术详情使用受支持命令或人工处理。',
+            '再次运行状态检查。',
+        ]
+        : sourceDegraded || sourceUnavailable
+            ? ['检查 Git URL、ref 或本地目录。', '确认当前终端具备来源授权。', '运行“重新检查来源”验证修复。']
+            : dependency
+                ? ['检查依赖关系和依赖插件状态。', '完成恢复动作后重新检查根插件。']
+                : configUnavailable
+                    ? ['恢复插件来源和可信字段定义。', '重新检查来源后再次打开设置。']
+                    : configInvalid
+                        ? ['完成或修正列出的设置字段。', '重新检查插件设置。']
+                        : ['检查目标平台配置和访问权限。', '完成恢复动作后重新运行状态检查。'];
+    return {
+        severity: sourceDegraded ? 'warning' : 'error',
+        title: issue.title,
+        userMessage: issue.explanation,
+        impact,
+        nextStep,
+        technical: {
+            code,
+            stage,
+            ...(sourceDiagnostic && issue.sourceId ? { sourceId: issue.sourceId } : {}),
+            ...(sourceDiagnostic && source?.requestedRef ? { requestedRef: source.requestedRef } : {}),
+            ...(sourceDiagnostic && source?.resolvedCommit ? { resolvedCommit: source.resolvedCommit } : {}),
+            ...(sourceDegraded || sourceUnavailable
+                ? { lastGood: sourceDegraded ? 'available' : 'unavailable' }
+                : {}),
+            ...(context.length > 0 ? { context } : {}),
+            checks,
+        },
+    };
+}
 export function buildTuiViewModel(options) {
     const dependencyById = new Map((options.dependencyOverviews ?? [])
         .map((overview) => [overview.pluginId, overview]));
@@ -413,7 +617,9 @@ export function buildTuiViewModel(options) {
         const sourceId = targets[0]?.sourceId ?? pluginId.slice(0, pluginId.indexOf('/'));
         const placements = ['codex', 'claude'].flatMap((platform) => {
             const platformTargets = targets.filter((target) => target.platform === platform);
-            return platformTargets.length > 0 ? [projectPlatformPlacement(platform, platformTargets)] : [];
+            return platformTargets.length > 0
+                ? [projectPlatformPlacement(platform, platformTargets, options.targetRevisions)]
+                : [];
         });
         const attention = placements.some((placement) => placement.state === 'scopeConflict'
             || (placement.state === 'installed' && placement.health !== 'ready'));
@@ -466,7 +672,7 @@ export function buildTuiViewModel(options) {
         state: sourceState(source, options.sourceHealth?.get(source.id)),
     }));
     const sourceRootIds = new Set([...(options.sourceHealth?.values() ?? [])]
-        .filter((health) => health.state === 'cache' || health.state === 'degraded' || health.state === 'unavailable')
+        .filter((health) => health.state === 'degraded' || health.state === 'unavailable')
         .map((health) => health.sourceId));
     const allTargetIssues = targetIssues(options.status);
     const targetImpactCounts = new Map();
@@ -475,13 +681,18 @@ export function buildTuiViewModel(options) {
             continue;
         targetImpactCounts.set(issue.sourceId, (targetImpactCounts.get(issue.sourceId) ?? 0) + 1);
     }
-    const issues = enrichDependencyIssuePlacements([
+    const sourceDetails = new Map((options.sourceDetails ?? []).map((detail) => [detail.id, detail]));
+    const issueDrafts = enrichDependencyIssuePlacements([
         ...allTargetIssues.filter((issue) => !issue.mergeEligible
             || !issue.sourceId || !sourceRootIds.has(issue.sourceId)),
         ...statusIssues(options.status),
         ...configIssues(options.pluginSummaries),
         ...[...(options.sourceHealth?.values() ?? [])].flatMap((health) => sourceIssue(health, targetImpactCounts.get(health.sourceId) ?? 0) ?? []),
     ], options.dependencyOverviews ?? []);
+    const issues = issueDrafts.map((issue) => ({
+        ...issue,
+        diagnostic: issueDiagnostic(issue, sourceDetails),
+    }));
     return {
         plugins,
         sourceTabs,
@@ -524,25 +735,39 @@ function configSourceLabel(source) {
 }
 export function buildConfigGroups(options) {
     const entryByKey = new Map(options.read.fields.map((field) => [field.key, field]));
+    const effectiveEntryByKey = new Map((options.effectiveRead ?? options.read).fields.map((field) => [field.key, field]));
     const effectivePage = options.read.scope === 'effective';
     const fieldModel = (key) => {
         const schema = options.schema.schema[key];
         const entry = entryByKey.get(key);
+        const effectiveEntry = effectiveEntryByKey.get(key);
         const presentation = options.schema.presentation?.fields?.[key];
         const inherited = effectivePage
-            ? entry?.sourceLayer === undefined || entry?.sourceLayer === null
+            ? false
             : entry?.storedSourceLayer === undefined;
         const configured = effectivePage
-            ? entry?.valueState === 'configured' || entry?.valueState === 'default'
+            ? entry?.sourceLayer !== undefined
+                && entry.sourceLayer !== null
+                && entry.effectiveValue !== undefined
+                && entry.effectiveValue !== null
+                && (entry.valueState === 'configured' || entry.valueState === 'default')
             : entry?.storedSourceLayer !== undefined;
         const privateValue = schema.sensitive === true || schema.type === 'file' || schema.type === 'directory';
         const selectedValue = effectivePage ? entry?.effectiveValue : entry?.storedValue;
+        const selectedStoredInvalid = !effectivePage
+            && entry?.storedSourceLayer !== undefined
+            && entry.storedValue === undefined;
+        const effectiveConfigured = effectiveEntry?.sourceLayer !== undefined
+            && effectiveEntry.sourceLayer !== null
+            && effectiveEntry.effectiveValue !== undefined
+            && effectiveEntry.effectiveValue !== null
+            && (effectiveEntry.valueState === 'configured' || effectiveEntry.valueState === 'default');
         return {
             key,
             title: schema.title ?? key,
             ...(schema.description ? { description: schema.description } : {}),
             type: schema.type,
-            displayValue: displayConfigValue({
+            displayValue: selectedStoredInvalid ? '值无效' : displayConfigValue({
                 privateValue,
                 inherited,
                 configured,
@@ -556,9 +781,19 @@ export function buildConfigGroups(options) {
             sourceLabel: effectivePage
                 ? configSourceLabel(entry?.sourceLayer ?? null)
                 : configured ? '本层已设置' : '继承',
+            effectiveDisplayValue: displayConfigValue({
+                privateValue,
+                inherited: false,
+                configured: effectiveConfigured,
+                value: effectiveEntry?.effectiveValue,
+            }),
+            effectiveSourceLabel: configSourceLabel(effectiveEntry?.sourceLayer ?? null),
             ...(!privateValue && selectedValue !== undefined
                 ? { value: selectedValue }
                 : {}),
+            ...(!privateValue && effectiveEntry?.effectiveValue !== undefined && effectiveEntry.effectiveValue !== null
+                ? { effectiveValue: effectiveEntry.effectiveValue }
+                : {}),
             ...(!privateValue && schema.default !== undefined ? { defaultValue: schema.default } : {}),
             ...(schema.values ? { enumValues: [...schema.values] } : {}),
             ...(presentation?.valueLabels ? { valueLabels: { ...presentation.valueLabels } } : {}),