driggsby 0.7.1 → 0.7.3

package/README.md

@@ -123,4 +123,6 @@ signed in with an earlier version of the CLI, run
 
 ## License
 
-Apache-2.0
+Apache-2.0. The bundled Inter font (`assets/Inter.woff2`), which
+`driggsby dev` serves to the app it previews, is under the SIL Open Font
+License 1.1; see `assets/Inter-LICENSE.txt`.

package/assets/Inter-LICENSE.txt

@@ -0,0 +1,92 @@
+Copyright (c) 2016 The Inter Project Authors (https://github.com/rsms/inter)
+
+This Font Software is licensed under the SIL Open Font License, Version 1.1.
+This license is copied below, and is also available with a FAQ at:
+http://scripts.sil.org/OFL
+
+-----------------------------------------------------------
+SIL OPEN FONT LICENSE Version 1.1 - 26 February 2007
+-----------------------------------------------------------
+
+PREAMBLE
+The goals of the Open Font License (OFL) are to stimulate worldwide
+development of collaborative font projects, to support the font creation
+efforts of academic and linguistic communities, and to provide a free and
+open framework in which fonts may be shared and improved in partnership
+with others.
+
+The OFL allows the licensed fonts to be used, studied, modified and
+redistributed freely as long as they are not sold by themselves. The
+fonts, including any derivative works, can be bundled, embedded,
+redistributed and/or sold with any software provided that any reserved
+names are not used by derivative works. The fonts and derivatives,
+however, cannot be released under any other type of license. The
+requirement for fonts to remain under this license does not apply
+to any document created using the fonts or their derivatives.
+
+DEFINITIONS
+"Font Software" refers to the set of files released by the Copyright
+Holder(s) under this license and clearly marked as such. This may
+include source files, build scripts and documentation.
+
+"Reserved Font Name" refers to any names specified as such after the
+copyright statement(s).
+
+"Original Version" refers to the collection of Font Software components as
+distributed by the Copyright Holder(s).
+
+"Modified Version" refers to any derivative made by adding to, deleting,
+or substituting -- in part or in whole -- any of the components of the
+Original Version, by changing formats or by porting the Font Software to a
+new environment.
+
+"Author" refers to any designer, engineer, programmer, technical
+writer or other person who contributed to the Font Software.
+
+PERMISSION AND CONDITIONS
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of the Font Software, to use, study, copy, merge, embed, modify,
+redistribute, and sell modified and unmodified copies of the Font
+Software, subject to the following conditions:
+
+1) Neither the Font Software nor any of its individual components,
+in Original or Modified Versions, may be sold by itself.
+
+2) Original or Modified Versions of the Font Software may be bundled,
+redistributed and/or sold with any software, provided that each copy
+contains the above copyright notice and this license. These can be
+included either as stand-alone text files, human-readable headers or
+in the appropriate machine-readable metadata fields within text or
+binary files as long as those fields can be easily viewed by the user.
+
+3) No Modified Version of the Font Software may use the Reserved Font
+Name(s) unless explicit written permission is granted by the corresponding
+Copyright Holder. This restriction only applies to the primary font name as
+presented to the users.
+
+4) The name(s) of the Copyright Holder(s) or the Author(s) of the Font
+Software shall not be used to promote, endorse or advertise any
+Modified Version, except to acknowledge the contribution(s) of the
+Copyright Holder(s) and the Author(s) or with their explicit written
+permission.
+
+5) The Font Software, modified or unmodified, in part or in whole,
+must be distributed entirely under this license, and must not be
+distributed under any other license. The requirement for fonts to
+remain under this license does not apply to any document created
+using the Font Software.
+
+TERMINATION
+This license becomes null and void if any of the above conditions are
+not met.
+
+DISCLAIMER
+THE FONT SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO ANY WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT
+OF COPYRIGHT, PATENT, TRADEMARK, OR OTHER RIGHT. IN NO EVENT SHALL THE
+COPYRIGHT HOLDER BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+INCLUDING ANY GENERAL, SPECIAL, INDIRECT, INCIDENTAL, OR CONSEQUENTIAL
+DAMAGES, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+FROM, OUT OF THE USE OR INABILITY TO USE THE FONT SOFTWARE OR FROM
+OTHER DEALINGS IN THE FONT SOFTWARE.

