@allansantos-dev/smart-tool 0.9.1 → 0.9.2

package/CHANGELOG.md

@@ -1,5 +1,20 @@
 # Changelog
 
+## 0.9.2 - beta
+
+- Installer reported success after a broken Camoufox download: camoufox 0.5.6 prints the error of `fetch` and exits 0.
+  The installer now catches that error and fails the step (retried 3 times), every request of the download has a
+  60 s read timeout (a stalled download used to wait until the 3-minute idle limit), and the final check requires the
+  Camoufox and Chromium executables on disk, so an incomplete browser can never end in "Smart Tool ready".
+- Setup screen: text, model and adapter fields were unstyled boxes (inputs without a type), selects and model fields
+  now look like comboboxes; the hook change opens inside the client's card in a scrollable block with Confirm and
+  Cancel instead of overflowing the page; "Save behavior" works without registering the MCP first; web search keys
+  are set one provider at a time from a provider selector instead of a stack of key fields.
+- Product page: the display font was a family that Google Fonts does not serve (titles fell back to Arial Narrow);
+  it now uses Big Shoulders Display. The page shows the current version (a test keeps it in sync with version.py),
+  links to the release notes and says what the installer does on failures and older installations. A failed Pages
+  deploy is retried once, the run fails unless the live page shows the version, and every release republishes it.
+
 ## 0.9.1 - beta
 
 - Installer on a regular Windows code page (cp1252): the steps' output was garbled or crashed the step; every child

package/install_runtime.py

@@ -133,7 +133,7 @@ def _run(args, *, cwd=None, label="Web dependency", idle_s=600, stream=False, at
         except RuntimeError as exc:
             if attempt == attempts:
                 raise
-            print(f"{label}: {exc}; trying again.", flush=True)
+            print(f"{exc}; trying again.", flush=True)
 
 
 def _run_once(args, cwd, env, flags, label, idle_s, stream):
@@ -179,8 +179,10 @@ def _run_once(args, cwd, env, flags, label, idle_s, stream):
             time.sleep(0.5)
         reader.join(timeout=10)
         if process.returncode:
-            raise RuntimeError(f"{' '.join(map(str, args[:3]))} failed (exit {process.returncode}): "
-                               + "\n".join(tail)[-1500:])
+            if not stream:
+                for line in list(tail)[-15:]:
+                    print(f"{label}: {line}", flush=True)
+            raise RuntimeError(f"{label} failed (exit {process.returncode}): {tail[-1] if tail else 'no output'}")
 
 
 def _check():
@@ -193,6 +195,8 @@ def _check():
         "angular_parser":bool(node and ANGULAR_PARSER.is_file()),
         "browser_python": BROWSER_PYTHON.is_file(),
         "browser_packages": False,
+        "camoufox_browser": False,
+        "chromium_browser": False,
     }
     if status["browser_python"]:
         try:
@@ -203,9 +207,36 @@ def _check():
             status["browser_packages"] = result.returncode == 0
         except subprocess.TimeoutExpired:
             status["browser_packages"] = False
+    if status["browser_packages"]:
+        status.update(_browser_executables())
     return status
 
 
+_BROWSERS_PROBE = """
+import json, os
+from camoufox.pkgman import LAUNCH_FILE, OS_NAME, camoufox_path
+from playwright.sync_api import sync_playwright
+found = {}
+try:
+    found["camoufox_browser"] = os.path.isfile(os.path.join(camoufox_path(download_if_missing=False), LAUNCH_FILE[OS_NAME]))
+except Exception:
+    found["camoufox_browser"] = False
+with sync_playwright() as playwright:
+    found["chromium_browser"] = os.path.isfile(playwright.chromium.executable_path)
+print(json.dumps(found))
+"""
+
+
+def _browser_executables():
+    """Both browsers must exist on disk: a download tool reporting success is not enough."""
+    try:
+        result = subprocess.run([str(BROWSER_PYTHON), "-c", _BROWSERS_PROBE], capture_output=True, text=True,
+                                encoding="utf-8", errors="replace", check=False, timeout=60)
+        return json.loads(result.stdout.strip().splitlines()[-1])
+    except (subprocess.TimeoutExpired, ValueError, IndexError):
+        return {"camoufox_browser": False, "chromium_browser": False}
+
+
 def _link_existing_browser(existing, link):
     try:
         os.symlink(existing, link, target_is_directory=True)
