openclacky 1.2.7 → 1.2.9

data/lib/clacky/web/i18n.js

@@ -490,6 +490,35 @@ const I18n = (() => {
       "settings.models.empty":    "No models configured. Click \"+ Add Model\" to add one.",
       "settings.models.badge.default": "Default",
       "settings.models.badge.lite":    "Lite",
+      "settings.media.title":         "Media Generation",
+      "settings.media.desc":          "Optional. Image / video / audio generation models.",
+      "settings.media.loading":       "Loading…",
+      "settings.media.error":         "Failed to load: {{msg}}",
+      "settings.media.kind.image":    "Image",
+      "settings.media.kind.video":    "Video",
+      "settings.media.kind.audio":    "Audio",
+      "settings.media.source.off":    "Off",
+      "settings.media.source.auto":   "Auto",
+      "settings.media.source.custom": "Custom",
+      "settings.media.field.model":   "Model",
+      "settings.media.field.baseUrl": "Base URL",
+      "settings.media.field.apiKey":  "API Key",
+      "settings.media.field.provider":"Provider",
+      "settings.media.off.hint":               "Disabled.",
+      "settings.media.auto.followsDefault":    "Follows default chat model",
+      "settings.media.auto.noDefaultModel":    "Set a default chat model first.",
+      "settings.media.auto.unsupported":       "Current provider has no built-in model for this kind. Switch to Custom.",
+      "settings.media.auto.comingSoon":        "Not available yet — no built-in providers.",
+      "settings.media.auto.disabledTitle":     "No built-in provider available — use Custom.",
+      "settings.media.action.edit":   "Edit",
+      "settings.media.action.save":   "Save",
+      "settings.media.action.cancel": "Cancel",
+      "settings.media.action.saving": "Saving…",
+      "settings.media.action.saved":  "Saved",
+      "settings.media.apiKey.placeholder": "Enter API key",
+      "settings.media.apiKey.required":    "API key required",
+      "settings.media.model.required":     "Model name required",
+      "settings.media.baseUrl.required":   "Base URL required",
       "settings.models.field.quicksetup": "Quick Setup",
       "settings.models.field.model":      "Model",
       "settings.models.field.baseurl":    "Base URL",
@@ -686,15 +715,25 @@ const I18n = (() => {
       "billing.cacheHit":        "Cache Hit",
       "billing.inputCacheHit":   "Input (Cache Hit)",
       "billing.inputCacheMiss":  "Input (Cache Miss)",
-      "billing.output":          "Output",
-      "billing.tokenUsage":      "Token Usage",
+      "billing.totalInput":      "Total Input",
+      "billing.output":          "Output",      "billing.tokenUsage":      "Token Usage",
       "billing.costTrend":       "Cost Trend",
       "billing.noData":          "No data available",
 
       "error.insufficient_credit": "Insufficient LLM credit. Please top up your account to continue.",
       "error.insufficient_credit.action": "Top up",
-    },
 
+      "billing.sessions":        "Sessions",
+      "billing.sessionId":       "Session",
+      "billing.tokens":          "Tokens",
+      "billing.lastRequest":     "Last Request",
+      "billing.noSessions":      "No session data",
+      "billing.deletedSessions": "Deleted Sessions",
+      "billing.headerTotal":     "Total",
+      "billing.headerHit":       "Hit",
+      "billing.headerMiss":      "Miss",
+      "billing.headerOutput":    "Output",
+    },
     zh: {
       // ── Sidebar ──
       "sidebar.chat":     "会话",
@@ -1170,6 +1209,35 @@ const I18n = (() => {
       "settings.models.empty":    "暂未配置模型，点击「+ 添加模型」添加。",
       "settings.models.badge.default": "默认",
       "settings.models.badge.lite":    "轻量",
+      "settings.media.title":         "媒体生成",
+      "settings.media.desc":          "可选。图片 / 视频 / 音频 生成模型。",
+      "settings.media.loading":       "加载中…",
+      "settings.media.error":         "加载失败：{{msg}}",
+      "settings.media.kind.image":    "图片",
+      "settings.media.kind.video":    "视频",
+      "settings.media.kind.audio":    "音频",
+      "settings.media.source.off":    "关闭",
+      "settings.media.source.auto":   "自动",
+      "settings.media.source.custom": "自定义",
+      "settings.media.field.model":   "模型",
+      "settings.media.field.baseUrl": "Base URL",
+      "settings.media.field.apiKey":  "API Key",
+      "settings.media.field.provider":"服务商",
+      "settings.media.off.hint":               "已关闭。",
+      "settings.media.auto.followsDefault":    "跟随默认聊天模型",
+      "settings.media.auto.noDefaultModel":    "请先设置默认聊天模型。",
+      "settings.media.auto.unsupported":       "当前服务商无内置模型，请切换到「自定义」。",
+      "settings.media.auto.comingSoon":        "暂无内置服务商，敬请期待。",
+      "settings.media.auto.disabledTitle":     "暂无内置服务商，请使用自定义。",
+      "settings.media.action.edit":   "编辑",
+      "settings.media.action.save":   "保存",
+      "settings.media.action.cancel": "取消",
+      "settings.media.action.saving": "保存中…",
+      "settings.media.action.saved":  "已保存",
+      "settings.media.apiKey.placeholder": "请输入 API Key",
+      "settings.media.apiKey.required":    "请填写 API Key",
+      "settings.media.model.required":     "请填写模型名称",
+      "settings.media.baseUrl.required":   "请填写 Base URL",
       "settings.models.field.quicksetup": "快速配置",
       "settings.models.field.model":      "Model",
       "settings.models.field.baseurl":    "Base URL",
@@ -1366,16 +1434,26 @@ const I18n = (() => {
       "billing.cacheHit":        "缓存命中",
       "billing.inputCacheHit":   "输入（命中缓存）",
       "billing.inputCacheMiss":  "输入（未命中缓存）",
-      "billing.output":          "输出",
-      "billing.tokenUsage":      "Token 用量",
+      "billing.totalTokens":     "Token 总消耗",
+      "billing.totalInput":      "总输入",
+      "billing.output":          "输出",      "billing.tokenUsage":      "Token 用量",
       "billing.costTrend":       "费用趋势",
       "billing.noData":          "暂无数据",
 
       "error.insufficient_credit": "LLM（大模型）余额不足，请充值后继续使用。",
       "error.insufficient_credit.action": "去充值",
+      "billing.sessions":        "会话消耗",
+      "billing.sessionId":       "会话",
+      "billing.tokens":          "Token",
+      "billing.lastRequest":     "最后请求",
+      "billing.noSessions":      "暂无会话数据",
+      "billing.deletedSessions": "已删除会话",
+      "billing.headerTotal":     "总消耗",
+      "billing.headerHit":       "命中",
+      "billing.headerMiss":      "未命中",
+      "billing.headerOutput":    "输出",
     }
   };
-
   // ── State ──────────────────────────────────────────────────────────────────
   let _lang = localStorage.getItem(STORAGE_KEY) || DEFAULT_LANG;
 

data/lib/clacky/web/index.html

@@ -771,6 +771,17 @@
             </div>
             <div id="model-cards"></div>
           </section>
+
+          <!-- Media generation section -->
+          <section class="settings-section" id="media-section">
+            <div class="settings-section-title">
+              <span data-i18n="settings.media.title">Media Generation</span>
+            </div>
+            <div class="settings-section-desc" data-i18n="settings.media.desc">
+              Generate images, video, and audio using your configured providers. "Auto" follows your default chat model.
+            </div>
+            <div id="media-rows"></div>
+          </section>
         </div>
 
         <!-- ══ Tab: UI ══ -->
@@ -1052,8 +1063,8 @@
           <div id="model-modal-test-result" class="model-test-result"></div>
 
           <label class="model-field model-field-checkbox" id="model-modal-default-field">
-            <input type="checkbox" id="model-modal-set-default">
-            <span data-i18n="settings.models.field.setDefault">Set as default model</span>
+            <input type="checkbox" id="model-modal-set-default" class="field-checkbox">
+            <span class="field-label" data-i18n="settings.models.field.setDefault">Set as default model</span>
           </label>
         </div>
         <div class="modal-footer">
@@ -1288,6 +1299,7 @@
 <script src="/skills.js"></script>
 <script src="/channels.js"></script>
 <script src="/mcp.js"></script>
+<script src="/model-tester.js"></script>
 <script src="/settings.js"></script>
 <script src="/billing.js"></script>
 <script src="/onboard.js"></script>

data/lib/clacky/web/model-tester.js

@@ -0,0 +1,58 @@
+// Shared helpers for the model config UI flows.
+// Used by both the onboarding wizard and the settings model modal.
+window.ModelTester = (function () {
+  // Test a model connection.
+  // Returns one of:
+  //   { ok: true,  base_url, message }                 — connected, no rewrite
+  //   { ok: true,  base_url, message, rewrote: true }  — connected, base_url auto-corrected (/v1 appended)
+  //   { ok: false, message }                           — failed (server-reported or network)
+  async function testConnection({ model, base_url, api_key, anthropic_format, index } = {}) {
+    const body = { model, base_url, api_key };
+    if (typeof index === "number") body.index = index;
+    if (anthropic_format) body.anthropic_format = true;
+
+    let data;
+    try {
+      const res = await fetch("/api/config/test", {
+        method:  "POST",
+        headers: { "Content-Type": "application/json" },
+        body:    JSON.stringify(body)
+      });
+      data = await res.json();
+    } catch (e) {
+      return { ok: false, message: e.message };
+    }
+
+    if (!data.ok) return { ok: false, message: data.message || "" };
+
+    if (data.effective_base_url && data.effective_base_url !== base_url) {
+      return { ok: true, base_url: data.effective_base_url, message: data.message || "", rewrote: true };
+    }
+    return { ok: true, base_url, message: data.message || "" };
+  }
+
+  // Persist a model config (create or update).
+  // existingId === null/undefined → POST /api/config/models (create).
+  // existingId === string         → PATCH /api/config/models/:id (update).
+  // Returns { ok: bool, error? }.
+  async function saveModel(payload, { existingId } = {}) {
+    const url = existingId
+      ? `/api/config/models/${encodeURIComponent(existingId)}`
+      : "/api/config/models";
+    const method = existingId ? "PATCH" : "POST";
+
+    try {
+      const res  = await fetch(url, {
+        method,
+        headers: { "Content-Type": "application/json" },
+        body:    JSON.stringify(payload)
+      });
+      const data = await res.json();
+      return data.ok ? { ok: true } : { ok: false, error: data.error || "" };
+    } catch (e) {
+      return { ok: false, error: e.message };
+    }
+  }
+
+  return { testConnection, saveModel };
+})();

data/lib/clacky/web/onboard.js

@@ -417,43 +417,30 @@ const Onboard = (() => {
     _setResult(null, "");
 
     // Step 1: test connection
-    try {
-      const res  = await fetch("/api/config/test", {
-        method:  "POST",
-        headers: { "Content-Type": "application/json" },
-        body:    JSON.stringify({ model, base_url: baseUrl, api_key: apiKey, index: 0 })
-      });
-      const data = await res.json();
-      if (!data.ok) {
-        _setResult(false, data.message || (zh ? "连接失败。" : "Connection failed."));
-        btn.disabled    = false;
-        btn.textContent = I18n.t("onboard.key.btn.test");
-        return;
-      }
-    } catch (e) {
-      _setResult(false, e.message);
+    const testResult = await ModelTester.testConnection({
+      model, base_url: baseUrl, api_key: apiKey, index: 0
+    });
+
+    if (!testResult.ok) {
+      _setResult(false, testResult.message || (zh ? "连接失败。" : "Connection failed."));
       btn.disabled    = false;
       btn.textContent = I18n.t("onboard.key.btn.test");
       return;
     }
 
+    let effectiveBaseUrl = testResult.base_url;
+    if (testResult.rewrote) {
+      const baseInput = document.getElementById("setup-base-url");
+      if (baseInput) baseInput.value = effectiveBaseUrl;
+    }
+
     // Step 2: save config
     btn.textContent = I18n.t("onboard.key.saving");
-    try {
-      const res  = await fetch("/api/config/models", {
-        method:  "POST",
-        headers: { "Content-Type": "application/json" },
-        body:    JSON.stringify({ type: "default", model, base_url: baseUrl, api_key: apiKey, anthropic_format: false })
-      });
-      const data = await res.json();
-      if (!data.ok) {
-        _setResult(false, data.error || (zh ? "保存失败。" : "Save failed."));
-        btn.disabled    = false;
-        btn.textContent = I18n.t("onboard.key.btn.test");
-        return;
-      }
-    } catch (e) {
-      _setResult(false, e.message);
+    const saveResult = await ModelTester.saveModel({
+      type: "default", model, base_url: effectiveBaseUrl, api_key: apiKey
+    });
+    if (!saveResult.ok) {
+      _setResult(false, saveResult.error || (zh ? "保存失败。" : "Save failed."));
       btn.disabled    = false;
       btn.textContent = I18n.t("onboard.key.btn.test");
       return;