@lesliechan721/aw 0.1.0-beta.63 → 0.1.0-beta.65

package/dist/src/tui/controller.js

@@ -1,7 +1,9 @@
+import { isPlatformTarget } from '@lesliechan721/aw-plugin-core/manifest';
 import crypto from 'node:crypto';
 import { CatalogGenerationError } from '../utils/catalog-generation-error.js';
 import { readSafeOperationError } from '../utils/safe-operation-diagnostic.js';
-import { flattenStatusTargets, statusTargetActivation, statusTargetExtensions, statusTargetIntent, statusTargetOwnershipState, statusTargetSharedNative, } from '../commands/status-v6.js';
+import { NativeCliError } from '../utils/native-cli.js';
+import { flattenStatusTargets, statusTargetActivation, statusTargetIntent, statusTargetOwnershipState, statusTargetSharedNative, } from '../commands/status-v6.js';
 import { buildRebuildReceiptJson, requestedIntentAction } from '../output/command-receipt.js';
 import { buildOperationResultModel } from '../commands/operation-planner.js';
 import { buildOperationReviewProjection } from './operation-review-planner.js';
@@ -11,7 +13,8 @@ import { safeDiagnosticCode, sanitizeDiagnosticText } from './diagnostics.js';
 import { projectExecutionDiagnostics, projectThrownOperationDiagnostic } from './diagnostic-projection.js';
 import { OperationHistoryStore, } from './operation-history.js';
 import { targetHasArtifactCollision } from '../utils/target-eligibility.js';
-import { buildProjectInventory, hasStatusInstallationEvidence, } from './project-inventory.js';
+import { hasStatusInstallationEvidence } from './scoped-inventory.js';
+import { buildScopedInventory } from './scoped-inventory.js';
 import { TuiRouter, } from './router.js';
 import { normalizeTuiRoute } from './screen-registry.js';
 import { CatalogSourcesSession } from './catalog-sources/session.js';
@@ -91,89 +94,6 @@ function reviewPreparationStageLabel(stage) {
         evidence: '准备确认信息',
     }[stage];
 }
