openclacky 1.5.20 → 1.5.22

data/lib/clacky/default_extensions/preview/panels/preview/view.js

@@ -8,12 +8,15 @@
 // chat stream calls Clacky.Preview.open(), which opens the aside, activates
 // this tab and (re)loads the page.
 //
-// Host-origin pages (proxied workspace files and proxied dev servers) are
-// sandboxed WITHOUT allow-same-origin so AI-generated pages can run
-// scripts/forms/popups but never touch the host origin (cookies, localStorage,
-// DOM). Third-party URLs loaded directly (e.g. a Vite dev server) get
-// allow-same-origin added, otherwise their ES-module imports fail and the
-// frame stays blank. Because the sandbox hides load errors, the panel HEADs
+// Proxied pages (workspace files and dev servers) are served from
+// `preview.localhost` instead of the host origin: same server, different
+// origin. That keeps them unable to read the host's cookies, localStorage or
+// DOM while still giving them a real (non-opaque) origin — an opaque origin
+// turns every <script type="module"> into a CORS request that fails, and makes
+// localStorage/sessionStorage/cookie throw SecurityError, so any framework
+// (Rails+Stimulus, Turbo, React) would render but never become interactive.
+// Third-party URLs are loaded directly and only get allow-same-origin when
+// they are cross-origin. Because the sandbox hides load errors, the panel HEADs
 // the URL first and shows a friendly 404 card instead of a blank frame.
 // ───────────────────────────────────────────────────────────────────────────
 
@@ -21,7 +24,13 @@
   if (!window.Clacky || !Clacky.ext) return;
 
   const PREVIEW_ASIDE_WIDTH = 620;
+  // Chrome resolves every *.localhost name to loopback, so the preview proxy
+  // is reachable under a second origin without a second listener.
+  const ISOLATED_PREVIEW_HOST = "preview.localhost";
   const SANDBOX = "allow-scripts allow-forms allow-popups allow-popups-to-escape-sandbox allow-modals";
+  const ZOOM_MIN = 50;
+  const ZOOM_MAX = 200;
+  const ZOOM_STEP = 10;
 
   const ICON_GLOBE = '<svg viewBox="0 0 24 24" width="40" height="40" fill="none" stroke="currentColor" stroke-width="1.2"><circle cx="12" cy="12" r="9"/><path d="M3 12h18"/><path d="M12 3a15 15 0 0 1 0 18M12 3a15 15 0 0 0 0 18"/></svg>';
   const ICON_BACK = '<svg viewBox="0 0 24 24" width="15" height="15" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"><path d="M19 12H5"/><path d="M12 19l-7-7 7-7"/></svg>';
@@ -29,6 +38,8 @@
   const ICON_RELOAD = '<svg viewBox="0 0 24 24" width="14" height="14" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"><path d="M21 12a9 9 0 1 1-2.64-6.36L21 8"/><path d="M21 3v5h-5"/></svg>';
   const ICON_GO = '<svg viewBox="0 0 24 24" width="13" height="13" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"><path d="M5 12h14"/><path d="M12 5l7 7-7 7"/></svg>';
   const ICON_EXTERNAL = '<svg viewBox="0 0 24 24" width="14" height="14" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"><path d="M18 13v6a2 2 0 0 1-2 2H5a2 2 0 0 1-2-2V8a2 2 0 0 1 2-2h6"/><path d="M15 3h6v6"/><path d="M10 14L21 3"/></svg>';
