@things-factory/ai-assistant 10.1.79 → 10.1.81

package/dist-client/components/assistant-dock.d.ts

@@ -35,6 +35,9 @@ export declare class AssistantDock extends AssistantDock_base {
     private showingHistory;
     private conversationView;
     private asking?;
+    private screenChanged;
+    private navigationNotice;
+    private openedIdentity;
     private app;
     /** The kind the person picked; kept while the surface stays the same. */
     private chosenKind;
@@ -47,6 +50,10 @@ export declare class AssistantDock extends AssistantDock_base {
     connectedCallback(): void;
     disconnectedCallback(): void;
     private scopeKey;
+    private identityKey;
+    private get navigationState();
+    private mayLeaveConversation;
+    private requestSurface;
     /** The screen changed - a different surface or domain is a different conversation. */
     private follow;
     private open;
@@ -62,8 +69,14 @@ export declare class AssistantDock extends AssistantDock_base {
     private report;
     /** Every proposal ends in exactly one reported outcome - a kind nobody handles is `unavailable`. */
     private onProposal;
+    /**
+     * "Check result" - asks the surface what became of a requested proposal and reports only what it learns.
+     * Nothing is run: a lost answer never turns into a second application (ADR-0097 Q-D4 ④).
+     */
+    private onProposalCheck;
     private appendNote;
     private onScenePatch;
+    private mayApplyOnScreen;
     private onBoardRevert;
     private onSceneAction;
     private stuckLine;

package/dist-client/components/assistant-dock.js

@@ -21,6 +21,7 @@ import { setOpenSession, subscribeSessionActivity } from '../utils/assistant-act
 import { assistantHomeSurface, currentAssistantSurface, isAnchor, subscribeAssistantSurface } from '../utils/assistant-surface.js';
 import { runProposal } from '../utils/assistant-proposals.js';
 import { holdAssistantAsk, subscribeAssistantAsk, takeAssistantAsk } from '../utils/assistant-ask.js';
+import { surfaceTransition } from '../utils/assistant-navigation.js';
 export const ASSISTANT_DOCK_VIEWPART = 'assistant-dock';
 const t = (key, defaultValue, options = {}) => i18next.t(`ai-assistant.dock.${key}`, { defaultValue, ...options });
 const MODES_QUERY = gql `
@@ -66,6 +67,9 @@ let AssistantDock = class AssistantDock extends localize(i18next)(LitElement) {
         this.failure = '';
         this.showingHistory = false;
         this.conversationView = 0;
+        this.screenChanged = false;
+        this.navigationNotice = '';
+        this.openedIdentity = '';
         this.app = new AppController(this);
         /** The kind the person picked; kept while the surface stays the same. */
         this.chosenKind = '';
@@ -84,17 +88,21 @@ let AssistantDock = class AssistantDock extends localize(i18next)(LitElement) {
             this.failure = next.error;
         }, { getItem: key => sessionStorage.getItem(key), setItem: (key, value) => sessionStorage.setItem(key, value) }, { lazy: true });
         this.onStartNewSession = () => void this.newConversation();
-        this.onModeChange = (event) => {
+        this.onModeChange = async (event) => {
             const kind = event.detail?.kind;
             if (!kind || kind === this.kind)
                 return;
+            if (!(await this.mayLeaveConversation()))
+                return;
             this.chosenKind = kind;
             void this.open();
         };
         /** Every proposal ends in exactly one reported outcome - a kind nobody handles is `unavailable`. */
         this.onProposal = async (event) => {
             const { proposal, sessionId, proposalKey } = event.detail ?? {};
-            const outcome = await runProposal(proposal, this.proposalContext(sessionId));
+            const outcome = this.openedFor !== this.scopeKey(currentAssistantSurface()) || this.openedIdentity !== this.identityKey()
+                ? { verdict: 'unavailable', errorCode: 'conversation-screen-changed', note: t('return-to-subject', 'Return to the conversation subject before applying this proposal.') }
+                : await runProposal(proposal, this.proposalContext(sessionId));
             if (outcome.verdict === 'unavailable' && outcome.errorCode === 'unknown-proposal-kind') {
                 notify({ level: 'error', message: t('proposal-not-runnable', 'this proposal cannot be run on this screen.') });
             }
@@ -103,8 +111,36 @@ let AssistantDock = class AssistantDock extends localize(i18next)(LitElement) {
             if (outcome.note && sessionId)
                 await this.appendNote(sessionId, outcome.note);
         };
+        /**
+         * "Check result" - asks the surface what became of a requested proposal and reports only what it learns.
+         * Nothing is run: a lost answer never turns into a second application (ADR-0097 Q-D4 ④).
+         */
+        this.onProposalCheck = async (event) => {
+            const { proposal, sessionId, proposalKey } = event.detail ?? {};
+            const ask = this.surface?.proposalOutcome;
+            if (!ask) {
+                notify({ level: 'info', message: t('proposal-result-uncheckable', 'this screen cannot check that result. open the screen where it was applied.') });
+                return;
+            }
+            let outcome;
+            try {
+                outcome = await ask.call(this.surface, proposalKey, proposal);
+            }
+            catch {
+                outcome = undefined;
+            }
+            if (!outcome?.verdict) {
+                notify({ level: 'info', message: t('proposal-result-unknown', 'the result is still unknown. it was not applied again.') });
+                return;
+            }
+            await this.report(sessionId, proposalKey, outcome);
+            if (outcome.note && sessionId)
+                await this.appendNote(sessionId, outcome.note);
+        };
         /* ── board surfaces: the chat's scene edits land on the open board ───────────────── */
         this.onScenePatch = async (event) => {
+            if (!this.mayApplyOnScreen())
+                return;
             const board = this.surface?.board;
             if (!board)
                 return;
@@ -112,8 +148,10 @@ let AssistantDock = class AssistantDock extends localize(i18next)(LitElement) {
             if (result?.missed)
                 notify({ level: 'info', message: t('patch-missed', '{missed} of the changes could not be applied.', { missed: result.missed }) });
         };
-        this.onBoardRevert = (event) => void this.surface?.board?.revertPatch?.(event.detail?.patchId);
-        this.onSceneAction = (event) => void this.surface?.board?.applyAction?.(event.detail);
+        this.onBoardRevert = (event) => { if (this.mayApplyOnScreen())
+            void this.surface?.board?.revertPatch?.(event.detail?.patchId); };
+        this.onSceneAction = (event) => { if (this.mayApplyOnScreen())
+            void this.surface?.board?.applyAction?.(event.detail); };
     }
     static { this.styles = [
         ScrollbarStyles,
@@ -239,12 +277,42 @@ let AssistantDock = class AssistantDock extends localize(i18next)(LitElement) {
         gap: 4px;
         font: inherit;
       }
+
+      .next-step {
+        display: flex;
+        align-items: center;
+        justify-content: space-between;
+        gap: 10px;
+        padding: 8px 12px;
+        border-bottom: 1px solid var(--md-sys-color-outline-variant);
+        background: var(--md-sys-color-surface-container-low);
+        color: var(--md-sys-color-on-surface-variant);
+        font-size: 12px;
+        line-height: 1.4;
+      }
+
+      .next-step a {
+        display: inline-flex;
+        align-items: center;
+        gap: 3px;
+        flex: none;
+        color: var(--md-sys-color-primary);
+        font-weight: 650;
+        text-decoration: none;
+      }
+
+      .next-step a:hover { text-decoration: underline; }
+      .next-step md-icon { --md-icon-size: 16px; }
+      ox-assistant-chat[hidden] { display: none; }
+      .transition { padding: 10px 12px; font-size: 13px; line-height: 1.5; border-bottom: 1px solid var(--md-sys-color-outline-variant); background: var(--md-sys-color-surface-container-low); }
+      .transition button { display: block; margin-top: 6px; font: inherit; }
     `
     ]; }
     connectedCallback() {
         super.connectedCallback();
         this.addEventListener('assistant-start-new-session', this.onStartNewSession);
-        this.unsubscribers.push(subscribeAssistantSurface(() => this.follow()), subscribeAssistantAsk(() => void this.takeAsk()), subscribeSessionActivity(activity => {
+        this.unsubscribers.push(subscribeAssistantSurface(() => this.follow()), store.subscribe(() => { if (this.openedIdentity !== this.identityKey())
+            this.follow(); }), subscribeAssistantAsk(() => void this.takeAsk()), subscribeSessionActivity(activity => {
             /* A rename or a new conversation elsewhere on this anchor - the tabs read again. */
             if (activity.kind === 'meta' && isAnchor(this.anchor) && activity.anchorId === this.anchor.anchorId)
                 void this.reloadSessions();
@@ -259,23 +327,73 @@ let AssistantDock = class AssistantDock extends localize(i18next)(LitElement) {
         this.controller.clear();
         super.disconnectedCallback();
     }
-    scopeKey(surface = this.surface) {
+    scopeKey(surface) {
         return JSON.stringify([this.app.contextPath, surface?.key ?? '']);
     }
+    identityKey() {
+        const user = store.getState().auth?.user;
+        return JSON.stringify([this.app.contextPath, user?.id || user?.email || '']);
+    }
+    get navigationState() {
+        return this.renderRoot.querySelector('ox-assistant-chat')?.navigationState ?? { busy: false, draft: false };
+    }
+    async mayLeaveConversation() {
+        if (this.navigationState.busy) {
+            notify({ level: 'info', message: t('wait-before-switch', 'Wait for the current response before changing conversations.') });
+            return false;
+        }
+        if (!this.navigationState.draft)
+            return true;
+        const identity = this.identityKey();
+        const accepted = await OxPrompt.open({
+            type: 'warning', title: t('switch-title', 'Change conversation?'),
+            text: t('switch-draft', 'Your unsent text and attachments will not move to the other conversation.'),
+            confirmButton: { text: t('switch-confirm', 'Discard draft and switch') },
+            cancelButton: { text: t('stay', 'Keep writing') }
+        });
+        return !!accepted && identity === this.identityKey();
+    }
+    async requestSurface(surface) {
+        if (!(await this.mayLeaveConversation()))
+            return;
+        this.chosenKind = '';
+        this.surface = surface;
+        this.navigationNotice = surface ? t('now-about', 'Conversation subject: {name}', { name: surface.label() }) : '';
+        await this.open();
+    }
     /** The screen changed - a different surface or domain is a different conversation. */
     follow(force = false) {
         const next = currentAssistantSurface();
-        if (!force && next === this.surface && this.scopeKey(next) === this.openedFor) {
-            /* The same conversation, told that its words changed - a name loaded, a board renamed on save. */
+        const transition = surfaceTransition({
+            identityChanged: this.openedIdentity !== this.identityKey(),
+            sameSubject: this.scopeKey(next) === this.openedFor,
+            active: isAnchor(this.anchor) && (!!this.sessionId || this.navigationState.draft || this.navigationState.busy)
+        });
+        if (!force && transition === 'refresh') {
+            this.surface = next;
+            this.screenChanged = false;
             this.requestUpdate();
             return;
         }
+        if (!force && transition === 'offer') {
+            this.screenChanged = true;
+            return;
+        }
+        if (transition === 'reset') {
+            this.asking = undefined;
+            this.capability = 'unknown';
+            if (this.openedIdentity)
+                takeAssistantAsk();
+        }
+        this.navigationNotice = transition === 'follow' && next ? t('now-about', 'Conversation subject: {name}', { name: next.label() }) : '';
         if (next?.key !== this.surface?.key)
             this.chosenKind = '';
         this.surface = next;
         void this.open();
     }
     async open() {
+        this.openedIdentity = this.identityKey();
+        this.screenChanged = false;
         const ticket = ++this.revision;
         this.conversationView++;
         this.showingHistory = false;
@@ -283,7 +401,7 @@ let AssistantDock = class AssistantDock extends localize(i18next)(LitElement) {
         this.loading = true;
         this.failure = '';
         this.anchor = undefined;
-        this.openedFor = this.scopeKey();
+        this.openedFor = this.scopeKey(this.surface);
         try {
             if (this.capability !== 'configured') {
                 this.capability = await readAiCapability();
@@ -342,13 +460,17 @@ let AssistantDock = class AssistantDock extends localize(i18next)(LitElement) {
     async newConversation() {
         if (this.loading || !isAnchor(this.anchor))
             return;
+        if (!(await this.mayLeaveConversation()))
+            return;
         this.showingHistory = false;
         const revision = this.controller.state.revision;
         await this.controller.reset();
         if (revision !== this.controller.state.revision)
             this.conversationView++;
     }
-    selectSession(id, pickedKind) {
+    async selectSession(id, pickedKind) {
+        if (id !== this.sessionId && !(await this.mayLeaveConversation()))
+            return;
         this.showingHistory = false;
         const follow = followPickedConversation(pickedKind, this.kind);
         if (follow) {
@@ -365,6 +487,12 @@ let AssistantDock = class AssistantDock extends localize(i18next)(LitElement) {
     async takeAsk() {
         if (this.loading || !this.anchor)
             return;
+        if (this.screenChanged || this.navigationState.busy || this.navigationState.draft) {
+            const waiting = takeAssistantAsk();
+            if (waiting)
+                notify({ level: 'info', message: t('ask-kept-current', 'The current conversation was kept. Switch to the intended subject before asking again.') });
+            return;
+        }
         if (!isAnchor(this.anchor)) {
             /*
               A question is not sent later on its own, once some conversation happens to stand - by then the person is looking
@@ -438,6 +566,8 @@ let AssistantDock = class AssistantDock extends localize(i18next)(LitElement) {
     }
     /* ── proposals ───────────────────────────────────────────────────────────────────── */
     proposalContext(sessionId) {
+        const identity = this.identityKey();
+        const scope = this.openedFor;
         return {
             sessionId,
             surface: this.surface,
@@ -447,7 +577,7 @@ let AssistantDock = class AssistantDock extends localize(i18next)(LitElement) {
                 text,
                 confirmButton: { text: confirmText ?? t('confirm', 'OK') },
                 cancelButton: { text: cancelText ?? t('cancel', 'Cancel') }
-            })),
+            })) && identity === this.identityKey() && scope === this.scopeKey(currentAssistantSurface()),
             notify: (level, message) => notify({ level, message })
         };
     }
@@ -483,6 +613,12 @@ let AssistantDock = class AssistantDock extends localize(i18next)(LitElement) {
             /* the outcome is already reported; a lost note is not a lost outcome */
         }
     }
+    mayApplyOnScreen() {
+        if (this.openedFor === this.scopeKey(currentAssistantSurface()) && this.openedIdentity === this.identityKey())
+            return true;
+        notify({ level: 'info', message: t('return-to-subject', 'Return to the conversation subject before applying this proposal.') });
+        return false;
+    }
     /* ── drawing ─────────────────────────────────────────────────────────────────────── */
     stuckLine() {
         if (this.capability === 'not-configured')
@@ -512,16 +648,16 @@ let AssistantDock = class AssistantDock extends localize(i18next)(LitElement) {
               <md-icon>home</md-icon>
             </button>`
             : nothing}
-        ${ready
+        ${ready && this.showingHistory
             ? html `<button
               class="sbtn"
               title=${this.showingHistory ? t('back-to-conversation', 'back to the conversation') : t('conversations', 'conversations')}
               @click=${() => (this.showingHistory = !this.showingHistory)}
             >
-              <md-icon>${this.showingHistory ? 'forum' : 'list'}</md-icon>
+              <md-icon>arrow_back</md-icon>${t('back-to-conversation', 'back to the conversation')}
             </button>`
             : nothing}
-        <button class="sbtn" title=${t('rebind', 'follow this screen again')} @click=${() => this.follow(true)}>
+        <button class="sbtn" title=${t('rebind', 'follow this screen again')} @click=${() => this.requestSurface(currentAssistantSurface())}>
           <md-icon>refresh</md-icon>
         </button>
         <button class="sbtn" title=${t('close', 'close')} @click=${() => closeOverlay(this.viewpart)}>
@@ -532,9 +668,7 @@ let AssistantDock = class AssistantDock extends localize(i18next)(LitElement) {
     }
     /** The home button: talk about the application instead of this screen, until the screen changes. */
     useSurface(surface) {
-        this.surface = surface;
-        this.chosenKind = '';
-        void this.open();
+        void this.requestSurface(surface);
     }
     render() {
         const anchor = this.anchor;
@@ -546,6 +680,14 @@ let AssistantDock = class AssistantDock extends localize(i18next)(LitElement) {
         const mode = ready ? { kind: this.kind, target: anchor.anchorId, hostContext: {} } : undefined;
         return html `
       ${this.header()}
+      ${surface?.nextStep ? html `<div class="next-step" role="status">
+        <span>${surface.nextStep.description?.() || ''}</span>
+        <a href=${surface.nextStep.href}>${surface.nextStep.label()}<md-icon>arrow_forward</md-icon></a>
+      </div>` : nothing}
+      ${this.screenChanged ? html `<div class="transition" role="status">
+        ${t('screen-and-conversation', 'Screen: {screen}. Conversation: {conversation}. Your conversation has been kept.', { screen: currentAssistantSurface()?.label() || t('no-subject', 'No subject'), conversation: surface?.label() || '' })}
+        <button class="sbtn" @click=${() => this.requestSurface(currentAssistantSurface())}>${t('switch-to-screen', 'Talk about this screen')}</button>
+      </div>` : this.navigationNotice ? html `<div class="transition" role="status">${this.navigationNotice}</div>` : nothing}
       ${ready && this.showingHistory
             ? html `<ox-assistant-session-manager
             .anchorType=${anchor.anchorType}
@@ -553,6 +695,7 @@ let AssistantDock = class AssistantDock extends localize(i18next)(LitElement) {
             .sessionId=${this.sessionId}
             .kind=${this.kind}
             .kindLabels=${this.kindLabels}
+            .scopeLabel=${t('conversation-scope', 'Conversations · {name}', { name: surface?.label() || '' })}
             @assistant-session-select=${(event) => this.selectSession(event.detail.sessionId, event.detail.kind)}
             @assistant-session-reset=${() => this.newConversation()}
             @assistant-session-changed=${() => this.reloadSessions()}
@@ -565,20 +708,23 @@ let AssistantDock = class AssistantDock extends localize(i18next)(LitElement) {
             .loading=${this.loading}
             .error=${this.failure}
             historyEnabled
+            singleConversation
             @assistant-session-select=${(event) => this.selectSession(event.detail.sessionId)}
             @assistant-session-reset=${() => this.newConversation()}
             @assistant-session-history=${() => (this.showingHistory = true)}
             @assistant-session-retry=${() => this.open()}
           ></ox-assistant-session-toolbar>`
             : nothing}
-      ${ready && !this.showingHistory && !this.loading && !this.failure
+      ${ready && !this.loading && !this.failure
             ? keyed(this.conversationView, html `<ox-assistant-chat
+              ?hidden=${this.showingHistory}
+              .sendBlocked=${this.screenChanged ? t('return-to-subject', 'Return to the conversation subject before sending or applying changes.') : ''}
               .sessionId=${this.sessionId}
               .prepareSession=${(adopt) => this.controller.prepareSession(adopt)}
               .contextProvider=${() => {
                 /* The screen moved on between writing and sending - do not answer about the old one. */
-                if (openedFor !== this.scopeKey(currentAssistantSurface() ?? surface))
-                    throw new Error(t('screen-changed', 'the screen changed while you were writing. send it again.'));
+                if (openedFor !== this.scopeKey(currentAssistantSurface()) || this.openedIdentity !== this.identityKey())
+                    throw new Error(t('return-to-subject', 'Return to the conversation subject before applying this proposal.'));
                 return { hostContext: surface?.hostContext?.() ?? {} };
             }}
               .mode=${mode}
@@ -598,6 +744,7 @@ let AssistantDock = class AssistantDock extends localize(i18next)(LitElement) {
               .draftRequestId=${this.asking?.requestId}
               @assistant-mode-change=${this.onModeChange}
               @assistant-proposal-execute=${this.onProposal}
+              @assistant-proposal-check=${this.onProposalCheck}
               @scene-edit-patch=${this.onScenePatch}
               @board-edit-revert=${this.onBoardRevert}
               @scene-action-execute=${this.onSceneAction}
@@ -676,6 +823,14 @@ __decorate([
     state(),
     __metadata("design:type", Object)
 ], AssistantDock.prototype, "asking", void 0);
+__decorate([
+    state(),
+    __metadata("design:type", Object)
+], AssistantDock.prototype, "screenChanged", void 0);
+__decorate([
+    state(),
+    __metadata("design:type", Object)
+], AssistantDock.prototype, "navigationNotice", void 0);
 AssistantDock = __decorate([
     customElement('ox-assistant-dock')
 ], AssistantDock);