driggsby 0.10.1 → 0.10.3

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,70 +2,88 @@
 // 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.
-import { spawn } from "node:child_process";
-import { existsSync } from "node:fs";
-import { fileURLToPath } from "node:url";
+// starts over, the arrows move two seconds, and q quits; the voice follows
+// each of them in place. 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 { CliError } from "../cli-error.js";
 import { defaultCredentialEnvironment, readStoredToken } from "../credentials/store.js";
 import { deployFailure, requireDeploySession } from "../deploy/api-session.js";
 import { runLogin } from "../login/login.js";
 import { CUES, SILENT, VOICED } from "./att-story.js";
 import { MIN_COLS, MIN_ROWS, renderFrame } from "./feed-frame.js";
+import { lineAt, startVoice } from "./voice.js";
 import { castVote } from "./vote.js";
-const PLAYER = "/usr/bin/afplay";
 const TICK_MS = 33;
 const RETRY_COMMAND = "npx driggsby@latest replay att";
 export async function runReplay(options, environment = defaultCredentialEnvironment()) {
     if (!process.stdin.isTTY || !process.stdout.isTTY) {
         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 voice = options.quiet ? null : await startVoice();
+    const ending = await play(voice === null ? SILENT : VOICED, voice, 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, voice, environment) {
     const stdin = process.stdin;
     const stdout = process.stdout;
-    const playing = new Set();
-    const hush = () => {
-        for (const child of playing)
-            child.kill();
-        playing.clear();
-    };
-    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" });
-        child.on("error", () => playing.delete(child));
-        child.on("exit", () => playing.delete(child));
-        playing.add(child);
-    };
     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 rate = () => (fast ? 2 : 1);
+    // A jump picks up whatever line is being said at the new moment, mid-word.
     const seek = (to) => {
-        hush();
         pt = Math.max(0, Math.min(timeline.total, to));
+        if (voice === null)
+            return;
+        const line = lineAt(CUES, pt);
+        if (line === null)
+            voice.stop();
+        else
+            voice.play(line.file, line.offset, rate(), paused);
     };
     return new Promise((resolve) => {
         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();
+            voice?.close();
             stdin.off("data", onKey);
             stdin.setRawMode(false);
             stdin.pause();
@@ -73,6 +91,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,22 +118,25 @@ 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;
+                if (paused)
+                    voice?.pause();
+                else
+                    voice?.resume();
             }
             else if (key === "f") {
-                hush();
                 fast = !fast;
+                voice?.rate(rate());
             }
             else if (key === "r") {
-                seek(0);
                 paused = false;
+                seek(0);
             }
             else if (key === "\u001b[C")
                 seek(pt + 2);
@@ -111,11 +149,11 @@ function play(timeline, sound) {
             const dt = (now - last) / 1000;
             last = now;
             if (!paused && pt < timeline.total) {
-                const next = Math.min(timeline.total, pt + dt * (fast ? 2 : 1));
-                if (sound)
+                const next = Math.min(timeline.total, pt + dt * rate());
+                if (voice !== null)
                     for (const cue of CUES)
                         if (cue.at > pt && cue.at <= next)
-                            playCue(cue.file, fast);
+                            voice.play(cue.file, 0, rate(), false);
                 pt = next;
             }
             draw();
@@ -125,22 +163,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/dist/replay/voice.js

@@ -0,0 +1,130 @@
+// The replay's voice on a Mac: one player, macOS's own, driven over a pipe
+// through the built-in osascript. It pauses, resumes, changes speed and
+// stops in place and at once, and only one line ever plays. When the replay
+// ends, or its process dies, the pipe closes and the player stops and exits.
+import { spawn } from "node:child_process";
+import { existsSync } from "node:fs";
+import { fileURLToPath } from "node:url";
+const OSASCRIPT = "/usr/bin/osascript";
+const READY_MS = 3_000;
+// Commands arrive one per line, tab-separated: play <path> <offset> <rate>
+// <paused 0|1>, pause, resume, rate <rate>, stop. A play past the end of its
+// file stays silent, and a resume only continues a line a pause (or a paused
+// jump) held, never one that had already finished. End of input stops the
+// player and exits.
+const PLAYER_SCRIPT = `
+ObjC.import("AVFoundation");
+ObjC.import("Foundation");
+function run() {
+  const input = $.NSFileHandle.fileHandleWithStandardInput;
+  const output = $.NSFileHandle.fileHandleWithStandardOutput;
+  output.writeData($("ready\\n").dataUsingEncoding($.NSUTF8StringEncoding));
+  let player = null;
+  let held = false;
+  let buffer = "";
+  for (;;) {
+    const data = input.availableData;
+    if (Number(data.length) === 0) break;
+    buffer += $.NSString.alloc.initWithDataEncoding(data, $.NSUTF8StringEncoding).js;
+    let end;
+    while ((end = buffer.indexOf("\\n")) >= 0) {
+      const parts = buffer.slice(0, end).split("\\t");
+      buffer = buffer.slice(end + 1);
+      const command = parts[0];
+      if (command === "play") {
+        if (player) player.stop;
+        player = null;
+        held = false;
+        const next = $.AVAudioPlayer.alloc.initWithContentsOfURLError($.NSURL.fileURLWithPath(parts[1]), null);
+        const offset = Number(parts[2]);
+        if (!next.isNil() && offset >= 0 && offset < next.duration) {
+          next.enableRate = true;
+          next.prepareToPlay;
+          next.rate = Number(parts[3]);
+          next.currentTime = offset;
+          if (parts[4] === "1") held = true;
+          else next.play;
+          player = next;
+        }
+      } else if (command === "pause") {
+        held = Boolean(player && player.playing);
+        if (held) player.pause;
+      } else if (command === "resume") {
+        if (held) player.play;
+        held = false;
+      } else if (command === "rate") {
+        if (player) player.rate = Number(parts[1]);
+      } else if (command === "stop") {
+        if (player) player.stop;
+        player = null;
+        held = false;
+      }
+    }
+  }
+  if (player) player.stop;
+}
+`;
+// The line under a moment of the replay: the last sound started at or before
+// it, and how far into it the moment is (past its end, the player stays silent).
+export function lineAt(cues, pt) {
+    let found = null;
+    for (const cue of cues) {
+        if (cue.at > pt)
+            break;
+        found = cue;
+    }
+    return found === null ? null : { file: found.file, offset: pt - found.at };
+}
+// One command line for the player; null for a path it couldn't carry.
+export function playerCommand(parts) {
+    const fields = parts.map(String);
+    return fields.some((field) => /[\t\n\r]/.test(field)) ? null : `${fields.join("\t")}\n`;
+}
+// The player, ready to speak, or null where there is none (not a Mac, or it
+// didn't start): the replay then plays silently.
+export function startVoice() {
+    if (process.platform !== "darwin" || !existsSync(OSASCRIPT))
+        return Promise.resolve(null);
+    return new Promise((resolve) => {
+        const child = spawn(OSASCRIPT, ["-l", "JavaScript", "-e", PLAYER_SCRIPT], { stdio: ["pipe", "pipe", "ignore"] });
+        let settled = false;
+        const settle = (voice) => {
+            if (settled)
+                return;
+            settled = true;
+            clearTimeout(timer);
+            if (voice === null)
+                child.kill();
+            resolve(voice);
+        };
+        const timer = setTimeout(() => { settle(null); }, READY_MS);
+        child.on("error", () => { settle(null); });
+        child.on("exit", () => { settle(null); });
+        // The player may be gone before a write lands; a lost line is silence.
+        child.stdin.on("error", () => undefined);
+        child.stdout.on("data", (chunk) => {
+            if (chunk.toString("utf8").includes("ready"))
+                settle(voiceOver(child));
+        });
+    });
+}
+function voiceOver(child) {
+    const send = (parts) => {
+        const line = playerCommand(parts);
+        if (line !== null && child.stdin.writable)
+            child.stdin.write(line);
+    };
+    return {
+        play: (file, offset, rate, paused) => {
+            send(["play", fileURLToPath(new URL(`../../assets/replay/${file}`, import.meta.url)), offset.toFixed(3), rate, paused ? 1 : 0]);
+        },
+        pause: () => { send(["pause"]); },
+        resume: () => { send(["resume"]); },
+        rate: (rate) => { send(["rate", rate]); },
+        stop: () => { send(["stop"]); },
+        close: () => {
+            send(["stop"]);
+            child.stdin.end();
+        },
+    };
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "driggsby",
-  "version": "0.10.1",
+  "version": "0.10.3",
   "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.3",
+    "@driggsby/sdk": "0.10.3"
   }
 }