@things-factory/ai-assistant 10.1.79 → 10.1.87

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

@@ -45,7 +45,7 @@ import { buildMentionCandidates, buildCatalogCandidates, buildSlashCandidates, b
  */
 import { chatDefaults } from './chat-defaults.js';
 import { isDifferentConversation, resolveConversation, pickInitialMode } from './assistant-mode.js';
-import { parseProposalOutcomeLine } from './proposal-outcome-line.js';
+import { parseProposalOutcomeLine, parseProposalRequestLine, proposalCardState } from './proposal-outcome-line.js';
 import { availableTriggers } from './chat-triggers.js';
 function formatFileSize(bytes) {
     if (!bytes || bytes < 1024)
@@ -184,6 +184,7 @@ const CHAT_MESSAGES_QUERY = gql `
       content
       relatedPatchId
       toolUsagesJson
+      proposalsJson
       groundingWarningsJson
       attachmentsJson
       createdAt
@@ -205,6 +206,7 @@ const CHAT_MESSAGE_SUBSCRIPTION = gql `
       content
       relatedPatchId
       toolUsagesJson
+      proposalsJson
       groundingWarningsJson
       attachmentsJson
       createdAt
@@ -298,6 +300,8 @@ let OxAssistantChat = class OxAssistantChat extends LitElement {
         /** 안내를 닫았는가 — 한 번 닫으면 이 세션에서는 다시 띄우지 않는다(잔소리 금지). */
         this.foldNoticeDismissed = false;
         this.busy = false;
+        /** Host navigation may retain a conversation for reading while its subject is off screen. */
+        this.sendBlocked = '';
         /** C4 presence/roster — 세션 참여자 목록. lastSeenAt 으로 online 판정. */
         this.participants = [];
         /** roster online 재평가 트리거 — heartbeat tick 마다 갱신(시간 경과 반영). */
@@ -559,6 +563,10 @@ let OxAssistantChat = class OxAssistantChat extends LitElement {
     }
     /** Once per page: the miss is a wiring mistake, and repeating it per candidate buries it. */
     static { this.warnedMissingStagedNotice = false; }
+    /** The host may inspect navigation risk without reading or copying the person's input. */
+    get navigationState() {
+        return { busy: this.busy, draft: !!this.input.trim() || this.attachments.length > 0 };
+    }
     /** 현재 로그인 사용자 email — 그룹챗에서 내 메시지 vs 타인 메시지 구분.
      *  email 을 쓰는 이유: /auth/profile 이 항상 내려주는 로그인 식별자이고(비어 있지 않다),
      *  내부 관리키(User.id)를 클라이언트 판정에 의존하지 않기 위함. */
@@ -2555,6 +2563,9 @@ let OxAssistantChat = class OxAssistantChat extends LitElement {
                 const prevSameSender = !!prev && prev.role === 'user' && prev.senderEmail === line.senderEmail;
                 const showSenderLabel = isOther && !prevSameSender;
                 const content = (line.content ?? '').trim();
+                /* A "requested" row is the card's state, shown on the card - as a line it would only be the machine's key. */
+                if (line.role === 'system' && parseProposalRequestLine(content))
+                    return nothing;
                 /*
                  * 가려진 줄은 어시스턴트의 말이 아니다 — 마크다운으로 그리지 않고, 복사·재실행 같은 손잡이도
                  * 달지 않는다(ADR-0073 판정 1). 그 손잡이들은 있지도 않은 답을 다룬다.
@@ -2797,9 +2808,9 @@ let OxAssistantChat = class OxAssistantChat extends LitElement {
               `
             : nothing}
           <button
-            ?disabled=${this.busy || (!this.input.trim() && this.attachments.length === 0)}
+            ?disabled=${this.busy || !!this.sendBlocked || (!this.input.trim() && this.attachments.length === 0)}
             @click=${this.send}
-            title=${i18next.t('ai-assistant.text.send-tooltip')}>
+            title=${this.sendBlocked || i18next.t('ai-assistant.text.send-tooltip')}>
             ${this.busy
             ? html `<span class="spinner"></span>`
             : html `<md-icon>arrow_upward</md-icon>`}
@@ -3486,11 +3497,15 @@ let OxAssistantChat = class OxAssistantChat extends LitElement {
         const items = line.proposals ?? [];
         if (items.length === 0)
             return nothing;
+        /* The card's state is the conversation's rows - read once for every card of this line. */
+        const outcomes = this.proposalOutcomes;
+        const requested = this.proposalRequests;
         return html `
       <div class="proposals">
         ${items.map(p => {
             const key = this.proposalKey(p);
-            const sent = this.sentProposals.has(key);
+            const card = proposalCardState(key, { outcomes, requested, sentHere: this.sentProposals.has(key) });
+            const sent = card.state !== 'ready';
             /*
               Follow-up chips are the host's words, never this component's. The fallback that used
               to live here named a 3D modeller's operations in hardcoded Korean, and it reached the
@@ -3511,14 +3526,23 @@ let OxAssistantChat = class OxAssistantChat extends LitElement {
                 the one action the card exists for became unreachable while the model kept
                 telling people to press it.
               */''}
-              <button
-                class="run"
-                ?disabled=${sent}
-                @click=${() => this.executeProposal(p, key)}>
-                ${sent
-                ? this.proposalStateText(key)
-                : i18next.t('ai-assistant.button.run-proposal', { defaultValue: 'run' })}
-              </button>
+              ${card.state === 'unconfirmed'
+                ? html `
+                    <span class="preason">${i18next.t('ai-assistant.text.proposal-unconfirmed', { defaultValue: 'sent earlier - no answer received' })}</span>
+                    <button class="run" @click=${() => this.checkProposal(p, key)}>
+                      ${i18next.t('ai-assistant.button.check-proposal', { defaultValue: 'check result' })}
+                    </button>
+                  `
+                : html `
+                    <button
+                      class="run"
+                      ?disabled=${sent}
+                      @click=${() => this.executeProposal(p, key)}>
+                      ${sent
+                    ? this.proposalStateText(key)
+                    : i18next.t('ai-assistant.button.run-proposal', { defaultValue: 'run' })}
+                    </button>
+                  `}
               ${ /*
                 Drawn only where the host has said it staged this candidate, in the host's own
                 words. Not knowing is not a claim: with no word from the host, nothing is drawn.
@@ -3646,10 +3670,34 @@ let OxAssistantChat = class OxAssistantChat extends LitElement {
             return `${p?.tool ?? ''}|${p?.command ?? ''}|${p?.instanceId ?? ''}`;
         }
     }
-    executeProposal(p, key) {
+    async executeProposal(p, key) {
+        if (this.sentProposals.has(key))
+            return;
         this.sentProposals = new Set(this.sentProposals).add(key);
         this.proposalSentAt.set(key, Date.now());
         this._startElapsedTicker();
+        /*
+         * The server records the request first and answers whether this conversation has taken the proposal
+         * already (ADR-0097 Q-D4 ④). Only a granted request reaches the host. A refused one - taken in another
+         * window, or before a refresh - leaves the card to the rows; a failed one leaves it as it was, and the
+         * error is said by the client's own error line. Either way the host is not asked.
+         */
+        if (this.sessionId) {
+            let granted = false;
+            try {
+                granted = await this.requestProposal(key);
+            }
+            catch {
+                granted = false;
+            }
+            if (!granted) {
+                const left = new Set(this.sentProposals);
+                left.delete(key);
+                this.sentProposals = left;
+                this.proposalSentAt.delete(key);
+                return;
+            }
+        }
         this.dispatchEvent(new CustomEvent('assistant-proposal-execute', {
             /*
              * `proposalKey` 를 함께 준다 — 호스트가 `reportProposalOutcome` 으로 답할 때 쓰는 이름이다.
@@ -3660,6 +3708,42 @@ let OxAssistantChat = class OxAssistantChat extends LitElement {
             composed: true
         }));
     }
+    async requestProposal(key) {
+        const result = await client.mutate({
+            mutation: gql `
+        mutation ($id: String!, $key: String!) {
+          requestProposal(sessionId: $id, proposalKey: $key)
+        }
+      `,
+            variables: { id: this.sessionId, key }
+        });
+        if (result.errors?.length)
+            throw new Error(result.errors[0].message);
+        return result.data?.requestProposal === true;
+    }
+    /**
+     * "Check result" on a card that was requested and never answered: the host is asked what happened
+     * (`AssistantSurface.proposalOutcome`), never to run it again. The dock reports what it learns.
+     */
+    checkProposal(p, key) {
+        this.dispatchEvent(new CustomEvent('assistant-proposal-check', {
+            detail: { proposal: p, sessionId: this.sessionId, proposalKey: key },
+            bubbles: true,
+            composed: true
+        }));
+    }
+    /** Keys whose run was requested - from the conversation's rows, like the outcomes. */
+    get proposalRequests() {
+        const requested = new Set();
+        for (const line of this.lines) {
+            if (line.role !== 'system')
+                continue;
+            const key = parseProposalRequestLine(line.content ?? '');
+            if (key)
+                requested.add(key);
+        }
+        return requested;
+    }
     /**
      * 호스트가 무엇을 했는지 — 대화에 남은 `system` 행에서 읽는다(ADR-0070 A12-a 결정 ①).
      *
@@ -3959,6 +4043,10 @@ let OxAssistantChat = class OxAssistantChat extends LitElement {
         }));
     }
     async send() {
+        if (this.sendBlocked) {
+            this.errorMessage = this.sendBlocked;
+            return;
+        }
         const text = this.input.trim();
         const attachmentsToSend = [...this.attachments];
         if ((!text && attachmentsToSend.length === 0) || this.busy)
@@ -4022,6 +4110,7 @@ let OxAssistantChat = class OxAssistantChat extends LitElement {
         }
         catch (error) {
             this.errorMessage = error instanceof Error ? error.message : String(error);
+            this.attachments = attachmentsToSend;
             return;
         }
         // pickedMentions / pickedUserMentions 에서 현재 텍스트에 실제 #/@ token 으로
@@ -4375,6 +4464,10 @@ __decorate([
     state(),
     __metadata("design:type", Object)
 ], OxAssistantChat.prototype, "busy", void 0);
+__decorate([
+    property(),
+    __metadata("design:type", Object)
+], OxAssistantChat.prototype, "sendBlocked", void 0);
 __decorate([
     state(),
     __metadata("design:type", String)