@olares/lares-core 0.15.17 → 0.15.19

package/i18n/chat-model-switch.js

@@ -1,7 +1,8 @@
 export const ZH = {
-  "reasoning.default": "默认",
+  "reasoning.default": "使用模型默认",
   "reasoning.title": "推理强度",
   "reasoning.switchAria": "切换推理强度，当前 {label}",
+  "effort.none": "关闭思考",
   "effort.off": "关闭",
   "effort.minimal": "最低",
   "effort.low": "低",
@@ -12,6 +13,8 @@ export const ZH = {
   "model.select": "选择模型",
   "model.switchAria": "切换模型，当前 {label}",
   "model.menuAria": "模型",
+  "menu.model": "模型",
+  "menu.effort": "推理等级",
   "model.refreshing": "正在刷新模型列表…",
   "model.opFailed": "模型操作失败：{msg}",
   "model.loadFailed": "{name} 加载失败：{msg}",
@@ -20,9 +23,10 @@ export const ZH = {
 };
 
 export const EN = {
-  "reasoning.default": "Default",
+  "reasoning.default": "Model default",
   "reasoning.title": "Reasoning effort",
   "reasoning.switchAria": "Switch reasoning effort, current {label}",
+  "effort.none": "No thinking",
   "effort.off": "Off",
   "effort.minimal": "Minimal",
   "effort.low": "Low",
@@ -33,6 +37,8 @@ export const EN = {
   "model.select": "Select model",
   "model.switchAria": "Switch model, current {label}",
   "model.menuAria": "Model",
+  "menu.model": "Model",
+  "menu.effort": "Effort",
   "model.refreshing": "Refreshing models…",
   "model.opFailed": "Model action failed: {msg}",
   "model.loadFailed": "{name} failed to load: {msg}",

package/i18n/voice.js

@@ -1,4 +1,16 @@
 export const ZH = {
+  "readout.error": "朗读失败，请检查语音设置", "readout.dismiss": "关闭提示", "readout.preparing": "准备朗读…", "readout.playing": "正在朗读", "readout.confirming": "确认插话…", "readout.stop": "停止朗读",
+  "tts.voice": "音色",
+  "tts.default": "模型默认",
+  "tts.loading": "正在加载音色…",
+  "tts.loadFailed": "音色加载失败，请重试",
+  "tts.noPresets": "此模型不提供预设音色，使用模型默认声音。",
+  "tts.preview": "试听",
+  "tts.stopPreview": "停止试听",
+  "tts.previewHint": "播放固定短句，不会开启自动朗读。",
+  "tts.previewFailed": "试听失败，请重试",
+  "tts.busy": "请先结束录音或暂停语音对话。",
+
   "pc.conversation": "开始语音对话",
   "pc.pause": "暂停语音对话",
   "pc.resume": "继续语音对话",
@@ -145,7 +157,8 @@ export const ZH = {
   "error.voice_gpu_stop_failed": "{app}停不下来，显卡模式没有改变（{detail}）。请在 Olares 市场查看它的状态，再点重试",
   "error.voice_gpu_memory": "{app}显存不够，没能启动。请在「显存分片」里调大它的显存，或关掉其他应用后重试",
   "error.voice_gpu_resume_failed": "{app}没能启动（{detail}）。请在 Olares 市场查看它的状态，再点重试",
-  "mic.preparing": "正在准备麦克风…",
+  "mic.checking": "正在检查语音能力…",
+  "mic.preparing": "正在开启麦克风…",
   "mic.stop": "点击结束录音",
   "mic.transcribing": "转写中…",
   "mic.idle": "语音输入",
@@ -155,7 +168,31 @@ export const ZH = {
   "settings.refresh": "刷新",
   "settings.refreshing": "刷新中…",
   "settings.router": "Router 控制台",
+  "preferences.dictationStyle": "听写方式",
+  "preferences.save": "保存",
+  "preferences.cancel": "取消",
+  "preferences.saving": "正在保存…",
+  "preferences.shortcuts": "快捷键",
+  "preferences.shortcutScope": "仅当前网页获得焦点时生效。可为默认听写或特定预设设置快捷键。",
+  "preferences.shortcutRecording": "请按组合键",
+  "preferences.shortcutHelp": "松开组合键保存；Esc 取消，Tab 离开。",
+  "preferences.unset": "未设置",
+  "preferences.clear": "清除",
+  "preferences.shortcutError.duplicate": "此组合键已用于其他听写操作，请换一个。",
+  "preferences.shortcutError.reserved": "这是浏览器或系统常用快捷键，请换一个。",
+  "preferences.shortcutError.invalid": "请使用 Ctrl、⌘ 或 Alt 加字母、数字或功能键的组合。",
+  "preferences.shortcutError.save": "保存失败，原快捷键已保留。",
+  "preferences.unsaved": "有未保存的预设修改",
+  "preferences.unsavedHint": "保存修改后离开，或放弃本次修改。",
+  "preferences.continue": "继续编辑",
+  "preferences.discard": "放弃修改",
+  "preferences.modelsMissing": "暂无可用模型，请前往 Router 控制台配置。",
+  "settings.model.none": "未选择模型",
+  "settings.model.auto": "自动选择",
+  "preferences.unavailable": "当前不可用",
   "settings.loading": "正在读取语音设置…",
+  "settings.diagnosticsLoading": "正在检查模型运行状态…",
+  "settings.diagnosticsFailed": "模型状态检查失败，请刷新重试",
   "settings.loadFailed": "读取语音设置失败",
   "settings.refreshFailed": "刷新语音模型列表失败",
   "settings.stt.title": "语音识别",
@@ -230,6 +267,7 @@ export const ZH = {
   "settings.resumeFailed": "启用失败",
   "settings.language.title": "识别语言",
   "settings.language.hint": "指定语言可提升准确度与速度",
+  "settings.readAloudSyncFailed": "朗读设置同步失败，当前语音已静音，请重试",
   "settings.saveFailed": "保存失败",
   "settings.bluetooth.title": "蓝牙设备",
   "settings.bluetooth.hint": "连上后可以用这台设备说话，回答也会从它播出来",
@@ -242,6 +280,18 @@ export const ZH = {
 };
 
 export const EN = {
+  "readout.error": "Reading failed. Check voice settings.", "readout.dismiss": "Dismiss", "readout.preparing": "Preparing speech…", "readout.playing": "Reading aloud", "readout.confirming": "Checking interruption…", "readout.stop": "Stop reading",
+  "tts.voice": "Voice",
+  "tts.default": "Model default",
+  "tts.loading": "Loading voices…",
+  "tts.loadFailed": "Could not load voices. Try again.",
+  "tts.noPresets": "This model has no preset voices. Its default voice will be used.",
+  "tts.preview": "Preview voice",
+  "tts.stopPreview": "Stop preview",
+  "tts.previewHint": "Play a sample without enabling automatic read-aloud.",
+  "tts.previewFailed": "Preview failed. Try again.",
+  "tts.busy": "Finish recording or pause the voice conversation first.",
+
   "pc.conversation": "Start voice conversation",
   "pc.pause": "Pause voice conversation",
   "pc.resume": "Resume voice conversation",
@@ -397,7 +447,8 @@ export const EN = {
   "error.voice_gpu_memory":
     "{app} ran out of GPU memory and did not start. Give it more memory under Memory slices, or turn other apps off, then retry",
   "error.voice_gpu_resume_failed": "{app} did not start ({detail}). Check it in the Olares Market, then retry",
-  "mic.preparing": "Preparing microphone…",
+  "mic.checking": "Checking voice capabilities…",
+  "mic.preparing": "Opening microphone…",
   "mic.stop": "Click to stop recording",
   "mic.transcribing": "Transcribing…",
   "mic.idle": "Voice input",
@@ -407,7 +458,31 @@ export const EN = {
   "settings.refresh": "Refresh",
   "settings.refreshing": "Refreshing…",
   "settings.router": "Router console",
+  "preferences.dictationStyle": "Dictation style",
+  "preferences.save": "Save",
+  "preferences.cancel": "Cancel",
+  "preferences.saving": "Saving…",
+  "preferences.shortcuts": "Keyboard shortcuts",
+  "preferences.shortcutScope": "Shortcuts work only while this page has focus. Choose the default style or a specific preset.",
+  "preferences.shortcutRecording": "Press a shortcut",
+  "preferences.shortcutHelp": "Release to save. Esc cancels; Tab moves focus.",
+  "preferences.unset": "Not set",
+  "preferences.clear": "Clear",
+  "preferences.shortcutError.duplicate": "This shortcut is assigned to another dictation action.",
+  "preferences.shortcutError.reserved": "This shortcut is reserved by the browser or system.",
+  "preferences.shortcutError.invalid": "Use Ctrl, Command or Alt with a letter, digit or function key.",
+  "preferences.shortcutError.save": "Save failed. Your previous shortcut is unchanged.",
+  "preferences.unsaved": "Unsaved preset changes",
+  "preferences.unsavedHint": "Save your changes before leaving, or discard them.",
+  "preferences.continue": "Keep editing",
+  "preferences.discard": "Discard changes",
+  "preferences.modelsMissing": "No models are available. Configure them in the Router console.",
+  "settings.model.none": "No model selected",
+  "settings.model.auto": "Automatic",
+  "preferences.unavailable": "Currently unavailable",
   "settings.loading": "Loading voice settings…",
+  "settings.diagnosticsLoading": "Checking model runtime status…",
+  "settings.diagnosticsFailed": "Model diagnostics failed; refresh to retry",
   "settings.loadFailed": "Failed to load voice settings",
   "settings.refreshFailed": "Failed to refresh voice models",
   "settings.stt.title": "Speech recognition",
@@ -482,6 +557,7 @@ export const EN = {
   "settings.resumeFailed": "Start failed",
   "settings.language.title": "Recognition language",
   "settings.language.hint": "Specifying a language improves accuracy and speed",
+  "settings.readAloudSyncFailed": "Read-aloud settings could not sync. Voice output is muted; retry to apply them.",
   "settings.saveFailed": "Failed to save",
   "settings.bluetooth.title": "Bluetooth devices",
   "settings.bluetooth.hint": "After connecting, speak into this device and hear answers from it",

package/i18n/webhook.js

@@ -0,0 +1,39 @@
+export const ZH = {
+  "settings.nav": "Webhook",
+  "settings.title": "Webhook",
+  "settings.intro": "给其他应用一个入口：提交一段提示词，Lares 开一个新会话来回答。演示用途，目前不校验调用方身份，只在需要演示时打开。",
+  "settings.enabled": "启用",
+  "settings.enabledHint": "关闭时提交会被拒绝。已经开始的会话仍可按 id 查询。",
+  "settings.workspace": "工作区",
+  "settings.workspaceHint": "新会话的目录。留空则使用本机默认工作区。必须是绝对路径。",
+  "settings.workspacePlaceholder": "留空使用默认工作区",
+  "settings.save": "保存",
+  "settings.saving": "正在保存…",
+  "settings.saved": "已保存",
+  "settings.loadFailed": "载入失败：{msg}",
+  "settings.saveFailed": "保存失败：{msg}",
+  "settings.contract": "调用方式",
+  "settings.contractHint": "POST 立刻返回会话 id。GET 在 status 为 idle 时带上回复文本；running 表示还在回答。地址在 webhook 入口上，和当前页面不是同一个域名。",
+  "settings.copy": "复制",
+  "settings.copied": "已复制",
+};
+
+export const EN = {
+  "settings.nav": "Webhook",
+  "settings.title": "Webhook",
+  "settings.intro": "An entrance for other apps: submit a prompt and Lares opens a new session to answer it. This is for demos and does not check the caller. Turn it on only while you are demonstrating.",
+  "settings.enabled": "Enabled",
+  "settings.enabledHint": "Submissions are refused while this is off. A session that already started can still be read by id.",
+  "settings.workspace": "Workspace",
+  "settings.workspaceHint": "Directory for new sessions. Leave empty to use the default workspace. Must be an absolute path.",
+  "settings.workspacePlaceholder": "Empty uses the default workspace",
+  "settings.save": "Save",
+  "settings.saving": "Saving…",
+  "settings.saved": "Saved",
+  "settings.loadFailed": "Couldn't load: {msg}",
+  "settings.saveFailed": "Couldn't save: {msg}",
+  "settings.contract": "How to call it",
+  "settings.contractHint": "POST returns a session id immediately. GET includes the reply text once status is idle; running means the answer is still in progress. The address is the webhook entrance, a different host from this page.",
+  "settings.copy": "Copy",
+  "settings.copied": "Copied",
+};

package/larepass/mux.js

@@ -195,6 +195,7 @@ export function createSessionFollow() {
         }
         attempt.nextIndex += 1;
         const event = fromChunk(attempt.turn, attempt.step, live.chunk);
+        if (event) Object.assign(event.data, { attemptId: attempt.attemptId, chunkIndex: live.index });
         return { events: event ? [event] : [] };
       }
       if (live.type === "end") {

package/larepass/rpc.js

@@ -25,7 +25,7 @@ export function hostEndpoint(method) {
 
 /**
  * Wire body for one call. `session.history` is `session/page`. `session/list`
- * names its argument `_request`; every other claimed method uses `request`.
+ * names its argument `_request`; settings uses direct named parameters.
  * Prompt requires a `requestId` the call site does not carry.
  */
 export function hostCall(method, payload = {}) {
@@ -45,8 +45,9 @@ export function hostCall(method, payload = {}) {
     };
   }
   if (endpoint === "session/list") return { endpoint, args: { _request: body } };
-  // modelCatalog takes no parameter; a `request` object fails the strict codec.
-  if (endpoint === "session/modelCatalog") return { endpoint, args: {} };
+  // Parameterless endpoints reject even an empty `request` object.
+  if (endpoint === "session/modelCatalog" || endpoint === "settings/describe") return { endpoint, args: {} };
+  if (endpoint === "settings/update") return { endpoint, args: body };
   if (endpoint === "$events/result") return { endpoint, args: body };
   if (endpoint === "session/prompt") {
     return {

package/larepass/runtime.js

@@ -731,6 +731,9 @@ export function createChatRuntime(client) {
       emit();
       return archived;
     },
+    async refreshModelCatalog() {
+      await client.settings.refreshModels();
+    },
     modelCatalog() {
       return client.rpc("session.modelCatalog");
     },
@@ -862,7 +865,7 @@ export function createChatRuntime(client) {
       }
       return client.upload(id, file, options);
     },
-    voiceSocket(ticket) { return client.voiceSocket(ticket); },
+    voiceSocket(ticket, path) { return client.voiceSocket(ticket, path); },
     voiceRequest(path, options) { return client.voiceRequest(path, options); },
     transcribe(blob, language, signal, model) {
       if (typeof client.transcribe !== "function") {

package/larepass/settings.js

@@ -89,32 +89,35 @@ export function createHostSettings(request) {
         ),
       );
     },
-    async voice(force = false) {
+    async voice(force = false, { diagnostics = true } = {}) {
       return voiceStore.load(async () => {
         const query = force ? "?refresh=1" : "";
         const [config, status, models] = await Promise.all([
           request("/api/lares/voice/config"),
-          request(`/api/lares/voice/status${query}`),
-          request(`/api/lares/voice/models${query}`),
+          diagnostics ? request(`/api/lares/voice/status${query}`) : Promise.resolve(null),
+          request(`/api/lares/voice/${diagnostics ? "models" : "capabilities"}${query}`),
         ]);
-        const listed = payload(models, "/api/lares/voice/models");
+        const listed = payload(models, "/api/lares/voice/capabilities");
         return {
           config: payload(config, "/api/lares/voice/config"),
-          status: payload(status, "/api/lares/voice/status"),
+          status: status ? payload(status, "/api/lares/voice/status") : { modelAvailable: Boolean(listed.selected), model: listed.selected || "" },
           sttModels: modelIds(listed, "stt"),
           ttsModels: modelIds(listed, "tts"),
+          ttsSelected: listed.ttsSelected || "",
+          ttsDefault: listed.ttsDefault || "",
           chatModels: modelIds(listed, "chat"),
           realtimeModels: modelIds(listed, "realtime"),
           realtimeReady: modelIds(listed, "realtimeReady"),
         };
       }, { force: Boolean(force) });
     },
-    async saveVoice(patch) {
-      payload(
+    async saveVoice(patch, { diagnostics = true } = {}) {
+      const config = payload(
         await request("/api/lares/voice/config", { method: "POST", body: patch }),
         "/api/lares/voice/config",
       );
-      const value = await this.voice(true);
+      const previous = voiceStore.peek();
+      const value = !diagnostics && previous ? voiceStore.remember({ ...previous, config }) : await this.voice(true, { diagnostics });
       for (const listener of voiceListeners) listener(value);
       return value;
     },

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@olares/lares-core",
-  "version": "0.15.17",
+  "version": "0.15.19",
   "description": "Lares 共享业务核心：Router、workspace、文件/媒体、Olares 身份（无 UI、无平台壳）",
   "type": "module",
   "repository": {
@@ -28,10 +28,14 @@
     "search",
     "tools",
     "voice",
+    "webhook",
     "workspace",
     "skills"
   ],
   "exports": {
+    "./router/catalog-coordinator": "./router/catalog-coordinator.js",
+    "./router/model-state": "./router/model-state.js",
+    "./router/model-authorization": "./router/model-authorization.js",
     "./tools/http": "./tools/http.js",
     "./tools/json-file": "./tools/json-file.js",
     "./tools/async": "./tools/async.js",
@@ -50,6 +54,7 @@
     "./i18n/preview": "./i18n/preview.js",
     "./i18n/mobile": "./i18n/mobile.js",
     "./i18n/mcp": "./i18n/mcp.js",
+    "./i18n/webhook": "./i18n/webhook.js",
     "./router/catalog": "./router/catalog.js",
     "./router/catalog-cache": {
       "types": "./router/catalog-cache.d.ts",
@@ -106,6 +111,10 @@
     "./drive/url-download": "./drive/url-download.js",
     "./drive/execute": "./drive/execute.js",
     "./drive/tools": "./drive/tools.js",
+    "./voice/stream-gateway": "./voice/stream-gateway.js",
+    "./voice/stream-client": "./voice/stream-client.js",
+    "./voice/pcm-player": "./voice/pcm-player.js",
+    "./voice/pcm-worklet": "./voice/pcm-worklet.js",
     "./voice/config": "./voice/config.js",
     "./voice/languages": "./voice/languages.js",
     "./voice/service": "./voice/service.js",
@@ -135,6 +144,10 @@
     "./media/tool": "./media/tool.js",
     "./mcp/config": "./mcp/config.js",
     "./mcp/client": "./mcp/client.js",
+    "./webhook/config": "./webhook/config.js",
+    "./webhook/public": "./webhook/public.js",
+    "./webhook/reply": "./webhook/reply.js",
+    "./webhook/client": "./webhook/client.js",
     "./mcp/approval": "./mcp/approval.js",
     "./olares/identity": "./olares/identity.js",
     "./olares/session-identity": "./olares/session-identity.js",
@@ -194,10 +207,24 @@
     "./voice/hold": "./voice/hold.js",
     "./voice/dictation": "./voice/dictation.js",
     "./voice/shortcuts": "./voice/shortcuts.js",
+    "./voice/tts-settings": "./voice/tts-settings.js",
+    "./voice/tts-preview": "./voice/tts-preview.js",
+    "./voice/tts-voice": "./voice/tts-voice.js",
+    "./voice/activity": "./voice/activity.js",
+    "./voice/preferences": "./voice/preferences.js",
+    "./voice/lares-policy": "./voice/lares-policy.js",
     "./voice/panel": "./voice/panel.js",
-    "./voice/projection": "./voice/projection.js"
+    "./voice/startup": "./voice/startup.js",
+    "./voice/projection": "./voice/projection.js",
+    "./voice/reply-stream": "./voice/reply-stream.js",
+    "./router/default-selection": {
+      "types": "./router/default-selection.d.ts",
+      "default": "./router/default-selection.js"
+    }
   },
   "dependencies": {
+    "emoji-regex": "11.0.0",
+    "markdown-it": "14.3.0",
     "ws": "^8.22.0"
   }
 }

package/router/catalog-cache.js

@@ -119,7 +119,7 @@ export class CatalogCache {
   async load() {
     if (!this.primed) {
       this.primed = true;
-      const seeded = readCatalogSeed(this.dataDir);
+      const seeded = process.env.LARES_ROUTER_CATALOG_BOOT_FAILED === "1" ? null : readCatalogSeed(this.dataDir);
       if (seeded) {
         this.accept(seeded);
         return this.snapshot();

package/router/catalog-coordinator.js

@@ -0,0 +1,60 @@
+import { ensureDefaultSelection } from "./default-selection.js";
+import { catalogCache } from "./catalog-cache.js";
+import { chatModelsFromRouterCatalog, catalogSettingsOps, LLM_SETTINGS_NS } from "./models.js";
+
+export class CatalogCoordinator {
+  constructor(cache = catalogCache) {
+    this.cache = cache;
+    this.committed = null;
+    this.signature = null;
+    this.revision = 0;
+    this.listeners = new Set();
+    this.inflight = null;
+  }
+
+  async sync(ports, refresh = false) {
+    if (this.inflight) {
+      const pending = this.inflight;
+      const result = await pending.promise;
+      await ensureDefaultSelection(ports.defaultModel, result.models);
+      if (!refresh || pending.refresh) return result;
+      return this.sync(ports, true);
+    }
+    const pending = { refresh, promise: null };
+    pending.promise = this.perform(ports, refresh).finally(() => {
+      if (this.inflight === pending) this.inflight = null;
+    });
+    this.inflight = pending;
+    return pending.promise;
+  }
+
+  async perform(ports, refresh) {
+    const previous = this.cache.snapshot();
+    try {
+      const next = await this.cache.get({ refresh });
+      const models = chatModelsFromRouterCatalog(next.payload);
+      const signature = JSON.stringify(next.rows);
+      // Readers cannot observe new capabilities until dsh accepts the same catalog.
+      if (signature !== this.signature) {
+        await ports.mutateSettings(LLM_SETTINGS_NS, catalogSettingsOps(models));
+        await ensureDefaultSelection(ports.defaultModel, models);
+        this.committed = { ...next, models };
+        this.signature = signature;
+        this.revision++;
+        for (const listener of this.listeners) listener(this.revision);
+      } else {
+        await ensureDefaultSelection(ports.defaultModel, models);
+      }
+      return this.committed;
+    } catch (error) {
+      this.cache.restore(previous);
+      throw error;
+    }
+  }
+}
+
+export const catalogCoordinator = new CatalogCoordinator();
+
+export function synchronizeHostCatalog(ctx, refresh = false) {
+  return catalogCoordinator.sync({ mutateSettings: (ns, ops) => ctx.settings.mutate(ns, ops), defaultModel: ctx.agentDefaultModel }, refresh);
+}

package/router/catalog-sync.js

@@ -1,14 +1,9 @@
-import { createInFlightCoalescer } from "../tools/async.js";
-import { catalogCache } from "./catalog-cache.js";
+import { catalogCoordinator } from "./catalog-coordinator.js";
+import { authorizedChatModel } from "./model-authorization.js";
 import {
-  LLM_SETTINGS_NS,
   ROUTER_PROVIDER_ID,
-  catalogSettingsOps,
-  chatModelsFromRouterCatalog,
-  defaultNeedsRepair,
   listedCatalog,
   parseDefaultModelRequest,
-  pickDefaultModel,
   unregisteredRouterFailure,
 } from "./models.js";
 import { forgetSttModel } from "./stt.js";
@@ -17,61 +12,15 @@ function messageOf(err) {
   return err instanceof Error ? err.message : String(err);
 }
 
-let adapterRevision = 0;
-/** What the last successful refresh wrote, so periodic reconciles stay quiet. */
-let publishedModels = null;
-/** @type {Set<(revision: number) => void>} */
-const revisionListeners = new Set();
-
-export function catalogRevision() {
-  return adapterRevision;
-}
-
-/** @param {(revision: number) => void} listener */
+export function catalogRevision() { return catalogCoordinator.revision; }
 export function onCatalogRevision(listener) {
-  revisionListeners.add(listener);
-  return () => revisionListeners.delete(listener);
+  catalogCoordinator.listeners.add(listener);
+  return () => catalogCoordinator.listeners.delete(listener);
 }
-
-function bumpRevision() {
-  adapterRevision += 1;
-  for (const listener of revisionListeners) listener(adapterRevision);
-}
-
-/**
- * @param {{
- *   mutateSettings: (ns: string, ops: unknown[]) => Promise<void>,
- *   currentSelection: () => { provider: string, model: string },
- *   saveSelection: (next: { provider: string, model: string }) => Promise<void>,
- * }} ports
- */
-async function performRefresh(ports) {
-  const previous = catalogCache.snapshot();
-  try {
-    const { payload } = await catalogCache.get({ refresh: true });
-    const models = chatModelsFromRouterCatalog(payload);
-    await ports.mutateSettings(LLM_SETTINGS_NS, catalogSettingsOps(models));
-    const current = ports.currentSelection();
-    if (defaultNeedsRepair(current, models)) {
-      await ports.saveSelection({ provider: ROUTER_PROVIDER_ID, model: pickDefaultModel(models).id });
-    }
-    forgetSttModel();
-    const serialized = JSON.stringify(models);
-    if (serialized !== publishedModels) {
-      publishedModels = serialized;
-      bumpRevision();
-    }
-    return models;
-  } catch (err) {
-    catalogCache.restore(previous);
-    throw err;
-  }
-}
-
-const coalesceRefresh = createInFlightCoalescer();
-
-export function refreshCatalog(ports) {
-  return coalesceRefresh(() => performRefresh(ports));
+export async function refreshCatalog(ports) {
+  const snapshot = await catalogCoordinator.sync(ports, true);
+  forgetSttModel();
+  return snapshot.models;
 }
 
 /**
@@ -86,10 +35,14 @@ export async function listCatalog(ports) {
     return { models: [], failures: unregisteredRouterFailure() };
   }
   try {
-    return { models: listedCatalog(provider, await ports.listModels(ROUTER_PROVIDER_ID)), failures: [] };
+    const authorized = await catalogCoordinator.sync(ports);
+    return {
+      models: listedCatalog(provider, await ports.listModels(ROUTER_PROVIDER_ID)).filter((model) => authorized.rows.some((row) => row.id === model.id)),
+      failures: [],
+    };
   } catch (err) {
     return {
-      models: [],
+      models: listedCatalog(provider, catalogCoordinator.committed?.models ?? []),
       failures: [{ provider: ROUTER_PROVIDER_ID, name: provider.name, message: messageOf(err) }],
     };
   }
@@ -110,6 +63,8 @@ export async function saveDefault(ports, request) {
   const asked = parseDefaultModelRequest(request);
   let resolved;
   try {
+    await catalogCoordinator.sync(ports);
+    if (!await authorizedChatModel(asked)) throw new Error("Select an authorized chat model");
     resolved = await ports.resolveCallConfig(asked);
   } catch (err) {
     throw Object.assign(new Error(messageOf(err)), { code: "model_unavailable", status: 400 });

package/router/catalog.d.ts

@@ -8,8 +8,10 @@ export interface RouterCatalogRow {
   supportsStt: boolean;
   /** Speech playback, from `tts`. */
   supportsTts: boolean;
-  /** pi-ai level → Router wire spelling, or null when the model takes no effort. */
+  supportsSttStream: boolean;
+  /** Router identifier → identical wire value, in declared order; null without effort capability. */
   reasoningEfforts: Record<string, string> | null;
+  reasoningDefault?: string;
   /** Tokens one request may span, or null when Router states none. */
   contextWindow: number | null;
   /** Output tokens a turn may reserve: Router's limit capped at a quarter of the window. */

package/router/catalog.js

@@ -1,6 +1,4 @@
 const SAFE_MODEL_ID = /^[^\u0000-\u001f\u007f]{1,512}$/;
-/** pi-ai's thinking vocabulary; a Router level outside it has no wire spelling to declare. */
-const THINKING_LEVELS = new Set(["off", "minimal", "low", "medium", "high", "xhigh", "max"]);
 
 /**
  * The capability flags one catalog row declares, named without Router's
@@ -23,20 +21,12 @@ function capabilities(item) {
   return flags;
 }
 
-/**
- * The effort levels Router advertises for one model, keyed by pi-ai level with
- * Router's own spelling as the wire value. A dict offering nothing beyond `off`
- * is no capability at all, and pi-ai rejects it.
- */
+/** Keep Router identifiers and their declared order independent of adapter vocabulary. */
 function reasoningEfforts(item, flags) {
   if (!flags.has("reasoning_effort")) return null;
   const options = Array.isArray(item.reasoning_effort?.options) ? item.reasoning_effort.options : [];
-  const efforts = {};
-  for (const option of options) {
-    const level = String(option ?? "").trim().toLowerCase();
-    if (THINKING_LEVELS.has(level)) efforts[level] = level;
-  }
-  return Object.keys(efforts).some((level) => level !== "off") ? efforts : null;
+  const entries = options.filter((value) => typeof value === "string" && value.length > 0);
+  return entries.length ? Object.fromEntries(entries.map((value) => [value, value])) : null;
 }
 
 /**
@@ -80,7 +70,10 @@ export function routerCatalogRows(payload) {
       supportsVision: flags.has("vision"),
       supportsStt: flags.has("stt") || flags.has("stt_stream"),
       supportsTts: flags.has("tts"),
+      supportsSttStream: flags.has("stt_stream"),
       reasoningEfforts: reasoningEfforts(item, flags),
+      ...(item.reasoning_effort?.default && (item.reasoning_effort.options ?? []).includes(item.reasoning_effort.default)
+        ? { reasoningDefault: item.reasoning_effort.default } : {}),
       contextWindow,
       maxTokens: outputTokenBudget(tokenCount(item.max_output_tokens), contextWindow),
     });

package/router/default-selection.d.ts

@@ -0,0 +1,3 @@
+export interface ModelSelection { provider: string; model: string; reasoningEffort?: string }
+export function resolveDefaultSelection<T extends ModelSelection>(current: T, models: { id: string }[]): T | ModelSelection;
+export function ensureDefaultSelection(service: { currentSelection(): ModelSelection; saveSelection(next: ModelSelection, options: { expected: ModelSelection }): Promise<void> } | undefined, models: { id: string }[]): Promise<void>;