driggsby 0.10.1 → 0.10.2

package/dist/replay/att-story.js

@@ -101,6 +101,11 @@ export const STEPS = [
     }
 ];
 export const LINES = [
+    {
+        at: 30,
+        who: "att",
+        text: "Thanks for calling AT&T. In a few words, tell me what you’re calling about."
+    },
     {
         at: 40.1,
         who: "agent",
@@ -209,7 +214,7 @@ export const LINES = [
     {
         at: 1506,
         who: "agent",
-        text: "Thanks so much, you too. Bye!"
+        text: "That sounds perfect. Thanks so much for your help. Bye!"
     }
 ];
 export const SILENT = {
@@ -219,10 +224,10 @@ export const SILENT = {
     speak: new Map(),
 };
 export const VOICED = {
-    keys: [[0, 0], [40.1, 1.745], [76.4, 3.234], [77.3, 7.332], [161.1, 9.354], [201.6, 12.746], [238.4, 13.596], [753.6, 20.236], [803.1, 22.061], [829.1, 31.517], [1110.5, 34.671], [1128.7, 37.725], [1130.1, 40.504], [1148.5, 44.816], [1205.6, 48.481], [1228.7, 53.955], [1260.8, 57.989], [1262.5, 62.902], [1275, 66.519], [1318.6, 69.236], [1331.3, 73.208], [1365.5, 74.711], [1506, 77.299], [1509.3, 79.713]],
-    endStart: 80.513,
-    total: 90.513,
-    speak: new Map([[40.1, 1.039], [76.4, 3.648], [77.3, 0.361], [161.1, 2.943], [201.6, 0.4], [238.4, 2.19], [753.6, 1.374], [803.1, 9.006], [829.1, 1.496], [1110.5, 2.604], [1128.7, 2.329], [1130.1, 3.862], [1148.5, 3.215], [1205.6, 5.024], [1228.7, 3.584], [1260.8, 4.464], [1262.5, 3.167], [1275, 2.267], [1318.6, 3.522], [1331.3, 0.308], [1365.5, 2.138], [1506, 1.614]]),
+    keys: [[0, 0], [30, 1.65], [40.1, 6.103], [76.4, 7.592], [77.3, 11.69], [161.1, 13.711], [201.6, 17.104], [238.4, 17.954], [753.6, 24.594], [803.1, 26.418], [829.1, 35.875], [1110.5, 39.029], [1128.7, 42.082], [1130.1, 44.862], [1148.5, 49.174], [1205.6, 52.839], [1228.7, 58.313], [1260.8, 62.346], [1262.5, 67.26], [1275, 70.877], [1318.6, 73.594], [1331.3, 77.566], [1365.5, 79.069], [1506, 81.657], [1509.3, 85.737]],
+    endStart: 86.537,
+    total: 96.537,
+    speak: new Map([[30, 4.003], [40.1, 1.039], [76.4, 3.648], [77.3, 0.361], [161.1, 2.943], [201.6, 0.4], [238.4, 2.19], [753.6, 1.374], [803.1, 9.006], [829.1, 1.496], [1110.5, 2.604], [1128.7, 2.329], [1130.1, 3.862], [1148.5, 3.215], [1205.6, 5.024], [1228.7, 3.584], [1260.8, 4.464], [1262.5, 3.167], [1275, 2.267], [1318.6, 3.522], [1331.3, 0.308], [1365.5, 2.138], [1506, 3.28]]),
 };
 // Each sound and the replay second it starts at, on the voiced timeline.
 export const CUES = [
@@ -231,99 +236,103 @@ export const CUES = [
         file: "att-00.m4a"
     },
     {
-        at: 1.745,
+        at: 1.65,
         file: "att-01.m4a"
     },
     {
-        at: 3.234,
+        at: 6.103,
         file: "att-02.m4a"
     },
     {
-        at: 7.332,
+        at: 7.592,
         file: "att-03.m4a"
     },
     {
-        at: 9.354,
+        at: 11.69,
         file: "att-04.m4a"
     },
     {
-        at: 12.746,
+        at: 13.711,
         file: "att-05.m4a"
     },
     {
-        at: 13.596,
+        at: 17.104,
         file: "att-06.m4a"
     },
     {
-        at: 15.986,
+        at: 17.954,
         file: "att-07.m4a"
     },
     {
-        at: 20.236,
+        at: 20.344,
         file: "att-08.m4a"
     },
     {
-        at: 22.061,
+        at: 24.594,
         file: "att-09.m4a"
     },
     {
-        at: 31.517,
+        at: 26.418,
         file: "att-10.m4a"
     },
     {
-        at: 34.671,
+        at: 35.875,
         file: "att-11.m4a"
     },
     {
-        at: 37.725,
+        at: 39.029,
         file: "att-12.m4a"
     },
     {
-        at: 40.504,
+        at: 42.082,
         file: "att-13.m4a"
     },
     {
-        at: 44.816,
+        at: 44.862,
         file: "att-14.m4a"
     },
     {
-        at: 48.481,
+        at: 49.174,
         file: "att-15.m4a"
     },
     {
-        at: 53.955,
+        at: 52.839,
         file: "att-16.m4a"
     },
     {
-        at: 57.989,
+        at: 58.313,
         file: "att-17.m4a"
     },
     {
-        at: 62.902,
+        at: 62.346,
         file: "att-18.m4a"
     },
     {
-        at: 66.519,
+        at: 67.26,
         file: "att-19.m4a"
     },
     {
-        at: 69.236,
+        at: 70.877,
         file: "att-20.m4a"
     },
     {
-        at: 73.208,
+        at: 73.594,
         file: "att-21.m4a"
     },
     {
-        at: 74.711,
+        at: 77.566,
         file: "att-22.m4a"
     },
     {
-        at: 77.299,
+        at: 79.069,
         file: "att-23.m4a"
     },
     {
-        at: 80.513,
+        at: 81.657,
         file: "att-24.m4a"
+    },
+    {
+        at: 86.537,
+        file: "att-25.m4a"
     }
 ];

package/dist/replay/feed-frame.js

@@ -87,7 +87,7 @@ export function renderFrame(input) {
             }
         });
         if (ended)
-            feed.push(...result(input.pt - timeline.endStart, w, narrow));
+            feed.push(...result(input.pt - timeline.endStart, w, narrow, input.vote ?? "idle"));
         return { feed, doneAt };
     };
     const room = rows - 6;