package/dist/dev/dashboard-font.js

@@ -0,0 +1,14 @@
+// Inter, the face Driggsby apps set their text in. Driggsby serves it on
+// every deployed app's own origin at DASHBOARD_FONT_PATH, and the scaffold
+// loads it from there; dev serves the same bytes at the same path, from
+// this package (assets/Inter.woff2, under the SIL Open Font License 1.1 in
+// assets/Inter-LICENSE.txt). So the preview draws the letters the deployed
+// page draws, and nothing reaches the internet for them.
+import { readFile } from "node:fs/promises";
+export const DASHBOARD_FONT_PATH = "/-/inter.woff2";
+export const DASHBOARD_FONT_TYPE = "font/woff2";
+// src/dev/ and dist/dev/ both sit two levels under the package root.
+const FONT_FILE = new URL("../../assets/Inter.woff2", import.meta.url);
+export async function loadDashboardFont() {
+    return await readFile(FONT_FILE);
+}

package/dist/dev/dev-command.js

@@ -13,6 +13,7 @@ import { defaultCredentialEnvironment, } from "../credentials/store.js";
 import { requireDeploySession } from "../deploy/api-session.js";
 import { tryOpenUrl } from "../login/open-url.js";
 import { wrapProse } from "../terminal-text.js";
+import { loadDashboardFont } from "./dashboard-font.js";
 import { DEV_IDLE_MINUTES, DEV_START_COMMAND, DEV_STOP_COMMAND } from "./dev-commands.js";
 import { startDevServers } from "./dev-servers.js";
 import { pruneDevStatesForPorts, readDevStates, removeDevState, writeDevState } from "./dev-state.js";
