larkway 0.3.33 → 0.3.35

package/dist/web/public/app.js

@@ -797,6 +797,108 @@ function lkHexA(hex, alpha) {
   return `rgba(${r},${g},${b},${alpha})`;
 }
 
+// ---------------------------------------------------------------------------
+// Model / Effort 覆盖(perf plan 批 C 旋钮)—— 挂在底座卡片下方,因为可选的
+// model 建议项直接取决于选了哪个底座。
+// ---------------------------------------------------------------------------
+
+/**
+ * model 输入的建议项(datalist,非枚举)。按底座区分,因为两家模型名字完全不同:
+ * claude 是 --model 接受的别名;codex 是 OpenAI 模型 slug(取自本机
+ * ~/.codex/models_cache.json 当前可见模型,按 priority 升序的前三个:
+ * gpt-5.5(默认/最强)· gpt-5.4-mini(更快更省)· gpt-5.3-codex(编程特化),
+ * 不是瞎猜的名字)。input 本身允许自由输入任意值 —— 两家模型都在演进,建议项
+ * 只是省得手打,不是白名单。
+ * @param {string} backendId
+ * @returns {Array<[string,string]>} [value, label][]
+ */
+function modelSuggestionsForBackend(backendId) {
+  if (backendId === "codex") {
+    return [
+      ["gpt-5.5", "gpt-5.5 · 当前默认，最强"],
+      ["gpt-5.4-mini", "gpt-5.4-mini · 更快更省"],
+      ["gpt-5.3-codex", "gpt-5.3-codex · 编程特化"],
+    ];
+  }
+  return [
+    ["fable", "fable"],
+    ["opus", "opus"],
+    ["sonnet", "sonnet"],
+  ];
+}
+
+/**
+ * effort <select> 的 <option> HTML。两家底座共用同一套 value(low/medium/high/max)
+ * ——claude 直接透传给 --effort;codex 经 codexEffortFromLarkway 映射成它自己的
+ * low/medium/high/xhigh(即官方 Codex 客户端 Reasoning 选择器里的
+ * Light/Medium/High/Extra High,已用 model/list 实测确认)。value 保持一致只是
+ * 为了 larkway 配置层统一,label 按底座换成对应措辞,避免用户以为 codex 也有个
+ * 叫 "max" 的档位。
+ * @param {string} effortVal
+ * @param {string} backendId
+ */
+function effortOptionsHTML(effortVal, backendId) {
+  const labels = backendId === "codex"
+    ? { low: "low (Light)", medium: "medium (Medium)", high: "high (High)", max: "max (Extra High)" }
+    : { low: "low", medium: "medium", high: "high", max: "max" };
+  return [
+    ["", "默认（不覆盖）"],
+    ["low", labels.low],
+    ["medium", labels.medium],
+    ["high", labels.high],
+    ["max", labels.max],
+  ].map(([v, label]) => `<option value="${esc(v)}"${v === effortVal ? " selected" : ""}>${esc(label)}</option>`).join("");
+}
+
+/**
+ * Model / Effort 覆盖块的 HTML —— 嵌进「用哪个底座驱动它」卡片(lk-bk-card),
+ * 紧跟在 lkBackendSelectHTML(...) 后面。只在编辑态渲染(调用方 buildDetailHTML
+ * 只服务已存在的 bot);新建流程走 /api/onboard/finalize,那条路径尚不转发
+ * 这两个字段,建完再来编辑页配即可。
+ * @param {{model?:string, effort?:string, backend?:string}} bot
+ */
+function buildModelEffortHTML(bot) {
+  const modelVal = bot.model ?? "";
+  const effortVal = bot.effort ?? "";
+  const backendId = bot.backend || LK_BACKEND_DEFAULT;
+  const modelListHTML = modelSuggestionsForBackend(backendId)
+    .map(([v, label]) => `<option value="${esc(v)}">${esc(label)}</option>`)
+    .join("");
+  return (
+    `<div class="ac-field" id="lk-bk-model-effort" style="margin-top:14px;padding-top:14px;border-top:1px solid var(--border)">` +
+    `<label class="ac-label" for="ac-model">Model / Effort 覆盖 <span class="ac-optional">可选</span></label>` +
+    `<p class="ac-hint">不覆盖 = 用账号默认；降低 effort 会牺牲判断深度。</p>` +
+    `<div style="display:flex;gap:12px;flex-wrap:wrap;align-items:center">` +
+    `<input list="ac-model-list" id="ac-model" name="model" class="ac-input" style="width:210px" value="${esc(modelVal)}" placeholder="默认（不覆盖）" autocomplete="off" />` +
+    `<datalist id="ac-model-list">${modelListHTML}</datalist>` +
+    `<span id="ac-effort-field">` +
+    `<select id="ac-effort" name="effort" class="ac-input" style="width:150px">${effortOptionsHTML(effortVal, backendId)}</select>` +
+    `</span>` +
+    `</div>` +
+    `</div>`
+  );
+}
+
+/**
+ * 底座切换时实时刷新 model 建议项 + effort 选项的措辞。effort 两家底座都生效
+ * (见 effortOptionsHTML 顶部注释),这里只换 label,不再隐藏控件。
+ * @param {HTMLElement} panel
+ * @param {string} backendId
+ */
+function refreshModelEffortForBackend(panel, backendId) {
+  const datalist = panel.querySelector("#ac-model-list");
+  if (datalist) {
+    datalist.innerHTML = modelSuggestionsForBackend(backendId)
+      .map(([v, label]) => `<option value="${esc(v)}">${esc(label)}</option>`)
+      .join("");
+  }
+  const effortSelect = panel.querySelector("#ac-effort");
+  if (effortSelect) {
+    const currentVal = effortSelect.value;
+    effortSelect.innerHTML = effortOptionsHTML(currentVal, backendId);
+  }
+}
+
 // ---------------------------------------------------------------------------
 // BL-17: 运行态 vs 配置态底座不一致 badge
 // ---------------------------------------------------------------------------