@@ -268,9 +299,10 @@ def main():
                         help="Reuse an existing venv without duplicating files (useful when disk is low)")
     args = parser.parse_args()
     if args.check:
-        for name, ready in _check().items():
+        status = _check()
+        for name, ready in status.items():
             print(f"{name}: {'ok' if ready else 'missing'}")
-        return 0 if all(_check().values()) else 1
+        return 0 if all(status.values()) else 1
     try:
         install(args.reuse_browser_runtime)
     except (OSError, RuntimeError, subprocess.SubprocessError) as exc:

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@allansantos-dev/smart-tool",
-  "version": "0.9.1",
+  "version": "0.9.2",
   "description": "Local MCP server that gives coding agents (Claude Code, Codex) cheaper, sharper tools than their built-in search. Windows.",
   "license": "Apache-2.0",
   "author": "Allan Santos",

package/setup_ui.py

@@ -397,9 +397,18 @@ _PAGE_TEMPLATE = """<!doctype html>
   .pair { display: grid; grid-template-columns: minmax(0, 1fr) minmax(0, 1fr); gap: 12px; }
   label { display: block; font-size: .8rem; font-weight: 600; margin-bottom: 4px; }
   .hint { display: block; font-size: .76rem; color: var(--muted); margin-top: 3px; }
-  select, input[type=text], input[type=url], input[type=number], input[type=password] {
+  select, input:not([type]), input[type=text], input[type=url], input[type=number], input[type=password] {
     width: 100%; padding: 8px 10px; border-radius: 8px; border: 1px solid var(--line);
-    background: var(--bg); color: var(--ink); font: .84rem var(--mono); min-width: 0; max-width: 100%; }
+    background-color: var(--bg); color: var(--ink); font: .84rem var(--mono); min-width: 0; max-width: 100%; }
+  select, input[list] { appearance: none; padding-right: 34px; cursor: pointer;
+    background-image: linear-gradient(45deg, transparent 50%, var(--muted) 50%), linear-gradient(135deg, var(--muted) 50%, transparent 50%);
+    background-position: calc(100% - 17px) 52%, calc(100% - 12px) 52%; background-size: 5px 5px; background-repeat: no-repeat; }
+  input[list] { cursor: text; }
+  input[list]::-webkit-calendar-picker-indicator { opacity: 0; cursor: pointer; }
+  select:hover, input[list]:hover { border-color: var(--muted); }
+  .code-preview { display: block; margin: 10px 0 0; padding: 12px 14px; max-height: 320px; overflow: auto; white-space: pre;
+    font: .78rem/1.5 var(--mono); color: var(--ink); background: var(--bg); border: 1px solid var(--line); border-radius: 8px; }
+  .plan { margin-top: 12px; padding-top: 12px; border-top: 1px dashed var(--line); }
   input[type=password] { font-family: var(--body); }
   input::placeholder { color: var(--idle); }
   select:focus-visible, input:focus-visible, button:focus-visible { outline: 2px solid var(--signal); outline-offset: 2px; }
@@ -556,10 +565,8 @@ _PAGE_TEMPLATE = """<!doctype html>
           </select>
           <span class="hint" id="hook-mode-hint">Applies to every client on the next tool call; nothing is reinstalled.</span></div>
         <div class="actions"><button type="button" id="btn-save-hook-mode">Save behavior</button></div>
-        <div id="agents-list"></div>
-        <pre class="hint" id="agents-preview" hidden></pre>
-        <div class="actions"><button type="button" id="btn-agents-confirm" hidden>Confirm and write</button></div>
         <div class="msg" id="agents-msg" role="status"></div>
