@things-factory/ai-assistant 10.1.39 → 10.1.42

package/client/components/assistant-chat.ts

@@ -15,7 +15,7 @@
  */
 import '@material/web/icon/icon.js'
 import './assistant-session-toolbar.js'
-import { assistantAutoAskKey, assistantModelFingerprint, type AssistantRequestContext } from '../utils/assistant-request-context.js'
+import { assistantAutoAskKey, assistantDraftDecision, assistantModelFingerprint, type AssistantRequestContext } from '../utils/assistant-request-context.js'
 
 import { LitElement, css, html, nothing } from 'lit'
 import { customElement, property, state } from 'lit/decorators.js'
@@ -516,6 +516,18 @@ export class OxAssistantChat extends LitElement {
   @property({ attribute: false })
   autoAsk?: string
   @property() autoAskRequestId?: string
+
+  /**
+   * A sentence to place in the input **without sending it** — the pair of `autoAsk`.
+   *
+   * Some paths hand the person a starting sentence to edit and send themselves (twin's "new twin →
+   * AI"). Filled once per `draftRequestId`, with focus on the input; never over text the person is
+   * typing; and when `autoAsk` arrives for the same request, `autoAsk` wins
+   * (`assistantDraftDecision`).
+   */
+  @property({ attribute: false })
+  draft?: string
+  @property() draftRequestId?: string
   @property({ attribute: false }) contextProvider?: () => AssistantRequestContext
 
   /**
@@ -548,6 +560,8 @@ export class OxAssistantChat extends LitElement {
 
   /** autoAsk 를 이미 보냈는지 — 재렌더마다 다시 보내지 않기 위한 표식. */
   private _autoAsked?: string
+  /** The draft already placed (or deliberately skipped) — so a re-render does not place it again. */
+  private _drafted?: string
 
   /** 마지막 send 실패 시 보존 — 다시 시도 버튼 클릭 시 사용 */
   @state()
@@ -2599,6 +2613,21 @@ export class OxAssistantChat extends LitElement {
       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.
      *

package/client/utils/assistant-request-context.ts

@@ -12,6 +12,38 @@ export interface AssistantRequestContext {
 export function assistantAutoAskKey(text: string, requestId?: string): string {
   return requestId ? JSON.stringify([requestId, text]) : text
 }
+/**
+ * Whether a draft handed in from outside fills the input now — the pair of `autoAsk` that does not send.
+ *
+ * A host sometimes wants a sentence placed in the input for the person to edit and send themselves
+ * ("new twin → AI" in twin's instance list). Four rules, each a thing a person would notice:
+ *   · once per request — a re-render must not fill it again after the person cleared or changed it
+ *   · never over what the person is typing — their text is theirs
+ *   · when `autoAsk` comes for the same request, it wins — sending is the clearer intent
+ *   · no draft, nothing to do
+ * Returns the key to remember when the draft was consumed (filled, or deliberately skipped), so a
+ * skipped draft does not surface later by surprise.
+ */
+export function assistantDraftDecision(input: {
+  draft?: string
+  draftRequestId?: string
+  drafted?: string
+  typed: string
+  autoAsk?: string
+  autoAskRequestId?: string
+}): { fill: boolean; consumed?: string } {
+  if (!input.draft) return { fill: false }
+
+  const key = assistantAutoAskKey(input.draft, input.draftRequestId)
+  if (key === input.drafted) return { fill: false }
+
+  const sameRequestAsked = !!input.autoAsk && !!input.draftRequestId && input.autoAskRequestId === input.draftRequestId
+  if (sameRequestAsked) return { fill: false, consumed: key }
+
+  if (input.typed.trim()) return { fill: false, consumed: key }
+
+  return { fill: true, consumed: key }
+}
 export function assistantRecentSessions<T extends { id: string }>(sessions: T[], selected: string, limit: number): T[] {
   const count = Math.max(1, Math.floor(limit) || 5)
   const recent = sessions.slice(0, count)

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

@@ -171,6 +171,16 @@ export declare class OxAssistantChat extends LitElement {
      */
     autoAsk?: string;
     autoAskRequestId?: string;
+    /**
+     * A sentence to place in the input **without sending it** — the pair of `autoAsk`.
+     *
+     * Some paths hand the person a starting sentence to edit and send themselves (twin's "new twin →
+     * AI"). Filled once per `draftRequestId`, with focus on the input; never over text the person is
+     * typing; and when `autoAsk` arrives for the same request, `autoAsk` wins
+     * (`assistantDraftDecision`).
+     */
+    draft?: string;
+    draftRequestId?: string;
     contextProvider?: () => AssistantRequestContext;
     /**
      * 빈 화면의 제목·부제 — **호스트가 자기 말로 준다.**
@@ -206,6 +216,8 @@ export declare class OxAssistantChat extends LitElement {
     }>;
     /** autoAsk 를 이미 보냈는지 — 재렌더마다 다시 보내지 않기 위한 표식. */
     private _autoAsked?;
+    /** The draft already placed (or deliberately skipped) — so a re-render does not place it again. */
+    private _drafted?;
     /** 마지막 send 실패 시 보존 — 다시 시도 버튼 클릭 시 사용 */
     private lastFailedInput?;
     /** 되돌려진 patch id 들 — 한 번 revert 한 patch 는 버튼 비활성 */

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

@@ -17,7 +17,7 @@ import { __decorate, __metadata } from "tslib";
  */
 import '@material/web/icon/icon.js';
 import './assistant-session-toolbar.js';
-import { assistantAutoAskKey, assistantModelFingerprint } from '../utils/assistant-request-context.js';
+import { assistantAutoAskKey, assistantDraftDecision, assistantModelFingerprint } from '../utils/assistant-request-context.js';
 import { LitElement, css, html, nothing } from 'lit';
 import { customElement, property, state } from 'lit/decorators.js';
 import { unsafeHTML } from 'lit/directives/unsafe-html.js';
@@ -2272,6 +2272,21 @@ let OxAssistantChat = class OxAssistantChat extends LitElement {
             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.
          *
@@ -4199,6 +4214,14 @@ __decorate([
     property(),
     __metadata("design:type", String)
 ], OxAssistantChat.prototype, "autoAskRequestId", void 0);
+__decorate([
+    property({ attribute: false }),
+    __metadata("design:type", String)
+], OxAssistantChat.prototype, "draft", void 0);
+__decorate([
+    property(),
+    __metadata("design:type", String)
+], OxAssistantChat.prototype, "draftRequestId", void 0);
 __decorate([
     property({ attribute: false }),
     __metadata("design:type", Function)