-function projectReminderTargetKey(target) {
-    return [target.pluginId, target.platform, target.scope].join('\0');
-}
-export function projectCurrentIntentReminder(status) {
-    if (status.projectIntent && status.projectIntent.state !== 'ready')
-        return undefined;
-    const actionableTargets = [];
-    const blockedTargets = [];
-    const unconfirmedTargets = [];
-    const projectRoots = new Map((status.projectIntent?.state === 'ready'
-        ? status.projectIntent.roots : status.projectIntentRoots ?? []).map((root) => [
-        root.pluginId,
-        new Set(root.platforms),
-    ]));
-    const projectTargets = flattenStatusTargets(status.payload.targets).filter((target) => {
-        const intent = statusTargetIntent(target);
-        return target.scope === 'project'
-            && projectRoots.get(target.pluginId)?.has(target.platform) === true
-            && intent.scopes.includes('project');
-    });
-    for (const target of projectTargets) {
-        if (target.state === 'ready')
-            continue;
-        const reminderTarget = {
-            pluginId: target.pluginId,
-            platform: target.platform,
-            scope: 'project',
-        };
-        const statusReasons = [
-            ...target.reasons,
-            ...(target.sharedReasons ?? []),
-        ];
-        const reasonCodes = [...new Set(statusReasons.flatMap((reason) => [
-                reason.code,
-                ...(reason.rootIssueCode ? [reason.rootIssueCode] : []),
-            ]))].sort((left, right) => left.localeCompare(right, 'en'));
-        const sharedNative = statusTargetSharedNative(target);
-        const activation = statusTargetActivation(target);
-        const extensions = statusTargetExtensions(target);
-        const ownership = statusTargetOwnershipState(target);
-        const blocking = target.state === 'blocked'
-            || [...target.reasons, ...(target.sharedReasons ?? [])]
-                .some((reason) => reason.severity === 'blocking');
-        const unobserved = ownership === 'error'
-            || (!blocking && (sharedNative?.state === 'unobserved'
-                || activation?.evidence === 'unobserved'
-                || reasonCodes.includes('codexSharedNativeUnobserved')
-                || target.components.some((component) => component.metadata?.rootIssueCode === 'codexSharedNativeUnobserved')));
-        const confirmedDifference = ownership === 'absent' || ownership === 'partial'
-            || sharedNative?.state === 'missing' || sharedNative?.state === 'replaceable'
-            || extensions?.state === 'missing' || extensions?.state === 'drifted'
-            || activation?.evidence === 'observed' && activation.project === false
-            || target.components.some((component) => component.kind === 'dependency'
-                && (component.state === 'absent' || component.state === 'incomplete'));
-        if (blocking && confirmedDifference) {
-            blockedTargets.push({ ...reminderTarget, reasonCodes });
-        }
-        else if (!unobserved && target.state === 'needsSync' && confirmedDifference) {
-            actionableTargets.push({ ...reminderTarget, reasonCodes });
-        }
-        else {
-            unconfirmedTargets.push({ ...reminderTarget, reasonCodes });
-        }
-    }
-    if (projectTargets.length === 0)
-        return undefined;
-    const canonicalActionable = actionableTargets.sort((left, right) => projectReminderTargetKey(left).localeCompare(projectReminderTargetKey(right), 'en'));
-    const canonicalBlocked = blockedTargets.sort((left, right) => projectReminderTargetKey(left).localeCompare(projectReminderTargetKey(right), 'en'));
-    const canonicalUnconfirmed = unconfirmedTargets.sort((left, right) => projectReminderTargetKey(left).localeCompare(projectReminderTargetKey(right), 'en'));
-    const projectRoot = status.projectRoot ?? projectTargets[0].cwd;
-    const signature = crypto.createHash('sha256').update(JSON.stringify({
-        projectRoot,
-        actionableTargets: canonicalActionable.map(projectReminderTargetKey),
-        blockedTargets: canonicalBlocked.map(projectReminderTargetKey),
-    })).digest('hex');
-    return {
-        projectRoot,
-        signature: `sha256:${signature}`,
-        actionableTargets: canonicalActionable,
-        blockedTargets: canonicalBlocked,
-        unconfirmedTargets: canonicalUnconfirmed,
-    };
-}
 export class TuiOperationBlockedError extends Error {
     code;
     diagnostics;
@@ -220,16 +140,17 @@ function canonicalPluginWriteTaskTargets(targets) {
         .localeCompare(pluginWriteTaskTargetKey(right), 'en'));
 }
 function normalizeOperationIntent(intent) {
-    if (intent.kind === 'configSave' && intent.retryApply && !intent.apply) {
-        return { ...intent, apply: true };
+    if (intent.kind === 'configSave' || intent.kind === 'configReset' || intent.kind === 'configSaveBatch') {
+        return { ...intent, context: intent.context ?? 'user',
+            ...(intent.kind === 'configSave' ? { scope: 'user',
+                apply: intent.retryApply ? true : intent.apply } : {}) };
     }
     if (intent.kind === 'pluginWriteTask') {
         return { ...intent, targets: canonicalPluginWriteTaskTargets(intent.targets) };
     }
     if (intent.kind !== 'pluginWriteBatch')
         return intent;
-    if (intent.selection.kind === 'targets'
-        || intent.selection.kind === 'currentProjectIntentTargets') {
+    if (intent.selection.kind === 'targets') {
         return {
             ...intent,
             selection: {
@@ -713,6 +634,7 @@ export class TuiController {
     #reviewPreparationIntents = new Map();
     #inflightOperations = new Map();
     #pendingReads = new Set();
+    #readCleanupError;
     #pluginContent = new Map();
     #pluginContentInflight = new Map();
     #pluginContentEpoch = 0;
@@ -740,10 +662,14 @@ export class TuiController {
     #portableResultLifecycle = 0;
     #portableResultRecheck;
     #completionNotice;
-    #projectIntentReminder;
-    #projectInventory;
-    #projectInventoryRefresh = { state: 'idle' };
-    #projectInventoryRefreshToken = 0;
+    #scopedInventories = {};
+    #lastRefreshedScope;
+    #scopedInventoryRefresh = {};
+    #scopedRefreshToken = { user: 0, project: 0 };
+    #scopedPreparationAbort;
+    #scopedExecuted = new WeakSet();
+    #scopedTaskInflight;
+    #configSaveInflight;
     #loadError;
     #portableDraft;
     #recoverablePortableDraft;
@@ -860,16 +786,9 @@ export class TuiController {
                     } }
                 : {}),
             ...(this.#completionNotice ? { completionNotice: this.#completionNotice } : {}),
-            ...(this.#projectIntentReminder
-                ? { projectIntentReminder: this.#projectIntentReminder }
-                : {}),
-            ...(this.#projectInventory ? { projectInventory: this.#projectInventory } : {}),
-            projectInventoryRefresh: this.#projectInventoryRefresh,
-            ...(this.#status?.projectIntent?.state === 'absent' ? { projectDeclarationAbsent: true } : {}),
-            ...(this.#status?.projectIntent?.state === 'invalid'
-                || this.#status?.projectIntent?.state === 'unavailable'
-                ? { projectIntentIssue: this.#status.projectIntent }
-                : {}),
+            ...(this.#status?.projectRoot ? { projectRoot: this.#status.projectRoot } : {}),
+            scopedInventories: this.#scopedInventories,
+            scopedInventoryRefresh: this.#scopedInventoryRefresh,
         });
     }
     subscribe(listener) {
@@ -878,7 +797,8 @@ export class TuiController {
         return () => this.#listeners.delete(listener);
     }
     get hasActiveWrite() {
-        return this.#inflightOperations.size > 0;
+        return this.#inflightOperations.size > 0 || this.#scopedTaskInflight !== undefined
+            || this.#configSaveInflight !== undefined;
     }
     get retiring() {
         return this.#retiring;
@@ -946,9 +866,16 @@ export class TuiController {
         return recordId;
     }
     #trackRead(promise) {
-        this.#pendingReads.add(promise);
-        void promise.finally(() => this.#pendingReads.delete(promise)).catch(() => undefined);
-        return promise;
+        const tracked = promise.catch(async (error) => {
+            if (error instanceof NativeCliError && error.cleanupError) {
+                this.#readCleanupError ??= error;
+                await this.#logErrorSafe(error, issueCode(error));
+            }
+            throw error;
+        });
+        this.#pendingReads.add(tracked);
+        void tracked.finally(() => this.#pendingReads.delete(tracked)).catch(() => undefined);
+        return tracked;
     }
     beginRetirement() {
         this.#retiring = true;
@@ -956,8 +883,12 @@ export class TuiController {
     }
     async waitForWrites() {
         this.beginRetirement();
-        while (this.#inflightOperations.size > 0) {
-            await Promise.allSettled([...this.#inflightOperations.values()].map((operation) => operation.promise));
+        while (this.hasActiveWrite) {
+            await Promise.allSettled([
+                ...[...this.#inflightOperations.values()].map((operation) => operation.promise),
+                ...(this.#scopedTaskInflight ? [this.#scopedTaskInflight.promise] : []),
+                ...(this.#configSaveInflight ? [this.#configSaveInflight] : []),
+            ]);
         }
     }
     async cancelAndWaitForReads() {
@@ -974,6 +905,8 @@ export class TuiController {
             await Promise.allSettled([...this.#pendingReads]);
         }
         await catalogDrain;
+        if (this.#readCleanupError)
+            throw this.#readCleanupError;
         return !this.hasActiveWrite;
     }
     #assertAcceptingActions() {
@@ -1090,7 +1023,9 @@ export class TuiController {
                     stage,
                     fallbackCode: code,
                     sensitiveValues,
-                    ...(intent && 'pluginId' in intent && 'platform' in intent && intent.platform !== 'both'
+                    ...(intent && 'pluginId' in intent && 'platform' in intent
+                        && (intent.platform === 'codex' || intent.platform === 'claude')
+                        && (intent.scope === 'user' || intent.scope === 'project')
                         ? { target: { pluginId: intent.pluginId, platform: intent.platform, scope: intent.scope } }
                         : {}),
                 })],
@@ -1195,7 +1130,6 @@ export class TuiController {
     #project() {
         if (!this.#status)
             return;
-        this.#projectIntentReminder = projectCurrentIntentReminder(this.#status);
         this.#viewModel = buildTuiViewModel({
             status: this.#status.payload,
             pluginSummaries: this.#status.pluginSummaries,
@@ -1212,15 +1146,26 @@ export class TuiController {
             portablePluginIds: this.#status.portablePluginIds,
             configStoreInventory: this.#status.configStoreInventory,
         });
-        this.#projectInventory = buildProjectInventory({
-            projectRoot: this.#status.projectRoot,
-            projectIntent: this.#status.projectIntent,
-            status: this.#status.payload,
-            pluginSummaries: this.#viewModel.plugins,
-            targetRevisions: this.#status.targetRevisions,
-            dependencyOverviews: this.#status.dependencyOverviews,
-            actionableTargets: this.#projectIntentReminder?.actionableTargets,
-        });
+        for (const issue of this.#viewModel.issues) {
+            // Cross-scope recovery needs separate Intent, cleanup, and sync reviews.
+            issue.actions = issue.actions.filter((action) => action.id !== 'keepProjectScope' && action.id !== 'keepUserScope');
+        }
+        for (const scope of ['user', 'project']) {
+            const recovery = this.#status.scopedRecovery?.[scope];
+            if (!recovery) {
+                delete this.#scopedInventories[scope];
+                continue;
+            }
+            this.#scopedInventories[scope] = buildScopedInventory({
+                recovery,
+                status: recovery.nativeSnapshot?.payload ?? this.#status.payload,
+                pluginSummaries: recovery.nativeSnapshot?.pluginSummaries ?? this.#viewModel.plugins,
+                targetRevisions: recovery.nativeSnapshot?.targetRevisions ?? this.#status.targetRevisions,
+                dependencyOverviews: recovery.nativeSnapshot?.dependencyOverviews ?? this.#status.dependencyOverviews,
+                ...(scope === 'project' && this.#status.projectRoot
+                    ? { projectRoot: this.#status.projectRoot } : {}),
+            });
+        }
     }
     #normalizeRoute(route) {
         const state = this.#routeEntityState();
@@ -1237,8 +1182,7 @@ export class TuiController {
     #routeEntityState() {
         return {
             hasPlugin: (pluginId) => this.#viewModel?.plugins.some((plugin) => plugin.pluginId === pluginId)
-                || this.#projectInventory?.declaredRoots.some((root) => root.pluginId === pluginId)
-                || this.#projectInventory?.extraInstalledRoots.some((root) => root.pluginId === pluginId)
+                || Object.values(this.#scopedInventories).some((inventory) => inventory.declaredRoots.some((root) => root.pluginId === pluginId) || inventory.extraInstalledRoots.some((root) => root.pluginId === pluginId))
                 || false,
             hasSource: (sourceId) => this.#viewModel?.sourceTabs.some((source) => source.id === sourceId) ?? false,
             hasIssue: (issueId) => this.#viewModel?.issues.some((issue) => issue.issueId === issueId) ?? false,
@@ -1430,9 +1374,7 @@ export class TuiController {
             ? {
                 ...structuredClone(intent),
                 selection: {
-                    kind: intent.selection.kind === 'currentProjectIntentRoots'
-                        || intent.selection.kind === 'currentProjectIntentTargets'
-                        ? 'currentProjectIntentTargets' : 'targets',
+                    kind: 'targets',
                     targets: structuredClone(result.summary.batch.retryTargets),
                 },
             }
@@ -1459,7 +1401,10 @@ export class TuiController {
             ? result.returnRoute.batchOrigin.flowId
             : undefined;
         const completedPluginId = completedSinglePluginId(intent, result);
-        if (completedPluginId && target.name === 'pluginDetail') {
+        const hasUnreviewedTaskTargets = intent.kind === 'pluginWriteTask'
+            && 'returnRoute' in result && result.returnRoute?.name === 'pluginWriteTask'
+            && result.returnRoute.targetKeys?.some((key) => !intent.targets.some((candidate) => pluginWriteTaskTargetKey(candidate) === key));
+        if (completedPluginId && target.name === 'pluginDetail' && !hasUnreviewedTaskTargets) {
             this.#recordTerminalResult();
             const action = intent.kind === 'pluginWrite' || intent.kind === 'pluginWriteBatch'
                 ? intent.action : 'sync';
@@ -1494,6 +1439,7 @@ export class TuiController {
             this.#router.replace(terminal);
     }
     #applyStatus(status) {
+        this.#lastRefreshedScope = undefined;
         this.#pluginContentEpoch += 1;
         this.#pluginContent.clear();
         this.#pluginContentInflight.clear();
@@ -1563,8 +1509,10 @@ export class TuiController {
         this.#assertAcceptingActions();
         this.dependencies.beginCatalogSession?.();
         const generation = ++this.#generation;
-        this.#projectInventoryRefreshToken += 1;
-        this.#projectInventoryRefresh = { state: 'idle' };
+        this.#scopedRefreshToken.user += 1;
+        this.#scopedRefreshToken.project += 1;
+        this.#scopedInventoryRefresh = {};
+        this.#scopedInventories = {};
         this.#pluginContentEpoch += 1;
         this.#pluginContent.clear();
         this.#pluginContentInflight.clear();
@@ -1592,49 +1540,106 @@ export class TuiController {
         this.#loadError = undefined;
         this.#publish();
     }
-    listProjectInventoryRoots(section = 'declared') {
+    listScopedInventoryRoots(scope, section = 'declared') {
+        const inventory = this.#scopedInventories[scope];
         return cloneFrozen(section === 'declared'
-            ? this.#projectInventory?.declaredRoots ?? []
-            : this.#projectInventory?.extraInstalledRoots ?? []);
-    }
-    getProjectInventoryRoot(pluginId) {
-        const root = [...(this.#projectInventory?.declaredRoots ?? []),
-            ...(this.#projectInventory?.extraInstalledRoots ?? [])]
-            .find((entry) => entry.pluginId === pluginId);
-        return root ? cloneFrozen(root) : undefined;
+            ? inventory?.declaredRoots ?? [] : inventory?.extraInstalledRoots ?? []);
     }
-    async refreshProjectInventory() {
+    async refreshScopedInventory(scope) {
         this.#assertAcceptingActions();
-        if (!this.#status || this.#phase !== 'ready')
+        if (!this.#status || this.#phase !== 'ready' || !this.dependencies.loadScopedStatus)
             return false;
-        const token = ++this.#projectInventoryRefreshToken;
+        const token = ++this.#scopedRefreshToken[scope];
         const generation = this.#generation;
-        this.#projectInventoryRefresh = { state: 'checking' };
+        this.#scopedInventoryRefresh[scope] = { state: 'checking' };
         this.#publish();
         try {
-            const status = await this.#trackRead(this.dependencies.loadStatus(this.#abort.signal));
-            if (this.#disposed || generation !== this.#generation
-                || token !== this.#projectInventoryRefreshToken)
+            const recovery = await this.#trackRead(this.dependencies.loadScopedStatus(scope, this.#abort.signal));
+            if (this.#disposed || generation !== this.#generation || token !== this.#scopedRefreshToken[scope])
                 return false;
-            this.#applyStatus(status);
-            this.#projectInventoryRefresh = {
-                state: 'idle',
-                checkedAtMs: this.#statusReadAtMs,
-            };
+            const inventory = buildScopedInventory({
+                recovery, status: recovery.nativeSnapshot.payload, pluginSummaries: recovery.nativeSnapshot.pluginSummaries,
+                targetRevisions: recovery.nativeSnapshot.targetRevisions,
+                dependencyOverviews: recovery.nativeSnapshot.dependencyOverviews,
+                ...(scope === 'project' && this.#status.projectRoot ? { projectRoot: this.#status.projectRoot } : {}),
+            });
+            this.#status.scopedRecovery = { ...this.#status.scopedRecovery, [scope]: structuredClone(recovery) };
+            this.#scopedInventories[scope] = inventory;
+            this.#lastRefreshedScope = scope;
+            this.#scopedInventoryRefresh[scope] = { state: 'idle' };
             this.#publish();
             return true;
         }
         catch (error) {
-            if (this.#disposed || generation !== this.#generation
-                || token !== this.#projectInventoryRefreshToken)
+            if (this.#disposed || generation !== this.#generation || token !== this.#scopedRefreshToken[scope])
                 return false;
             const code = issueCode(error);
             await this.#logErrorSafe(error, code);
-            this.#projectInventoryRefresh = { state: 'error', errorCode: code };
+            if (this.#disposed || generation !== this.#generation || token !== this.#scopedRefreshToken[scope])
+                return false;
+            this.#scopedInventoryRefresh[scope] = { state: 'error', errorCode: code };
             this.#publish();
             return false;
         }
     }
+    async prepareScopedTask(request) {
+        this.#assertAcceptingActions();
+        if (!this.dependencies.prepareScopedTask)
+            throw new Error('recoveryUnavailable');
+        this.#scopedPreparationAbort?.abort();
+        const abort = new AbortController();
+        this.#scopedPreparationAbort = abort;
+        try {
+            return await this.#trackRead(this.dependencies.prepareScopedTask(request, AbortSignal.any([this.#abort.signal, abort.signal])));
+        }
+        finally {
+            if (this.#scopedPreparationAbort === abort)
+                this.#scopedPreparationAbort = undefined;
+        }
+    }
+    async readAgentSettings() {
+        if (!this.dependencies.readAgentSettings)
+            throw new Error('agentSettingsUnavailable');
+        return this.#trackRead(this.dependencies.readAgentSettings());
+    }
+    async previewAgentSettings(preferences, pluginId) {
+        if (!this.dependencies.previewAgentSettings)
+            throw new Error('agentSettingsUnavailable');
+        return this.#trackRead(this.dependencies.previewAgentSettings(preferences, pluginId));
+    }
+    async saveAgentSettings(request) {
+        this.#assertAcceptingActions();
+        if (this.hasActiveWrite || !this.dependencies.saveAgentSettings)
+            throw new Error('agentSettingsUnavailable');
+        return this.dependencies.saveAgentSettings(request);
+    }
+    cancelScopedPreparation() { this.#scopedPreparationAbort?.abort(); }
+    async discardScopedPlan(plan) {
+        this.#scopedExecuted.add(plan);
+        if (plan.kind === 'recovery' || plan.kind === 'retire')
+            await plan.plan.context.dispose();
+    }
+    executeScopedTask(plan) {
+        if (this.#retiring || this.#disposed)
+            return Promise.reject(new Error('sessionRetiring'));
+        if (!this.dependencies.executeScopedTask)
+            return Promise.reject(new Error('recoveryUnavailable'));
+        if (this.#scopedTaskInflight?.plan === plan)
+            return this.#scopedTaskInflight.promise;
+        if (this.hasActiveWrite || this.#scopedExecuted.has(plan)) {
+            return Promise.reject(new Error('reviewTicketInvalid'));
+        }
+        this.#scopedExecuted.add(plan);
+        this.#progressFeed?.clearCurrent();
+        this.#progress = { messages: [], startedAtMs: this.dependencies.now?.() ?? Date.now() };
+        this.#publish();
+        const promise = this.dependencies.executeScopedTask(plan).finally(() => {
+            if (this.#scopedTaskInflight?.promise === promise)
+                this.#scopedTaskInflight = undefined;
+        });
+        this.#scopedTaskInflight = { plan, promise };
+        return promise;
+    }
     push(route, context) {
         if (this.#router.snapshot.current.route.name === 'result') {
             this.#invalidatePortableResultRecheck();
@@ -1974,12 +1979,12 @@ export class TuiController {
             this.#router.replace(nextRoute, context);
         this.#publish();
     }
-    beginConfigFlow(pluginId) {
+    beginConfigFlow(pluginId, options = {}) {
         this.#router.beginConfigFlow(pluginId);
         this.#router.push({
             name: 'configFields',
             pluginId,
-            layer: { scope: 'effective' },
+            layer: { profile: options.platform ?? 'common', context: options.context ?? 'user' },
         });
         this.#publish();
     }
@@ -1998,8 +2003,9 @@ export class TuiController {
             this.#tickets.delete(this.#activeReview.reviewToken);
         this.#activeReview = undefined;
         this.#router.beginFlow('configEdit', route, this.#router.snapshot.currentFrameId, current.context);
-        this.#router.push({ name: 'configFields', pluginId, layer: { scope: 'effective' } });
-        this.#router.push({ name: 'configFieldEditor', pluginId, layer: { scope: 'effective' }, fieldKey, editor: 'array', mode: 'choices' });
+        const layer = ('layer' in route ? route.layer : undefined) ?? { profile: 'common', context: 'user' };
+        this.#router.push({ name: 'configFields', pluginId, layer });
+        this.#router.push({ name: 'configFieldEditor', pluginId, layer, fieldKey, editor: 'array', mode: 'choices' });
         this.#publish();
     }
     beginSavedConfigRecovery(pluginId) {
@@ -2013,9 +2019,7 @@ export class TuiController {
             name: 'configUnavailable',
             pluginId,
             storedScopes: plugin.savedConfigScopes,
-            ...(plugin.savedConfigScopes.length === 1
-                ? { layer: { scope: plugin.savedConfigScopes[0] } }
-                : {}),
+            layer: { profile: 'common', context: 'user' },
             diagnosticCode: 'catalogSourceUnavailable',
             diagnosticStage: 'read-config',
         });
@@ -2032,11 +2036,11 @@ export class TuiController {
             || !this.#viewModel?.sourceTabs.some((source) => source.id === sourceId)) {
             throw new TuiOperationBlockedError('configSourceRecoveryUnavailable', '来源恢复只能从不可用的设置流程开始。');
         }
-        const layer = route.layer?.scope ?? route.resumeRoute?.layer.scope ?? 'effective';
+        const layer = route.layer ?? route.resumeRoute?.layer ?? { profile: 'common', context: 'user' };
         const returnTarget = route.resumeRoute ?? {
             name: 'configFields',
             pluginId: route.pluginId,
-            layer: { scope: layer },
+            layer,
         };
         this.#router.beginFlow('sourceRecovery', returnTarget, undefined, route.resumeContext);
         this.#router.push({ name: 'sourceDetail', sourceId });
@@ -2048,21 +2052,22 @@ export class TuiController {
             kind: 'pluginWrite', action: 'cleanup', pluginId, platform, scope, force: true,
         };
         try {
-            const evidence = await this.#trackRead(this.dependencies.captureEvidence(intent, this.#abort.signal));
-            const candidate = (evidence.offlineCleanupPlans
-                ?? (evidence.offlineCleanup ? [evidence.offlineCleanup] : [])).find((entry) => entry.pluginId === pluginId
-                && entry.platform === platform
-                && entry.scope === scope);
-            if (!evidence.operationPlan
-                || !candidate
-                || candidate.platform !== platform
-                || candidate.scope !== scope
-                || (candidate.forceExclusive !== true && candidate.plan.actions.length > 0)
-                || (candidate.plan.actions.length === 0
-                    && !evidence.operationPlan.intentChanges.some((change) => change.scope === scope))) {
+            const prepared = await this.prepareScopedTask({ kind: 'recovery', command: 'cleanup',
+                scope, selectors: [pluginId], targets: [platform === 'claude' ? 'claude' : 'codex'],
+                exactTargets: [{ pluginId, agent: platform === 'claude' ? 'claude' : 'codex' }], force: true });
+            if (prepared.kind !== 'recovery')
                 return undefined;
+            try {
+                const candidate = prepared.plan.nativeGroups.flatMap((group) => group.preview.operationPlan ? group.preview.offlineCleanupPlans ?? [] : [])
+                    .find((entry) => entry.pluginId === pluginId && entry.platform === platform && entry.scope === scope);
+                if (prepared.plan.blockExecution || !candidate || candidate.forceExclusive !== true
+                    || candidate.plan.actions.length === 0)
+                    return undefined;
+                return cloneFrozen({ pluginId, platform, scope, actionCount: candidate.plan.actions.length });
+            }
+            finally {
+                await this.discardScopedPlan(prepared);
             }
-            return cloneFrozen({ pluginId, platform, scope, actionCount: candidate.plan.actions.length });
         }
         catch (error) {
             await this.#logOperationError(error, issueCode(error), intent);
@@ -2070,14 +2075,10 @@ export class TuiController {
         }
     }
     startForceCleanupReview(candidate) {
-        return this.startReviewPreparation({
-            kind: 'pluginWrite',
-            action: 'cleanup',
-            pluginId: candidate.pluginId,
-            platform: candidate.platform,
-            scope: candidate.scope,
-            force: true,
-        });
+        const agent = candidate.platform === 'claude' ? 'claude' : 'codex';
+        return this.prepareScopedTask({ kind: 'recovery', command: 'cleanup',
+            scope: candidate.scope, selectors: [candidate.pluginId], targets: [agent],
+            exactTargets: [{ pluginId: candidate.pluginId, agent }], force: true });
     }
     configOrigin(pluginId) {
         const origin = this.#router.configOrigin(pluginId);
@@ -2426,7 +2427,7 @@ export class TuiController {
                 platform: draft.platforms.length === 2 ? 'both' : draft.platforms[0],
                 scope: draft.rootScope,
                 ...(draft.dependencyScopeOverrides.length > 0
-                    ? { dependencyScopeOverrides: structuredClone(draft.dependencyScopeOverrides) } : {}),
+                    ? { dependencyScopeOverrides: structuredClone(draft.dependencyScopeOverrides), saveDependencyScopeOverrides: true } : {}),
             };
         return {
             kind: 'pluginWrite',
@@ -2435,7 +2436,7 @@ export class TuiController {
             platform: draft.platforms.length === 2 ? 'both' : draft.platforms[0],
             scope: draft.rootScope,
             ...(draft.dependencyScopeOverrides.length > 0
-                ? { dependencyScopeOverrides: draft.dependencyScopeOverrides }
+                ? { dependencyScopeOverrides: draft.dependencyScopeOverrides, saveDependencyScopeOverrides: true }
                 : {}),
         };
     }
@@ -2534,6 +2535,8 @@ export class TuiController {
     listPlugins(options) {
         const query = options.query?.trim().toLocaleLowerCase('en');
         const actualScopes = new Map();
+        const portableObservedScopes = new Set();
+        const uncertainPortablePlugins = new Set();
         const statusTargets = flattenStatusTargets(this.#status?.payload.targets ?? []);
         const targetsByPlugin = new Map();
         for (const target of statusTargets) {
@@ -2554,13 +2557,39 @@ export class TuiController {
             scopes.add(target.scope);
             actualScopes.set(target.pluginId, scopes);
         }
+        for (const inventory of Object.values(this.#scopedInventories)) {
+            if (inventory.coverage?.portable) {
+                for (const scope of inventory.coverage.scopes ?? [inventory.scope])
+                    portableObservedScopes.add(scope);
+            }
+            for (const root of [...inventory.declaredRoots, ...inventory.extraInstalledRoots]) {
+                for (const plugin of [root, ...root.dependencies]) {
+                    for (const target of plugin.targets) {
+                        if (target.delivery !== 'agent-skills')
+                            continue;
+                        if (target.actual !== true) {
+                            if (target.observation !== 'known')
+                                uncertainPortablePlugins.add(plugin.pluginId);
+                            continue;
+                        }
+                        const scopes = actualScopes.get(plugin.pluginId) ?? new Set();
+                        scopes.add(target.scope);
+                        actualScopes.set(plugin.pluginId, scopes);
+                    }
+                }
+            }
+        }
+        const portableAbsenceObserved = portableObservedScopes.has('user')
+            && (!this.#status?.projectRoot || portableObservedScopes.has('project'));
         return cloneFrozen((this.#viewModel?.plugins ?? []).filter((plugin) => (!options.sourceId || plugin.sourceId === options.sourceId)
             && (options.installFilter !== 'installed'
                 || (actualScopes.get(plugin.pluginId)?.size ?? 0) > 0)
             && (options.installFilter !== 'uninstalled'
                 || plugin.aggregateStatus === 'available'
-                    && (targetsByPlugin.get(plugin.pluginId)?.length ?? 0) > 0
-                    && targetsByPlugin.get(plugin.pluginId).every((target) => target.state === 'absent')
+                    && ((targetsByPlugin.get(plugin.pluginId)?.length ?? 0) > 0
+                        || plugin.portableSkills && portableAbsenceObserved)
+                    && (targetsByPlugin.get(plugin.pluginId) ?? []).every((target) => target.state === 'absent')
+                    && !uncertainPortablePlugins.has(plugin.pluginId)
                     && (actualScopes.get(plugin.pluginId)?.size ?? 0) === 0)
             && (options.installFilter !== 'project'
                 || actualScopes.get(plugin.pluginId)?.has('project') === true)
@@ -2586,7 +2615,12 @@ export class TuiController {
             pluginSummaries: this.#status.pluginSummaries,
             targetRevisions: this.#status.targetRevisions,
             plugins: this.#viewModel.plugins,
-            projectInventory: this.#projectInventory,
+            scopedInventories: this.#scopedInventories,
+            scopedSnapshots: {
+                user: this.#status.scopedRecovery?.user?.nativeSnapshot,
+                project: this.#status.scopedRecovery?.project?.nativeSnapshot,
+            },
+            latestScope: this.#lastRefreshedScope,
             dependencyOverviews: this.#status.dependencyOverviews,
         });
         return subject ? cloneFrozen(subject) : undefined;
@@ -3060,14 +3094,14 @@ export class TuiController {
         }
         return cloneFrozen(await this.#trackRead(this.dependencies.inspectCatalogStore(this.#abort.signal)));
     }
-    async getConfigGroups(pluginId, layer) {
+    async getConfigGroups(pluginId, options) {
         this.#assertAcceptingActions();
         if (!this.dependencies.getConfigGroups) {
             throw new TuiOperationBlockedError('configUnavailable', '设置读取入口不可用。');
         }
-        return cloneFrozen(await this.#trackRead(this.dependencies.getConfigGroups(pluginId, structuredClone(layer), this.#abort.signal)));
+        return cloneFrozen(await this.#trackRead(this.dependencies.getConfigGroups(pluginId, structuredClone(options), this.#abort.signal)));
     }
-    async getConfigPage(pluginId, layer, signal) {
+    async getConfigPage(pluginId, options, signal) {
         this.#assertAcceptingActions();
         if (!this.dependencies.getConfigPage) {
             throw new TuiOperationBlockedError('configUnavailable', '设置读取入口不可用。');
@@ -3075,14 +3109,61 @@ export class TuiController {
         const combined = signal
             ? AbortSignal.any([this.#abort.signal, signal])
             : this.#abort.signal;
-        return cloneFrozen(await this.#trackRead(this.dependencies.getConfigPage(pluginId, structuredClone(layer), combined)));
+        return cloneFrozen(await this.#trackRead(this.dependencies.getConfigPage(pluginId, structuredClone(options), combined)));
     }
-    async getConfigReferenceContext(pluginId, scope, draft, signal) {
+    async getConfigReferenceContext(pluginId, options, draft, signal) {
         this.#assertAcceptingActions();
         if (!this.dependencies.getConfigReferenceContext)
             return { selections: {} };
         const combined = signal ? AbortSignal.any([this.#abort.signal, signal]) : this.#abort.signal;
-        return cloneFrozen(await this.#trackRead(this.dependencies.getConfigReferenceContext(pluginId, scope, structuredClone(draft), combined)));
+        return cloneFrozen(await this.#trackRead(this.dependencies.getConfigReferenceContext(pluginId, structuredClone(options), structuredClone(draft), combined)));
+    }
+    async saveConfigDraft(request, signal) {
+        this.#assertAcceptingActions();
+        if (this.hasActiveWrite)
+            throw new TuiOperationBlockedError('writeInProgress', '另一个写操作仍在执行。');
+        if (request.apply || request.kind === 'configSave' && request.retryApply) {
+            throw new TuiOperationBlockedError('configSaveOnlyRequired', '此入口只保存配置。请单独准备插件更新。');
+        }
+        const intent = normalizeOperationIntent(structuredClone(request));
+        const combined = signal ? AbortSignal.any([this.#abort.signal, signal]) : this.#abort.signal;
+        const promise = (async () => {
+            try {
+                this.#validateReviewIntent(intent);
+                const evidence = await this.#prepareReviewEvidence(intent, combined);
+                combined.throwIfAborted();
+                const execution = await this.dependencies.executeIntent(intent, evidence, combined);
+                if (intent.kind === 'configSaveBatch') {
+                    const batch = execution;
+                    return {
+                        status: batch.status,
+                        savedProfiles: batch.groups.filter((group) => group.configSaved).map((group) => group.platform ?? 'common'),
+                        failedProfiles: batch.groups.filter((group) => !group.configSaved).map((group) => ({
+                            profile: group.platform ?? 'common',
+                            ...(group.errorCode ? { errorCode: safeDiagnosticCode(group.errorCode, 'configWriteFailed') } : {}),
+                        })),
+                    };
+                }
+                const saved = typeof execution === 'object' && execution !== null
+                    && execution.configWrite === 'succeeded';
+                return { status: saved ? 'succeeded' : 'failed', savedProfiles: saved ? [intent.platform ?? 'common'] : [],
+                    failedProfiles: saved ? [] : [{ profile: intent.platform ?? 'common', errorCode: 'configWriteUnconfirmed' }] };
+            }
+            catch (error) {
+                await this.#logOperationError(error, issueCode(error), intent);
+                throw new TuiOperationBlockedError(issueCode(error), sanitizeDiagnosticText(error instanceof Error ? error.message : '设置未保存。', [], collectOperationSensitiveValues(intent)));
+            }
+        })();
+        this.#configSaveInflight = promise;
+        this.#publish();
+        try {
+            return cloneFrozen(await promise);
+        }
+        finally {
+            if (this.#configSaveInflight === promise)
+                this.#configSaveInflight = undefined;
+            this.#publish();
+        }
     }
     async previewConfigSaveImpact(intent, signal) {
         this.#assertAcceptingActions();
@@ -3097,12 +3178,12 @@ export class TuiController {
         }
         return cloneFrozen(evidence.config);
     }
-    async getConfigResetAvailability(pluginId, layer) {
+    async getConfigResetAvailability(pluginId, options) {
         this.#assertAcceptingActions();
         if (!this.dependencies.getConfigResetAvailability) {
             throw new TuiOperationBlockedError('configResetVerificationUnavailable', '设置层可信读取入口不可用。');
         }
-        return cloneFrozen(await this.#trackRead(this.dependencies.getConfigResetAvailability(pluginId, structuredClone(layer), this.#abort.signal)));
+        return cloneFrozen(await this.#trackRead(this.dependencies.getConfigResetAvailability(pluginId, structuredClone(options), this.#abort.signal)));
     }
     listUserIssues() {
         return cloneFrozen(this.#viewModel?.issues ?? []);
@@ -3215,25 +3296,6 @@ export class TuiController {
             }
         }
         if (intent.kind === 'pluginWriteBatch') {
-            if ((intent.selection.kind === 'currentProjectIntentRoots'
-                || intent.selection.kind === 'currentProjectIntentTargets')
-                && (intent.action !== 'sync' || intent.scope !== 'project')) {
-                throw new TuiOperationBlockedError('batchSelectionInvalid', '当前项目全部同步只支持 project scope sync。');
-            }
-            if (intent.selection.kind === 'currentProjectIntentTargets') {
-                const targets = intent.selection.targets;
-                const canonical = [...new Map(targets.map((target) => [
-                        projectReminderTargetKey(target), target,
-                    ])).values()].sort((left, right) => projectReminderTargetKey(left)
-                    .localeCompare(projectReminderTargetKey(right), 'en'));
-                if (targets.length === 0
-                    || targets.some((target) => target.scope !== 'project')
-                    || JSON.stringify(targets) !== JSON.stringify(canonical)) {
-                    throw new TuiOperationBlockedError('batchSelectionInvalid', '当前项目同步目标必须是非空、规范且精确的 project 目标集合。');
-                }
-                for (const target of targets)
-                    sourceIdFromPluginId(target.pluginId);
-            }
             if (intent.selection.kind === 'selected') {
                 const canonical = canonicalPluginIds(intent.selection.pluginIds);
                 if (canonical.length === 0) {
@@ -3258,7 +3320,7 @@ export class TuiController {
         if (intent.kind === 'pluginWriteBatch') {
             return intent.selection.kind === 'selected'
                 ? `${intent.selection.pluginIds.length} 个插件`
-                : '当前项目全部插件';
+                : `${intent.selection.targets.length} 个目标`;
         }
         if ('pluginId' in intent) {
             return this.#viewModel?.plugins.find((plugin) => plugin.pluginId === intent.pluginId)?.displayName
@@ -3464,7 +3526,7 @@ export class TuiController {
         const configImpact = configEvidence ? {
             state: configEvidence.some((group) => group.impactState !== 'known') ? 'unknown' : 'known',
             affectedTargetCount: new Set(configEvidence.flatMap((group) => group.affectedTargets
-                .map((target) => `${target.platform}\0${target.scope}`))).size
+                .map((target) => `${target.pluginName ?? ''}\0${target.platform}\0${target.scope}`))).size
                 + new Set(configEvidence.flatMap((group) => (group.commandPackages ?? [])
                     .map((target) => target.packageId))).size,
         } : undefined;
@@ -3887,6 +3949,19 @@ export class TuiController {
                         summary: pluginSummary,
                     });
                 }
+                const concurrentScopeConflict = ticket.intent.kind === 'pluginWrite'
+                    && ticket.intent.action === 'install'
+                    && unsuccessfulTargets.length === pluginSummary.targets?.length
+                    && unsuccessfulTargets.every((target) => target.errorCode === 'codexExtensionScopeConflict');
+                if (concurrentScopeConflict) {
+                    return this.#setBlocked(operationId, 'codexExtensionScopeConflict', {
+                        intent: ticket.intent,
+                        navigation: 'result',
+                        returnRoute: ticket.returnRoute,
+                        summary: pluginSummary,
+                        writeMayHaveCompleted: false,
+                    });
+                }
                 const dependencyStillRequired = unsuccessfulTargets.length > 0
                     && unsuccessfulTargets.every((target) => target.errorCode === 'dependencyStillRequired');
                 return this.#setBlocked(operationId, dependencyStillRequired ? 'dependencyStillRequired' : 'operationFailed', {
@@ -3902,7 +3977,11 @@ export class TuiController {
                 });
             }
             const originIssue = ticket.intent.kind === 'pluginWrite' ? ticket.intent.originIssue : undefined;
+            const projectRemovalKeepsDemand = ticket.intent.kind === 'pluginWrite'
+                && ticket.intent.action === 'uninstall' && ticket.intent.scope === 'project'
+                && pluginSummary?.code === 'operationSucceeded';
             if (originIssue && !dependencyPartial
+                && !projectRemovalKeepsDemand
                 && this.#viewModel?.issues.some((issue) => originIssueRemains(issue, originIssue))) {
                 return this.#setBlocked(operationId, 'issueStillPresent', {
                     intent: ticket.intent,
@@ -3912,7 +3991,7 @@ export class TuiController {
                     verification: 'issueStillPresent',
                 });
             }
-            if (ticket.intent.kind === 'configSave' || ticket.intent.kind === 'configReset') {
+            if ((ticket.intent.kind === 'configSave' && !ticket.intent.retryApply) || ticket.intent.kind === 'configReset') {
                 const configWrite = typeof execution === 'object' && execution !== null
                     ? execution.configWrite
                     : undefined;
@@ -3986,7 +4065,7 @@ export class TuiController {
                             : ticket.returnRoute)),
             };
             const configResultNeedsAttention = result.state === 'succeeded' && (result.summary.messages?.some((message) => message.startsWith('警告：')
-                || message === '提示：其它项目没有被扫描，可能需要在对应项目目录中运行 aw sync。') ?? false);
+                || message === '提示：其它项目没有被扫描，可能需要在对应项目目录中运行 aw plugin sync --context project。') ?? false);
             if ((ticket.intent.kind === 'configSave' || ticket.intent.kind === 'configSaveBatch'
                 || ticket.intent.kind === 'configReset')
                 && this.#portableRepreparePluginId === ticket.intent.pluginId
@@ -4085,7 +4164,7 @@ export class TuiController {
                                 ? '设置已保存，但后续应用失败。'
                                 : '设置已保存，但后续步骤未完成。',
                     pluginId: ticket.intent.pluginId,
-                    configScope: ticket.intent.scope,
+                    configScope: 'user', configPlatform: ticket.intent.platform, configContext: ticket.intent.context ?? 'user',
                     ...(ticket.intent.kind === 'configSave' && ticket.intent.apply
                         ? { configApplyRetryAvailable: true } : {}),
                     elapsedMs,
@@ -4279,6 +4358,7 @@ export class TuiController {
         if (this.#disposed)
             return;
         this.#disposed = true;
+        this.#scopedPreparationAbort?.abort();
         this.#invalidatePortableResultRecheck();
         this.#cancelReviewPreparation();
         this.#cancelPortableRequest();
@@ -4687,6 +4767,7 @@ function operationResultSummaryUnsafe(intent, execution) {
                 : false,
             configGroups: batch.groups.map((group) => ({
                 scope: group.scope,
+                platform: group.platform,
                 configSaved: group.configSaved,
                 applyRequested: group.applyRequested,
                 applyStatus: group.applyStatus,
@@ -4698,7 +4779,7 @@ function operationResultSummaryUnsafe(intent, execution) {
                 : []),
             messages: [
                 ...batch.groups.map((group) => {
-                    const label = group.scope === 'project' ? '当前项目' : '个人默认';
+                    const label = group.platform ? `${group.platform} 平台配置` : '公共配置';
                     return group.configSaved
                         ? `${label}已保存${group.errorCode === 'invalidConfig'
                             ? '，但当前配置无效，未应用'
@@ -4707,7 +4788,7 @@ function operationResultSummaryUnsafe(intent, execution) {
                 }),
                 ...publicWarnings.map((warning) => `警告：${warning}`),
                 ...(otherProjectsMayRequireSync
-                    ? ['提示：其它项目没有被扫描，可能需要在对应项目目录中运行 aw sync。']
+                    ? ['提示：其它项目没有被扫描，可能需要在对应项目目录中运行 aw plugin sync --context project。']
                     : []),
             ],
         };
@@ -4727,7 +4808,7 @@ function operationResultSummaryUnsafe(intent, execution) {
             const target = typeof entry.target === 'object' && entry.target !== null
                 ? entry.target
                 : entry;
-            if ((target.platform !== 'codex' && target.platform !== 'claude')
+            if (!isPlatformTarget(target.platform)
                 || (target.scope !== 'user' && target.scope !== 'project')
                 || (entry.state !== 'completed' && entry.state !== 'failed' && entry.state !== 'skipped'))
                 return [];
@@ -4761,13 +4842,12 @@ function operationResultSummaryUnsafe(intent, execution) {
             ? execution.warnings.filter((warning) => typeof warning === 'string'
                 && warning.startsWith('projectConfigShareabilityUnverified:'))
             : [];
-        const otherProjectsMayRequireSync = intent.scope === 'user'
-            && typeof execution === 'object' && execution !== null
+        const otherProjectsMayRequireSync = typeof execution === 'object' && execution !== null
             && execution.otherProjectsMayRequireSync === true;
         const publicMessages = [
             ...publicWarnings.map((warning) => `警告：${warning}`),
             ...(otherProjectsMayRequireSync
-                ? ['提示：其它项目没有被扫描，可能需要在对应项目目录中运行 aw sync。']
+                ? ['提示：其它项目没有被扫描，可能需要在对应项目目录中运行 aw plugin sync --context project。']
                 : []),
         ];
         const partial = overallState === 'partial'
@@ -4784,7 +4864,7 @@ function operationResultSummaryUnsafe(intent, execution) {
             message: invalidConfig ? '设置已保存，但没有应用。当前配置仍无效。'
                 : failed || partial ? '设置已保存，但插件内容重新应用失败或部分失败。' : '操作已完成。',
             pluginId: intent.pluginId,
-            configScope: intent.scope,
+            configScope: 'user', configPlatform: intent.platform, configContext: intent.context ?? 'user',
             configApplyRetryAvailable: intent.kind === 'configSave'
                 && intent.apply && !invalidConfig && (applyState === 'partial' || applyState === 'unavailable'),
             ...(intent.kind === 'configSave' && intent.retryApply ? { configRetryApply: true } : {}),
@@ -4804,7 +4884,7 @@ function operationResultSummaryUnsafe(intent, execution) {
                         ? { quarantineBasename } : {}),
                 }
                 : {}),
-            ...(targets.length > 0 ? { targets } : {}),
+            ...(targets.length > 0 ? { configTargets: targets } : {}),
             ...(commandResults.length > 0 ? { commandResults,
                 recoveryActions: [...new Set(commandResults.flatMap((result) => result.recoveryActions))] } : {}),
         };