@things-factory/ai-assistant 10.1.25 → 10.1.26

package/client/components/assistant-chat.ts

@@ -708,8 +708,9 @@ export class OxAssistantChat extends LitElement {
   /*
    * ── What this conversation is, resolved ──────────────────────────────────────────────
    *
-   * A mode answers first. A host that has not declared one keeps the separate properties and
-   * the global defaults it had before, which is what every consumer written before modes does.
+   * A host that declares a mode gets the mode and nothing else — a field it leaves out is empty,
+   * never filled from these properties or the registered defaults. A host that has not declared
+   * one keeps the separate properties and the global defaults it had before.
    */
   private get conversation() {
     return resolveConversation(

package/client/components/assistant-mode.test.ts

@@ -45,10 +45,25 @@ describe('resolveConversation', () => {
     expect(JSON.stringify(c.slashTemplates)).not.toContain('add-monitor')
   })
 
-  test('what a mode leaves out still comes from the defaults', () => {
+  test('★ what a mode leaves out stays out — the defaults another package registered do not fill it', () => {
     const c = resolveConversation(MODE, HOST_PROPERTIES, GLOBAL_DEFAULTS)
-    expect(c.catalogEntries).toEqual(GLOBAL_DEFAULTS.catalogEntries)
-    expect(c.footerNoticeKey).toBe(GLOBAL_DEFAULTS.footerNoticeKey)
+    /* The board's `@` catalog and its "previewed on the board" line belong to board authoring. */
+    expect(c.catalogEntries).toEqual([])
+    expect(c.footerNoticeKey).toBeUndefined()
+  })
+
+  test('★ a mode that declares no slash list offers none, even when a board package registered its own', () => {
+    /* plant's factory mode declares no `slashTemplates`; board-ai registers `/add-monitor` globally. */
+    const { slashTemplates, ...withoutSlash } = MODE
+    const c = resolveConversation({ ...withoutSlash, id: 'plant:factory:D-1' }, HOST_PROPERTIES, GLOBAL_DEFAULTS)
+    expect(c.slashTemplates).toEqual([])
+  })
+
+  test('★ a mode that leaves out a field the host also set as a property does not take the property either', () => {
+    const c = resolveConversation({ id: 'twin:none' }, HOST_PROPERTIES, GLOBAL_DEFAULTS)
+    expect(c.systemPrompt).toBeUndefined()
+    expect(c.toolCategories).toBeUndefined()
+    expect(c.hostContext).toBeUndefined()
   })
 
   test('a host with no mode gets exactly what it had before modes existed', () => {

package/client/components/assistant-mode.ts

@@ -92,15 +92,21 @@ export interface ConversationSettings {
 }
 
 /**
- * Reconcile the three places a setting can come from.
+ * Reconcile the places a setting can come from.
  *
- * **The mode answers first, as a whole.** Then the host's own properties, then whatever was
- * registered globally. The order matters in one direction only: a host that declares a mode
- * must not have half of its conversation decided somewhere else, which is the failure this
- * type exists to remove.
+ * **A host that declares a mode gets the mode and nothing else.** A field the mode leaves out is
+ * empty: it is not filled from the element's own properties, and it is not filled from the
+ * defaults another package registered. Filling it back in is how the defect this type removes
+ * returned — board-ai registers board authoring's `/add-monitor`, its component `@` catalog and
+ * its "previewed on the board" line globally, and plant's factory mode, which declares no slash
+ * list, offered them on a factory screen once the board modeller had been loaded. A mode that
+ * wants those declares them.
  *
  * A host that declares no mode gets exactly what it got before modes existed — its own
  * properties, falling back to the registered defaults.
+ *
+ * `chatEndpoint` still falls back to `boardAIChat` when nothing names one; that default is a
+ * separate question (standard A2).
  */
 export function resolveConversation(
   mode: AssistantMode | undefined,
@@ -108,7 +114,7 @@ export function resolveConversation(
   defaults: Partial<ConversationSettings>
 ): ConversationSettings {
   const pick = <K extends keyof ConversationSettings>(key: K): ConversationSettings[K] =>
-    (mode as any)?.[key] ?? (own as any)[key] ?? (defaults as any)[key]
+    mode ? (mode as any)[key] : ((own as any)[key] ?? (defaults as any)[key])
 
   return {
     systemPrompt: pick('systemPrompt'),

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

@@ -440,8 +440,9 @@ let OxAssistantChat = class OxAssistantChat extends LitElement {
     /*
      * ── What this conversation is, resolved ──────────────────────────────────────────────
      *
-     * A mode answers first. A host that has not declared one keeps the separate properties and
-     * the global defaults it had before, which is what every consumer written before modes does.
+     * A host that declares a mode gets the mode and nothing else — a field it leaves out is empty,
+     * never filled from these properties or the registered defaults. A host that has not declared
+     * one keeps the separate properties and the global defaults it had before.
      */
     get conversation() {
         return resolveConversation(this.mode, {