@olares/lares-mobile 0.15.5 → 0.15.7

package/src/settings/AgentSettings.vue

@@ -1,5 +1,5 @@
 <template>
-  <div class="lares-agent" :aria-busy="loading ? 'true' : 'false'">
+  <div class="lares-agent" :data-device="layoutDevice" :aria-busy="loading ? 'true' : 'false'">
     <div v-if="loading" class="lares-agent__loading" role="status">
       <span class="lares-agent__spinner" aria-hidden="true" />
       <p>{{ t("agent.loading") }}</p>
@@ -7,7 +7,15 @@
     <div class="lares-agent__body" :inert="loading || undefined">
     <section class="lares-agent__group">
       <h2>{{ tModel("settings.title") }}</h2>
-      <div class="lares-agent__list">
+      <LaresSelect
+        v-if="isDesktop"
+        :value="modelCurrent"
+        :sections="modelSelectSections"
+        :disabled="busy || !models"
+        :empty="tModel('settings.empty')"
+        @select="(item) => pick(item, 'model')"
+      />
+      <div v-else class="lares-agent__list">
         <LaresSettingRow
           :label="tModel('settings.default')"
           :value="modelLabel"
@@ -22,6 +30,17 @@
       </p>
       <p v-if="modelError" class="lares-agent__hint" data-status="error">{{ modelError }}</p>
     </section>
+    <section v-if="isDesktop" class="lares-agent__group">
+      <h2>{{ t("settings.input.title") }}</h2>
+      <LaresSelect
+        :value="conversation?.busyEnter || 'queue'"
+        :sections="busyEnterSections"
+        :disabled="busy || !conversation?.writable"
+        @select="chooseBusyEnter"
+      />
+      <p class="lares-agent__hint">{{ t("settings.input.busyEnter.hint") }}</p>
+      <p v-if="conversationError" class="lares-agent__hint" data-status="error">{{ conversationError }}</p>
+    </section>
     <!-- Voice input parked.
     <section class="lares-agent__group">
       <h2>{{ tVoice("settings.title") }}</h2>
@@ -48,7 +67,15 @@
     -->
     <section class="lares-agent__group">
       <h2>{{ tSearch("settings.title") }}</h2>
-      <div class="lares-agent__list">
+      <LaresSelect
+        v-if="isDesktop"
+        :value="searchMenuId"
+        :sections="searchSelectSections"
+        :disabled="busy || !search"
+        :empty="tSearch('settings.default.empty')"
+        @select="(item) => pick(item, 'search')"
+      />
+      <div v-else class="lares-agent__list">
         <LaresSettingRow
           :label="tSearch('settings.default')"
           :value="searchLabel"
@@ -60,7 +87,7 @@
       </div>
       <p v-if="searchError" class="lares-agent__hint" data-status="error">{{ searchError }}</p>
     </section>
-    <LaresSheet :open="Boolean(panel)" :title="sheetTitle" @close="panel = ''">
+    <LaresSheet v-if="!isDesktop" :open="Boolean(panel)" :title="sheetTitle" @close="panel = ''">
       <p v-if="sheetEmpty" class="lares-agent__hint lares-agent__hint--sheet">{{ sheetEmpty }}</p>
       <template v-for="section in sheetSections" :key="section.heading || 'main'">
         <p v-if="section.heading" class="lares-agent__heading">{{ section.heading }}</p>
@@ -100,8 +127,10 @@ import { hostKey as hostSessionKey } from "@olares/lares-core/larepass/host";
 import { createHostClient } from "../host.js";
 import { adoptHost } from "../runtime.js";
 import { createT } from "../i18n.js";
+import { chatDevice, DEVICE_DESKTOP } from "../layout.js";
 import LaresSettingRow from "./SettingRow.vue";
 import LaresSheet from "./Sheet.vue";
