@wilm-ai/wilma-cli 2.1.1 → 2.1.2

package/dist/login-server.d.ts

@@ -14,9 +14,23 @@ export interface LoginServer {
  * on different Wilmas can add another login on the same page; it closes when
  * the parent presses Done or after 15 idle minutes.
  */
+/**
+ * The assistant app that asked for the login (by the name it gives when it
+ * connects to the MCP server), named in the page's intro so the parent can
+ * connect the page to what they just did.
+ */
+export type OpenedBy = {
+    app: string;
+};
+/** A plain app name from the name an MCP client reports, or undefined if unknown. */
+export declare function appName(client?: {
+    name?: string;
+    title?: string;
+}): string | undefined;
 export declare function startLoginServer(opts?: {
     timeoutMs?: number;
     onSaved?: (profile: StoredProfile) => void;
+    openedBy?: OpenedBy;
 }): Promise<LoginServer>;
 export type BrowserOpenResult = "opened" | "skipped" | "headless";
 /** Best-effort: open a URL in the user's default browser. */
@@ -28,6 +42,7 @@ export interface LoginPageOptions {
     apiBase: string;
     /** Shown in the privacy note under the form. */
     configPath?: string;
+    openedBy?: OpenedBy;
 }
 /** The login page. The login API answers {status: "ok", students, accounts}. */
 export declare function renderLoginPage(opts: LoginPageOptions): string;

package/dist/login-server.js

@@ -16,13 +16,25 @@ function accountsSummary(profiles) {
         students: (p.students ?? []).map((s) => s.name),
     }));
 }
-/**
- * Serve a one-time login page on 127.0.0.1. The parent picks their school's
- * Wilma, logs in, and the verified login is saved to the local config file —
- * the password never passes through an agent's chat. Families with children
- * on different Wilmas can add another login on the same page; it closes when
- * the parent presses Done or after 15 idle minutes.
- */
+/** A plain app name from the name an MCP client reports, or undefined if unknown. */
+export function appName(client) {
+    const raw = `${client?.title ?? ""} ${client?.name ?? ""}`.toLowerCase();
+    if (raw.includes("claude-code") || raw.includes("claude code"))
+        return "Claude Code";
+    if (raw.includes("claude"))
+        return "Claude";
+    if (raw.includes("codex"))
+        return "Codex";
+    if (raw.includes("chatgpt") || raw.includes("openai"))
+        return "ChatGPT";
+    if (raw.includes("cursor"))
+        return "Cursor";
+    if (raw.includes("openclaw"))
+        return "OpenClaw";
+    // Another app: its own display name, if it gave one.
+    const title = client?.title?.trim();
+    return title && title.length <= 40 ? title : undefined;
+}
 export async function startLoginServer(opts = {}) {
     const token = randomBytes(18).toString("base64url");
     const nonce = randomBytes(16).toString("base64");
@@ -64,7 +76,7 @@ export async function startLoginServer(opts = {}) {
                     "base-uri 'none'",
                 ].join("; "),
             });
