@things-factory/ai-assistant 10.1.110 → 10.1.112

package/client/components/assistant-chat.ts

@@ -2435,11 +2435,24 @@ export class OxAssistantChat extends LitElement {
     .composer-size {
       margin-left: auto;
     }
+    /* Named above the send button, out of the row - it takes no width from the box. */
+    .composer.wide .input-row {
+      position: relative;
+    }
     .send-shortcut {
+      position: absolute;
+      right: 14px;
+      bottom: 48px;
       font-size: 10px;
       color: var(--md-sys-color-outline, #64748b);
       white-space: nowrap;
-      padding-bottom: 10px;
+      pointer-events: none;
+    }
+    /* A finger has no Ctrl or ⌘ - the send button is the way. */
+    @media (pointer: coarse) {
+      .send-shortcut {
+        display: none;
+      }
     }
     .table-preview {
       flex: 1;
@@ -2889,6 +2902,15 @@ export class OxAssistantChat extends LitElement {
     /* 모드가 이미 붙어 있으면 무엇을 주는지 먼저 묻는다 — 바뀔 때는 updated 가 다시 묻는다. */
     if (this.mode?.kind) this.loadModeView()
     if (this.subject) this.onSubjectChanged()
+    /*
+     * Put back after the dock was closed: what is being written stays, the conversation is read again and its
+     * broadcast and presence start again - they were stopped when it was taken out.
+     */
+    if (this.hasUpdated && this.sessionId) {
+      this.loadHistory()
+      this._startPresence()
+      this._startMessageSubscription()
+    }
   }
 
   /**
@@ -3544,7 +3566,16 @@ export class OxAssistantChat extends LitElement {
     if (!att?.table) return nothing
     const { rows, columns } = att.table
     return html`
-      <div class="table-preview" role="region" aria-label=${att.name}>
+      <div
+        class="table-preview"
+        role="region"
+        aria-label=${att.name}
+        @keydown=${(e: KeyboardEvent) => {
+          if (e.key === 'Escape') {
+            e.stopPropagation()
+            this.previewAttachmentId = null
+          }
+        }}>
         <div class="table-preview-head">
           <md-icon>table_chart</md-icon>
           <span class="table-preview-name">${att.name}</span>
@@ -3616,7 +3647,9 @@ export class OxAssistantChat extends LitElement {
     }
     const action = composerKeyAction(e, this.composerWide)
     if (action === 'narrow') {
+      /* The Escape that narrows the box is spent here - the floating dock closes on the next one. */
       e.preventDefault()
+      e.stopPropagation()
       this.setComposerWide(false)
     } else if (action === 'send') {
       e.preventDefault()

package/client/components/assistant-dock.ts

@@ -360,16 +360,21 @@ export class AssistantDock extends localize(i18next)(LitElement) {
         if (activity.kind === 'meta' && isAnchor(this.anchor) && activity.anchorId === this.anchor.anchorId) void this.reloadSessions()
       })
     )
-    this.follow(true)
+    if (!this.openedIdentity) return this.follow(true)
+    /*
+     * The same dock opened again - the aside bar takes it out while it is closed. The conversation and what was
+     * being written in it are still here; only what moved while it was closed (the screen, the person) is followed.
+     */
+    setOpenSession(this.sessionId)
+    this.follow()
   }
 
+  /* Closing keeps the conversation: the dock comes back as it was left (design/ai/shared-dock.md §2-1, §2-7). */
   disconnectedCallback() {
-    this.revision++
     this.removeEventListener('assistant-start-new-session', this.onStartNewSession)
     this.removeEventListener('assistant-open-page', this.onOpenPage as EventListener)
     this.unsubscribers.splice(0).forEach(unsubscribe => unsubscribe())
     setOpenSession('')
-    this.controller.clear()
     super.disconnectedCallback()
   }
 

package/client/setup-assistant-dock.ts

@@ -124,6 +124,14 @@ export function setupAssistantDock(options: { viewpart?: string } = {}): void {
 
   startSessionActivityFeed()
 
+  /*
+   * One dock for the application's life. The aside bar drops a closed viewpart's template, so a template that
+   * makes the element would make a new dock on every opening - and a new composer, the text being written gone
+   * (design/ai/shared-dock.md §2-1, §2-7). The same element is put back instead, as the entity360 dock is.
+   */
+  const dock = document.createElement('ox-assistant-dock') as HTMLElement & { viewpart: string }
+  dock.viewpart = viewpart
+
   appendViewpart({
     name: viewpart,
     /*
@@ -134,7 +142,7 @@ export function setupAssistantDock(options: { viewpart?: string } = {}): void {
       show: false,
       persistent: true,
       level: VIEWPART_LEVEL.TOPMOST,
-      template: html`<ox-assistant-dock .viewpart=${viewpart}></ox-assistant-dock>`
+      template: html`${dock}`
     },
     position: VIEWPART_POSITION.ASIDEBAR
   })

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

@@ -2082,11 +2082,24 @@ let OxAssistantChat = class OxAssistantChat extends LitElement {
     .composer-size {
       margin-left: auto;
     }
+    /* Named above the send button, out of the row - it takes no width from the box. */
+    .composer.wide .input-row {
+      position: relative;
+    }
     .send-shortcut {
+      position: absolute;
+      right: 14px;
+      bottom: 48px;
       font-size: 10px;
       color: var(--md-sys-color-outline, #64748b);
       white-space: nowrap;
-      padding-bottom: 10px;
+      pointer-events: none;
+    }
+    /* A finger has no Ctrl or ⌘ - the send button is the way. */
+    @media (pointer: coarse) {
+      .send-shortcut {
+        display: none;
+      }
     }
     .table-preview {
       flex: 1;
@@ -2537,6 +2550,15 @@ let OxAssistantChat = class OxAssistantChat extends LitElement {
             this.loadModeView();
         if (this.subject)
             this.onSubjectChanged();
+        /*
+         * Put back after the dock was closed: what is being written stays, the conversation is read again and its
+         * broadcast and presence start again - they were stopped when it was taken out.
+         */
+        if (this.hasUpdated && this.sessionId) {
+            this.loadHistory();
+            this._startPresence();
+            this._startMessageSubscription();
+        }
     }
     /**
      * 화면이 보여 주는 것의 종류가 바뀌었다 — 설 수 있는 대화를 다시 묻고, 지난번 고른 것을 되살린다.
@@ -3184,7 +3206,16 @@ let OxAssistantChat = class OxAssistantChat extends LitElement {
             return nothing;
         const { rows, columns } = att.table;
         return html `
-      <div class="table-preview" role="region" aria-label=${att.name}>
+      <div
+        class="table-preview"
+        role="region"
+        aria-label=${att.name}
+        @keydown=${(e) => {
+            if (e.key === 'Escape') {
+                e.stopPropagation();
+                this.previewAttachmentId = null;
+            }
+        }}>
         <div class="table-preview-head">
           <md-icon>table_chart</md-icon>
           <span class="table-preview-name">${att.name}</span>
@@ -3254,7 +3285,9 @@ let OxAssistantChat = class OxAssistantChat extends LitElement {
         }
         const action = composerKeyAction(e, this.composerWide);
         if (action === 'narrow') {
+            /* The Escape that narrows the box is spent here - the floating dock closes on the next one. */
             e.preventDefault();
+            e.stopPropagation();
             this.setComposerWide(false);
         }
         else if (action === 'send') {