+import LaresSelect from "./Select.vue";
 
 const catalogs = {
   model: { zh: MODEL_ZH, en: MODEL_EN },
@@ -115,10 +144,11 @@ function itemLabel(items, id) {
 
 export default {
   name: "LaresAgentSettings",
-  components: { LaresSettingRow, LaresSheet },
+  components: { LaresSettingRow, LaresSheet, LaresSelect },
   expose: ["reload"],
   props: {
     locale: { type: String, default: "en" },
+    device: { type: String, default: "mobile" },
     baseUrl: { type: String, default: undefined },
     proxyPrefix: { type: String, default: undefined },
     request: { type: Function, default: undefined },
@@ -133,15 +163,23 @@ export default {
       models: remembered.models,
       voice: remembered.voice,
       search: remembered.search,
+      conversation: remembered.conversation,
       modelError: "",
       voiceError: "",
       searchError: "",
+      conversationError: "",
     };
   },
   computed: {
     t() {
       return createT(this.locale);
     },
+    layoutDevice() {
+      return chatDevice(this.device);
+    },
+    isDesktop() {
+      return this.layoutDevice === DEVICE_DESKTOP;
+    },
     ports() {
       return {
         baseUrl: this.baseUrl,
@@ -200,9 +238,33 @@ export default {
       if (!this.voice) return "—";
       return itemLabel(this.voiceLanguages, voiceMenuValue(this.voice.config?.language));
     },
+    searchMenuId() {
+      return searchMenuValue(this.search?.defaultSearchModel);
+    },
     searchLabel() {
       if (!this.search) return "—";
-      return itemLabel(this.searchItems, searchMenuValue(this.search.defaultSearchModel));
+      return itemLabel(this.searchItems, this.searchMenuId);
+    },
+    modelSelectSections() {
+      return this.modelGroups.map((group) => ({
+        heading: group.provider,
+        items: group.models.map((model) => ({
+          id: this.modelKey(model),
+          label: model.name,
+          model,
+        })),
+      }));
+    },
+    searchSelectSections() {
+      return [{ items: this.searchItems.map((item) => ({ id: item.id, label: item.label })) }];
+    },
+    busyEnterSections() {
+      return [{
+        items: [
+          { id: "queue", label: this.t("settings.input.busyEnter.queue") },
+          { id: "steer", label: this.t("settings.input.busyEnter.steer") },
+        ],
+      }];
     },
     sheetTitle() {
       if (this.panel === "model") return this.tModel("settings.title");
@@ -212,32 +274,17 @@ export default {
       return "";
     },
     sheetCurrent() {
-      if (this.panel === "model") return this.modelCurrent;
-      if (this.panel === "voiceModel") return voiceMenuValue(this.voice?.config?.model);
-      if (this.panel === "voiceLang") return voiceMenuValue(this.voice?.config?.language);
-      if (this.panel === "search") return searchMenuValue(this.search?.defaultSearchModel);
-      return "";
+      return this.sheetCurrentFor(this.panel);
     },
     sheetSections() {
-      if (this.panel === "model") {
-        return this.modelGroups.map((group) => ({
-          heading: group.provider,
-          items: group.models.map((model) => ({
-            id: this.modelKey(model),
-            label: model.name,
-            model,
-          })),
-        }));
-      }
+      if (this.panel === "model") return this.modelSelectSections;
       if (this.panel === "voiceModel") {
         return [{ items: this.voiceModels.map((item) => ({ id: item.id, label: item.label })) }];
       }
       if (this.panel === "voiceLang") {
         return [{ items: this.voiceLanguages.map((item) => ({ id: item.id, label: item.label })) }];
       }
-      if (this.panel === "search") {
-        return [{ items: this.searchItems.map((item) => ({ id: item.id, label: item.label })) }];
-      }
+      if (this.panel === "search") return this.searchSelectSections;
       return [];
     },
     sheetEmpty() {
@@ -255,9 +302,11 @@ export default {
       this.models = null;
       this.voice = null;
       this.search = null;
+      this.conversation = null;
       this.modelError = "";
       this.voiceError = "";
       this.searchError = "";
+      this.conversationError = "";
       this.load(true);
     },
   },
@@ -286,9 +335,8 @@ export default {
       if (!ready) return;
       this.panel = panel;
     },
-    async pick(item) {
-      const panel = this.panel;
-      if (item.id === this.sheetCurrent) {
+    async pick(item, panel = this.panel) {
+      if (item.id === this.sheetCurrentFor(panel)) {
         this.panel = "";
         return;
       }
@@ -298,6 +346,13 @@ export default {
       if (panel === "voiceLang") await this.patchVoice("language", voiceValueFromMenu(item.id));
       if (panel === "search") await this.chooseSearch(item.id);
     },
+    sheetCurrentFor(panel) {
+      if (panel === "model") return this.modelCurrent;
+      if (panel === "voiceModel") return voiceMenuValue(this.voice?.config?.model);
+      if (panel === "voiceLang") return voiceMenuValue(this.voice?.config?.language);
+      if (panel === "search") return searchMenuValue(this.search?.defaultSearchModel);
+      return "";
+    },
     reload() {
       return this.load(true);
     },
@@ -307,17 +362,20 @@ export default {
         this.models = remembered.models ?? this.models;
         this.voice = remembered.voice ?? this.voice;
         this.search = remembered.search ?? this.search;
-        if (this.models && this.voice && this.search) return;
+        this.conversation = remembered.conversation ?? this.conversation;
+        if (this.models && this.voice && this.search && this.conversation) return;
       }
       this.panel = "";
       this.loading = true;
       this.modelError = "";
       this.voiceError = "";
       this.searchError = "";
-      const [models, voice, search] = await Promise.allSettled([
+      this.conversationError = "";
+      const [models, voice, search, conversation] = await Promise.allSettled([
         this.settings.models({ force }),
         this.settings.voice(force),
         this.settings.search({ force }),
+        this.settings.conversation({ force }),
       ]);
       if (models.status === "fulfilled") this.models = models.value;
       else this.modelError = this.failText(this.tModel, "settings.loadFailed", models.reason);
@@ -325,6 +383,8 @@ export default {
       else this.voiceError = this.tVoice("settings.loadFailed");
       if (search.status === "fulfilled") this.search = search.value;
       else this.searchError = this.failText(this.tSearch, "settings.loadFailed", search.reason);
+      if (conversation.status === "fulfilled") this.conversation = conversation.value;
+      else this.conversationError = conversation.reason instanceof Error ? conversation.reason.message : String(conversation.reason);
       this.loading = false;
     },
     async chooseModel(model) {
@@ -369,6 +429,18 @@ export default {
         this.pending = "";
       }
     },
+    async chooseBusyEnter(item) {
+      if (!item?.id || item.id === this.conversation?.busyEnter || this.busy) return;
+      this.pending = "busyEnter";
+      this.conversationError = "";
+      try {
+        this.conversation = await this.settings.setBusyEnter(item.id);
+      } catch (err) {
+        this.conversationError = err instanceof Error ? err.message : String(err);
+      } finally {
+        this.pending = "";
+      }
+    },
   },
 };
 </script>
@@ -382,6 +454,11 @@ export default {
   color: var(--q-ink-1);
 }
 
+.lares-agent[data-device="desktop"] {
+  min-height: 0;
+  width: 100%;
+}
+
 .lares-agent__body {
   display: flex;
   flex-direction: column;
@@ -389,6 +466,15 @@ export default {
   padding: 16px 20px 32px;
 }
 
+.lares-agent[data-device="desktop"] .lares-agent__body {
+  gap: 16px;
+  padding: 0;
+}
+
+.lares-agent[data-device="desktop"] .lares-agent__group h2 {
+  font-size: 16px;
+}
+
 .lares-agent__loading {
   position: absolute;
   inset: 0;
@@ -405,8 +491,12 @@ export default {
 
 .lares-agent__loading p {
   margin: 0;
-  font-size: 14px;
-  line-height: 20px;
+  font-size: 16px;
+  line-height: 22px;
+}
+
+.lares-agent[data-device="desktop"] .lares-agent__loading {
+  min-height: 96px;
 }
 
 .lares-agent__spinner {
@@ -436,9 +526,9 @@ export default {
 
 .lares-agent__group h2 {
   margin: 0;
-  font-size: 16px;
+  font-size: 18px;
   font-weight: 500;
-  line-height: 22px;
+  line-height: 24px;
 }
 
 .lares-agent__list {
@@ -449,7 +539,7 @@ export default {
 
 .lares-agent__hint {
   margin: 0;
-  font-size: 13px;
+  font-size: 15px;
   color: var(--q-ink-3);
 }
 
@@ -465,8 +555,8 @@ export default {
   margin: 0;
   padding: 12px 16px 4px;
   color: var(--q-ink-3);
-  font-size: 12px;
+  font-size: 14px;
   font-weight: 500;
-  line-height: 16px;
+  line-height: 18px;
 }
 </style>

package/src/settings/Select.vue

@@ -0,0 +1,183 @@
+<template>
+  <div class="lares-select">
+    <LaresPcPopover v-model="open" width="anchor" placement="bottom-start">
+      <template #trigger="{ toggle }">
+        <button
+          type="button"
+          class="lares-select__trigger"
+          :disabled="disabled"
+          aria-haspopup="listbox"
+          :aria-expanded="open ? 'true' : 'false'"
+          @click="toggle"
+        >
+          <span class="lares-select__value">{{ currentLabel }}</span>
+          <svg class="lares-select__chevron" viewBox="0 0 24 24" aria-hidden="true">
+            <path d="M6.5 9 12 14.5 17.5 9" />
+          </svg>
+        </button>
+      </template>
+      <div class="lares-select__menu" role="listbox">
+        <p v-if="emptyText" class="lares-select__empty">{{ emptyText }}</p>
+        <template v-for="section in sections" :key="section.heading || 'main'">
+          <p v-if="section.heading" class="lares-select__heading">{{ section.heading }}</p>
+          <button
+            v-for="item in section.items"
+            :key="item.id"
+            type="button"
+            class="lares-select__option"
+            role="option"
+            :aria-selected="item.id === value"
+            :disabled="disabled"
+            @click="choose(item)"
+          >
+            <span>{{ item.label }}</span>
+            <svg v-if="item.id === value" class="lares-select__check" viewBox="0 0 24 24" aria-hidden="true">
+              <path d="M5 12.5 9.5 17 19 7.5" />
+            </svg>
+          </button>
+        </template>
+      </div>
+    </LaresPcPopover>
+  </div>
+</template>
+
+<script>
+import LaresPcPopover from "../desktop/ui/PcPopover.vue";
+
+export default {
+  name: "LaresSelect",
+  components: { LaresPcPopover },
+  props: {
+    value: { type: String, default: "" },
+    sections: { type: Array, default: () => [] },
+    disabled: { type: Boolean, default: false },
+    empty: { type: String, default: "" },
+  },
+  emits: ["select"],
+  data() {
+    return { open: false };
+  },
+  computed: {
+    currentLabel() {
+      for (const section of this.sections) {
+        for (const item of section.items) {
+          if (item.id === this.value) return item.label;
+        }
+      }
+      return "—";
+    },
+    itemCount() {
+      return this.sections.reduce((sum, section) => sum + section.items.length, 0);
+    },
+    emptyText() {
+      return this.itemCount === 0 ? this.empty : "";
+    },
+  },
+  methods: {
+    choose(item) {
+      this.open = false;
+      this.$emit("select", item);
+    },
+  },
+};
+</script>
+
+<style scoped>
+.lares-select {
+  width: 100%;
+}
+
+.lares-select__trigger {
+  display: flex;
+  align-items: center;
+  gap: 8px;
+  box-sizing: border-box;
+  width: 100%;
+  height: 32px;
+  padding: 0 8px 0 12px;
+  border: 1px solid var(--q-separator);
+  border-radius: 8px;
+  background: transparent;
+  color: var(--q-ink-2);
+  text-align: left;
+  cursor: pointer;
+}
+
+.lares-select__trigger:disabled {
+  cursor: default;
+  opacity: 0.5;
+}
+
+.lares-select__value {
+  min-width: 0;
+  flex: 1;
+  overflow: hidden;
+  font-size: 15px;
+  line-height: 20px;
+  text-overflow: ellipsis;
+  white-space: nowrap;
+}
+
+.lares-select__chevron,
+.lares-select__check {
+  width: 20px;
+  height: 20px;
+  flex-shrink: 0;
+  fill: none;
+  stroke: var(--q-ink-3);
+  stroke-width: 1.75;
+  stroke-linecap: round;
+  stroke-linejoin: round;
+}
+
+.lares-select__check {
+  width: 16px;
+  height: 16px;
+  stroke: var(--q-blue-default);
+}
+
+.lares-select__menu {
+  margin: -2px;
+}
+
+.lares-select__empty,
+.lares-select__heading {
+  margin: 0;
+  padding: 8px;
+  color: var(--q-ink-3);
+  font-size: 14px;
+  font-weight: 500;
+  line-height: 18px;
+}
+
+.lares-select__option {
+  display: flex;
+  align-items: center;
+  justify-content: space-between;
+  gap: 8px;
+  width: 100%;
+  padding: 8px;
+  border: 0;
+  border-radius: 4px;
+  background: transparent;
+  color: var(--q-ink-2);
+  font-size: 15px;
+  line-height: 20px;
+  text-align: left;
+  cursor: pointer;
+}
+
+.lares-select__option span {
+  min-width: 0;
+  overflow: hidden;
+  text-overflow: ellipsis;
+}
+
+.lares-select__option:hover:not(:disabled) {
+  background: var(--q-background-hover);
+}
+
+.lares-select__option[aria-selected="true"] span {
+  color: var(--q-blue-default);
+}
+</style>

package/src/settings/SettingRow.vue

@@ -52,6 +52,7 @@ export default {
   background: transparent;
   color: var(--q-ink-1);
   text-align: left;
+  transition: background var(--lares-duration-fast, 120ms) var(--lares-ease-out, ease);
 }
 
 .lares-set-row--boxed {
@@ -75,8 +76,8 @@ export default {
 .lares-set-row__label {
   min-width: 0;
   flex: 1;
-  font-size: 14px;
-  line-height: 20px;
+  font-size: 16px;
+  line-height: 22px;
   word-break: break-word;
 }
 
@@ -91,8 +92,8 @@ export default {
 
 .lares-set-row__value {
   overflow: hidden;
-  font-size: 13px;
-  line-height: 18px;
+  font-size: 15px;
+  line-height: 20px;
   color: var(--q-ink-2);
   text-align: right;
   text-overflow: ellipsis;

package/src/settings/Sheet.vue

@@ -52,7 +52,7 @@ export default {
   inset: 0;
   background: rgb(0 0 0 / 32%);
   opacity: 0;
-  transition: opacity 0.28s cubic-bezier(0.32, 0.72, 0, 1);
+  transition: opacity var(--lares-duration-sheet, 280ms) var(--lares-ease-out, cubic-bezier(0.32, 0.72, 0, 1));
 }
 
 .lares-sheet[data-open="true"] .lares-sheet__backdrop {
@@ -73,7 +73,7 @@ export default {
   background: var(--q-background-1);
   box-shadow: 0 -8px 32px rgb(0 0 0 / 12%);
   transform: translateY(100%);
-  transition: transform 0.28s cubic-bezier(0.32, 0.72, 0, 1);
+  transition: transform var(--lares-duration-sheet, 280ms) var(--lares-ease-out, cubic-bezier(0.32, 0.72, 0, 1));
 }
 
 .lares-sheet[data-open="true"] .lares-sheet__panel {
@@ -91,9 +91,9 @@ export default {
 
 .lares-sheet__title {
   margin: 0;
-  font-size: 18px;
+  font-size: 20px;
   font-weight: 500;
-  line-height: 24px;
+  line-height: 26px;
 }
 
 .lares-sheet__close {

package/src/styles.css

@@ -1,12 +1,21 @@
+@import "./motion.css";
+
+/* Own the base size instead of inheriting the host page, so unstyled text
+   (user bubbles, composer textareas) matches the transcript body. */
 .lares-shell {
   position: relative;
   display: flex;
   flex-direction: column;
   min-height: 0;
   flex: 1;
+  font-size: 17px;
   color: var(--q-ink-1);
 }
 
+.lares-shell[data-device="desktop"] {
+  font-size: 15px;
+}
+
 .lares-shell__conversation {
   display: flex;
   flex-direction: column;