-            res.end(renderLoginPage({ nonce, apiBase: `${base}/api`, configPath: getConfigPath() }));
+            res.end(renderLoginPage({ nonce, apiBase: `${base}/api`, configPath: getConfigPath(), openedBy: opts.openedBy }));
             return;
         }
         if (url.pathname === `${base}/api/tenants` && req.method === "GET") {
@@ -260,7 +272,18 @@ export function renderLoginPage(opts) {
             tooMany: "Too many attempts. Close this tab and start again from your assistant.",
             missing: "Pick your school's Wilma and fill in both fields.",
             expired: "This login page is no longer active. Start the login again from your assistant, or run wilma login.",
-            privacy: "Your login is saved only on this computer, in {path}. WilmAI has no server; it talks only to your school's Wilma.",
+            privacy: "Your login is saved only on this computer, in {path}, readable only by your user account. To remove it, run wilma config clear or delete that file.",
+            introApp: "{app} asked to connect to your Wilma. Log in once, and {app} can then check schedules, homework, exams, messages and news for you.",
+            trustLocalTitle: "On your own computer",
+            trustLocal: "This page isn't a website. It runs on this computer (that's what 127.0.0.1 in the address bar means), and WilmAI has no server.",
+            trustWilmaTitle: "Only to your school's Wilma",
+            trustWilma: "Your password goes from this computer straight to your school's Wilma. Your assistant never sees it.",
+            trustWilmaHost: "Your password goes from this computer straight to {host}. Your assistant never sees it.",
+            trustReadTitle: "The same information you see",
+            trustRead: "WilmAI reads schedules, messages, news and the rest just as you see them in Wilma.",
+            sentTo: "Sent only to {host}",
+            learnMore: "How WilmAI handles your login",
+            sourceCode: "Source code",
             disclaimer: "WilmAI is an independent open-source project, not affiliated with Visma or the Wilma service.",
         },
         fi: {
@@ -293,7 +316,18 @@ export function renderLoginPage(opts) {
             tooMany: "Liian monta yritystä. Sulje välilehti ja aloita uudelleen avustajasi kautta.",
             missing: "Valitse koulusi Wilma ja täytä molemmat kentät.",
             expired: "Tämä kirjautumissivu ei ole enää käytössä. Aloita kirjautuminen uudelleen avustajasi kautta tai komennolla wilma login.",
-            privacy: "Kirjautumistietosi tallennetaan vain tälle tietokoneelle, tiedostoon {path}. WilmAI:lla ei ole palvelinta; se on yhteydessä vain koulusi Wilmaan.",
+            privacy: "Kirjautumistietosi tallennetaan vain tälle tietokoneelle, tiedostoon {path}, jota vain sinun käyttäjätilisi voi lukea. Voit poistaa ne komennolla wilma config clear tai poistamalla tiedoston.",
+            introApp: "{app} pyysi yhteyttä Wilmaasi. Kirjaudu kerran, niin {app} voi sen jälkeen tarkistaa lukujärjestykset, läksyt, kokeet, viestit ja tiedotteet puolestasi.",
+            trustLocalTitle: "Omalla koneellasi",
+            trustLocal: "Tämä sivu ei ole verkkosivusto. Se toimii tällä koneella (sitä osoiterivin 127.0.0.1 tarkoittaa), eikä WilmAI:lla ole palvelinta.",
+            trustWilmaTitle: "Vain koulusi Wilmaan",
+            trustWilma: "Salasanasi lähtee tältä koneelta suoraan koulusi Wilmaan. Avustajasi ei näe sitä.",
+            trustWilmaHost: "Salasanasi lähtee tältä koneelta suoraan osoitteeseen {host}. Avustajasi ei näe sitä.",
+            trustReadTitle: "Samat tiedot kuin sinulla",
+            trustRead: "WilmAI lukee lukujärjestykset, viestit, tiedotteet ja muut tiedot samoin kuin näet ne Wilmassa.",
+            sentTo: "Lähetetään vain osoitteeseen {host}",
+            learnMore: "Miten WilmAI käsittelee kirjautumisen (englanniksi)",
+            sourceCode: "Lähdekoodi",
             disclaimer: "WilmAI on itsenäinen avoimen lähdekoodin projekti, eikä se liity Vismaan tai Wilma-palveluun.",
         },
     };
@@ -310,9 +344,14 @@ export function renderLoginPage(opts) {
   @media (prefers-color-scheme: dark) { :root { --ink:#eef2f3; --muted:#a8b5bb; --paper:#141c21; --line:#2c3a42; --card:#1b252b; --err:#ff8a80; } }
   * { box-sizing:border-box; }
   body { margin:0; background:var(--paper); color:var(--ink); font:16px/1.5 -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, "Helvetica Neue", Arial, sans-serif; }
-  main { max-width:440px; margin:0 auto; padding:40px 16px 48px; }
+  main { max-width:920px; margin:0 auto; padding:32px 16px 48px; }
+  .layout { display:grid; grid-template-columns:minmax(0, 1fr) minmax(0, 1fr); gap:24px 48px; align-items:start; }
+  .layout .card { margin:0 0 16px; }
+  .foot { max-width:560px; margin-top:28px; }
+  @media (max-width:760px) { main { max-width:480px; } .layout { grid-template-columns:minmax(0, 1fr); } }
   h1 { font-size:28px; line-height:1.2; margin:0 0 8px; }
   h1 mark { background:linear-gradient(transparent 55%, var(--yellow) 55%); color:inherit; padding:0 2px; }
+  @media (prefers-color-scheme: dark) { h1 mark { background:linear-gradient(transparent 60%, rgba(255,216,77,.4) 60%); } }
   p { margin:0 0 16px; }
   .muted { color:var(--muted); font-size:14px; }
   .card { background:var(--card); border:1px solid var(--line); border-radius:12px; padding:20px; margin:20px 0; }
@@ -343,13 +382,41 @@ export function renderLoginPage(opts) {
   .add-hint { margin-top:8px; }
   .error { color:var(--err); margin-top:12px; }
   .done h2 { margin:0 0 8px; }
+  .top { display:flex; justify-content:space-between; align-items:center; gap:12px; margin-bottom:28px; }
+  .brand { font-weight:800; font-size:18px; letter-spacing:-0.01em; }
+  .lang { display:flex; gap:4px; }
+  .lang button { font:inherit; font-size:13px; padding:3px 10px; border-radius:999px; border:1px solid var(--line); background:transparent; color:var(--muted); cursor:pointer; }
+  .lang button[aria-pressed="true"] { background:var(--yellow); border-color:var(--yellow); color:#1b2b34; font-weight:700; }
+  .trust { list-style:none; margin:20px 0 0; padding:0; display:flex; flex-direction:column; gap:12px; }
+  .trust li { display:flex; gap:12px; align-items:flex-start; }
+  .trust svg { flex:none; width:22px; height:22px; margin-top:1px; fill:none; stroke:var(--teal); stroke-width:1.8; stroke-linecap:round; stroke-linejoin:round; }
+  .trust strong { display:block; font-size:15px; line-height:1.35; }
+  .trust span { display:block; font-size:14px; line-height:1.45; color:var(--muted); }
+  .sent-to { font-size:13px; color:var(--muted); margin:6px 0 0; }
+  .links a { color:var(--teal); }
   [hidden] { display:none !important; }
 </style>
 </head>
 <body>
 <main>
+  <header class="top">
+    <span class="brand">WilmAI</span>
+    <span class="lang" role="group" aria-label="Kieli / Language">
+      <button type="button" id="lang-fi" lang="fi">Suomi</button>
+      <button type="button" id="lang-en" lang="en">English</button>
+    </span>
+  </header>
+  <div class="layout">
+  <div class="about">
   <h1 id="heading"></h1>
   <p id="intro"></p>
+  <ul class="trust">
+    <li><svg viewBox="0 0 24 24" aria-hidden="true"><rect x="3" y="4" width="18" height="12" rx="2"/><path d="M8 20h8M12 16v4"/></svg><div><strong id="trust-local-title"></strong><span id="trust-local"></span></div></li>
+    <li><svg viewBox="0 0 24 24" aria-hidden="true"><rect x="5" y="11" width="14" height="9" rx="2"/><path d="M8 11V8a4 4 0 0 1 8 0v3"/></svg><div><strong id="trust-wilma-title"></strong><span id="trust-wilma"></span></div></li>
+    <li><svg viewBox="0 0 24 24" aria-hidden="true"><path d="M2 12s3.5-7 10-7 10 7 10 7-3.5 7-10 7S2 12 2 12z"/><circle cx="12" cy="12" r="3"/></svg><div><strong id="trust-read-title"></strong><span id="trust-read"></span></div></li>
+  </ul>
+  </div>
+  <div class="forms">
   <section class="card" id="form-card">
     <div id="school-pick">
       <label for="school" id="school-label"></label>
@@ -367,6 +434,7 @@ export function renderLoginPage(opts) {
     <input id="username" autocomplete="username" autocapitalize="none" spellcheck="false">
     <label for="password" id="password-label"></label>
     <input id="password" type="password" autocomplete="current-password">
+    <p class="sent-to" id="sent-to" hidden></p>
     <div id="mfa" hidden>
       <label id="mfa-title"></label>
       <p class="muted" id="mfa-body"></p>
@@ -388,37 +456,75 @@ export function renderLoginPage(opts) {
     <h2 id="finished-title"></h2>
     <p id="finished-body"></p>
   </section>
+  </div>
+  </div>
+  <div class="foot">
   <p class="muted" id="privacy"></p>
+  <p class="muted links"><a id="learn-more" href="https://github.com/aikarjal/wilmai#credentials--privacy" target="_blank" rel="noreferrer"></a> · <a id="source-code" href="https://github.com/aikarjal/wilmai" target="_blank" rel="noreferrer"></a></p>
   <p class="muted" id="disclaimer"></p>
+  </div>
 </main>
 <script nonce="${nonce}">
 (() => {
   const STRINGS = ${jsonForScript(strings)};
   const API = ${jsonForScript(opts.apiBase)};
   const CONFIG_PATH = ${jsonForScript(opts.configPath ?? "")};
-  const lang = (navigator.language || "en").toLowerCase().startsWith("fi") ? "fi" : "en";
-  const t = STRINGS[lang];
-  document.documentElement.lang = lang;
-  document.title = t.title;
+  const OPENED_BY = ${jsonForScript(opts.openedBy ?? null)};
+  let lang = (navigator.language || "en").toLowerCase().startsWith("fi") ? "fi" : "en";
+  let t = STRINGS[lang];
+  let tenant = null;
+  let timer = null;
+  let seq = 0;
+  let shownAccounts = null;
   const $ = (id) => document.getElementById(id);
   const text = (id, value) => { $(id).textContent = value; };
-  text("heading", ""); $("heading").append(t.heading.split(" ").slice(0, -1).join(" ") + " ");
-  const mark = document.createElement("mark"); mark.textContent = t.heading.split(" ").slice(-1)[0]; $("heading").append(mark);
-  text("intro", t.intro); text("school-label", t.school); text("school-label-2", t.school);
-  $("school").placeholder = t.schoolHint; text("no-results", t.noResults); text("change", t.change);
-  text("school-help", t.schoolHelp);
+  const hostOf = (url) => { try { return new URL(url).host; } catch { return url; } };
+
+  // Every text on the page, in the chosen language (the switch at the top re-runs this).
+  function applyText() {
+    t = STRINGS[lang];
+    document.documentElement.lang = lang;
+    document.title = t.title;
+    $("heading").replaceChildren(t.heading.split(" ").slice(0, -1).join(" ") + " ");
+    const mark = document.createElement("mark"); mark.textContent = t.heading.split(" ").slice(-1)[0]; $("heading").append(mark);
+    text("intro", OPENED_BY ? t.introApp.split("{app}").join(OPENED_BY.app) : t.intro);
+    text("trust-local-title", t.trustLocalTitle); text("trust-local", t.trustLocal);
+    text("trust-wilma-title", t.trustWilmaTitle);
+    text("trust-read-title", t.trustReadTitle); text("trust-read", t.trustRead);
+    text("school-label", t.school); text("school-label-2", t.school);
+    $("school").placeholder = t.schoolHint; text("no-results", t.noResults); text("change", t.change);
+    text("school-help", t.schoolHelp);
+    text("username-label", t.username); text("password-label", t.password);
+    text("mfa-title", t.mfaTitle); text("mfa-body", t.mfaBody); text("mfa-label", t.mfaLabel); text("mfa-help", t.mfaHelp);
+    if (!$("submit").disabled) text("submit", t.submit);
+    text("done-title", t.doneTitle);
+    text("finish", t.finish); text("add-another", t.addAnother); text("add-hint", t.addAnotherHint);
+    text("finished-title", t.finishedTitle); text("finished-body", t.finishedBody);
+    text("privacy", t.privacy.replace("{path}", CONFIG_PATH));
+    text("learn-more", t.learnMore); text("source-code", t.sourceCode);
+    text("disclaimer", t.disclaimer);
+    for (const code of ["fi", "en"]) $("lang-" + code).setAttribute("aria-pressed", String(code === lang));
+    showHost();
+    if (shownAccounts) renderAccounts(shownAccounts);
+  }
+
+  // Where the password goes, once the parent has picked their Wilma.
+  function showHost() {
+    const host = tenant ? hostOf(tenant.url) : "";
+    text("trust-wilma", host ? t.trustWilmaHost.replace("{host}", host) : t.trustWilma);
+    $("sent-to").hidden = !host;
+    if (host) text("sent-to", t.sentTo.replace("{host}", host));
+  }
+
+  for (const code of ["fi", "en"]) $("lang-" + code).addEventListener("click", () => { lang = code; applyText(); });
   for (const city of ["Helsinki", "Espoo", "Tampere", "Vantaa", "Oulu", "Turku", "Jyväskylä"]) {
     const b = document.createElement("button"); b.type = "button"; b.textContent = city;
     b.addEventListener("click", () => { $("school").value = city; search(city).catch(() => showError(t.expired)); $("school").focus(); });
     $("chips").append(b);
   }
-  text("username-label", t.username); text("password-label", t.password);
-  text("mfa-title", t.mfaTitle); text("mfa-body", t.mfaBody); text("mfa-label", t.mfaLabel); text("mfa-help", t.mfaHelp);
-  text("submit", t.submit); text("done-title", t.doneTitle);
-  text("finish", t.finish); text("add-another", t.addAnother); text("add-hint", t.addAnotherHint);
-  text("finished-title", t.finishedTitle); text("finished-body", t.finishedBody);
 
   function renderAccounts(accounts) {
+    shownAccounts = accounts;
     const box = $("accounts"); box.replaceChildren();
     const intro = document.createElement("p"); intro.textContent = t.doneIntro; box.append(intro);
     for (const account of accounts) {
@@ -434,7 +540,7 @@ export function renderLoginPage(opts) {
   }
 
   $("add-another").addEventListener("click", () => {
-    tenant = null;
+    tenant = null; shownAccounts = null; showHost();
     for (const id of ["school", "username", "password", "totp"]) $(id).value = "";
     render([]); showError("");
     $("mfa").hidden = true; $("school-chosen").hidden = true; $("school-pick").hidden = false;
@@ -457,21 +563,16 @@ export function renderLoginPage(opts) {
     }
     $("done").hidden = true; $("finished").hidden = false;
   });
-  text("privacy", t.privacy.replace("{path}", CONFIG_PATH)); text("disclaimer", t.disclaimer);
-
-  let tenant = null;
-  let timer = null;
-  let seq = 0;
   const showError = (msg) => { const el = $("error"); el.textContent = msg; el.hidden = !msg; };
 
   function choose(t2) {
     tenant = t2;
-    text("chosen-name", t2.name || t2.url); text("chosen-url", t2.url);
+    text("chosen-name", t2.name || t2.url); text("chosen-url", t2.url); showHost();
     $("school-pick").hidden = true; $("school-chosen").hidden = false;
     $("username").focus();
   }
   $("change").addEventListener("click", () => {
-    tenant = null; $("school-chosen").hidden = true; $("school-pick").hidden = false; $("school").focus();
+    tenant = null; showHost(); $("school-chosen").hidden = true; $("school-pick").hidden = false; $("school").focus();
   });
 
   async function search(q) {
@@ -565,6 +666,7 @@ export function renderLoginPage(opts) {
       btn.disabled = false; btn.textContent = t.submit;
     }
   }
+  applyText();
   $("school").focus();
 })();
 </script>

package/dist/mcp.js

@@ -10,7 +10,7 @@ import { createAccess } from "./access.js";
 import { loadConfig } from "./config.js";
 import { ENV_VARS, isMfaFailure, resolveAccounts } from "./credentials.js";
 import { createUniqueDownloadFile } from "./downloads.js";
-import { openBrowser, startLoginServer } from "./login-server.js";
+import { appName, openBrowser, startLoginServer } from "./login-server.js";
 import { z } from "zod";
 import { INSTRUCTIONS, READ_ONLY, json, registerWilmaTools, textResult } from "./mcp-tools.js";
 import { searchTenants } from "./tenant-search.js";
@@ -23,6 +23,8 @@ const SECRET_SETTINGS_HINT = [
     "Never ask the user to type their Wilma password into the chat.",
 ].join("\n");
 let loginServerPromise = null;
+/** The running server, so the login page can name the app that asked for it. */
+let mcpServer = null;
 /** One login page at a time. Parallel tool calls share it; an explicit wilma_login starts a fresh one. */
 async function ensureLoginServer(fresh) {
     if (fresh && loginServerPromise) {
@@ -31,7 +33,8 @@ async function ensureLoginServer(fresh) {
     }
     if (loginServerPromise)
         return { server: await loginServerPromise, created: false };
-    const pending = startLoginServer().then((server) => {
+    const app = appName(mcpServer?.server.getClientVersion());
+    const pending = startLoginServer(app ? { openedBy: { app } } : {}).then((server) => {
         server.result.finally(() => {
             if (loginServerPromise === pending)
                 loginServerPromise = null;
@@ -170,5 +173,6 @@ export async function runMcpServer(version) {
     if (updateChecksEnabled())
         updateCheck = startUpdateCheck();
     const server = createWilmaMcpServer(version);
+    mcpServer = server;
     await server.connect(new StdioServerTransport());
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@wilm-ai/wilma-cli",
-  "version": "2.1.1",
+  "version": "2.1.2",
   "description": "Read your children's Wilma (Finnish school system) from the terminal or an AI assistant: schedule, homework, exams, messages and news.",
   "license": "MIT",
   "repository": {