@things-factory/ai-assistant 10.1.122 → 10.1.125

package/client/components/assistant-chat.ts

@@ -2931,33 +2931,6 @@ export class OxAssistantChat extends LitElement {
   updated(changed: Map<string, any>) {
     if (changed.has('input') || changed.has('composerWide') || changed.has('previewAttachmentId') || changed.has('attachments')) this.fitComposer()
 
-    /*
-     * 밖에서 넣어 준 질문을 자동 전송한다(오류 토스트의 "AI에게 묻기" 등).
-     *
-     * sessionId 가 붙기 전에 보내면 대화에 남지 않으므로 세션이 준비될 때까지 기다린다.
-     * 같은 문장을 두 번 보내지 않도록 보낸 값을 기억한다 — 재렌더마다 updated 가 다시 돌기 때문이다.
-     */
-    if (this.autoAsk && assistantAutoAskKey(this.autoAsk, this.autoAskRequestId) !== this._autoAsked && (this.sessionId || this.prepareSession) && !this.busy) {
-      this._autoAsked = assistantAutoAskKey(this.autoAsk, this.autoAskRequestId)
-      this.input = this.autoAsk
-      this.send()
-    }
-
-    /* A draft fills the input and waits for the person — it is never sent from here. */
-    const draft = assistantDraftDecision({
-      draft: this.draft,
-      draftRequestId: this.draftRequestId,
-      drafted: this._drafted,
-      typed: this.input,
-      autoAsk: this.autoAsk,
-      autoAskRequestId: this.autoAskRequestId
-    })
-    if (draft.consumed) this._drafted = draft.consumed
-    if (draft.fill) {
-      this.input = this.draft!
-      this.updateComplete.then(() => (this.renderRoot.querySelector('textarea') as HTMLTextAreaElement | null)?.focus())
-    }
-
     /*
      * The subject changed, so the conversation is over.
      *
@@ -3019,6 +2992,29 @@ export class OxAssistantChat extends LitElement {
         this._stopMessageSubscription()
       }
     }
+    /* Send carried questions only after subject, mode and session cleanup has completed. */
+    if (this.autoAsk && assistantAutoAskKey(this.autoAsk, this.autoAskRequestId) !== this._autoAsked && (this.sessionId || this.prepareSession) && !this.busy) {
+      this._autoAsked = assistantAutoAskKey(this.autoAsk, this.autoAskRequestId)
+      this.input = this.autoAsk
+      void this.send()
+    }
+
+    /* A draft fills the input and waits for the person — it is never sent from here. */
+    const draft = assistantDraftDecision({
+      draft: this.draft,
+      draftRequestId: this.draftRequestId,
+      drafted: this._drafted,
+      typed: this.input,
+      autoAsk: this.autoAsk,
+      autoAskRequestId: this.autoAskRequestId
+    })
+    if (draft.consumed) this._drafted = draft.consumed
+    if (draft.fill) {
+      this.input = this.draft!
+      this.updateComplete.then(() => (this.renderRoot.querySelector('textarea') as HTMLTextAreaElement | null)?.focus())
+    }
+
+
     // 자동 스크롤
     const ms = this.renderRoot.querySelector('.messages') as HTMLElement | null
     if (ms) ms.scrollTop = ms.scrollHeight

package/client/utils/assistant-navigation.test.ts

@@ -36,3 +36,25 @@ describe('navigation wiring', () => {
     expect(dock).toContain("errorCode: 'conversation-screen-changed'")
   })
 })