+        <div id="agents-list"></div>
       </section>
 
       <section id="providers-section">
@@ -570,7 +577,10 @@ _PAGE_TEMPLATE = """<!doctype html>
           <span class="hint" id="contact-hint">Wikimedia asks tools to identify a contact in the User-Agent. It stays on this machine and is sent only to the search APIs.</span></div>
         <div class="actions"><button type="button" id="btn-save-contact">Save contact</button></div>
         <div class="msg" id="contact-msg" role="status"></div>
-        <div id="providers-list"></div>
+        <div class="field" style="margin-top:18px"><label for="provider-select">Provider</label>
+          <select id="provider-select"></select>
+          <span class="hint">Pick a provider to see its free tier and set or remove your key for it.</span></div>
+        <div id="provider-panel"></div>
       </section>
     </div>
   </div>
@@ -643,8 +653,10 @@ function renderGatewayFields() {
   for (const field of (adapter || { fields: [] }).fields) {
     const wrap = document.createElement("div");
     wrap.className = "field";
-    wrap.innerHTML = `<label></label><input autocomplete="off" spellcheck="false"><span class="hint"></span>`;
+    wrap.innerHTML = `<label></label><input type="text" autocomplete="off" spellcheck="false"><span class="hint"></span>`;
     const input = wrap.querySelector("input");
+    input.id = "gateway-field-" + field.name;
+    wrap.querySelector("label").htmlFor = input.id;
     wrap.querySelector("label").textContent = field.label + (field.required ? "" : " (optional)");
     input.dataset.field = field.name;
     input.dataset.secret = field.secret ? "1" : "";
@@ -831,7 +843,6 @@ $("btn-save-local-models").addEventListener("click", async () => {
   }
 });
 
-let agentsPlan = null;
 async function loadAgents() {
   try {
     const resp = await fetch("/setup/integration");
@@ -847,7 +858,9 @@ async function loadAgents() {
       const mcp = item.mcp_url ? "MCP registered: " + item.mcp_url : "smart-tool MCP not registered in this client";
       const hook = item.hook_error ? "Hook unreadable: " + item.hook_error : item.hook ? "Hook installed and up to date" : "Hook missing or outdated";
       row.innerHTML = `<div class="provider-head"><strong></strong><span class="state"></span></div><p class="hint mcp"></p><p class="hint mono cmd"></p><p class="hint file"></p>
-        <div class="actions"><button type="button" class="register">Register MCP</button><button type="button" class="hook">Install or update hook</button></div>`;
+        <div class="actions"><button type="button" class="register">Register MCP</button><button type="button" class="hook">Install or update hook</button></div>
+        <div class="plan" hidden><span class="hint plan-file"></span><pre class="code-preview"></pre>
+          <div class="actions"><button type="button" class="confirm">Confirm and write</button><button type="button" class="quiet cancel">Cancel</button></div></div>`;
       row.querySelector("strong").textContent = item.label;
       row.querySelector(".state").textContent = hook;
       row.querySelector(".mcp").textContent = mcp;
@@ -862,34 +875,37 @@ async function loadAgents() {
           const result = await post("/setup/integration", { client: item.client, action: "register_mcp" });
           setMsg("agents-msg", "ok", "MCP registered with: " + result.command + ". Reconnect open sessions (/mcp).");
           await loadAgents();
-$("btn-save-hook-mode").addEventListener("click", async () => {
-  try {
-    await post("/setup/integration", { action: "hook_mode", mode: $("sel-hook-mode").value });
-    setMsg("agents-msg", "ok", "Hook behavior saved; it applies on the next tool call.");
-    await loadAgents();
-  } catch (error) {
-    setMsg("agents-msg", "error", error.message);
-  }
-});
         } catch (error) {
           setMsg("agents-msg", "error", error.message);
           register.disabled = false;
         }
       });
       const button = row.querySelector(".hook");
+      const plan = row.querySelector(".plan");
       button.hidden = Boolean(item.hook);
       button.addEventListener("click", async () => {
         setMsg("agents-msg", "", "Preparing the change…");
         try {
-          agentsPlan = { client: item.client, ...(await post("/setup/integration", { client: item.client, action: "preview" })) };
-          $("agents-preview").textContent = item.file + "\\n" + JSON.stringify(agentsPlan.change, null, 2);
-          $("agents-preview").hidden = false;
-          $("btn-agents-confirm").hidden = false;
-          setMsg("agents-msg", "", "Review the entry above; the file is backed up before writing.");
+          const preview = await post("/setup/integration", { client: item.client, action: "preview" });
+          row.querySelector(".plan-file").textContent = "Entry added to " + preview.file + " (the file is backed up first):";
+          row.querySelector(".code-preview").textContent = JSON.stringify(preview.change, null, 2);
+          plan.hidden = false;
+          button.hidden = true;
+          setMsg("agents-msg", "", "");
+          row.querySelector(".confirm").onclick = async () => {
+            try {
+              const result = await post("/setup/integration", { client: item.client, action: "install", token: preview.token });
+              setMsg("agents-msg", "ok", item.label + ": hook written. Backup: " + (result.backup || "new file") + (result.after_install ? ". " + result.after_install : ""));
+              await loadAgents();
+            } catch (error) {
+              setMsg("agents-msg", "error", error.message);
+            }
+          };
         } catch (error) {
           setMsg("agents-msg", "error", error.message);
         }
       });
+      row.querySelector(".cancel").addEventListener("click", () => { plan.hidden = true; button.hidden = false; });
       list.appendChild(row);
     }
   } catch (error) {
@@ -897,14 +913,10 @@ $("btn-save-hook-mode").addEventListener("click", async () => {
   }
 }
 loadAgents();
-$("btn-agents-confirm").addEventListener("click", async () => {
-  if (!agentsPlan) return;
+$("btn-save-hook-mode").addEventListener("click", async () => {
   try {
-    const result = await post("/setup/integration", { client: agentsPlan.client, action: "install", token: agentsPlan.token });
-    setMsg("agents-msg", "ok", "Hook written. Backup: " + (result.backup || "new file") + (result.after_install ? ". " + result.after_install : ""));
-    agentsPlan = null;
-    $("agents-preview").hidden = true;
-    $("btn-agents-confirm").hidden = true;
+    await post("/setup/integration", { action: "hook_mode", mode: $("sel-hook-mode").value });
+    setMsg("agents-msg", "ok", "Hook behavior saved; it applies on the next tool call.");
     await loadAgents();
   } catch (error) {
     setMsg("agents-msg", "error", error.message);
@@ -946,8 +958,7 @@ function providerCard(name, info) {
       try {
         const data = await post("/setup/providers", { provider: name, action, ...(action === "save" ? { api_key: input.value.trim() } : {}) });
         input.value = "";
-        await loadProviders();
-        setMsg(name + "-msg", "ok", action === "save" ? `Key accepted by the provider (${data.validated_results} result(s) in the test) and protected on this Windows machine.` : "Key removed; free tier active.");
+        await loadProviders(action === "save" ? `Key accepted by the provider (${data.validated_results} result(s) in the test) and protected on this Windows machine.` : "Key removed; free tier active.");
       } catch (error) {
         setMsg(msg.id, "error", error.message);
         button.disabled = false;
@@ -966,13 +977,27 @@ $("btn-save-contact").addEventListener("click", async () => {
   }
 });
 
-async function loadProviders() {
-  const list = $("providers-list");
+let providers = {};
+function showProvider(message) {
+  const name = $("provider-select").value;
+  $("provider-panel").replaceChildren(...(providers[name] ? [providerCard(name, providers[name])] : []));
+  if (message) setMsg(name + "-msg", "ok", message);
+}
+$("provider-select").addEventListener("change", () => showProvider());
+
+async function loadProviders(message) {
+  const list = $("provider-panel");
   try {
     const resp = await fetch("/setup/providers");
     const data = await resp.json();
     if (!resp.ok || data.error) throw new Error(data.error);
-    list.replaceChildren(...Object.entries(data.providers).map(([name, info]) => providerCard(name, info)));
+    providers = data.providers;
+    const select = $("provider-select");
+    const chosen = select.value;
+    select.replaceChildren(...Object.entries(providers).map(([name, info]) =>
+      new Option(info.label + " · " + ((providerLabels[info.status] || [null, info.status])[1]), name)));
+    if (chosen && providers[chosen]) select.value = chosen;
+    showProvider(message);
     if (document.activeElement !== $("contact-input")) $("contact-input").value = data.contact;
     $("contact-hint").textContent = "Sent as: " + data.user_agent;
   } catch (error) {

package/version.py

@@ -1,7 +1,7 @@
 """Single source of the Smart Tool version and of the User-Agent sent to public APIs."""
 import re
 
-VERSION = "0.9.1"
+VERSION = "0.9.2"
 _CONTACT_RE = re.compile(r"^(?:[^\s@()<>;]+@[^\s@()<>;]+\.[^\s@()<>;]+|https?://[^\s()<>;]+)$")
 
 

package/web_adapters/browser/fetch_camoufox.py

@@ -1,13 +1,21 @@
-"""`camoufox fetch` for the installer: a stalled download fails after 60 s instead of hanging, and progress is printed
-as plain lines (the rich bar stays invisible when the output is a pipe)."""
-import socket
+"""`camoufox fetch` for the installer. camoufox 0.5.6 prints a failed download and still exits 0, so the error is
+caught here and turned into a failing exit, and the browser executable must exist afterwards. Its downloads have no
+timeout (requests passes None, which also overrides socket.setdefaulttimeout), so every request gets one here: a
+stalled download fails after 60 s instead of hanging. Progress is printed as plain lines (the rich bar stays
+invisible in a pipe)."""
+import sys
+from pathlib import Path
 
+import camoufox.__main__ as camoufox_cli
+import requests
 from camoufox import pkgman
-from camoufox.__main__ import cli
 
-socket.setdefaulttimeout(60)
+TIMEOUT_S = (30, 60)
 REPORT_EVERY_MB = 50
 _webdl = pkgman.webdl
+_update = camoufox_cli.CamoufoxUpdate.update
+_get = requests.get
+failures = []
 
 
 def _reporting_webdl(url, desc=None, buffer=None, bar=True, progress_callback=None):
@@ -22,7 +30,40 @@ def _reporting_webdl(url, desc=None, buffer=None, bar=True, progress_callback=No
     return _webdl(url, desc=desc, buffer=buffer, bar=False, progress_callback=progress_callback or report)
 
 
-pkgman.webdl = _reporting_webdl
+def _get_with_timeout(*args, **kwargs):
+    kwargs.setdefault("timeout", TIMEOUT_S)
+    return _get(*args, **kwargs)
+
+
+def _recording_update(self, *args, **kwargs):
+    try:
+        return _update(self, *args, **kwargs)
+    except Exception as exc:
+        failures.append(exc)
+        raise
+
+
+def installed_executable():
+    """The browser executable, without the download that launch_path() starts when it is missing."""
+    executable = Path(pkgman.camoufox_path(download_if_missing=False)) / pkgman.LAUNCH_FILE[pkgman.OS_NAME]
+    if not executable.is_file():
+        raise FileNotFoundError(executable)
+    return executable
+
+
+def main():
+    requests.get = _get_with_timeout
+    pkgman.webdl = _reporting_webdl
+    camoufox_cli.CamoufoxUpdate.update = _recording_update
+    camoufox_cli.cli.main(["fetch"], standalone_mode=False)
+    if failures:
+        sys.exit(f"Camoufox download failed: {failures[-1]}")
+    try:
+        executable = installed_executable()
+    except Exception as exc:
+        sys.exit(f"Camoufox is not installed after the download: {exc}")
+    print(f"Camoufox {pkgman.installed_verstr()} ready: {executable}", flush=True)
+
 
 if __name__ == "__main__":
-    cli(["fetch"])
+    main()