@@ -154,7 +154,7 @@ function checkRows(checks, real, inner, narrow, guide) {
         out.push(line(guide(), ...checks.slice(r, r + 2).flatMap((c) => check(c, cw))));
     return out;
 }
-function result(t, w, narrow) {
+function result(t, w, narrow, vote) {
     const after = CALL.before + (CALL.after - CALL.before) * ease(t / 0.9);
     const saved = `${money((CALL.before - CALL.after) * CALL.months)} saved`;
     const at = (n) => t >= 0.15 * n;
@@ -172,7 +172,9 @@ function result(t, w, narrow) {
     if (at(2))
         out.push(line(seg("Verizon, same week:  ", C.mute), seg("$95.71", C.faint, { strike: true }), seg(" → ", C.mute), seg("$74.01", C.money)));
     if (at(3))
-        out.push(line(), line(seg(" j ", C.ink, { bg: C.money, bold: true }), seg("  Vote to roll this out", C.text, { bold: true })));
+        out.push(line(), vote === "counted"
+            ? line(seg("✓", C.money, { bold: true }), seg("  Your vote is in. Thanks.", C.text, { bold: true }))
+            : line(seg(" j ", C.ink, { bg: C.money, bold: true }), seg("  Vote to roll this out", C.text, { bold: true })));
     return out;
 }
 // Too tall for the window: fold the earliest finished steps into one line
@@ -201,12 +203,19 @@ function bottomBar(real, pt, ended, w, narrow, timeline) {
     return spread(left, right, w);
 }
 function help(input, w, narrow) {
-    if (input.join === "open") {
-        return spread([seg("Count your vote to roll this out?", C.text, { bold: true })], [seg("enter", C.money, { bold: true }), seg(" yes   ", C.mute), seg("esc", C.text), seg(" not now", C.mute)], w);
-    }
     const keys = narrow
         ? [["space", input.paused ? "play" : "pause"], ["q", "quit"]]
         : [["space", input.paused ? "play" : "pause"], ["f", input.fast ? "1×" : "2×"], ["r", "replay"], ["q", "quit"]];
     const left = keys.flatMap(([key, what], i) => [seg((i > 0 ? (narrow ? "  " : "  ·  ") : "") + key, C.mute), seg(` ${what}`, C.faint)]);
-    return spread(left, [seg(" j ", C.ink, { bg: C.money, bold: true }), seg(" vote to roll this out", C.money)], w);
+    // j belongs to the ending: nothing about it shows while the call plays.
+    if (input.pt < input.timeline.endStart)
+        return line(...left);
+    // Once pressed, this spot says how the vote went.
+    const state = input.vote ?? "idle";
+    const vote = state === "counting" ? [seg("counting your vote…", C.mute)]
+        : state === "counted" ? [seg("✓ ", C.money, { bold: true }), seg("your vote is in", C.money)]
+            : state === "closed" ? [seg("voting has closed", C.faint)]
+                : state === "failed" ? [seg("couldn’t count it · ", C.faint), seg(" j ", C.ink, { bg: C.money, bold: true }), seg(" try again", C.money)]
+                    : [seg(" j ", C.ink, { bg: C.money, bold: true }), seg(" vote to roll this out", C.money)];
+    return spread(left, vote, w);
 }

package/dist/replay/replay-command.js

@@ -2,8 +2,9 @@
 // internet bill, in the terminal. On a Mac it plays with sound (recreated
 // voices, the call's real words), paced around them; elsewhere, or with
 // --quiet, it plays silently and faster. Space pauses, f plays at 2x, r
-// starts over, the arrows move two seconds, q quits, and j votes to roll the
-// feature out, signing in first if this machine isn't signed in.
+// starts over, the arrows move two seconds, and q quits. Once the call has
+// played to the end, j votes to roll the feature out: signed in, the vote counts
+// in place; signed out, it signs in first, votes, and the command ends.
 import { spawn } from "node:child_process";
 import { existsSync } from "node:fs";
 import { fileURLToPath } from "node:url";
@@ -22,20 +23,46 @@ export async function runReplay(options, environment = defaultCredentialEnvironm
         throw new CliError(`The replay plays in an interactive terminal. Open one and run:\n  ${RETRY_COMMAND}`, 1);
     }
     const sound = !options.quiet && process.platform === "darwin" && existsSync(PLAYER);
-    const ending = await play(sound ? VOICED : SILENT, sound);
+    const ending = await play(sound ? VOICED : SILENT, sound, environment);
     if (ending === "quit")
         return 0;
-    return await vote(environment);
+    // Signing in needs the terminal: the replay has ended, so sign in, vote, done.
+    process.stdout.write("To count your vote, sign in to Driggsby first. It takes about a minute.\n\n");
+    await runLogin(environment);
+    const vote = await voteSignedIn(environment);
+    if (vote === "failed")
+        return 1;
+    process.stdout.write(vote === "counted" ? "\nThanks. Your vote to roll this out is in.\n" : "\nVoting on this has closed. Thanks for watching.\n");
+    return 0;
 }
-function play(timeline, sound) {
+async function voteSignedIn(environment) {
+    const session = await requireDeploySession(environment);
+    try {
+        return (await castVote(session)) === "voted" ? "counted" : "closed";
+    }
+    catch (error) {
+        // The reason stays in the terminal's own words (a sign-in to redo, a
+        // network to allow); the replay itself only shows that it didn't count.
+        process.stdout.write(`${deployFailure(error, session.baseUrl, RETRY_COMMAND).message}\n`);
+        return "failed";
+    }
+}
+function play(timeline, sound, environment) {
     const stdin = process.stdin;
     const stdout = process.stdout;
     const playing = new Set();
+    // SIGKILL, so a line frozen by a pause (SIGSTOP) stops too.
     const hush = () => {
         for (const child of playing)
-            child.kill();
+            child.kill("SIGKILL");
         playing.clear();
     };
+    // A pause freezes whatever is being said and a resume picks it up where it
+    // stopped, instead of cutting it off until the next line.
+    const freeze = (frozen) => {
+        for (const child of playing)
+            child.kill(frozen ? "SIGSTOP" : "SIGCONT");
+    };
     const playCue = (file, fast) => {
         const path = fileURLToPath(new URL(`../../assets/replay/${file}`, import.meta.url));
         const child = spawn(PLAYER, fast ? ["-r", "2", path] : [path], { stdio: "ignore" });
@@ -46,13 +73,14 @@ function play(timeline, sound) {
     let pt = 0;
     let paused = false;
     let fast = false;
+    let vote = "idle";
     let last = Date.now();
     // A full-screen app: the whole terminal, the header at the top and the
     // progress bar and keys anchored to the bottom.
     const draw = () => {
         const cols = Math.max(MIN_COLS, stdout.columns - 1);
         const rows = Math.max(MIN_ROWS, stdout.rows);
-        const frame = renderFrame({ pt, nowMs: Date.now(), cols, rows, timeline, join: "closed", paused, fast });
+        const frame = renderFrame({ pt, nowMs: Date.now(), cols, rows, timeline, vote, paused, fast });
         stdout.write(`\u001b[H${frame.join("\r\n")}`);
     };
     const seek = (to) => {
@@ -63,7 +91,11 @@ function play(timeline, sound) {
         stdout.write("\u001b[?1049h\u001b[?25l\u001b[2J");
         stdin.setRawMode(true);
         stdin.resume();
+        let done = false;
         const finish = (ending) => {
+            if (done)
+                return;
+            done = true;
             clearInterval(timer);
             hush();
             stdin.off("data", onKey);
@@ -73,6 +105,23 @@ function play(timeline, sound) {
             stdout.write("\u001b[?25h\u001b[?1049l");
             resolve(ending);
         };
+        // j, signed in: the vote counts in place and the bar shows how it went.
+        const castInPlace = async () => {
+            if ((await readStoredToken(environment)) === null) {
+                finish("sign-in");
+                return;
+            }
+            vote = "counting";
+            try {
+                const session = await requireDeploySession(environment);
+                vote = (await castVote(session)) === "voted" ? "counted" : "closed";
+            }
+            catch {
+                vote = "failed";
+            }
+            if (!done)
+                draw();
+        };
         const onResize = () => {
             stdout.write("\u001b[2J");
             draw();
@@ -83,17 +132,17 @@ function play(timeline, sound) {
                 finish("quit");
                 return;
             }
-            // j votes right away: no prompt to confirm.
             if (key === "j") {
-                finish("vote");
-                return;
+                // Only once the call has played to the end.
+                if (pt >= timeline.endStart && (vote === "idle" || vote === "failed"))
+                    void castInPlace();
             }
-            if (key === " ") {
-                hush();
+            else if (key === " ") {
                 paused = !paused;
+                freeze(paused);
             }
             else if (key === "f") {
-                hush();
+                // The line being said finishes at its own speed; the next plays faster.
                 fast = !fast;
             }
             else if (key === "r") {
@@ -125,22 +174,3 @@ function play(timeline, sound) {
         draw();
     });
 }
-async function vote(environment) {
-    const out = (text) => {
-        process.stdout.write(text);
-    };
-    if ((await readStoredToken(environment)) === null) {
-        out("To count your vote, sign in to Driggsby first. It takes about a minute.\n\n");
-        await runLogin(environment);
-        out("\n");
-    }
-    const session = await requireDeploySession(environment);
-    try {
-        const outcome = await castVote(session);
-        out(outcome === "voted" ? "Thanks. Your vote to roll this out is in.\n" : "Voting on this has closed. Thanks for watching.\n");
-        return 0;
-    }
-    catch (error) {
-        throw deployFailure(error, session.baseUrl, RETRY_COMMAND);
-    }
-}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "driggsby",
-  "version": "0.10.1",
+  "version": "0.10.2",
   "description": "Set up and build on Driggsby, the MCP server for personal finance.",
   "license": "Apache-2.0 AND OFL-1.1",
   "repository": {
@@ -31,7 +31,7 @@
     "node": ">=18"
   },
   "dependencies": {
-    "@driggsby/deploy": "0.10.1",
-    "@driggsby/sdk": "0.10.1"
+    "@driggsby/deploy": "0.10.2",
+    "@driggsby/sdk": "0.10.2"
   }
 }