+
+
+describe('a carried draft survives opening a new conversation', () => {
+  test('automatic review starts after cleanup and is sent once per request', () => {
+    const source = readFileSync(join(__dirname, '../components/assistant-chat.ts'), 'utf8')
+    const update = source.slice(source.indexOf('  updated(changed:'), source.indexOf('  disconnectedCallback()', source.indexOf('  updated(changed:')))
+    const placement = update.indexOf('if (this.autoAsk &&')
+    expect(placement).toBeGreaterThan(update.indexOf("if (changed.has('sessionId')"))
+    expect(update.slice(placement)).not.toContain("this.input = ''")
+    expect(update.slice(placement)).toContain('!== this._autoAsked')
+    expect(update.slice(placement)).toContain('void this.send()')
+  })
+  test('draft placement follows subject, mode and session cleanup', () => {
+    const source = readFileSync(join(__dirname, '../components/assistant-chat.ts'), 'utf8')
+    const update = source.slice(source.indexOf('  updated(changed:'), source.indexOf('  disconnectedCallback()', source.indexOf('  updated(changed:')))
+    const placement = update.indexOf('const draft = assistantDraftDecision(')
+    expect(placement).toBeGreaterThan(update.indexOf("if (changed.has('subject'))"))
+    expect(placement).toBeGreaterThan(update.indexOf("if (changed.has('mode')"))
+    expect(placement).toBeGreaterThan(update.indexOf("if (changed.has('sessionId')"))
+    expect(update.slice(placement)).not.toContain("this.input = ''")
+  })
+})

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

@@ -2578,32 +2578,6 @@ let OxAssistantChat = class OxAssistantChat extends LitElement {
     updated(changed) {
         if (changed.has('input') || changed.has('composerWide') || changed.has('previewAttachmentId') || changed.has('attachments'))
             this.fitComposer();
-        /*
-         * 밖에서 넣어 준 질문을 자동 전송한다(오류 토스트의 "AI에게 묻기" 등).
-         *
-         * sessionId 가 붙기 전에 보내면 대화에 남지 않으므로 세션이 준비될 때까지 기다린다.
-         * 같은 문장을 두 번 보내지 않도록 보낸 값을 기억한다 — 재렌더마다 updated 가 다시 돌기 때문이다.
-         */
-        if (this.autoAsk && assistantAutoAskKey(this.autoAsk, this.autoAskRequestId) !== this._autoAsked && (this.sessionId || this.prepareSession) && !this.busy) {
-            this._autoAsked = assistantAutoAskKey(this.autoAsk, this.autoAskRequestId);
-            this.input = this.autoAsk;
-            this.send();
-        }
-        /* A draft fills the input and waits for the person — it is never sent from here. */
-        const draft = assistantDraftDecision({
-            draft: this.draft,
-            draftRequestId: this.draftRequestId,
-            drafted: this._drafted,
-            typed: this.input,
-            autoAsk: this.autoAsk,
-            autoAskRequestId: this.autoAskRequestId
-        });
-        if (draft.consumed)
-            this._drafted = draft.consumed;
-        if (draft.fill) {
-            this.input = this.draft;
-            this.updateComplete.then(() => this.renderRoot.querySelector('textarea')?.focus());
-        }
         /*
          * The subject changed, so the conversation is over.
          *
@@ -2664,6 +2638,27 @@ let OxAssistantChat = class OxAssistantChat extends LitElement {
                 this._stopMessageSubscription();
             }
         }
+        /* Send carried questions only after subject, mode and session cleanup has completed. */
+        if (this.autoAsk && assistantAutoAskKey(this.autoAsk, this.autoAskRequestId) !== this._autoAsked && (this.sessionId || this.prepareSession) && !this.busy) {
+            this._autoAsked = assistantAutoAskKey(this.autoAsk, this.autoAskRequestId);
+            this.input = this.autoAsk;
+            void this.send();
+        }
+        /* A draft fills the input and waits for the person — it is never sent from here. */
+        const draft = assistantDraftDecision({
+            draft: this.draft,
+            draftRequestId: this.draftRequestId,
+            drafted: this._drafted,
+            typed: this.input,
+            autoAsk: this.autoAsk,
+            autoAskRequestId: this.autoAskRequestId
+        });
+        if (draft.consumed)
+            this._drafted = draft.consumed;
+        if (draft.fill) {
+            this.input = this.draft;
+            this.updateComplete.then(() => this.renderRoot.querySelector('textarea')?.focus());
+        }
         // 자동 스크롤
         const ms = this.renderRoot.querySelector('.messages');
         if (ms)