@nbtca/prompt 1.5.9 → 1.5.10

package/dist/app/app.js

@@ -8,6 +8,8 @@ import { docsView } from './views/docs.js';
 import { eventsView } from './views/events.js';
 import { settingsView } from './views/settings.js';
 import { getAppTabs } from './tabs.js';
+import { renderHelp } from './help.js';
+import { t } from '../i18n/index.js';
 import { SPINNER_FRAME_MS } from '../core/components/spinner.js';
 export async function runApp() {
     if (!process.stdin.isTTY || !process.stdout.isTTY)
@@ -22,6 +24,7 @@ export async function runApp() {
     let keyFlushTimer;
     let clockTimer;
     let busyTimer;
+    let helpOpen = false;
     let painted;
     let lastBody = { length: 0, height: 0 };
     const viewIds = getAppTabs().map((tab) => tab.id);
@@ -77,11 +80,14 @@ export async function runApp() {
         const tabs = getAppTabs();
         const chrome = resolveChromeLayout(rows);
         const header = renderHeader(tabs, view, cols, chrome.headerLines, active?.contextPath?.());
-        const body = active?.render(ctx) ?? [];
-        const bodyScroll = active?.capturesInput?.() ? Number.MAX_SAFE_INTEGER : scroll;
+        const activeTab = tabs.find((tab) => tab.id === view);
+        const body = helpOpen
+            ? renderHelp(activeTab?.title ?? '', active?.shortcuts?.() ?? [], tabs.length, cols)
+            : (active?.render(ctx) ?? []);
+        const bodyScroll = !helpOpen && active?.capturesInput?.() ? Number.MAX_SAFE_INTEGER : scroll;
         const height = computeBodyRows(rows, chrome.headerLines, chrome.footerLines);
         lastBody = { length: body.length, height };
-        const footer = renderFooter(view, cols, tabs.length, active?.footerHint?.(tabs.length, cols), chrome.footerLines, active?.scrollsBody?.() === true ? scrollPercent() : undefined);
+        const footer = renderFooter(view, cols, tabs.length, helpOpen ? t().help.close : active?.footerHint?.(tabs.length, cols), chrome.footerLines, !helpOpen && active?.scrollsBody?.() === true ? scrollPercent() : undefined);
         const lines = composeFrameLines(header, body, footer, rows, cols, bodyScroll);
         const patch = diffFrame(painted?.cols === cols ? painted.lines : undefined, lines);
         painted = { cols, lines };
@@ -127,6 +133,19 @@ export async function runApp() {
             render();
             return;
         }
+        if (helpOpen) {
+            if (key === '?' || key === '\x1b') {
+                helpOpen = false;
+                render();
+            }
+            return;
+        }
+        if (key === '?') {
+            helpOpen = true;
+            scroll = 0;
+            render();
+            return;
+        }
         const g = routeGlobalKey(key, viewIds, view);
         if (g.quit) {
             quit();

package/dist/app/chrome.js

@@ -112,7 +112,7 @@ export function passiveFooterHint(tabCount, cols = Number.POSITIVE_INFINITY) {
     const trans = t();
     const dot = pickIcon('·', '-');
     const compactTabs = tabCount > 1 ? `1-${tabCount}/Tab ${dot} ` : '';
-    return fitFooterHint(cols, `${digitTabHint(tabCount)}Esc ${dot} q ${trans.menu.hintQuit}`, `${compactTabs}Esc ${dot} q`, `Esc ${dot} q`, 'q');
+    return fitFooterHint(cols, `${digitTabHint(tabCount)}Esc ${dot} q ${trans.menu.hintQuit} ${dot} ${trans.help.hint}`, `${digitTabHint(tabCount)}Esc ${dot} q ${trans.menu.hintQuit}`, `${compactTabs}Esc ${dot} q ${dot} ?`, `Esc ${dot} q ${dot} ?`, `Esc ${dot} q`, 'q');
 }
 function interactiveFooterHint(tabCount, cols) {
     const trans = t();
@@ -122,6 +122,7 @@ function interactiveFooterHint(tabCount, cols) {
     const localFull = `${trans.menu.hintMove} ${dot} ${trans.menu.hintOpen} ${dot} Esc ${dot} q ${trans.menu.hintQuit}`;
     const localCompact = `${trans.menu.hintMove} ${trans.menu.hintOpen} Esc q`;
     const candidates = [
+        `${fullTabs}${localFull} ${dot} ${trans.help.hint}`,
         `${fullTabs}${localFull}`,
         `${compactTabs}${localFull}`,
         localFull,

package/dist/app/help.js

@@ -0,0 +1,44 @@
+import { type, space, glyph } from '../core/theme.js';
+import { pickIcon } from '../core/icons.js';
+import { t } from '../i18n/index.js';
+import { padEndV, visualWidth, wrapAnsiWithIndent } from '../core/text.js';
+function row(shortcut, keyWidth, cols) {
+    const key = padEndV(type.label(shortcut.key), keyWidth);
+    const line = `${space.indent}${space.indent}${key}  ${type.hint(shortcut.label)}`;
+    if (visualWidth(line) <= cols)
+        return [line];
+    return wrapAnsiWithIndent(`${type.label(shortcut.key)} ${type.hint(shortcut.label)}`, cols, space.indent + space.indent);
+}
+function group(title, shortcuts, cols) {
+    if (shortcuts.length === 0)
+        return [];
+    const keyWidth = shortcuts.reduce((width, item) => Math.max(width, visualWidth(item.key)), 0);
+    return [
+        ...wrapAnsiWithIndent(type.heading(title), cols, space.indent),
+        ...shortcuts.flatMap((shortcut) => row(shortcut, keyWidth, cols)),
+        '',
+    ];
+}
+export function globalShortcuts(tabCount) {
+    const trans = t();
+    const updown = glyph.updown();
+    return [
+        ...(tabCount > 1 ? [{ key: `1-${String(tabCount)}`, label: trans.help.tabs }] : []),
+        { key: 'Tab', label: trans.help.nextTab },
+        { key: `${updown} / j k`, label: trans.help.scroll },
+        { key: `PgUp/PgDn / ${pickIcon('␣', 'Space')}`, label: trans.help.page },
+        { key: 'Home/End / g G', label: trans.help.ends },
+        { key: pickIcon('⏎', 'Enter'), label: trans.help.open },
+        { key: 'Esc', label: trans.help.back },
+        { key: 'q', label: trans.help.quit },
+    ];
+}
+export function renderHelp(viewTitle, viewShortcuts, tabCount, cols) {
+    const trans = t();
+    return [
+        ...wrapAnsiWithIndent(type.heading(trans.help.title), cols, space.indent),
+        '',
+        ...group(trans.help.sectionGlobal, globalShortcuts(tabCount), cols),
+        ...group(viewTitle, viewShortcuts, cols),
+    ];
+}

package/dist/app/views/docs.js

@@ -465,6 +465,17 @@ export const docsView = {
                 return undefined;
         }
     },
+    shortcuts() {
+        const trans = t();
+        if (state.mode !== 'reader')
+            return [];
+        return [
+            ...((state.readerLinks?.length ?? 0) > 0
+                ? [{ key: 'f', label: trans.docs.readerLinksHint }]
+                : []),
+            { key: 'b', label: trans.docs.openBrowser },
+        ];
+    },
     scrollsBody() {
         return state.mode === 'reader' && state.readerLinksField === undefined;
     },

package/dist/app/views/schedule.js

@@ -298,6 +298,11 @@ export const scheduleView = {
     isBusy() {
         return state.mode === 'loading';
     },
+    shortcuts() {
+        return state.mode === 'hub' && state.timetable
+            ? hubShortcuts(state.timetable).map(({ key, label }) => ({ key, label }))
+            : [];
+    },
     capturesInput() {
         return (state.mode === 'needsLoginId' ||
             state.mode === 'needsLoginPassword' ||

package/dist/auth/cookie-transport.js

@@ -12,6 +12,8 @@ const WEBVPN_PATHS = new Set([
     '/vpn_key/update',
 ]);
 const AUTH_PATHS = new Set(['/authserver/login', '/authserver/checkNeedCaptcha.htl']);
+// CAS parks accounts owing a profile here instead of issuing a ticket.
+const PROFILE_GATE_PATH = '/authserver/improveInfo/improveUserInfo.do';
 const JWXT_EXACT_PATHS = new Set([
     '/sso/jziotlogin',
     '/jwglxt/ticketlogin',
@@ -92,6 +94,9 @@ export function assertAllowedCampusUrl(url) {
     }
     if (hostname === JWXT_HOST && isAllowedJwxtPath(url.pathname))
         return;
+    if (hostname === AUTH_HOST && url.pathname === PROFILE_GATE_PATH) {
+        throw new AuthError('PROFILE_INCOMPLETE', 'credentials', 'The campus requires this account to complete its profile.');
+    }
     throw new AuthError('UNTRUSTED_URL', 'session', 'The campus service URL is not allowed.');
 }
 function safeHeaders(headers) {

package/dist/auth/nbt-auth.js

@@ -88,19 +88,21 @@ function classifyRejectedLogin(html) {
     if (/锁定|冻结|次数过多|稍后再试/.test(visibleError)) {
         return new AuthError('ACCOUNT_LOCKED', 'credentials', 'The campus account is temporarily locked.');
     }
-    if (/激活|未启用/.test(visibleError)) {
-        return new AuthError('ACCOUNT_INACTIVE', 'credentials', 'The campus account must be activated first.');
-    }
     if (/验证码|滑块|captcha/i.test(visibleError)) {
         return new AuthError('INTERACTIVE_CHALLENGE', 'credentials', 'The campus login requires an interactive browser challenge.');
     }
-    if (/用户名|账号|密码|credential|password/i.test(visibleError)) {
+    // Key `accountLogin_account_pwd_error`; localized it also tells first-time users
+    // to activate, so it must be classified before the activation branch below.
+    if (/用户名|密码|credential|password|pwd/i.test(visibleError)) {
         return new AuthError('INVALID_CREDENTIALS', 'credentials', 'The student id or password was rejected.');
     }
+    if (/激活|未启用/.test(visibleError)) {
+        return new AuthError('ACCOUNT_INACTIVE', 'credentials', 'The campus account must be activated first.');
+    }
     return new AuthError('UNEXPECTED_RESPONSE', 'credentials', 'Campus login could not be confirmed.');
 }
-async function readText(response, stage) {
-    if (response.status < 200 || response.status >= 300) {
+async function readText(response, stage, toleratedStatus) {
+    if ((response.status < 200 || response.status >= 300) && response.status !== toleratedStatus) {
         throw new AuthError('HTTP_ERROR', stage, 'The campus service returned an error.', {
             retryable: response.status >= 500,
         });
@@ -220,15 +222,21 @@ export async function loginWithStudentPassword(username, password, options = {})
             method: 'POST',
             headers: {
                 Accept: 'text/html,application/xhtml+xml,application/xml;q=0.9,*/*;q=0.8',
+                // No Accept-Language on purpose: unresolved, the campus renders the bare
+                // message key, which is the only unambiguous error id this login offers.
                 'Content-Type': 'application/x-www-form-urlencoded',
                 Referer: loginResponse.url,
             },
             body: body.toString(),
             ...signalOption(options.signal),
         }, 'credentials');
-        const credentialHtml = await readText(credentialResponse, 'credentials');
+        // A rejected login is a 401 carrying the login page; classify it, don't report HTTP_ERROR.
+        const credentialHtml = await readText(credentialResponse, 'credentials', 401);
         if (hasLoginFingerprint(credentialHtml))
             throw classifyRejectedLogin(credentialHtml);
+        if (credentialResponse.status === 401) {
+            throw new AuthError('HTTP_ERROR', 'credentials', 'The campus service returned an error.');
+        }
         await verifyJwxtSession(cookies, options.signal);
         const authenticatedAt = (options.now ?? (() => new Date()))().toISOString();
         return createAuthenticatedSession(cookies, {

package/dist/core/logo.js

@@ -5,7 +5,7 @@ import chalk from 'chalk';
 import { useUnicodeIcons } from './icons.js';
 import { APP_INFO } from '../config/data.js';
 import { typeReveal, materializeBraille } from './motion.js';
-import { brandGradient as brand } from './theme.js';
+import { brandGradient as brand, c } from './theme.js';
 import { visualWidth } from './text.js';
 const __dirname = dirname(fileURLToPath(import.meta.url));
 const TAGLINE = 'To be at the intersection of technology and liberal arts.';
@@ -69,7 +69,9 @@ export async function runStartup() {
         return;
     const color = !process.env['NO_COLOR'];
     process.stdout.write('\n');
-    await materializeBraille(art, (s) => paint(s, color));
+    await materializeBraille(art, (s) => paint(s, color), {
+        paintProgress: (s) => (color ? c.brand(s) : s),
+    });
     await typeReveal([
         '',
         color ? brand(TAGLINE) : TAGLINE,

package/dist/core/motion.js

@@ -83,7 +83,8 @@ export async function materializeBraille(art, paint, opts = {}) {
             }
             shown++;
         }
-        write(paint(renderFrame()) + '\n');
+        const painter = f === frameCount ? paint : (opts.paintProgress ?? paint);
+        write(painter(renderFrame()) + '\n');
         if (f < frameCount) {
             await sleep(frameMs);
             write(ansi.cursorUp(lines.length) + ansi.cursorToCol0 + ansi.eraseDown);

package/dist/features/student-timetable.js

@@ -59,6 +59,8 @@ export function safeMessage(error) {
                 return trans.accountInactive;
             case 'INTERACTIVE_CHALLENGE':
                 return trans.challenge;
+            case 'PROFILE_INCOMPLETE':
+                return trans.profileIncomplete;
             case 'SESSION_EXPIRED':
                 return trans.sessionExpired;
             case 'TIMEOUT':

package/dist/i18n/locales/en.json

@@ -12,6 +12,21 @@
     "moreAbove": "{count} more above",
     "moreBelow": "{count} more below"
   },
+  "help": {
+    "title": "Keys",
+    "sectionGlobal": "Anywhere",
+    "sectionView": "Here",
+    "tabs": "Switch tab",
+    "nextTab": "Next tab",
+    "scroll": "Scroll a line",
+    "page": "Scroll a page",
+    "ends": "Jump to top or bottom",
+    "open": "Open",
+    "back": "Back",
+    "quit": "Quit",
+    "close": "Esc or ? to close",
+    "hint": "? keys"
+  },
   "menu": {
     "events": "Events",
     "eventsDesc": "",
@@ -218,6 +233,7 @@
     "sessionExpired": "The login session expired. Please sign in again.",
     "timeout": "The school service timed out.",
     "network": "Could not connect to the school service.",
+    "profileIncomplete": "The school wants this account's profile completed first; finish it in a browser, then try again.",
     "untrustedUrl": "The school returned an unapproved redirect; the request stopped safely.",
     "httpError": "The school login service returned an error status.",
     "loginChanged": "The school login page changed; credentials were not submitted.",

package/dist/i18n/locales/zh.json

@@ -12,6 +12,21 @@
     "moreAbove": "上方还有 {count} 项",
     "moreBelow": "下方还有 {count} 项"
   },
+  "help": {
+    "title": "快捷键",
+    "sectionGlobal": "全局",
+    "sectionView": "当前页",
+    "tabs": "切换标签页",
+    "nextTab": "下一个标签页",
+    "scroll": "滚动一行",
+    "page": "翻页",
+    "ends": "跳到开头或结尾",
+    "open": "打开",
+    "back": "返回",
+    "quit": "退出",
+    "close": "Esc 或 ? 关闭",
+    "hint": "? 快捷键"
+  },
   "menu": {
     "events": "活动",
     "eventsDesc": "",
@@ -218,6 +233,7 @@
     "sessionExpired": "登录状态已过期，请重新登录。",
     "timeout": "学校服务响应超时。",
     "network": "无法连接学校服务。",
+    "profileIncomplete": "学校要求先补全个人资料；请在浏览器登录统一身份认证完成后再试。",
     "untrustedUrl": "学校返回了未授权的登录跳转，已安全中止。",
     "httpError": "学校登录服务返回了错误状态。",
     "loginChanged": "学校登录页结构已经变化，当前版本未提交凭据。",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nbtca/prompt",
-  "version": "1.5.9",
+  "version": "1.5.10",
   "type": "module",
   "main": "dist/index.js",
   "exports": {
@@ -68,7 +68,7 @@
     "typescript": "^5.9.3",
     "typescript-eslint": "^8.67.0",
     "vite": "^6.4.3",
-    "vitest": "^3.2.7"
+    "vitest": "^4.1.11"
   },
   "engines": {
     "node": ">=20.12.0"