@wilm-ai/wilma-cli 2.3.2 → 2.4.0

package/dist/index.js

@@ -7,9 +7,9 @@ import { homedir } from "node:os";
 import { dirname, resolve } from "node:path";
 import { fileURLToPath } from "node:url";
 import { APIError, AuthenticationError, MfaRequiredError, NetworkError, WilmaClient, listTenants, } from "@wilm-ai/wilma-client";
-import { clearConfig, getConfigPath, loadConfig, obfuscateSecret, revealSecret, saveConfig } from "./config.js";
-import { WilmaAccess, WilmaAiError, adoptSession, flushSessions, forgetSession, logoutSession, useSessionStore, } from "./agent-data.js";
-import { createAccess, logoutAccounts } from "./access.js";
+import { clearConfig, getConfigPath, loadConfig, obfuscateSecret, revealSecret, saveConfig, savedStudent } from "./config.js";
+import { WilmaAccess, WilmaAiError, adoptSession, flushSessions, roleOf, useSessionStore, } from "./agent-data.js";
+import { createAccess, logoutAccounts, removeLogin } from "./access.js";
 import { parseCliArgs } from "./cli-args.js";
 import { commandHelp, generalHelp } from "./cli-help.js";
 import { compactText, formatText, messageLine, newsLine } from "./cli-output.js";