+  const ICON_MORE = '<svg viewBox="0 0 24 24" width="16" height="16" fill="currentColor"><circle cx="12" cy="5" r="1.7"/><circle cx="12" cy="12" r="1.7"/><circle cx="12" cy="19" r="1.7"/></svg>';
+  const ICON_ZOOM_RESET = '<svg viewBox="0 0 24 24" width="13" height="13" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"><path d="M3 12a9 9 0 1 0 3-6.7"/><path d="M3 4v5h5"/></svg>';
 
   const t = (k, fallback) => {
     const v = (typeof I18n !== "undefined") ? I18n.t(k) : null;
@@ -54,20 +65,30 @@
     style.id = "preview-panel-style";
     style.textContent = `
       .preview-root { display: flex; flex-direction: column; flex: 1; min-height: 0; }
-      .preview-bar { flex: none; display: flex; align-items: center; gap: 4px; padding: 6px 8px; border-bottom: 1px solid var(--color-border-secondary); }
-      .preview-nav-btn { flex: none; display: inline-flex; align-items: center; justify-content: center; width: 26px; height: 26px; border: none; border-radius: var(--radius-sm); background: transparent; color: var(--color-text-tertiary); cursor: pointer; }
+      .preview-bar { flex: none; position: relative; z-index: 10; display: flex; align-items: center; gap: 2px; padding: 7px 8px; border-bottom: 1px solid var(--color-border-secondary); }
+      .preview-nav-btn { flex: none; display: inline-flex; align-items: center; justify-content: center; width: 28px; height: 28px; border: none; border-radius: 50%; background: transparent; color: var(--color-text-secondary); cursor: pointer; transition: background var(--transition-fast), color var(--transition-fast); }
       .preview-nav-btn:hover:not(:disabled) { background: var(--color-bg-hover); color: var(--color-text-primary); }
-      .preview-nav-btn:disabled { opacity: .35; cursor: default; }
-      .preview-address-wrap { flex: 1; min-width: 0; position: relative; display: flex; align-items: center; }
-      .preview-address { width: 100%; height: 27px; padding: 0 32px 0 14px; border: none; border-radius: 14px; background: var(--color-bg-secondary); color: var(--color-text-primary); font-size: 12px; font-family: ui-monospace, monospace; text-align: center; transition: box-shadow var(--transition-fast), background var(--transition-fast); }
+      .preview-nav-btn:disabled { opacity: .3; cursor: default; }
+      .preview-address-wrap { flex: 1; min-width: 0; position: relative; display: flex; align-items: center; margin: 0 6px; }
+      .preview-address { width: 100%; height: 30px; padding: 0 30px 0 16px; border: 1px solid transparent; border-radius: var(--radius-pill); background: var(--color-bg-primary); color: var(--color-text-primary); font-size: 12px; font-family: ui-monospace, monospace; text-align: center; transition: background var(--transition-fast), box-shadow var(--transition-fast), border-color var(--transition-fast); }
       .preview-address::placeholder { color: var(--color-text-tertiary); font-family: -apple-system, sans-serif; }
-      .preview-address:hover:not(:focus) { box-shadow: 0 0 0 1px var(--color-border-strong); }
-      .preview-address:focus { outline: none; box-shadow: 0 0 0 1px var(--color-accent-primary); background: var(--color-bg-primary); }
-      .preview-go { position: absolute; right: 5px; display: inline-flex; align-items: center; justify-content: center; width: 20px; height: 20px; padding: 0; border: none; border-radius: 50%; background: transparent; color: var(--color-text-tertiary); cursor: pointer; }
+      .preview-address:hover:not(:focus) { background: var(--color-bg-hover); }
+      .preview-address:focus { outline: none; background: var(--color-bg-secondary); border-color: var(--color-border-strong); box-shadow: var(--shadow-sm); }
+      .preview-go { position: absolute; right: 6px; display: inline-flex; align-items: center; justify-content: center; width: 20px; height: 20px; padding: 0; border: none; border-radius: 50%; background: transparent; color: var(--color-text-tertiary); cursor: pointer; }
       .preview-go:hover { background: var(--color-bg-hover); color: var(--color-text-primary); }
-      .preview-icon-btn { flex: none; display: inline-flex; align-items: center; justify-content: center; width: 26px; height: 26px; border: none; border-radius: var(--radius-sm); background: transparent; color: var(--color-text-tertiary); cursor: pointer; }
+      .preview-icon-btn { flex: none; display: inline-flex; align-items: center; justify-content: center; width: 28px; height: 28px; border: none; border-radius: 50%; background: transparent; color: var(--color-text-secondary); cursor: pointer; transition: background var(--transition-fast), color var(--transition-fast); }
       .preview-icon-btn:hover { background: var(--color-bg-hover); color: var(--color-text-primary); }
-      .preview-frame-wrap { flex: 1; min-height: 0; overflow: hidden; }
+      .preview-menu { position: absolute; top: calc(100% - 2px); right: 10px; z-index: 20; width: 236px; padding: 5px; background: var(--color-bg-secondary); border: 1px solid var(--color-border-primary); border-radius: var(--radius-md); box-shadow: var(--shadow-lg); }
+      .preview-menu[hidden] { display: none; }
+      .preview-menu-label { flex: 1; }
+      .preview-menu-row { display: flex; align-items: center; justify-content: space-between; gap: 8px; padding: 3px 6px 3px 10px; font-size: 12.5px; color: var(--color-text-primary); }
+      .preview-zoom { display: flex; align-items: center; gap: 1px; padding: 1px; border-radius: var(--radius-pill); background: var(--color-bg-hover); }
+      .preview-zoom-btn { display: inline-flex; align-items: center; justify-content: center; width: 22px; height: 22px; padding: 0; border: none; border-radius: 50%; background: transparent; color: var(--color-text-secondary); font-size: 13px; line-height: 1; cursor: pointer; }
+      .preview-zoom-btn:hover:not(:disabled) { background: var(--color-bg-secondary); color: var(--color-text-primary); }
+      .preview-zoom-btn:disabled { opacity: .35; cursor: default; }
+      .preview-zoom-value { min-width: 46px; height: 22px; padding: 0 4px; border: none; border-radius: var(--radius-pill); background: transparent; color: var(--color-text-primary); font-size: 11.5px; font-variant-numeric: tabular-nums; cursor: pointer; }
+      .preview-zoom-value:hover { background: var(--color-bg-secondary); }
+      .preview-frame-wrap { flex: 1; min-height: 0; overflow: auto; }
       .preview-frame { display: block; width: 100%; height: 100%; border: none; background: #fff; }
       .preview-empty, .preview-notfound { flex: 1; display: flex; flex-direction: column; align-items: center; justify-content: center; gap: 8px; padding: 24px; text-align: center; }
       .preview-empty-icon { color: var(--color-text-tertiary); opacity: .5; margin-bottom: 4px; }
@@ -91,6 +112,7 @@
   let forwardStack = [];        // rels reachable via forward, newest → oldest
   let pending = null;           // { sid, rel } arrived before that body rendered
   let releaseAsideWidth = null; // set while the aside is widened for the preview
+  let zoom = 100;               // preview zoom, in percent; survives tab re-renders
 
   function isExternal(rel) {
     return /^https?:\/\//i.test(rel);
@@ -197,21 +219,39 @@
     els.forwardBtn.disabled = forwardStack.length === 0;
   }
 
-  // Follows in-frame navigation. A sandboxed frame without allow-same-origin
-  // cannot be inspected: contentWindow.location is sealed and the src property
-  // does not follow internal navigations. Instead the server injects a
-  // reporter into every preview HTML page that announces its URL on load, so
-  // link clicks inside the frame keep the address bar and the back/forward
-  // stacks in sync with what is actually on screen.
+  // Follows in-frame navigation. The frame is cross-origin to the host page,
+  // so contentWindow.location is unreadable and the src property does not
+  // follow internal navigations. Instead the server injects a reporter into
+  // every preview HTML page that announces its URL whenever it changes, so
+  // link clicks and SPA/Turbo transitions keep the address bar and the
+  // back/forward stacks in sync with what is actually on screen.
   function relFromUrl(url) {
     try {
       const u = new URL(url, location.href);
-      const m = u.pathname.match(/^\/preview\/s\/[^/]+\/(.*)$/);
-      if (!m || !m[1]) return null;
-      return m[1].split("/").map(decodeURIComponent).join("/");
+
+      const file = u.pathname.match(/^\/preview\/f(\/.*)$/);
+      if (file) return file[1].split("/").map(decodeURIComponent).join("/");
+
+      const dev = u.pathname.match(/^\/preview\/p\/(\d+)(\/.*)?$/);
+      if (dev) return `http://${devHostFor(dev[1])}:${dev[1]}${dev[2] || "/"}${u.search}`;
+
+      const ws = u.pathname.match(/^\/preview\/s\/([^/]+)\/(.*)$/);
+      if (!ws || !ws[2]) return null;
+      if (activeSessionId && ws[1] !== encodeURIComponent(activeSessionId)) return null;
+      return ws[2].split("/").map(decodeURIComponent).join("/");
     } catch (_e) { return null; }
   }
 
