@wilm-ai/wilma-cli 0.0.1 → 0.0.3

package/README.md

@@ -24,8 +24,8 @@ wilma messages list --folder inbox --all --json
 ```
 
 ## Config
-Local config is stored in `.wilmai/config.json` in the current working directory.
-Use `wilma config clear` to remove it.
+Local config is stored in `~/.config/wilmai/config.json` (or `$XDG_CONFIG_HOME/wilmai/config.json`).
+Use `wilma config clear` to remove it. Override with `WILMAI_CONFIG_PATH`.
 
 ## Notes
 - Credentials are stored with lightweight obfuscation for convenience.

package/dist/config.d.ts

@@ -1,6 +1,7 @@
 export interface StoredProfile {
     id: string;
     tenantUrl: string;
+    tenantName?: string | null;
     username: string;
     passwordObfuscated: string;
     students?: {

package/dist/config.js

@@ -1,12 +1,15 @@
 import { mkdir, readFile, writeFile, rm } from "node:fs/promises";
 import { dirname, resolve } from "node:path";
+import { homedir } from "node:os";
 const SALT = "wilmai::";
 export function getConfigPath() {
     const override = process.env.WILMAI_CONFIG_PATH;
     if (override) {
         return resolve(override);
     }
-    return resolve(process.cwd(), ".wilmai", "config.json");
+    const xdg = process.env.XDG_CONFIG_HOME;
+    const base = xdg ? resolve(xdg) : resolve(homedir(), ".config");
+    return resolve(base, "wilmai", "config.json");
 }
 export async function loadConfig() {
     const path = getConfigPath();
@@ -25,6 +28,9 @@ export async function loadConfig() {
                 p.lastStudentNumber = p.studentNumber;
                 p.lastStudentName = p.studentName ?? p.studentNumber;
             }
+            if (!p.tenantName) {
+                p.tenantName = p.tenantUrl;
+            }
             delete p.studentNumber;
             delete p.studentName;
             return p;

package/dist/index.js

@@ -1,7 +1,14 @@
 #!/usr/bin/env node
+import { emitKeypressEvents } from "node:readline";
 import { select, input, password } from "@inquirer/prompts";
+import { readFile } from "node:fs/promises";
+import { dirname, resolve } from "node:path";
 import { WilmaClient, listTenants, } from "@wilm-ai/wilma-client";
 import { clearConfig, getConfigPath, loadConfig, obfuscateSecret, revealSecret, saveConfig, } from "./config.js";
+// Enable keypress events for escape key detection
+if (process.stdin.isTTY) {
+    emitKeypressEvents(process.stdin);
+}
 const ACTIONS = [
     { value: "news", name: "List news" },
     { value: "exams", name: "List exams" },
@@ -10,6 +17,15 @@ const ACTIONS = [
 ];
 async function main() {
     const args = process.argv.slice(2);
+    if (args.includes("--help") || args.includes("-h")) {
+        printUsage();
+        return;
+    }
+    if (args.includes("--version") || args.includes("-v")) {
+        const version = await readPackageVersion();
+        console.log(version);
+        return;
+    }
     if (args[0] === "config" && args[1] === "clear") {
         await clearConfig();
         console.log(`Cleared config at ${getConfigPath()}`);
@@ -26,7 +42,7 @@ async function chooseProfile(config) {
     if (config.profiles.length) {
         const choices = config.profiles.map((p) => ({
             value: p.id,
-            name: `${p.username} @ ${p.tenantUrl} ${p.lastStudentName ? `(${p.lastStudentName})` : ""}`.trim(),
+            name: `${p.username} @ ${p.tenantName ?? p.tenantUrl}`.trim(),
         }));
         choices.push({ value: "new", name: "Use a new login" });
         const selected = await selectOrCancel({
@@ -91,6 +107,7 @@ async function chooseProfile(config) {
     const stored = {
         id: `${tenant.url}|${username}`,
         tenantUrl: tenant.url,
+        tenantName: tenant.name,
         username,
         passwordObfuscated: obfuscateSecret(passwordValue),
         students: students.map((s) => ({ studentNumber: s.studentNumber, name: s.name })),
@@ -106,8 +123,9 @@ async function chooseProfile(config) {
 async function runInteractive(config) {
     while (true) {
         const profile = await chooseProfile(config);
-        if (!profile)
+        if (!profile) {
             return;
+        }
         const client = await WilmaClient.login(profile);
         let nextAction = await selectOrCancel({
             message: "What do you want to view?",
@@ -118,6 +136,7 @@ async function runInteractive(config) {
             ],
         });
         if (nextAction === null) {
+            // Esc from main menu -> back to student picker
             continue;
         }
         while (nextAction !== "exit" && nextAction !== "back") {
@@ -125,6 +144,7 @@ async function runInteractive(config) {
                 await selectNewsToRead(client);
             }
             if (nextAction === "exams") {
+                console.clear();
                 await outputExams(client, { limit: 20, json: false });
             }
             if (nextAction === "messages") {
@@ -149,8 +169,9 @@ async function runInteractive(config) {
                     { value: "back", name: "Back to students" },
                     { value: "exit", name: "Exit" },
                 ],
-            });
+            }, false); // Don't clear screen - preserve content output
             if (nextAction === null) {
+                // Esc from action menu -> back to student picker
                 nextAction = "back";
             }
         }
@@ -414,6 +435,20 @@ async function handleCommand(args, config) {
     console.log("  wilma messages read <id> [--json]");
     console.log("  wilma exams list [--limit 20] [--student <id|name>] [--all-students] [--json]");
     console.log("  wilma config clear");
+    console.log("  wilma --help | -h");
+    console.log("  wilma --version | -v");
+}
+function printUsage() {
+    console.log("Usage:");
+    console.log("  wilma kids list [--json]");
+    console.log("  wilma news list [--limit 20] [--student <id|name>] [--all-students] [--json]");
+    console.log("  wilma news read <id> [--json]");
+    console.log("  wilma messages list [--folder inbox] [--limit 20] [--student <id|name>] [--all-students] [--json]");
+    console.log("  wilma messages read <id> [--json]");
+    console.log("  wilma exams list [--limit 20] [--student <id|name>] [--all-students] [--json]");
+    console.log("  wilma config clear");
+    console.log("  wilma --help | -h");
+    console.log("  wilma --version | -v");
 }
 async function getProfileForCommandNonInteractive(config, flags) {
     if (!config.lastProfileId) {
@@ -486,6 +521,12 @@ function parseArgs(args) {
     }
     return { command, subcommand, flags };
 }
+async function readPackageVersion() {
+    const pkgPath = resolve(dirname(new URL(import.meta.url).pathname), "..", "package.json");
+    const raw = await readFile(pkgPath, "utf-8");
+    const data = JSON.parse(raw);
+    return data.version ?? "unknown";
+}
 async function outputNews(client, opts) {
     const news = await client.news.list();
     const slice = news.slice(0, opts.limit);
@@ -577,8 +618,10 @@ async function selectNewsToRead(client) {
 }
 async function selectMessageToRead(client, folder) {
     const messages = await client.messages.list(folder);
-    if (!messages.length)
+    if (!messages.length) {
+        console.log(`\nNo messages found in ${folder}.`);
         return;
+    }
     const choices = messages.slice(0, 30).map((msg) => {
         const date = msg.sentAt.toISOString().slice(0, 10);
         return {
@@ -595,9 +638,20 @@ async function selectMessageToRead(client, folder) {
         return;
     await outputMessageItem(client, Number(selected), false);
 }
-async function selectOrCancel(opts) {
+async function selectOrCancel(opts, clearScreen = true) {
+    if (clearScreen) {
+        console.clear();
+    }
+    const prompt = select(opts, { clearPromptOnDone: true });
+    const onKeypress = (_ch, key) => {
+        if (key?.name === "escape") {
+            prompt.cancel();
+        }
+    };
+    process.stdin.on("keypress", onKeypress);
     try {
-        return (await select(opts));
+        const result = await prompt;
+        return result;
     }
     catch (err) {
         if (isPromptCancel(err)) {
@@ -605,10 +659,22 @@ async function selectOrCancel(opts) {
         }
         throw err;
     }
+    finally {
+        process.stdin.removeListener("keypress", onKeypress);
+    }
 }
 async function inputOrCancel(opts) {
+    console.clear();
+    const prompt = input(opts, { clearPromptOnDone: true });
+    const onKeypress = (_ch, key) => {
+        if (key?.name === "escape") {
+            prompt.cancel();
+        }
+    };
+    process.stdin.on("keypress", onKeypress);
     try {
-        return await input(opts);
+        const result = await prompt;
+        return result;
     }
     catch (err) {
         if (isPromptCancel(err)) {
@@ -616,10 +682,22 @@ async function inputOrCancel(opts) {
         }
         throw err;
     }
+    finally {
+        process.stdin.removeListener("keypress", onKeypress);
+    }
 }
 async function passwordOrCancel(opts) {
+    console.clear();
+    const prompt = password(opts, { clearPromptOnDone: true });
+    const onKeypress = (_ch, key) => {
+        if (key?.name === "escape") {
+            prompt.cancel();
+        }
+    };
+    process.stdin.on("keypress", onKeypress);
     try {
-        return await password(opts);
+        const result = await prompt;
+        return result;
     }
     catch (err) {
         if (isPromptCancel(err)) {
@@ -627,6 +705,9 @@ async function passwordOrCancel(opts) {
         }
         throw err;
     }
+    finally {
+        process.stdin.removeListener("keypress", onKeypress);
+    }
 }
 function isPromptCancel(err) {
     if (!err)
@@ -635,6 +716,7 @@ function isPromptCancel(err) {
     const name = err instanceof Error ? err.name : "";
     return (name === "AbortError" ||
         name === "ExitPromptError" ||
+        name === "CancelPromptError" ||
         message.includes("User force closed the prompt") ||
         message.toLowerCase().includes("cancel") ||
         message.toLowerCase().includes("aborted"));

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@wilm-ai/wilma-cli",
-  "version": "0.0.1",
+  "version": "0.0.3",
   "type": "module",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",