@@ -63,6 +64,7 @@ export async function runDev(options = {}, environment = defaultCredentialEnviro
     const session = await requireDeploySession(environment);
     await refuseSecondPreview(environment.homeDirectory, projectDirectory);
     const sdkBundle = await loadSdkBundle();
+    const dashboardFont = await loadDashboardFont();
     // Retries like the production host, so the preview loads the way the
     // deployed app would.
     const broker = new McpBroker({ baseUrl: session.baseUrl, token: session.token, retries: true });
@@ -83,6 +85,7 @@ export async function runDev(options = {}, environment = defaultCredentialEnviro
                 background: config.background,
                 serveDirectory: config.serveDirectory,
                 sdkBundle,
+                dashboardFont,
                 runToolCall: async (tool, argumentsObject) => {
                     const started = Date.now();
                     const calledIn = documentGeneration;

package/dist/dev/dev-servers.js

@@ -1,11 +1,12 @@
 // The two local servers behind `driggsby dev`, mirroring production's
 // topology: the host origin (the page a person opens; serves the host page
 // and the CLI's tool-call endpoint) and the app origin (the app's own
-// files, plus the Driggsby SDK at /-/driggsby-sdk.js). Both bind loopback
-// only. The app token never appears here — the broker callback holds it in
-// the CLI process.
+// files, plus the Driggsby SDK at /-/driggsby-sdk.js and the dashboard font
+// at /-/inter.woff2). Both bind loopback only. The app token never appears
+// here — the broker callback holds it in the CLI process.
 import { createServer } from "node:http";
 import { appResponseHeaders, INERT_SERVICE_WORKER } from "./app-policy.js";
+import { DASHBOARD_FONT_PATH, DASHBOARD_FONT_TYPE } from "./dashboard-font.js";
 import { DEV_IDENTITY_PATH } from "./dev-state.js";
 import { hostPageHtml, HOST_PAGE_JS } from "./host-page.js";
 import { serveStaticFile } from "./static-files.js";
@@ -71,7 +72,7 @@ export async function startDevServers(options) {
     };
 }
 // ---------------------------------------------------------------------------
-// The app origin: the SDK path, then the project's own files.
+// The app origin: the SDK and font paths, then the project's own files.
 // ---------------------------------------------------------------------------
 async function handleAppRequest(options, appPort, hostOrigin, request, response) {
     // Every response carries the deployed app's headers (app-policy.ts). Their
@@ -100,6 +101,15 @@ async function handleAppRequest(options, appPort, hostOrigin, request, response)
         sendText(response, 200, JAVASCRIPT, options.sdkBundle, appResponseHeaders(hostOrigin, JAVASCRIPT));
         return;
     }
+    if (path === DASHBOARD_FONT_PATH) {
+        response.writeHead(200, {
+            "Content-Type": DASHBOARD_FONT_TYPE,
+            "Cache-Control": "no-store",
+            ...appResponseHeaders(hostOrigin, DASHBOARD_FONT_TYPE),
+        });
+        response.end(options.dashboardFont);
+        return;
+    }
     const file = await serveStaticFile(options.serveDirectory, path);
     if (file === null) {
         sendText(response, 404, PLAIN_TEXT, "Not found.", plainTextHeaders);

package/dist/init/template-styles.js

@@ -5,13 +5,16 @@
 // console's stylesheet, so each gray is written as the console paints it
 // on its black page (the console's cards and fills are translucent over
 // that ground) and each hue verbatim. The :root block is the same one
-// Driggsby's own example dashboard carries. --bg-app must stay equal to
-// driggsby.json's "background" (init-command.test.ts pins the two
-// together): Driggsby paints that color while the app loads.
+// Driggsby's own example dashboard carries, --font-sans leading with
+// Inter, the face Driggsby serves every app (dev/dashboard-font.ts).
+// --bg-app must stay equal to driggsby.json's "background"
+// (init-command.test.ts pins the two together): Driggsby paints that color
+// while the app loads.
 export const STYLES_CSS = `/* Driggsby's console palette, so this page reads as part of the app it
-   opens inside. Change these together if you re-theme; keep --bg-app equal
-   to the "background" in driggsby.json. The status tones are the
-   console's own, for gains, losses, warnings, and a live dot. */
+   opens inside. Change these together if you re-theme (all but
+   --font-sans, which stays as it is); keep --bg-app equal to the
+   "background" in driggsby.json. The status tones are the console's own,
+   for gains, losses, warnings, and a live dot. */
 :root {
   color-scheme: dark;
   --bg-app: #000000;
@@ -28,10 +31,30 @@ export const STYLES_CSS = `/* Driggsby's console palette, so this page reads as
   --text-error: oklch(0.8 0.13 25);
   --radius-card: 8px;
   --radius-bar: 4px;
-  --font-sans: -apple-system, BlinkMacSystemFont, "Segoe UI", Helvetica, Arial, sans-serif;
+  --font-sans: "Inter", -apple-system, BlinkMacSystemFont, "Segoe UI", Helvetica, Arial, sans-serif;
   --ease: cubic-bezier(0.2, 0, 0, 1);
 }
 
+/* Inter, which Driggsby serves at /-/inter.woff2 on this app's own origin
+   (driggsby dev serves the same file there), so nothing loads from another
+   site. Inter is the only font a dashboard uses: set all text with
+   var(--font-sans), keep that stack as it is (the faces after Inter only
+   stand in if the font is slow or fails to load, or lacks a character),
+   and name no other font anywhere else. A <canvas> or a chart library's
+   font setting can't read var(): name "Inter" there, followed only by
+   sans-serif, and draw a canvas after document.fonts.ready. The
+   Dashboards page shows a picture of this page, taken on a server with
+   none of your fonts, and any other face looks different there than on
+   the live page. Text waits for the font (font-display: block,
+   preloaded) rather than flash another face first. */
+@font-face {
+  font-family: "Inter";
+  src: url("/-/inter.woff2") format("woff2");
+  font-weight: 100 900;
+  font-style: normal;
+  font-display: block;
+}
+
 * {
   box-sizing: border-box;
 }
@@ -46,6 +69,15 @@ body {
   -webkit-font-smoothing: antialiased;
 }
 
+/* Browsers set form controls in the system font on their own, whatever
+   the body's; these take the page's Inter instead. */
+button,
+input,
+select,
+textarea {
+  font: inherit;
+}
+
 /* A compact column: a few figures and a short list read best close
    together. The console's own pages run wider (75rem); widen this as the
    page grows. */
@@ -95,6 +127,10 @@ h2 {
 }
 
 .stat {
+  /* The figure inside sizes itself to this card (see .stat-value), so
+     the card takes its width from the grid, never from its content: in a
+     content-sized track it would collapse. */
+  container-type: inline-size;
   display: flex;
   flex-direction: column;
   padding: 14px 16px;
@@ -110,15 +146,34 @@ h2 {
 
 .stat-value {
   margin-top: 2px;
+  /* 20px, and 20px wherever container units aren't known; the @supports
+     rule below shrinks a figure too long for its card. The line stays
+     30px whatever size the figure draws at, so it measures the same as
+     the skeleton bar it replaces. */
   font-size: 20px;
+  line-height: 30px;
   font-weight: 600;
   letter-spacing: -0.01em;
   font-variant-numeric: tabular-nums;
-  /* A currency string has no natural break, and a clipped balance is a
-     wrong number. If a value ever outgrows its cell, it wraps. */
+  /* Past the 12px floor a figure wraps rather than spill out of its
+     card: a clipped balance is a wrong number. */
   overflow-wrap: anywhere;
 }
 
+/* A figure keeps 20px unless it is too long for its card, and then
+   shrinks just enough to stay one number: its length (--chars, which
+   renderOverview sets) at 0.6em a character, the widest these figures
+   run with a little room, fills at most the card (100cqi). A short
+   balance never shrinks; $99,999,999.99 in a desktop card draws near
+   17px. Inside @supports, so a browser without container units keeps
+   20px: outside it, the var() would let the line override 20px and
+   then fail. */
+@supports (width: 1cqi) {
+  .stat-value {
+    font-size: clamp(12px, calc(100cqi / (var(--chars, 1) * 0.6)), 20px);
+  }
+}
+
 #accounts {
   border: 1px solid var(--hairline);
   border-radius: var(--radius-card);
@@ -143,6 +198,28 @@ h2 {
   color: var(--text-secondary);
 }
 
+/* A section whose call failed says why in its own place (see "When a call
+   fails" in app.js): in the list, in a row's inset under any rows it
+   keeps; across the stat row, as a card of its own. A long reason (one
+   can quote your SQL) wraps inside it. */
+.problem {
+  padding: 14px 16px;
+  color: var(--text-warning);
+  overflow-wrap: anywhere;
+}
+
+.stat-grid > .problem {
+  grid-column: 1 / -1;
+  border: 1px solid var(--hairline);
+  border-radius: var(--radius-card);
+  background: var(--bg-card);
+}
+
+.account-row + .problem,
+.empty-row + .problem {
+  border-top: 1px solid var(--hairline);
+}
+
 /* The institution's initial on a round pill, as the console draws it. */
 .account-glyph {
   flex: none;

package/dist/init/templates.js

@@ -15,6 +15,7 @@ export function indexHtml(slug) {
   <meta charset="utf-8">
   <meta name="viewport" content="width=device-width, initial-scale=1">
   <title>${slug}</title>
+  <link rel="preload" href="/-/inter.woff2" as="font" type="font/woff2" crossorigin>
   <link rel="stylesheet" href="styles.css">
 </head>
 <body>
@@ -87,11 +88,13 @@ export const APP_JS = `// Your app's code. Edit anything — driggsby dev reload
 //
 // Reading data is one call:
 //
-//   driggsby.watch(tool, params, callback)
+//   driggsby.watch(tool, params, callback, { onError })
 //
 // Each watch is a live subscription: the callback runs with a fresh result
-// whenever your Driggsby data changes. The sample data below matches the
-// real result shapes, so the render functions work unchanged either way.
+// whenever your Driggsby data changes, and onError runs instead when a call
+// fails (see "When a call fails" below; watchSection wires one section
+// that way, so add yours with it). The sample data below matches the real
+// result shapes, so the render functions work unchanged either way.
 //
 // These are the tools an app can watch — read-only, nothing else responds:
 //
@@ -203,10 +206,11 @@ function renderOverview(result) {
   ];
   for (const [label, value] of stats) {
     const stat = element("div", "stat");
-    stat.append(
-      element("div", "stat-label", label),
-      element("div", "stat-value", formatMoney(value))
-    );
+    const figure = element("div", "stat-value", formatMoney(value));
+    // Its length, so a long figure can shrink to fit its card while a
+    // short one keeps its full size (see .stat-value in styles.css).
+    figure.style.setProperty("--chars", String(figure.textContent.length));
+    stat.append(element("div", "stat-label", label), figure);
     container.append(stat);
   }
   // aria-busy ships in the HTML so assistive tech hears "loading" until
@@ -347,6 +351,60 @@ function settledRenderer(render) {
   };
 }
 
+// ---------------------------------------------------------------------------
+// When a call fails. A watch whose call fails never runs its callback; it
+// runs onError instead, with { message, kind }, once for each new failure —
+// after Driggsby has already retried a call that failed because it was busy
+// or slow. The section says why where its data would be: in place of its
+// skeleton, so a failure never looks like a page still loading, or under
+// the data it already shows, which stays. The watch asks again on its own
+// the next time your data changes, and the next good result repaints the
+// section, reason and all. A section counts as still loading while its
+// container is aria-busy="true": the HTML ships every container that way,
+// and every render clears it and replaces everything in its container,
+// so keep all three true for a section you add.
+// ---------------------------------------------------------------------------
+
+function showProblem(containerId, error) {
+  const container = document.getElementById(containerId);
+  const message =
+    error && typeof error.message === "string" && error.message
+      ? error.message
+      : "This didn't load. It tries again when your data next changes.";
+  const note = element("div", "problem", message);
+  note.setAttribute("role", "status");
+  if (container.getAttribute("aria-busy") === "true") {
+    container.replaceChildren(note);
+    container.removeAttribute("aria-busy");
+    return;
+  }
+  const earlier = container.querySelector(".problem");
+  if (earlier) earlier.remove();
+  container.append(note);
+}
+
+// One section's live data: its watch, its render, and its failures. A
+// failure that lands while the section's first result waits for its
+// dissolve still shows once that result paints, under it. It returns the
+// watch's stop function: call it before watching the same section again
+// with new params.
+function watchSection(tool, params, containerId, render) {
+  let problem = null;
+  const paint = settledRenderer((result) => {
+    render(result);
+    if (problem) showProblem(containerId, problem);
+  });
+  return driggsby.watch(tool, params, (result) => {
+    problem = null;
+    paint(result);
+  }, {
+    onError: (error) => {
+      problem = error;
+      showProblem(containerId, error);
+    }
+  });
+}
+
 // ---------------------------------------------------------------------------
 // Live data. window.driggsby exists when the Driggsby SDK loaded — inside
 // Driggsby, or under driggsby dev. Whether anything embeds this page is
@@ -366,8 +424,8 @@ if (standalone) {
 }
 
 if (window.driggsby) {
-  driggsby.watch("get_overview", {}, settledRenderer(renderOverview));
-  driggsby.watch("list_accounts", {}, settledRenderer(renderAccounts));
+  watchSection("get_overview", {}, "overview", renderOverview);
+  watchSection("list_accounts", {}, "accounts", renderAccounts);
 }
 `;
 // "background" is the template's own page background (styles.css

package/package.json

@@ -1,8 +1,8 @@
 {
   "name": "driggsby",
-  "version": "0.7.1",
+  "version": "0.7.3",
   "description": "Set up and build on Driggsby, the MCP server for personal finance.",
-  "license": "Apache-2.0",
+  "license": "Apache-2.0 AND OFL-1.1",
   "repository": {
     "type": "git",
     "url": "git+https://github.com/driggsby/driggsby.git"
@@ -13,6 +13,8 @@
     "driggsby": "bin/driggsby.js"
   },
   "files": [
+    "assets/Inter.woff2",
+    "assets/Inter-LICENSE.txt",
     "bin",
     "dist",
     "LICENSE",
@@ -28,7 +30,7 @@
     "node": ">=18"
   },
   "dependencies": {
-    "@driggsby/deploy": "0.7.1",
-    "@driggsby/sdk": "0.7.1"
+    "@driggsby/deploy": "0.7.3",
+    "@driggsby/sdk": "0.7.3"
   }
 }