+  // A dev server is reachable as either localhost or 127.0.0.1; keep whichever
+  // the address bar was already showing so the URL doesn't flip on every click.
+  function devHostFor(port) {
+    try {
+      const u = new URL(currentRel);
+      if (u.port === String(port) && u.hostname) return u.hostname;
+    } catch (_e) { /* currentRel is a workspace path */ }
+    return "localhost";
+  }
+
   if (!window.__clackyPreviewNav) {
     window.__clackyPreviewNav = true;
     window.addEventListener("message", (e) => {
@@ -231,17 +271,69 @@
   // A brand-new element is the only reload primitive that works uniformly:
   // re-assigning an identical src is a no-op, and contentWindow is sealed by
   // the sandbox.
-  function freshFrame(url, opaque) {
-    const sandbox = opaque ? SANDBOX : (SANDBOX + " allow-same-origin");
+  function freshFrame(url, isolated) {
+    const src = isolated ? isolateOrigin(url) : url;
     const f = el("iframe", {
       class: "preview-frame",
-      sandbox: sandbox,
+      sandbox: sandboxFor(src),
       referrerpolicy: "no-referrer",
       title: t("preview.tab", "预览"),
     });
     els.frame.replaceChildren(f);
     els.iframe = f;
-    f.src = url;
+    applyZoom();
+    f.src = src;
+  }
+
+  // Swaps the loopback host for `preview.localhost`, keeping port and path so
+  // the same server answers. Non-loopback hosts (a remote clacky UI) have no
+  // second name to use and are left alone.
+  function isolateOrigin(url) {
+    try {
+      const u = new URL(url, location.href);
+      if (!isLoopbackHost(location.hostname) || !isLoopbackHost(u.hostname)) return url;
+      if (u.hostname === ISOLATED_PREVIEW_HOST) return u.href;
+      u.hostname = ISOLATED_PREVIEW_HOST;
+      return u.href;
+    } catch (_e) { return url; }
+  }
+
+  function isLoopbackHost(host) {
+    return host === "127.0.0.1" || host === "localhost" || host === "::1" || host === "[::1]";
+  }
+
+  // allow-same-origin is only withheld when the frame would share the host's
+  // origin, which is the one case where it would escape the sandbox.
+  function sandboxFor(url) {
+    try {
+      return new URL(url, location.href).origin === location.origin ? SANDBOX : (SANDBOX + " allow-same-origin");
+    } catch (_e) { return SANDBOX; }
+  }
+
+  // CSS zoom on an iframe keeps the element box at its laid-out size while
+  // shrinking the layout viewport inside it, so the page reflows at
+  // (width / scale) and is then drawn scaled — exactly what browser page zoom
+  // does. The box must stay at 100% or the frame detaches from the panel edge.
+  function applyZoom() {
+    if (!els) return;
+    if (els.iframe) els.iframe.style.zoom = String(zoom / 100);
+    if (els.zoomValue) els.zoomValue.textContent = zoom + "%";
+    if (els.zoomOutBtn) els.zoomOutBtn.disabled = zoom <= ZOOM_MIN;
+    if (els.zoomInBtn) els.zoomInBtn.disabled = zoom >= ZOOM_MAX;
+    if (els.zoomResetBtn) els.zoomResetBtn.disabled = zoom === 100;
+  }
+
+  function stepZoom(delta) {
+    const next = Math.min(ZOOM_MAX, Math.max(ZOOM_MIN, zoom + delta));
+    if (next === zoom) return;
+    zoom = next;
+    applyZoom();
+  }
+
+  function resetZoom() {
+    if (zoom === 100) return;
+    zoom = 100;
+    applyZoom();
   }
 
   async function openRel(sid, rel, record) {
@@ -290,10 +382,8 @@
     showOverlay(null);
     syncAddress(rel);
     ensureAsideWidth();
-    // Only third-party origins may self-identify: Vite-style dev servers
-    // need allow-same-origin for their ES-module graph to load. Proxy URLs
-    // (/preview/p/, /preview/s/) stay on the host origin and must remain
-    // opaque so AI pages can never touch the host's cookies or localStorage.
+    // Proxy URLs move to the isolated preview origin; direct third-party URLs
+    // stay as-is and are already cross-origin.
     freshFrame(frameUrl, isProxied(frameUrl));
   }
 
@@ -331,6 +421,40 @@
     window.open(url, "_blank", "noopener");
   }
 
+  // ── More menu ──────────────────────────────────────────────────────────
+  // Menu state is read from the DOM rather than the module-level `els` ref:
+  // when the aside re-renders (session switch, layout restore) the old `els`
+  // points at detached nodes and a click on the fresh toolbar would silently
+  // toggle a menu nobody can see.
+  function closeMenu() {
+    document.querySelectorAll(".preview-menu:not([hidden])").forEach((menu) => {
+      menu.hidden = true;
+      const btn = menu.parentElement && menu.parentElement.querySelector('[aria-haspopup="true"]');
+      if (btn) btn.setAttribute("aria-expanded", "false");
+    });
+  }
+
+  function toggleMenu(menu, btn) {
+    if (!menu) return;
+    menu.hidden = !menu.hidden;
+    if (btn) btn.setAttribute("aria-expanded", String(!menu.hidden));
+  }
+
+  if (!window.__clackyPreviewMenuDismiss) {
+    window.__clackyPreviewMenuDismiss = true;
+    document.addEventListener("mousedown", (e) => {
+      if (!document.querySelector(".preview-menu:not([hidden])")) return;
+      if (e.target.closest(".preview-menu") || e.target.closest('[aria-haspopup="true"]')) return;
+      closeMenu();
+    });
+    document.addEventListener("keydown", (e) => {
+      if (e.key === "Escape") closeMenu();
+    });
+    // Clicking into the preview frame moves focus to the iframe's document,
+    // which the host never sees; the window blur is the only signal available.
+    window.addEventListener("blur", () => closeMenu());
+  }
+
   Clacky.ext.ui.mount("session.aside", (container, ctx) => {
     if (!ctx || !ctx.sessionId) return;
 
@@ -382,7 +506,45 @@
     });
     extBtn.innerHTML = ICON_EXTERNAL;
 
-    const bar = el("div", { class: "preview-bar" }, backBtn, forwardBtn, reloadBtn, addressWrap, extBtn);
+    const moreBtn = el("button", {
+      class: "preview-icon-btn", type: "button",
+      title: t("preview.more", "更多"), "aria-haspopup": "true", "aria-expanded": "false",
+      onclick: (e) => { e.stopPropagation(); toggleMenu(menu, moreBtn); },
+    });
+    moreBtn.innerHTML = ICON_MORE;
+
+    const zoomOutBtn = el("button", {
+      class: "preview-zoom-btn", type: "button",
+      title: t("preview.zoom.out", "缩小"), text: "−",
+      onclick: () => stepZoom(-ZOOM_STEP),
+    });
+    const zoomValue = el("button", {
+      class: "preview-zoom-value", type: "button",
+      title: t("preview.zoom.reset", "重置为 100%"), text: zoom + "%",
+      onclick: resetZoom,
+    });
+    const zoomInBtn = el("button", {
+      class: "preview-zoom-btn", type: "button",
+      title: t("preview.zoom.in", "放大"), text: "+",
+      onclick: () => stepZoom(ZOOM_STEP),
+    });
+    const zoomResetBtn = el("button", {
+      class: "preview-zoom-btn", type: "button",
+      title: t("preview.zoom.reset", "重置为 100%"),
+      onclick: resetZoom,
+    });
+    zoomResetBtn.innerHTML = ICON_ZOOM_RESET;
+    const zoomRow = el("div", { class: "preview-menu-row" },
+      el("span", { class: "preview-menu-label", text: t("preview.zoom", "缩放") }),
+      el("div", { class: "preview-zoom" }, zoomOutBtn, zoomValue, zoomInBtn),
+      zoomResetBtn);
+
+    const menu = el("div", { class: "preview-menu" },
+      zoomRow);
+    menu.hidden = true;
+
+    const bar = el("div", { class: "preview-bar" },
+      backBtn, forwardBtn, reloadBtn, addressWrap, extBtn, moreBtn, menu);
     const frame = el("div", { class: "preview-frame-wrap" });
 
     const notFound = el("div", { class: "preview-notfound" },
@@ -412,10 +574,13 @@
       empty: empty, notFound: notFound, unreachable: unreachable,
       address: address,
       backBtn: backBtn, forwardBtn: forwardBtn,
+      moreBtn: moreBtn, menu: menu,
+      zoomValue: zoomValue, zoomOutBtn: zoomOutBtn, zoomInBtn: zoomInBtn, zoomResetBtn: zoomResetBtn,
     };
     activeSessionId = ctx.sessionId;
     syncAddress(currentRel);
     updateNavButtons();
+    applyZoom();
 
     if (pending && pending.sid === ctx.sessionId) {
       const rel = pending.rel;

data/lib/clacky/extension/loader.rb

@@ -288,10 +288,12 @@ module Clacky
       end
 
 
-      # A layer's fingerprint is the sorted list of "<ext_id>|<mtime>" for
+      # A layer's fingerprint is the list of [ext_id, manifest path, mtime] for
       # every container manifest present. Cheap to compute (one stat per
       # manifest); the whole map compared as a Hash so a container appearing
-      # or disappearing also invalidates.
+      # or disappearing also invalidates. The path belongs in the key: two
+      # roots can hold the same ext_id with manifests whose mtimes collide, and
+      # reusing a result across roots would hand back stale dirs.
       private def fingerprint_layers(layers)
         layers.each_with_object({}) do |(layer, root), acc|
           next unless root && Dir.exist?(root)
@@ -302,7 +304,7 @@ module Clacky
             manifest = File.join(root, ext_id, MANIFEST)
             next unless File.file?(manifest)
 
-            entries << [ext_id, File.mtime(manifest).to_f]
+            entries << [ext_id, manifest, File.mtime(manifest).to_f]
           end
           acc[layer] = entries
         end

data/lib/clacky/locales/en.rb

@@ -15,15 +15,15 @@ module Clacky
       "llm.error.403.access_denied"     => "Access denied, please check your API key permissions",
       "llm.error.403.default"           => "Access denied",
       "llm.error.endpoint_not_found"    => "API endpoint not found, please check your service URL",
-      "llm.error.rate_limit_429"        => "Rate limit exceeded, please wait a moment",
+      "llm.error.rate_limit_429"        => "Rate limit exceeded. Please switch to another model and retry, or wait a moment",
       "llm.error.quota_exhausted"       => "API quota exhausted (key usage limit reached). Please raise the quota or upgrade your plan in the console",
       "llm.error.server_error"          => "Service temporarily unavailable (%<status>d), retrying...",
-      "llm.error.unexpected"            => "Unexpected error (%<status>d)",
+      "llm.error.unexpected"            => "Request failed (%<status>d). Please switch to another model and retry",
       "llm.error.html_response"         => "Service temporarily unavailable (received HTML error page), retrying...",
       "llm.error.bad_request"           => "Model request failed. Please switch to another model and retry",
-      "llm.error.request_timeout"       => "Request timed out after %<retries>d retries",
-      "llm.error.network_failed"        => "Network connection failed after %<retries>d retries. If the problem persists, check your account balance or API Key",
-      "llm.error.service_unavailable"   => "Service unavailable after %<retries>d retries",
+      "llm.error.request_timeout"       => "Request timed out after %<retries>d retries. Please switch to another model and retry",
+      "llm.error.network_failed"        => "Network connection failed after %<retries>d retries. If the problem persists, switch to another model and retry, or check your account balance",
+      "llm.error.service_unavailable"   => "Service unavailable after %<retries>d retries. Please switch to another model and retry",
       "platform.error.invalid_proof"        => "Invalid license key — please check and try again.",
       "platform.error.invalid_signature"    => "Invalid request signature.",
       "platform.error.nonce_replayed"       => "Duplicate request detected. Please try again.",

data/lib/clacky/locales/zh.rb

@@ -15,15 +15,15 @@ module Clacky
       "llm.error.403.access_denied"     => "访问被拒绝，请检查 API 密钥权限",
       "llm.error.403.default"           => "访问被拒绝",
       "llm.error.endpoint_not_found"    => "API 端点不存在，请检查服务地址配置",
-      "llm.error.rate_limit_429"        => "请求过于频繁，请稍后重试",
+      "llm.error.rate_limit_429"        => "请求过于频繁，请暂时切换其他模型重试或稍后重试",
       "llm.error.quota_exhausted"       => "API 配额已用尽（已达 Key 的用量上限），请前往控制台提升配额或升级套餐后继续",
       "llm.error.server_error"          => "服务暂时不可用（%<status>d），正在重试...",
-      "llm.error.unexpected"            => "请求失败（%<status>d）",
+      "llm.error.unexpected"            => "请求失败（%<status>d），请暂时切换其他模型重试",
       "llm.error.html_response"         => "服务暂时不可用（收到 HTML 错误页），正在重试...",
       "llm.error.bad_request"           => "请求模型出错，请暂时切换其他模型重试",
-      "llm.error.request_timeout"       => "请求超时（已重试 %<retries>d 次）",
-      "llm.error.network_failed"        => "网络连接失败（已重试 %<retries>d 次），若持续失败，请检查账户余额或 API Key",
-      "llm.error.service_unavailable"   => "服务暂时不可用（已重试 %<retries>d 次）",
+      "llm.error.request_timeout"       => "请求超时（已重试 %<retries>d 次），请暂时切换其他模型重试",
+      "llm.error.network_failed"        => "网络连接失败（已重试 %<retries>d 次），若持续失败，请暂时切换其他模型重试或检查账户余额",
+      "llm.error.service_unavailable"   => "服务暂时不可用（已重试 %<retries>d 次），请暂时切换其他模型重试",
       "platform.error.invalid_proof"        => "许可证密钥无效，请检查后重试。",
       "platform.error.invalid_signature"    => "请求签名无效。",
       "platform.error.nonce_replayed"       => "检测到重复请求，请重试。",

data/lib/clacky/message_format/anthropic.rb

@@ -19,6 +19,10 @@ module Clacky
     module Anthropic
       module_function
 
+      # Same "no explicit level" set the OpenAI adapter uses: the sessionbar and
+      # config paths only ever emit these values or a concrete low..max level.
+      OFF_EFFORT_VALUES = %w[off nothink disabled none].freeze
+
       # Normalise a /v1/messages usage block to the codebase's canonical
       # (OpenAI-style) prompt_tokens: total input including cache_read but
       # excluding cache_creation.
@@ -122,6 +126,22 @@ module Clacky
             end
           body[:thinking] = { type: "enabled" }
           body[:output_config] = { effort: k3_effort } if k3_effort
+        elsif model.to_s.match?(/\Aminimax-m3[.]1-flash\z/i)
+          # Flash always thinks; use its lightest supported effort for "off".
+          effort = if OFF_EFFORT_VALUES.include?(reasoning_effort.to_s)
+                     "low"
+                   else
+                     normalized_effort(reasoning_effort)
+                   end
+          body[:output_config] = { effort: effort } if effort
+        elsif model.to_s.match?(/\Aminimax-m3\z/i)
+          # M3 defaults to disabled on this transport and ignores effort.
+          effort_str = reasoning_effort.to_s
+          if OFF_EFFORT_VALUES.include?(effort_str)
+            body[:thinking] = { type: "disabled" }
+          elsif !effort_str.empty?
+            body[:thinking] = { type: "adaptive" }
+          end
         elsif (effort = normalized_effort(reasoning_effort))
           body[:thinking] = { type: "adaptive" }
           body[:output_config] = { effort: effort }

data/lib/clacky/message_format/open_ai.rb

@@ -224,17 +224,23 @@ module Clacky
 
       # Returns the token-limit field name for the given model.
       # Most OpenAI-compatible APIs use :max_tokens; MiMo-V2.5 (Xiaomi) and
-      # MiniMax-M3 use :max_completion_tokens to cap the combined thinking +
+      # MiniMax-M3 / M3.1-Flash use :max_completion_tokens to cap the combined thinking +
       # answer length (M3 documents max_completion_tokens over the legacy
       # max_tokens field).
       private_class_method def self.token_field_for(model)
-        if model.to_s.match?(/^mimo-v2/i) || model.to_s.match?(/^minimax-m3$/i)
+        if model.to_s.match?(/^mimo-v2/i) || model.to_s.match?(/^minimax-m3([.]1-flash)?$/i)
           :max_completion_tokens
         else
           :max_tokens
         end
       end
 
+      # Values the sessionbar/config use to mean "no explicit level". They are
+      # model-specific on the wire (some families map them to their lightest
+      # effort, others to thinking disabled), so every branch below handles
+      # them explicitly — the generic fallback must never forward them.
+      OFF_EFFORT_VALUES = %w[off nothink disabled none].freeze
+
       # Apply model-specific reasoning / thinking parameters to the request body.
       #
       # Different model families expose extended reasoning through different API
@@ -259,7 +265,7 @@ module Clacky
           # error (Z.ai migration guide), so "off" maps to the lightest effort
           # "low". Effort accepts low/high/max only; server default is max.
           body[:thinking] = { type: "enabled" }
-          if %w[off nothink disabled].include?(effort_str)
+          if OFF_EFFORT_VALUES.include?(effort_str)
             body[:reasoning_effort] = "low"
           elsif !effort_str.empty?
             body[:reasoning_effort] =
@@ -275,7 +281,7 @@ module Clacky
           # ({type: "enabled"|"disabled"}) plus a restricted reasoning_effort
           # that only accepts "max" or "high". Other effort levels collapse
           # to "high". Send both fields so GLM activates thinking correctly.
-          if %w[off nothink disabled].include?(effort_str)
+          if OFF_EFFORT_VALUES.include?(effort_str)
             body[:thinking] = { type: "disabled" }
           elsif !effort_str.empty?
             glm_effort =
@@ -293,7 +299,7 @@ module Clacky
           # Thinking is always enabled and cannot be turned off; "off" maps
           # to the lowest intensity "low". Unsupported effort levels (medium,
           # xhigh) would be rejected or ignored by the server.
-          if %w[off nothink disabled].include?(effort_str)
+          if OFF_EFFORT_VALUES.include?(effort_str)
             body[:reasoning_effort] = "low"
           elsif !effort_str.empty?
             body[:reasoning_effort] =
@@ -309,11 +315,19 @@ module Clacky
           # thinking:{type:...} field rather than reasoning_effort. Map the
           # internal reasoning_effort value to thinking on/off so MiMo does
           # not receive an unsupported parameter.
-          if %w[off nothink disabled].include?(effort_str)
+          if OFF_EFFORT_VALUES.include?(effort_str)
             body[:thinking] = { type: "disabled" }
           elsif !effort_str.empty?
             body[:thinking] = { type: "enabled" }
           end
+        elsif model.to_s.match?(/^minimax-m3[.]1-flash$/i)
+          # M3.1-Flash always thinks and rejects thinking disabled / effort none,
+          # so "off" maps to the lightest effort "low".
+          if OFF_EFFORT_VALUES.include?(effort_str)
+            body[:reasoning_effort] = "low"
+          elsif %w[low medium high xhigh max].include?(effort_str)
+            body[:reasoning_effort] = effort_str
+          end
         elsif model.to_s.match?(/^minimax-m3$/i)
           # MiniMax-M3 controls thinking via a top-level "thinking" field with
           # { type: "adaptive" | "disabled" } — the same envelope shape MiMo
@@ -326,20 +340,23 @@ module Clacky
           #     decides per request); we let the server pick the intensity.
           # M2.7 cannot disable thinking and ignores this field, so sending
           # it is harmless for the rest of the MiniMax lineup.
-          if %w[off nothink disabled].include?(effort_str)
+          if OFF_EFFORT_VALUES.include?(effort_str)
             body[:thinking] = { type: "disabled" }
           elsif !effort_str.empty?
             body[:thinking] = { type: "adaptive" }
           end
         elsif model.to_s.match?(/deepseek/i)
           # DeepSeek V4 reasoning_effort only accepts low/high/max.
-          # xhigh is not recognized — map it to max.
-          effort = case effort_str
-                   when "xhigh" then "max"
-                   else effort_str
-                   end
-          assign_effort(body, effort, responses_api)
-        elsif reasoning_effort && !effort_str.empty?
+          # xhigh is not recognized — map it to max. Off-like values are not
+          # valid either, so they keep the provider default untouched.
+          unless OFF_EFFORT_VALUES.include?(effort_str)
+            effort = case effort_str
+                     when "xhigh" then "max"
+                     else effort_str
+                     end
+            assign_effort(body, effort, responses_api)
+          end
+        elsif reasoning_effort && !effort_str.empty? && !OFF_EFFORT_VALUES.include?(effort_str)
           assign_effort(body, effort_str, responses_api)
         end
       end

data/lib/clacky/message_history.rb

@@ -15,7 +15,7 @@ module Clacky
       subagent_instructions subagent_result subagent_transcript token_usage
       compressed_summary chunk_path truncated transient
       chunk_index chunk_count ext_events skill_command skill_command_display
-      display_files display_references
+      display_files display_references feedback_requests
     ].freeze
 
     INTERNAL_CONTENT_BLOCK_FIELDS = %i[image_path image_name].freeze
@@ -37,7 +37,8 @@ module Clacky
     # Write operations
     # ─────────────────────────────────────────────
 
-    # Append a single message hash to the history.
+    # Append a single message hash to the history. An optional block receives
+    # the stored, sanitized message so callers can retain its identity.
     #
     # When appending a user message, automatically drop any trailing assistant
     # message that has unanswered tool_calls (no tool_result follows it).
@@ -48,7 +49,9 @@ module Clacky
       if message[:role] == "user"
         drop_dangling_tool_calls!
       end
-      @messages << deep_sanitize_utf8(message)
+      stored_message = deep_sanitize_utf8(message)
+      @messages << stored_message
+      yield stored_message if block_given?
       self
     end
 
@@ -111,6 +114,16 @@ module Clacky
       self
     end
 
+    # Save the effective request before waiting, including while no tool result
+    # exists yet. The original model-authored call remains unchanged.
+    def attach_feedback_request(message:, tool_call_id:, request:)
+      return false unless message
+
+      message[:feedback_requests] ||= {}
+      message[:feedback_requests][tool_call_id.to_s] = deep_sanitize_utf8(request)
+      true
+    end
+
     # Settle an interrupted fan-out whose assistant.tool_calls turn is dangling
     # because the batch was cancelled before any tool result was written. Mirrors
     # repair_tool_call_pairing (same helpers, same scan) but PERSISTS the result:
@@ -315,6 +328,11 @@ module Clacky
         @messages
       end
       msgs = source.map { |m| strip_for_api(m) }
+      # A tool message with a blank id answers no announced call, and one of
+      # them makes every later request fail (422 "invalid type: null"). Drop
+      # these before pairing: a blank id is not recognized as a tool result,
+      # so pairing would otherwise insert a placeholder and orphan the real one.
+      msgs.reject! { |m| m[:role] == "tool" && m[:tool_call_id].to_s.strip.empty? }
       msgs = repair_tool_call_pairing(msgs)
       ensure_reasoning_content_consistency(msgs, force: force_reasoning_content_pad)
     end

data/lib/clacky/platform_http_client.rb

@@ -50,9 +50,13 @@ module Clacky
     # Auto-detects the platform endpoint:
     #   - When CLACKY_LICENSE_SERVER is set → that URL (dev override)
     #   - Otherwise                        → PRIMARY_HOST
+    def self.base_url
+      override = ENV["CLACKY_LICENSE_SERVER"]
+      override && !override.empty? ? override.chomp("/") : PRIMARY_HOST
+    end
+
     def initialize
-      override  = ENV["CLACKY_LICENSE_SERVER"]
-      @base_url = override && !override.empty? ? override : PRIMARY_HOST
+      @base_url = self.class.base_url
     end
 
     # Send a POST request with a JSON body and return a normalised result hash.