@@ -52,6 +52,7 @@ const ACTIONS = [
     { value: "grades", name: "Exam grades" },
     { value: "notes", name: "Lesson notes (last 14 days)" },
     { value: "gradebook", name: "Gradebook" },
+    { value: "contacts", name: "Class and teachers" },
     { value: "news", name: "List news" },
     { value: "messages", name: "List messages" },
     { value: "exit", name: "Exit" },
@@ -158,15 +159,17 @@ async function runDataCommand(parsed, out) {
         case "summary":
             return out.data(await access.summary({ student, days: flags.days, since: flags.since }));
         case "schedule":
-            return out.data(await access.schedule({ student, when: flags.when, date: flags.date, weekday: flags.weekday }));
+            return out.data(await access.schedule({ student, when: flags.when, date: flags.date, weekday: flags.weekday, from: flags.from, to: flags.to }));
         case "homework":
             return out.data(await access.homework({ student, limit: flags.limit }));
         case "exams":
             return out.data(await access.upcomingExams({ student, limit: flags.limit }));
         case "grades":
-            return out.data(await access.grades({ student, limit: flags.limit }));
+            return out.data(await access.grades({ student, limit: flags.limit, from: flags.from, to: flags.to }));
         case "gradebook":
             return out.data(await access.gradebook({ student }));
+        case "contacts":
+            return out.data(await access.contacts({ student }));
         case "notes":
             if (action === "summary")
                 return out.data(await access.lessonNotesSummary({ student, from: flags.from, to: flags.to }));
@@ -266,6 +269,8 @@ async function runInteractive(config) {
                 show("notes", await access.lessonNotes({ student, days: 14 }));
             if (nextAction === "gradebook")
                 show("gradebook", await access.gradebook({ student }));
+            if (nextAction === "contacts")
+                show("contacts", await access.contacts({ student }));
             if (nextAction === "news")
                 await selectNewsToRead(access, student);
             if (nextAction === "messages") {
@@ -528,7 +533,7 @@ async function chooseStudentFromProfile(stored, baseProfile, onMfa) {
     });
     if (fresh.length) {
         students = fresh;
-        stored.students = fresh.map((s) => ({ studentNumber: s.studentNumber, name: s.name }));
+        stored.students = fresh.map(savedStudent);
     }
     else if (stored.students && stored.students.length) {
         students = stored.students.map((s) => ({
@@ -632,7 +637,7 @@ async function handleLogin(args, out) {
             console.log(`\nLogged in to ${stored.tenantName ?? stored.tenantUrl} as ${stored.username}.`);
             if (students.length)
                 console.log(`Children: ${students.join(", ")}`);
-            console.log("Add another Wilma in the browser if a child is on a different one, or press Done there (or Enter here) to finish.");
+            console.log("Add another school's Wilma in the browser if a child is on a different one, or press Done there (or Enter here) to finish.");
         },
     });
     const opened = flags.browser && openBrowser(server.url) === "opened";
@@ -655,22 +660,27 @@ async function handleLogin(args, out) {
         process.stdin.off("data", finishOnEnter);
         process.stdin.pause();
     }
-    if (!logins.length) {
+    // Done without a new login is fine when logins are saved already: the page also logs in again, unticks and removes.
+    const saved = (await loadConfig()).profiles;
+    if (!saved.length) {
         throw new WilmaAiError("login_cancelled", "Login page closed before logging in. Run `wilma login` again.");
     }
     await flushSessions();
     if (out.json) {
+        // Every saved login, as the page left them.
         out.data({
             status: "ok",
-            logins: logins.map((stored) => ({
+            logins: saved.map((stored) => ({
                 wilma: stored.tenantName ?? stored.tenantUrl,
                 username: stored.username,
-                students: (stored.students ?? []).map((s) => s.name),
+                students: (stored.students ?? []).filter((s) => !stored.hidden?.includes(s.studentNumber)).map((s) => s.name),
             })),
             configPath: getConfigPath(),
         });
         return;
     }
+    if (!logins.length)
+        console.log(`\nNo new login. On this computer: ${saved.map((p) => `${p.tenantName ?? p.tenantUrl} — ${p.username}`).join(", ")}.`);
     console.log(`\nSaved to ${getConfigPath()}`);
 }
 const HEADLESS_LOGIN_HELP = [
@@ -687,12 +697,7 @@ const HEADLESS_LOGIN_HELP = [
 async function handleAccounts(action, args, out) {
     const config = await loadConfig();
     if (action === "remove") {
-        const removed = findSavedLogin(config.profiles, args.join(" "));
-        config.profiles = config.profiles.filter((p) => p.id !== removed.id);
-        if (config.lastProfileId === removed.id)
-            config.lastProfileId = config.profiles[0]?.id ?? null;
-        await saveConfig(config);
-        const session = await endRemovedSession(removed);
+        const { removed, ...session } = await removeLogin(findSavedLogin(config.profiles, args.join(" ")).id);
         const result = { status: "removed", wilma: removed.tenantName ?? removed.tenantUrl, username: removed.username, ...session };
         out.data(result, () => session.session === "ended"
             ? `Removed ${removed.username} @ ${result.wilma} and ended its Wilma session.`
@@ -701,39 +706,29 @@ async function handleAccounts(action, args, out) {
                 : `Removed ${removed.username} @ ${result.wilma}.`);
         return;
     }
-    const accounts = config.profiles.map((p, i) => ({
-        number: i + 1,
-        wilma: p.tenantName ?? p.tenantUrl,
-        url: p.tenantUrl,
-        username: p.username,
-        children: (p.students ?? []).map((st) => st.name),
-    }));
+    const accounts = config.profiles.map((p, i) => {
+        // As Wilma said when the login's children were last read.
+        const role = roleOf(p.students ?? []);
+        const hidden = (p.students ?? []).filter((st) => p.hidden?.includes(st.studentNumber)).map((st) => st.name);
+        return {
+            number: i + 1,
+            wilma: p.tenantName ?? p.tenantUrl,
+            url: p.tenantUrl,
+            username: p.username,
+            ...(role ? { role } : {}),
+            children: (p.students ?? []).filter((st) => !p.hidden?.includes(st.studentNumber)).map((st) => st.name),
+            // Unticked on the login page: not read.
+            ...(hidden.length ? { hidden } : {}),
+        };
+    });
     out.data({ accounts }, () => accounts.length
         ? [
-            ...accounts.map((a) => `${a.number}. ${a.wilma} — ${a.username}${a.children.length ? ` (${a.children.join(", ")})` : ""}`),
+            ...accounts.map((a) => `${a.number}. ${a.wilma} — ${a.username}${a.children.length ? ` (${a.children.join(", ")})` : ""}${a.role === "student" ? ", the student's own login" : ""}${a.hidden ? `; not read: ${a.hidden.join(", ")}` : ""}`),
             "",
             "Add another with `wilma login`; remove one with `wilma accounts remove <number>`.",
         ].join("\n")
         : "No saved Wilma logins. Run `wilma login`.");
 }
-/**
- * End a removed login's Wilma session and forget it; the other logins keep
- * theirs. The login is removed even when Wilma can't be reached: its saved
- * session is forgotten anyway, and Wilma ends the session when it expires.
- */
-async function endRemovedSession(removed) {
-    const password = revealSecret(removed.passwordObfuscated);
-    if (!password)
-        return { session: "none" };
-    const profile = { baseUrl: removed.tenantUrl, username: removed.username, password };
-    try {
-        return { session: (await logoutSession(profile)) ? "ended" : "none" };
-    }
-    catch (err) {
-        await forgetSession(profile);
-        return { session: "not_ended", message: err instanceof Error ? err.message : String(err) };
-    }
-}
 /** A saved login by its number in `wilma accounts`, its Wilma's name or address, or its username. */
 function findSavedLogin(profiles, rawTarget) {
     const target = rawTarget.trim().toLowerCase();

package/dist/login-server.d.ts

@@ -8,11 +8,13 @@ export interface LoginServer {
     close(): void;
 }
 /**
- * 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.
+ * Serve a one-time login page on 127.0.0.1, laid out like WilmAI Home's Wilma
+ * page: who uses WilmAI, one row per Wilma (a saved one with its children to
+ * tick, Log in again and Remove; a new one to fill in), Add another school's
+ * Wilma, and one button that logs in every new row. Each verified login is
+ * saved to the local config file — the password never passes through an
+ * agent's chat. One login per Wilma, as in Home. The page 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
@@ -37,12 +39,30 @@ export type BrowserOpenResult = "opened" | "skipped" | "headless";
 export declare function openBrowser(url: string, opts?: {
     dryRun?: boolean;
 }): BrowserOpenResult;
+/** A saved login as the page shows it (see accountsSummary). */
+export interface SavedLogin {
+    id: string;
+    wilma: string;
+    url: string;
+    username: string;
+    role?: "guardian" | "student";
+    children: {
+        number: string;
+        name: string;
+        hidden?: boolean;
+    }[];
+}
 export interface LoginPageOptions {
     nonce: string;
     apiBase: string;
     /** Shown in the privacy note under the form. */
     configPath?: string;
     openedBy?: OpenedBy;
+    /** The logins already saved. */
+    accounts?: SavedLogin[];
 }
-/** The login page. The login API answers {status: "ok", students, accounts}. */
+/**
+ * The login page, laid out like WilmAI Home's Wilma page. The API answers
+ * {status: "ok", accounts} after a login, a removal or a tick.
+ */
 export declare function renderLoginPage(opts: LoginPageOptions): string;