openclacky 1.2.5 → 1.2.7

data/lib/clacky/web/settings.js

@@ -6,6 +6,11 @@ const Settings = (() => {
   let _models = [];
   // Provider presets loaded from server
   let _providers = [];
+  // Provider id selected in the model edit modal (null when "Custom" or unset).
+  // Used to opt the request into anthropic_format=true when the user picks
+  // the Anthropic provider; other providers leave the flag unset and let the
+  // backend's runtime inference decide.
+  let _modalSelectedProviderId = null;
 
   // ── Public API ──────────────────────────────────────────────────────────────
 
@@ -52,9 +57,14 @@ const Settings = (() => {
   }
 
   function _getProviderName(model) {
-    if (!model.base_url) return I18n.t("settings.models.provider.custom");
-    const url = model.base_url.trim().replace(/\/+$/, "");
-    const provider = _providers.find(p => {
+    const p = _findProviderByBaseUrl(model.base_url);
+    return p ? p.name : I18n.t("settings.models.provider.custom");
+  }
+
+  function _findProviderByBaseUrl(baseUrl) {
+    if (!baseUrl) return null;
+    const url = String(baseUrl).trim().replace(/\/+$/, "");
+    return _providers.find(p => {
       const candidates = [p.base_url].concat(
         Array.isArray(p.endpoint_variants) ? p.endpoint_variants.map(v => v.base_url) : []
       ).filter(Boolean);
@@ -62,14 +72,15 @@ const Settings = (() => {
         const norm = String(c).replace(/\/+$/, "");
         return url === norm || url.startsWith(norm + "/");
       });
-    });
-    return provider ? provider.name : I18n.t("settings.models.provider.custom");
+    }) || null;
   }
 
   function _renderCard(container, model, index) {
     const isDefault = model.type === "default";
     const isLite    = model.type === "lite";
-    const providerName = _getProviderName(model);
+    const provider  = _findProviderByBaseUrl(model.base_url);
+    const providerName = provider ? provider.name : I18n.t("settings.models.provider.custom");
+    const websiteUrl   = provider && provider.website_url;
     const displayName = model.model || I18n.t("settings.models.unnamed");
 
     const card = document.createElement("div");
@@ -84,7 +95,7 @@ const Settings = (() => {
           ${isLite ? `<span class="badge badge-lite">${I18n.t("settings.models.badge.lite")}</span>` : ""}
         </div>
         <div class="model-card-grid-provider">${_esc(providerName)}</div>
-        ${model.model ? `<div class="model-card-grid-model">${_esc(model.model)}</div>` : ""}
+        ${model.api_key_masked ? `<div class="model-card-grid-model">${_esc(model.api_key_masked)}</div>` : ""}
         <div class="model-card-grid-status">
           <span class="model-test-result" data-index="${index}"></span>
         </div>
@@ -107,6 +118,12 @@ const Settings = (() => {
           <span>${I18n.t("settings.models.btn.delete")}</span>
         </button>` : ""}
       </div>
+      ${websiteUrl ? `<div class="model-card-grid-footer">
+        <a class="model-card-grid-link" href="${_esc(websiteUrl)}" target="_blank" rel="noopener noreferrer">
+          ${I18n.t("settings.models.link.topUp")}
+          <svg width="11" height="11" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2.5" stroke-linecap="round" stroke-linejoin="round"><path d="M7 17L17 7"/><path d="M8 7h9v9"/></svg>
+        </a>
+      </div>` : ""}
     `;
 
     container.appendChild(card);
@@ -150,7 +167,11 @@ const Settings = (() => {
       document.getElementById("model-modal-default-field").style.display = "none";
 
       // Set provider dropdown value
-      const providerName = _getProviderName(model);
+      const matched = _findProviderByBaseUrl(model.base_url);
+      // Preserve an explicit anthropic_format=true even if base_url is custom:
+      // the user may have configured a self-hosted Anthropic-compatible proxy.
+      _modalSelectedProviderId = matched ? matched.id : (model.anthropic_format ? "anthropic" : null);
+      const providerName = matched ? matched.name : I18n.t("settings.models.provider.custom");
       const providerValue = document.getElementById("model-modal-provider-value");
       providerValue.textContent = providerName;
       providerValue.classList.remove("placeholder");
@@ -164,6 +185,7 @@ const Settings = (() => {
       document.getElementById("model-modal-set-default").checked = true;
 
       // Reset provider dropdown
+      _modalSelectedProviderId = null;
       const providerValue = document.getElementById("model-modal-provider-value");
       providerValue.textContent = I18n.t("settings.models.placeholder.provider");
       providerValue.classList.add("placeholder");
@@ -208,6 +230,10 @@ const Settings = (() => {
         const value = option.dataset.value;
         const text = option.dataset.label || option.textContent.trim();
 
+        // Track the picked provider so test/save can flag anthropic_format=true
+        // when the user explicitly picks Anthropic. Empty / "custom" → null.
+        _modalSelectedProviderId = (value && value !== "custom") ? value : null;
+
         const providerValue = document.getElementById("model-modal-provider-value");
         providerValue.textContent = text;
         providerValue.classList.toggle("placeholder", !value);
@@ -256,15 +282,18 @@ const Settings = (() => {
     _showTestResult(index, null, "");
 
     try {
+      const body = {
+        model: model.model,
+        base_url: model.base_url,
+        api_key: model.api_key_masked,
+        index
+      };
+      if (model.anthropic_format) body.anthropic_format = true;
+
       const testRes = await fetch("/api/config/test", {
         method: "POST",
         headers: { "Content-Type": "application/json" },
-        body: JSON.stringify({
-          model: model.model,
-          base_url: model.base_url,
-          api_key: model.api_key_masked,
-          index
-        })
+        body: JSON.stringify(body)
       });
       const testData = await testRes.json();
       _showTestResult(index, testData.ok, testData.message);
@@ -285,15 +314,25 @@ const Settings = (() => {
 
     saveBtn.disabled = true;
 
+    // Anthropic protocol is opted in only when the user picks the Anthropic
+    // provider in the modal. Other providers leave the flag absent so the
+    // backend's runtime inference (provider preset + model api overrides)
+    // decides — preserving e.g. OpenRouter's per-model anthropic-messages
+    // routing for Claude sub-models.
+    const anthropic_format = _modalSelectedProviderId === "anthropic";
+
     // Step 1: Test first
     saveBtn.textContent = I18n.t("settings.models.btn.testing");
     _showModalTestResult(null, "");
 
     try {
+      const testBody = { model, base_url, api_key, index };
+      if (anthropic_format) testBody.anthropic_format = true;
+
       const testRes = await fetch("/api/config/test", {
         method: "POST",
         headers: { "Content-Type": "application/json" },
-        body: JSON.stringify({ model, base_url, api_key, index })
+        body: JSON.stringify(testBody)
       });
       const testData = await testRes.json();
       _showModalTestResult(testData.ok, testData.message);
@@ -317,7 +356,7 @@ const Settings = (() => {
     const existing = isNew ? {} : (_models[index] || {});
     const hasId = !!existing.id;
 
-    const payload = { model, base_url, anthropic_format: false };
+    const payload = { model, base_url, anthropic_format };
     if (isNew) {
       if (document.getElementById("model-modal-set-default").checked) {
         payload.type = "default";
@@ -886,7 +925,10 @@ const Settings = (() => {
       model:            card.querySelector(`[data-key="model"]`).value.trim(),
       base_url:         card.querySelector(`[data-key="base_url"]`).value.trim(),
       api_key:          card.querySelector(`[data-key="api_key"]`).value.trim(),
-      anthropic_format: false,
+      // The inline card form has no provider picker — preserve whatever the
+      // model was saved with. The modal flow is the only place where the
+      // user can flip this flag.
+      anthropic_format: !!_models[index]?.anthropic_format,
       type:             _models[index]?.type ?? null
     };
   }

data/lib/clacky/web/workspace.js

@@ -0,0 +1,204 @@
+// Workspace panel — lazy file tree for the active session's working directory.
+// Lists one directory level at a time via GET /api/sessions/:id/files,
+// expands/collapses folders in place, and downloads files on click via
+// POST /api/file-action.
+"use strict";
+
+const Workspace = (() => {
+  const STORAGE_KEY = "clacky.workspace.open";
+
+  let _sessionId   = null;
+  let _workingDir  = null;
+  let _open        = false;
+
+  const $ = (id) => document.getElementById(id);
+  const t = (key) => (typeof I18n !== "undefined" ? I18n.t(key) : key);
+
+  const ICON_FOLDER = '<svg xmlns="http://www.w3.org/2000/svg" width="14" height="14" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"><path d="M22 19a2 2 0 0 1-2 2H4a2 2 0 0 1-2-2V5a2 2 0 0 1 2-2h5l2 3h9a2 2 0 0 1 2 2z"/></svg>';
+  const ICON_FILE   = '<svg xmlns="http://www.w3.org/2000/svg" width="14" height="14" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"><path d="M14 2H6a2 2 0 0 0-2 2v16a2 2 0 0 0 2 2h12a2 2 0 0 0 2-2V8z"/><polyline points="14 2 14 8 20 8"/></svg>';
+  const ICON_CARET  = '<svg xmlns="http://www.w3.org/2000/svg" width="10" height="10" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="3" stroke-linecap="round" stroke-linejoin="round"><polyline points="9 18 15 12 9 6"/></svg>';
+
+  function formatSize(bytes) {
+    if (bytes == null) return "";
+    if (bytes < 1024) return `${bytes} B`;
+    const units = ["KB", "MB", "GB", "TB"];
+    let n = bytes / 1024, i = 0;
+    while (n >= 1024 && i < units.length - 1) { n /= 1024; i++; }
+    return `${n < 10 ? n.toFixed(1) : Math.round(n)} ${units[i]}`;
+  }
+
+  async function fetchEntries(relPath) {
+    const url = `/api/sessions/${encodeURIComponent(_sessionId)}/files?path=${encodeURIComponent(relPath || "")}`;
+    const resp = await fetch(url);
+    if (!resp.ok) throw new Error(`HTTP ${resp.status}`);
+    const data = await resp.json();
+    return data.entries || [];
+  }
+
+  function renderEntries(entries) {
+    const frag = document.createDocumentFragment();
+    if (!entries.length) {
+      const empty = document.createElement("div");
+      empty.className = "wt-empty";
+      empty.textContent = t("workspace.empty");
+      frag.appendChild(empty);
+      return frag;
+    }
+    for (const entry of entries) {
+      frag.appendChild(buildNode(entry));
+    }
+    return frag;
+  }
+
+  function buildNode(entry) {
+    const node = document.createElement("div");
+    node.className = "wt-node";
+
+    const row = document.createElement("div");
+    row.className = "wt-row";
+    row.title = entry.name;
+
+    const caret = document.createElement("span");
+    caret.className = "wt-caret" + (entry.type === "dir" ? "" : " leaf");
+    if (entry.type === "dir") caret.innerHTML = ICON_CARET;
+
+    const icon = document.createElement("span");
+    icon.className = "wt-icon";
+    icon.innerHTML = entry.type === "dir" ? ICON_FOLDER : ICON_FILE;
+
+    const name = document.createElement("span");
+    name.className = "wt-name";
+    name.textContent = entry.name;
+
+    row.appendChild(caret);
+    row.appendChild(icon);
+    row.appendChild(name);
+
+    if (entry.type === "file") {
+      const size = document.createElement("span");
+      size.className = "wt-size";
+      size.textContent = formatSize(entry.size);
+      row.appendChild(size);
+    }
+
+    node.appendChild(row);
+
+    if (entry.type === "dir") {
+      const children = document.createElement("div");
+      children.className = "wt-children";
+      children.style.display = "none";
+      node.appendChild(children);
+      row.addEventListener("click", () => toggleDir(entry, caret, children));
+    } else {
+      row.addEventListener("click", () => downloadFile(entry));
+    }
+
+    return node;
+  }
+
+  async function toggleDir(entry, caret, children) {
+    const isOpen = caret.classList.contains("open");
+    if (isOpen) {
+      caret.classList.remove("open");
+      children.style.display = "none";
+      return;
+    }
+    caret.classList.add("open");
+    children.style.display = "";
+    if (children.dataset.loaded === "1") return;
+
+    children.innerHTML = `<div class="wt-loading">${t("workspace.loading")}</div>`;
+    try {
+      const entries = await fetchEntries(entry.path);
+      children.innerHTML = "";
+      children.appendChild(renderEntries(entries));
+      children.dataset.loaded = "1";
+    } catch (err) {
+      console.error("workspace load failed:", err);
+      children.innerHTML = `<div class="wt-error">${t("workspace.error")}</div>`;
+    }
+  }
+
+  async function downloadFile(entry) {
+    const fullPath = _workingDir.replace(/\/+$/, "") + "/" + entry.path;
+    try {
+      const resp = await fetch("/api/file-action", {
+        method: "POST",
+        headers: { "Content-Type": "application/json" },
+        body: JSON.stringify({ path: fullPath, action: "download" })
+      });
+      if (!resp.ok) throw new Error(`HTTP ${resp.status}`);
+      const blob = await resp.blob();
+      const url = URL.createObjectURL(blob);
+      const a = document.createElement("a");
+      a.href = url;
+      a.download = entry.name;
+      document.body.appendChild(a);
+      a.click();
+      a.remove();
+      URL.revokeObjectURL(url);
+    } catch (err) {
+      console.error("download failed:", err);
+      if (typeof Modal !== "undefined") Modal.toast(t("workspace.downloadFailed"), "error");
+    }
+  }
+
+  async function loadRoot() {
+    const tree = $("workspace-tree");
+    if (!tree || !_sessionId) return;
+    tree.innerHTML = `<div class="wt-loading">${t("workspace.loading")}</div>`;
+    try {
+      const entries = await fetchEntries("");
+      tree.innerHTML = "";
+      tree.appendChild(renderEntries(entries));
+    } catch (err) {
+      console.error("workspace load failed:", err);
+      tree.innerHTML = `<div class="wt-error">${t("workspace.error")}</div>`;
+    }
+  }
+
+  function applyOpenState() {
+    const panel = $("workspace-panel");
+    const opener = $("btn-workspace-open");
+    if (!panel) return;
+    const hasSession = !!_sessionId;
+    panel.classList.toggle("collapsed", !(_open && hasSession));
+    if (opener) opener.style.display = (!_open && hasSession) ? "" : "none";
+  }
+
+  function setOpen(open) {
+    _open = open;
+    try { localStorage.setItem(STORAGE_KEY, open ? "1" : "0"); } catch (_) {}
+    applyOpenState();
+    if (open) loadRoot();
+  }
+
+  return {
+    init() {
+      try { _open = localStorage.getItem(STORAGE_KEY) === "1"; } catch (_) { _open = false; }
+
+      const close   = $("btn-workspace-close");
+      const opener   = $("btn-workspace-open");
+      const refresh  = $("btn-workspace-refresh");
+      if (close)   close.addEventListener("click", () => setOpen(false));
+      if (opener)  opener.addEventListener("click", () => setOpen(true));
+      if (refresh) refresh.addEventListener("click", () => loadRoot());
+
+      applyOpenState();
+    },
+
+    // Called from Sessions.updateInfoBar whenever the active session changes.
+    onSession(session) {
+      const newId  = session ? session.id : null;
+      const newDir = session ? session.working_dir : null;
+      const changed = newId !== _sessionId || newDir !== _workingDir;
+      _sessionId  = newId;
+      _workingDir = newDir;
+      applyOpenState();
+      if (changed && _open && _sessionId) loadRoot();
+    }
+  };
+})();
+
+document.addEventListener("DOMContentLoaded", () => Workspace.init());
+window.Workspace = Workspace;

data/lib/clacky/web/ws-dispatcher.js

@@ -18,7 +18,6 @@
 
 
 WS.onEvent(ev => {
-  console.log("[DEBUG] WS event received:", ev.type, ev);
   switch (ev.type) {
 
     // ── Internal WS lifecycle ──────────────────────────────────────────
@@ -273,11 +272,28 @@ WS.onEvent(ev => {
       break;
 
     case "error":
-      if (!ev.session_id || ev.session_id === Sessions.activeId)
-        Sessions.appendMsg("error", escapeHtml(ev.message));
+      if (!ev.session_id || ev.session_id === Sessions.activeId) {
+        renderErrorEvent(ev);
+      }
       break;
   }
 });
 
+// ── Error rendering ────────────────────────────────────────────────────────
+
+function renderErrorEvent(ev) {
+  if (ev.code === "insufficient_credit") {
+    const body = escapeHtml(I18n.t("error.insufficient_credit"));
+    const action = ev.top_up_url
+      ? ` <a href="${escapeHtml(ev.top_up_url)}" target="_blank" rel="noopener noreferrer">${escapeHtml(I18n.t("error.insufficient_credit.action"))} →</a>`
+      : "";
+    Sessions.appendMsg("error", `<span>${body}${action}</span>`);
+    return;
+  }
+  Sessions.appendMsg("error", escapeHtml(ev.message));
+}
+
+window.renderErrorEvent = renderErrorEvent;
+
 
 })();

data/lib/clacky.rb

@@ -118,9 +118,6 @@ require_relative "clacky/tools/todo_manager"
 require_relative "clacky/tools/trash_manager"
 require_relative "clacky/tools/request_user_feedback"
 require_relative "clacky/tools/invoke_skill"
-require_relative "clacky/tools/undo_task"
-require_relative "clacky/tools/redo_task"
-require_relative "clacky/tools/list_tasks"
 require_relative "clacky/tools/browser"
 require_relative "clacky/tools/terminal"
 require_relative "clacky/mcp/client"
@@ -139,6 +136,15 @@ module Clacky
   class AgentInterrupted < Exception; end  # Inherit from Exception to bypass rescue StandardError
   class AgentError < StandardError; end
   class BadRequestError < AgentError; end  # 400 errors — our request was malformed, history should be rolled back
+  class InsufficientCreditError < AgentError
+    attr_reader :error_code, :provider_id
+
+    def initialize(message, error_code: nil, provider_id: nil)
+      super(message)
+      @error_code = error_code
+      @provider_id = provider_id
+    end
+  end
   class RetryableError < StandardError; end  # Transient errors that should be retried (5xx, HTML response, rate limit)
   # Upstream (model/router like OpenRouter/Bedrock) returned finish_reason="stop" together with
   # one or more tool_calls whose `arguments` JSON was truncated (empty, "{}" placeholder, or

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: openclacky
 version: !ruby/object:Gem::Version
-  version: 1.2.5
+  version: 1.2.7
 platform: ruby
 authors:
 - windy
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2026-05-27 00:00:00.000000000 Z
+date: 2026-05-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday
@@ -360,6 +360,7 @@ files:
 - lib/clacky/default_parsers/pdf_parser_ocr.py
 - lib/clacky/default_parsers/pdf_parser_plumber.py
 - lib/clacky/default_parsers/pptx_parser.rb
+- lib/clacky/default_parsers/wps_parser.rb
 - lib/clacky/default_parsers/xlsx_parser.rb
 - lib/clacky/default_skills/browser-setup/SKILL.md
 - lib/clacky/default_skills/channel-manager/SKILL.md
@@ -461,8 +462,6 @@ files:
 - lib/clacky/tools/glob.rb
 - lib/clacky/tools/grep.rb
 - lib/clacky/tools/invoke_skill.rb
-- lib/clacky/tools/list_tasks.rb
-- lib/clacky/tools/redo_task.rb
 - lib/clacky/tools/request_user_feedback.rb
 - lib/clacky/tools/security.rb
 - lib/clacky/tools/terminal.rb
@@ -472,7 +471,6 @@ files:
 - lib/clacky/tools/terminal/session_manager.rb
 - lib/clacky/tools/todo_manager.rb
 - lib/clacky/tools/trash_manager.rb
-- lib/clacky/tools/undo_task.rb
 - lib/clacky/tools/web_fetch.rb
 - lib/clacky/tools/web_search.rb
 - lib/clacky/tools/write.rb
@@ -572,6 +570,7 @@ files:
 - lib/clacky/web/vendor/katex/katex.min.js
 - lib/clacky/web/version.js
 - lib/clacky/web/weixin-qr.html
+- lib/clacky/web/workspace.js
 - lib/clacky/web/ws-dispatcher.js
 - lib/clacky/web/ws.js
 - scripts/build/build.sh

data/lib/clacky/tools/list_tasks.rb

@@ -1,54 +0,0 @@
-# frozen_string_literal: true
-
-module Clacky
-  module Tools
-    # Tool for listing task history (Time Machine feature)
-    class ListTasks < Base
-      self.tool_name = "list_tasks"
-      self.tool_description = "List recent tasks in the task history with summaries. " \
-        "Shows current task, past tasks, and future tasks (after undo). " \
-        "Use when user wants to see task history or choose which task to undo/redo to."
-      self.tool_category = "time_machine"
-      self.tool_parameters = {
-        type: "object",
-        properties: {
-          limit: {
-            type: "integer",
-            description: "Maximum number of recent tasks to show (default: 10)",
-            default: 10
-          }
-        }
-      }
-
-      def execute(agent:, limit: 10, **_args)
-        history = agent.get_task_history(limit: limit)
-        
-        if history.empty?
-          return "No task history available."
-        end
-
-        lines = ["Task History:"]
-        history.each do |task|
-          indicator = case task[:status]
-          when :current then "→"
-          when :past then " "
-          when :future then "↯"
-          end
-          
-          branch_indicator = task[:has_branches] ? " ⎇" : ""
-          lines << "#{indicator}#{branch_indicator} Task #{task[:task_id]}: #{task[:summary]}"
-        end
-
-        lines.join("\n")
-      end
-
-      def format_call(limit: 10, **_args)
-        "Listing task history (limit: #{limit})..."
-      end
-
-      def format_result(result)
-        result
-      end
-    end
-  end
-end

data/lib/clacky/tools/redo_task.rb

@@ -1,41 +0,0 @@
-# frozen_string_literal: true
-
-module Clacky
-  module Tools
-    # Tool for redoing a task after undo (Time Machine feature)
-    class RedoTask < Base
-      self.tool_name = "redo_task"
-      self.tool_description = "Redo to a specific task after undo. Restores files to that task's state. " \
-        "Use when user wants to go forward to a future task or switch to a different branch."
-      self.tool_category = "time_machine"
-      self.tool_parameters = {
-        type: "object",
-        properties: {
-          task_id: {
-            type: "integer",
-            description: "The task ID to redo to (must be greater than current active task)"
-          }
-        },
-        required: ["task_id"]
-      }
-
-      def execute(agent:, task_id:, **_args)
-        result = agent.switch_to_task(task_id)
-        
-        if result[:success]
-          result[:message]
-        else
-          "Error: #{result[:message]}"
-        end
-      end
-
-      def format_call(task_id:, **_args)
-        "Redoing to task #{task_id}..."
-      end
-
-      def format_result(result)
-        result
-      end
-    end
-  end
-end

data/lib/clacky/tools/undo_task.rb

@@ -1,35 +0,0 @@
-# frozen_string_literal: true
-
-module Clacky
-  module Tools
-    # Tool for undoing the last task (Time Machine feature)
-    class UndoTask < Base
-      self.tool_name = "undo_task"
-      self.tool_description = "Undo the last task and restore files to previous state. " \
-        "Use when user wants to go back to previous state or undo recent changes."
-      self.tool_category = "time_machine"
-      self.tool_parameters = {
-        type: "object",
-        properties: {}
-      }
-
-      def execute(agent:, **_args)
-        result = agent.undo_last_task
-        
-        if result[:success]
-          result[:message]
-        else
-          "Error: #{result[:message]}"
-        end
-      end
-
-      def format_call(**_args)
-        "Undoing last task..."
-      end
-
-      def format_result(result)
-        result
-      end
-    end
-  end
-end