@@ -2826,6 +2928,14 @@ function readAgentConfigValues(panel) {
     turn_taking_limit: turnLimit,
     _memContent: memContent, // 带出,由调用方分别 PUT /api/memory
   };
+  // model/effort:控件挂在底座卡片(lk-bk-card)里,在 #ac-panel 之外,所以从
+  // panel(而非 ac)查找;仅编辑态渲染(create 模式下查不到,值为 undefined 时
+  // 不带字段)。带 "" 是有意的 ——「默认（不覆盖）」选项要让后端把已有覆盖值删掉,
+  // 不是不发这个字段(不发 = 后端保留原值,详见 api.ts putBot 的合并逻辑)。
+  const modelInput = panel.querySelector("#ac-model");
+  const effortSel = panel.querySelector("#ac-effort");
+  if (modelInput) config.model = modelInput.value.trim();
+  if (effortSel) config.effort = effortSel.value;
   if (botId) config.id = botId;
   // ① 新保存契约:_gitlabTokenValue === undefined 表示「不带字段」(保留现有)
   if (_gitlabTokenValue !== undefined) config.gitlab_token_value = _gitlabTokenValue;
@@ -3226,6 +3336,7 @@ function buildDetailHTML(id, bot, memContent) {
     `<h4 class="lk-bk-card-title">${ICONS.box} 用哪个底座驱动它</h4>` +
     `<p class="lk-bk-card-desc">底座决定这个助手背后跑哪个 CLI agent。默认 Codex；切换后需重启服务生效。</p>` +
     lkBackendSelectHTML(_configuredBk4, `bk-edit-${id}`) +
+    buildModelEffortHTML(bot) +
     bkMismatchDetail +
     `</div>`;
 
@@ -3414,8 +3525,18 @@ function wireDetailEvents(panel, id, bot) {
         const rosterChipEl = rosterLi.querySelector(".roster-state > span[style*='margin-left:auto']");
         if (rosterChipEl) rosterChipEl.innerHTML = lkBackendChipHTML(newId, { size: "sm" });
       }
+      // model 建议项(claude/codex 模型完全不是一回事)+ effort 选项措辞(两家
+      // 底座都生效,只是值域映射不同)随底座即时切换,不用等保存。
+      refreshModelEffortForBackend(panel, newId);
       toast(`底座已切换为 ${lkBackend(newId).name}（保存后生效）`, "info");
     });
+
+    // model(input)/effort(select)挂在 lk-bk-card 里、在 #ac-panel 之外 ——
+    // #ac-panel 的 input 脏检测监听器(见上)碰不到它们,这里单独接一份。
+    bkCard.addEventListener("input", () => {
+      state.formDirty = acFormSnapshot(panel) !== panel._acBaseline;
+      updateFormDirty(panel);
+    });
   }
 
   // 详情 hero 删除按钮

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "larkway",
-  "version": "0.3.33",
+  "version": "0.3.35",
   "description": "Thin bridge: Feishu thread to local Claude Code CLI",
   "license": "MIT",
   "author": "Chuck Wu (chuckwu0)",