@lesliechan721/aw 0.1.0-beta.27 → 0.1.0-beta.28

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

@@ -436,6 +436,7 @@ export type OperationExecuteResult = {
     }>['action'];
     pluginId?: string;
     originIssue?: IssueOrigin;
+    portableIntent?: PortableResultIntentMetadata;
     returnRoute?: TuiRoute;
     operationRecordId?: string;
     diagnosticIds?: string[];
@@ -450,6 +451,7 @@ export type OperationExecuteResult = {
     }>['action'];
     pluginId?: string;
     originIssue?: IssueOrigin;
+    portableIntent?: PortableResultIntentMetadata;
     returnRoute?: TuiRoute;
     operationRecordId?: string;
     diagnosticIds?: string[];
@@ -463,6 +465,7 @@ export type OperationExecuteResult = {
     }>['action'];
     review: OperationReviewModel;
     originIssue?: IssueOrigin;
+    portableIntent?: PortableResultIntentMetadata;
     operationRecordId?: string;
     diagnosticIds?: string[];
     effects?: OperationEffectFacts;
@@ -478,6 +481,7 @@ export type OperationExecuteResult = {
     pluginId?: string;
     returnRoute?: TuiRoute;
     originIssue?: IssueOrigin;
+    portableIntent?: PortableResultIntentMetadata;
     writeMayHaveCompleted?: boolean;
     verification?: 'issueStillPresent' | 'verificationFailed';
     summary?: OperationResultSummary;
@@ -485,6 +489,10 @@ export type OperationExecuteResult = {
     diagnosticIds?: string[];
     effects?: OperationEffectFacts;
 };
+export interface PortableResultIntentMetadata {
+    scope: Scope;
+    agentMode: 'automatic' | 'explicit';
+}
 export interface OperationResultSummary {
     code: 'operationSucceeded' | 'operationPartial' | 'operationFailed';
     message: string;
@@ -536,6 +544,10 @@ export interface OperationResultSummary {
         selectedSkills: string[];
         agentMode: 'automatic' | 'explicit';
         requestedAgents: string[];
+        attemptedTargets?: Array<{
+            skill: string;
+            agent?: string;
+        }>;
         scope: Scope;
         materializationDigest: string;
         skillsCliVersion: string;
@@ -603,6 +615,20 @@ export interface PluginOperationProgressLine {
 }
 export interface TuiStatusLoadResult {
     projectRoot?: string;
+    projectIntent?: {
+        state: 'ready';
+        roots: Array<{
+            pluginId: string;
+            platforms: PlatformName[];
+        }>;
+    } | {
+        state: 'absent';
+    } | {
+        state: 'invalid' | 'unavailable';
+        code: string;
+        message: string;
+    };
+    /** Compatibility input for older injected status fixtures. Production uses projectIntent. */
     projectIntentRoots?: Array<{
         pluginId: string;
         platforms: PlatformName[];
@@ -742,6 +768,11 @@ export interface TuiControllerSnapshot {
         operationRecordId?: string;
     };
     projectIntentReminder?: ProjectIntentReminder;
+    projectIntentIssue?: {
+        state: 'invalid' | 'unavailable';
+        code: string;
+        message: string;
+    };
 }
 export declare class TuiOperationBlockedError extends Error {
     readonly code: string;

package/dist/src/tui/controller.js

@@ -90,10 +90,13 @@ 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.projectIntentRoots ?? []).map((root) => [
+    const projectRoots = new Map((status.projectIntent?.state === 'ready'
+        ? status.projectIntent.roots : status.projectIntentRoots ?? []).map((root) => [
         root.pluginId,
         new Set(root.platforms),
     ]));
@@ -724,6 +727,8 @@ export class TuiController {
     #portableResultSkills;
     #portableResultReceipt;
     #portableResultIntent;
+    #portableResultLifecycle = 0;
+    #portableResultRecheck;
     #completionNotice;
     #projectIntentReminder;
     #loadError;
@@ -839,6 +844,10 @@ export class TuiController {
             ...(this.#projectIntentReminder
                 ? { projectIntentReminder: this.#projectIntentReminder }
                 : {}),
+            ...(this.#status?.projectIntent?.state === 'invalid'
+                || this.#status?.projectIntent?.state === 'unavailable'
+                ? { projectIntentIssue: this.#status.projectIntent }
+                : {}),
         });
     }
     subscribe(listener) {
@@ -921,6 +930,7 @@ export class TuiController {
     }
     beginRetirement() {
         this.#retiring = true;
+        this.#invalidatePortableResultRecheck();
     }
     async waitForWrites() {
         this.beginRetirement();
@@ -952,6 +962,7 @@ export class TuiController {
     goHome(options = {}) {
         if (this.hasSessionDraft && !options.discardDrafts)
             return false;
+        this.#invalidatePortableResultRecheck();
         this.#cancelReviewPreparation();
         this.#cancelPortableRequest();
         this.#cancelInstallPlacementRequest();
@@ -1330,6 +1341,7 @@ export class TuiController {
         return { name: 'sourceList' };
     }
     #showResult(result, intent) {
+        this.#invalidatePortableResultRecheck();
         const terminal = { name: 'result', operationId: result.operationId };
         const target = this.#stableResultRoute(intent, result);
         this.#resultAnchor = structuredClone(target);
@@ -1521,6 +1533,9 @@ export class TuiController {
         this.#publish();
     }
     push(route, context) {
+        if (this.#router.snapshot.current.route.name === 'result') {
+            this.#invalidatePortableResultRecheck();
+        }
         this.#cancelReviewPreparation();
         this.#cancelPortableRequest();
         this.#cancelInstallPlacementRequest();
@@ -1709,26 +1724,86 @@ export class TuiController {
             || !this.dependencies.recheckPortableInstall) {
             throw new TuiOperationBlockedError('portableRecheckUnavailable', '当前结果不能执行只读复查。');
         }
-        const checked = await this.#trackRead(this.dependencies.recheckPortableInstall(structuredClone(this.#portableResultReceipt), this.#abort.signal));
-        this.#portableResultReceipt = structuredClone(checked);
-        const summary = operationResultSummary(this.#portableResultIntent, checked);
-        const previous = this.#result;
-        this.#result = {
-            state: checked.status === 'succeeded' ? 'succeeded' : 'partial',
-            operationId: previous.operationId,
-            summary: {
+        const currentResult = this.#result;
+        if (currentResult.state !== 'succeeded' && currentResult.state !== 'partial') {
+            throw new TuiOperationBlockedError('portableRecheckUnavailable', '当前结果不能执行只读复查。');
+        }
+        const previous = structuredClone(currentResult);
+        const originalReceipt = structuredClone(this.#portableResultReceipt);
+        const originalIntent = structuredClone(this.#portableResultIntent);
+        const lifecycle = this.#portableResultLifecycle;
+        if (this.#portableResultRecheck?.lifecycle === lifecycle
+            && this.#portableResultRecheck.operationId === previous.operationId) {
+            return await this.#portableResultRecheck.promise;
+        }
+        const abort = new AbortController();
+        const signal = AbortSignal.any([this.#abort.signal, abort.signal]);
+        const isCurrent = () => !this.#disposed
+            && !this.#retiring
+            && !signal.aborted
+            && lifecycle === this.#portableResultLifecycle
+            && this.#router.snapshot.current.route.name === 'result'
+            && this.#result?.operationId === previous.operationId
+            && this.#result.operationRecordId === previous.operationRecordId;
+        const promise = (async () => {
+            let checked;
+            try {
+                checked = await this.#trackRead(this.dependencies.recheckPortableInstall(structuredClone(originalReceipt), signal));
+            }
+            catch (error) {
+                if (!isCurrent())
+                    return cloneFrozen(originalReceipt);
+                throw error;
+            }
+            if (!isCurrent())
+                return cloneFrozen(originalReceipt);
+            this.#portableResultReceipt = structuredClone(checked);
+            const summary = operationResultSummary(originalIntent, checked);
+            const verificationState = summary.portable?.verificationUnknown
+                ? 'unknown' : 'completed';
+            const effects = previous.effects
+                ? { ...previous.effects, finalVerification: verificationState }
+                : undefined;
+            const updatedSummary = {
                 ...summary,
-                elapsedMs: 'summary' in previous && previous.summary?.elapsedMs !== undefined
-                    ? previous.summary.elapsedMs : summary.elapsedMs,
-            },
-            operationKind: 'portableInstall',
-            pluginId: this.#portableResultIntent.pluginId,
-            returnRoute: 'returnRoute' in previous && previous.returnRoute
-                ? structuredClone(previous.returnRoute)
-                : { name: 'pluginDetail', pluginId: this.#portableResultIntent.pluginId },
+                ...(previous.summary.elapsedMs !== undefined
+                    ? { elapsedMs: previous.summary.elapsedMs } : {}),
+                ...(previous.summary.diagnosticIds
+                    ? { diagnosticIds: structuredClone(previous.summary.diagnosticIds) } : {}),
+                ...(effects ? { effects } : {}),
+            };
+            const updated = checked.status === 'succeeded'
+                ? { ...previous, state: 'succeeded', summary: updatedSummary, ...(effects ? { effects } : {}) }
+                : { ...previous, state: 'partial', summary: updatedSummary, ...(effects ? { effects } : {}) };
+            this.#result = updated;
+            if (updated.operationRecordId) {
+                const record = this.#operationHistory.get(updated.operationRecordId);
+                if (record) {
+                    record.summary = {
+                        ...record.summary,
+                        state: updated.state,
+                        code: updated.summary.code,
+                        message: updated.summary.message,
+                        effects: effects ?? record.summary.effects,
+                    };
+                    this.#operationHistory.record(record);
+                }
+            }
+            this.#publish();
+            return cloneFrozen(checked);
+        })();
+        this.#portableResultRecheck = {
+            lifecycle,
+            operationId: previous.operationId,
+            abort,
+            promise,
         };
-        this.#publish();
-        return cloneFrozen(checked);
+        void promise.finally(() => {
+            if (this.#portableResultRecheck?.promise === promise) {
+                this.#portableResultRecheck = undefined;
+            }
+        }).catch(() => undefined);
+        return await promise;
     }
     startPortableRetryReviewPreparation() {
         this.#assertAcceptingActions();
@@ -1763,6 +1838,9 @@ export class TuiController {
         this.#publish();
     }
     replace(route, context) {
+        if (this.#router.snapshot.current.route.name === 'result') {
+            this.#invalidatePortableResultRecheck();
+        }
         this.#cancelReviewPreparation();
         this.#cancelPortableRequest();
         this.#cancelInstallPlacementRequest();
@@ -1882,6 +1960,8 @@ export class TuiController {
     }
     back() {
         const route = this.#router.snapshot.current.route;
+        if (route.name === 'result')
+            this.#invalidatePortableResultRecheck();
         const activeFlow = this.#router.activeFlow();
         this.#cancelReviewPreparation();
         this.#cancelPortableRequest();
@@ -1925,6 +2005,7 @@ export class TuiController {
     leaveResult(target) {
         if (this.#router.snapshot.current.route.name !== 'result')
             return;
+        this.#invalidatePortableResultRecheck();
         if (target?.name === 'home') {
             this.#router.resetToRoot();
             this.#portableDraft = undefined;
@@ -1973,6 +2054,7 @@ export class TuiController {
         if (this.#router.snapshot.current.route.name !== 'result' || !result
             || !('returnRoute' in result) || !result.returnRoute)
             return;
+        this.#invalidatePortableResultRecheck();
         const returnRoute = this.#normalizeRoute(result.returnRoute);
         this.#router.back();
         const kind = result.operationKind === 'configSave' || result.operationKind === 'configSaveBatch'
@@ -2024,6 +2106,7 @@ export class TuiController {
         }
     }
     resetPortableFlowToPreview(pluginId, target, preserveDraft = false) {
+        this.#invalidatePortableResultRecheck();
         this.#cancelPortableRequest();
         if (preserveDraft && !this.#portableDraft) {
             this.#portableDraft = this.#recoverablePortableDraft;
@@ -2055,6 +2138,11 @@ export class TuiController {
         this.#portableRequestAbort = undefined;
         this.#portablePending = undefined;
     }
+    #invalidatePortableResultRecheck() {
+        this.#portableResultLifecycle += 1;
+        this.#portableResultRecheck?.abort.abort();
+        this.#portableResultRecheck = undefined;
+    }
     #runPortableRequest(key, action) {
         if (this.#portablePending?.key === key) {
             return this.#portablePending.promise;
@@ -2766,6 +2854,8 @@ export class TuiController {
         this.#ensureOperationFlow(intent);
         const inheritedReturnRoute = this.#reviewPreparation?.returnRoute;
         const current = this.#router.snapshot.current.route;
+        if (current.name === 'result')
+            this.#invalidatePortableResultRecheck();
         const navigation = current.name === 'result' || current.name === 'reviewPreparing'
             ? 'replace' : 'push';
         const resolvedReturnRoute = returnRoute
@@ -3836,6 +3926,12 @@ export class TuiController {
             operationKind: intent.kind,
             ...(intent.kind === 'sourceMutation' ? { sourceAction: intent.action } : {}),
             ...('pluginId' in intent ? { pluginId: intent.pluginId } : {}),
+            ...(intent.kind === 'portableInstall' ? {
+                portableIntent: {
+                    scope: intent.scope,
+                    agentMode: intent.requestedAgents === undefined ? 'automatic' : 'explicit',
+                },
+            } : {}),
             ...(intent.kind === 'pluginWrite' && intent.originIssue
                 ? { originIssue: intent.originIssue }
                 : {}),
@@ -3845,6 +3941,7 @@ export class TuiController {
         if (this.#disposed)
             return;
         this.#disposed = true;
+        this.#invalidatePortableResultRecheck();
         this.#cancelReviewPreparation();
         this.#cancelPortableRequest();
         this.#cancelInstallPlacementRequest();
@@ -3938,6 +4035,9 @@ function operationResultSummaryUnsafe(intent, execution) {
                 selectedSkills: receipt.selectedSkills.map((skill) => skill.name),
                 agentMode: receipt.agentMode,
                 requestedAgents: receipt.requestedAgents,
+                ...(receipt.attemptedTargets
+                    ? { attemptedTargets: structuredClone(receipt.attemptedTargets) }
+                    : {}),
                 scope: receipt.scope,
                 materializationDigest: receipt.materializationDigest,
                 skillsCliVersion: receipt.skillsCliVersion,